Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mainline Filthy Clothes mod #29291

Merged
merged 8 commits into from
Apr 6, 2019
Merged

Mainline Filthy Clothes mod #29291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
290c5f0
Added FILTHY_CLOTHES external option defaulted to true
Night-Pryanik Apr 5, 2019
15617c9
Set FILTHY_MORALE and FILTHY_WOUNDS external options to true by default
Night-Pryanik Apr 5, 2019
932bd85
Moved FILTHY_WOUNDS option to a more sensible place
Night-Pryanik Apr 5, 2019
d6b0934
Renamed mod to No Filthy Clothes
Night-Pryanik Apr 5, 2019
ac6db16
Removed former Filthy Clothes mod from the list of default mods
Night-Pryanik Apr 5, 2019
9a87d8e
Obsoleted Filthy Clothing mod
Night-Pryanik Apr 5, 2019
08f1b1b
Added No Filthy Clothing mod
Night-Pryanik Apr 5, 2019
595e362
Fixed formatting error
Night-Pryanik Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions data/json/game_balance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,31 +90,38 @@
"stype": "bool",
"value": false
},
{
"type": "EXTERNAL_OPTION",
"name": "FILTHY_CLOTHES",
"info": "If true, zombies will drop filthy clothing.",
"stype": "bool",
"value": true
},
{
"type": "EXTERNAL_OPTION",
"name": "FILTHY_MORALE",
"info": "Morale penalty for filthy clothing. If true, wearing filthy clothing will cause morale penalties.",
"info": "Morale penalty for filthy clothing. If true, wearing filthy clothing will cause morale penalties. Doesn't make sense if FILTHY_CLOTHES option is false.",
"stype": "bool",
"value": false
"value": true
},
{
"type": "EXTERNAL_OPTION",
"name": "MANUAL_BIONIC_INSTALLATION",
"info": "Permits manual self-installation of bionics.",
"name": "FILTHY_WOUNDS",
"info": "Infected wounds from filthy clothing. If true, getting hit in a body part covered in filthy clothing may cause infections. Doesn't make sense if FILTHY_CLOTHES option is false.",
"stype": "bool",
"value": false
"value": true
},
{
"type": "EXTERNAL_OPTION",
"name": "SAFE_AUTODOC",
"info": "Makes autodoc operations completely safe, independent of the players skill.",
"name": "MANUAL_BIONIC_INSTALLATION",
"info": "Permits manual self-installation of bionics.",
"stype": "bool",
"value": false
},
{
"type": "EXTERNAL_OPTION",
"name": "FILTHY_WOUNDS",
"info": "Infected wounds from filthy clothing. If true, getting hit in a body part covered in filthy clothing may cause infections.",
"name": "SAFE_AUTODOC",
"info": "Makes autodoc operations completely safe, independent of the players skill.",
"stype": "bool",
"value": false
},
Expand Down
17 changes: 2 additions & 15 deletions data/mods/Filthy_Morale/modinfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,7 @@
"name": "Filthy Clothing",
"description": "Worn dirty clothing (dropped by zombies) will cause morale penalties and, if hit in combat, infections.",
"category": "rebalance",
"dependencies": [ "dda" ]
},
{
"type": "EXTERNAL_OPTION",
"name": "FILTHY_MORALE",
"info": "Morale penalty for filthy clothing. If true, wearing filthy clothing will cause morale penalties.",
"stype": "bool",
"value": true
},
{
"type": "EXTERNAL_OPTION",
"name": "FILTHY_WOUNDS",
"info": "Infected wounds from filthy clothing. If true, getting hit in a body part covered in filthy clothing may cause infections.",
"stype": "bool",
"value": true
"dependencies": [ "dda" ],
"obsolete": true
}
]
31 changes: 31 additions & 0 deletions data/mods/No_Filthy_Clothes/modinfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[
{
"type": "MOD_INFO",
"ident": "no_filthy_clothing",
"name": "No Filthy Clothing",
"description": "Clothes dropped by zombies will be completely clean.",
"category": "rebalance",
"dependencies": [ "dda" ]
},
{
"type": "EXTERNAL_OPTION",
"name": "FILTHY_CLOTHES",
"info": "If true, zombies will drop filthy clothing.",
"stype": "bool",
"value": false
},
{
"type": "EXTERNAL_OPTION",
"name": "FILTHY_MORALE",
"info": "Morale penalty for filthy clothing. If true, wearing filthy clothing will cause morale penalties. Doesn't make sense if FILTHY_CLOTHES option is false.",
"stype": "bool",
"value": false
},
{
"type": "EXTERNAL_OPTION",
"name": "FILTHY_WOUNDS",
"info": "Infected wounds from filthy clothing. If true, getting hit in a body part covered in filthy clothing may cause infections. Doesn't make sense if FILTHY_CLOTHES option is false.",
"stype": "bool",
"value": false
}
]
2 changes: 1 addition & 1 deletion data/mods/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"ident": "dev:default",
"name": "default",
"description": "contains all the mods recommended by the developers",
"dependencies": [ "dda", "no_npc_food", "filthy_morale" ]
"dependencies": [ "dda", "no_npc_food" ]
}
2 changes: 1 addition & 1 deletion src/monster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2049,7 +2049,7 @@ void monster::drop_items_on_death()
}
const auto dropped = g->m.put_items_from_loc( type->death_drops, pos(), calendar::start );

if( has_flag( MF_FILTHY ) ) {
if( has_flag( MF_FILTHY ) && get_option<bool>( "FILTHY_CLOTHES" ) ) {
for( const auto &it : dropped ) {
if( it->is_armor() ) {
it->item_tags.insert( "FILTHY" );
Expand Down