1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
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",
|
