diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-06-11 15:11:56 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-06-11 15:11:56 -0700 |
commit | 87d6e5e267885d4d9dc0588ff754b695b2c4e59d (patch) | |
tree | d56a44bc2bacc2aeb9323e87c7392805d7d9fd42 /hotfix_mp3-player.patch | |
parent | Updated to 1999 (diff) | |
download | cataclysm-bn-87d6e5e267885d4d9dc0588ff754b695b2c4e59d.tar.xz |
Updated to 2006
Add mp3 player and musical instrument hotfix
Update vampire patch so that vampires do not thirst
Diffstat (limited to 'hotfix_mp3-player.patch')
-rw-r--r-- | hotfix_mp3-player.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/hotfix_mp3-player.patch b/hotfix_mp3-player.patch new file mode 100644 index 0000000..e6191ed --- /dev/null +++ b/hotfix_mp3-player.patch @@ -0,0 +1,44 @@ +--- a/src/monster.cpp ++++ b/src/monster.cpp +@@ -1507,12 +1507,7 @@ + + if( total_dealt > 6 && stab_cut > 0 && has_flag( MF_BLEED ) ) { + // Maybe should only be if DT_CUT > 6... Balance question +- if( target.is_player() || target.is_npc() ) { +- target.add_effect( effect_bleed, 6_minutes, bp_hit ); +- } else { +- target.add_effect( effect_bleed, 6_minutes, bp_hit ); +- } +- ++ target.add_effect( effect_bleed, 6_minutes, bp_hit ); + } + } + +--- a/data/json/effects.json ++++ b/data/json/effects.json +@@ -373,7 +373,7 @@ + "id": "earphones", + "name": [ "Wearing earphones" ], + "desc": [ "You are wearing earphones and can't hear much from outside world." ], +- "permanent": true, ++ "max_duration": "1 s", + "rating": "bad" + }, + { +@@ -526,6 +526,7 @@ + "name": [ "Sleep Deprived" ], + "desc": [ "Your sleep debt has been steadily increasing for a while. You should get some rest." ], + "rating": "bad", ++ "permanent": true, + "max_intensity": 100, + "int_dur_factor": 480, + "resist_effects": [ "meth" ], +@@ -1405,7 +1406,7 @@ + { + "type": "effect_type", + "id": "music", +- "permanent": true ++ "max_duration": "1 s" + }, + { + "type": "effect_type", |