summaryrefslogtreecommitdiff
path: root/hotfix_mp3-player.patch
diff options
context:
space:
mode:
Diffstat (limited to 'hotfix_mp3-player.patch')
-rw-r--r--hotfix_mp3-player.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/hotfix_mp3-player.patch b/hotfix_mp3-player.patch
deleted file mode 100644
index e6191ed..0000000
--- a/hotfix_mp3-player.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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",