Skip to content

Commit

Permalink
BALANCE Buff drugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@Coolthulhu
Coolthulhu committed Jul 12, 2020
1 parent 2739f8b commit 7739dbc
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 94 deletions.
80 changes: 25 additions & 55 deletions data/json/effects.json
View file
Expand Up @@ -1210,14 +1210,7 @@
"per_mod": [ -1 ],
"stamina_min": [ -2 ]
},
"scaling_mods": {
"speed_mod": [ 20 ],
"str_mod": [ 1.5 ],
"dex_mod": [ 1.5 ],
"int_mod": [ -2 ],
"per_mod": [ 0.5 ],
"stamina_min": [ 4 ]
}
"scaling_mods": { "speed_mod": [ 30 ], "str_mod": [ 4 ], "dex_mod": [ 4 ], "int_mod": [ -7 ], "per_mod": [ 2 ], "stamina_min": [ 4 ] }
},
{
"type": "effect_type",
Expand Down Expand Up @@ -1258,12 +1251,11 @@
"stamina_min": [ -4 ]
},
"scaling_mods": {
"speed_mod": [ 15 ],
"str_mod": [ 1.5 ],
"dex_mod": [ 1 ],
"int_mod": [ 0.5 ],
"per_mod": [ 1 ],
"fatigue_min": [ 1 ],
"speed_mod": [ 30 ],
"str_mod": [ 4 ],
"dex_mod": [ 4 ],
"int_mod": [ 1 ],
"per_mod": [ 5 ],
"stamina_min": [ 8 ]
}
},
Expand All @@ -1274,7 +1266,8 @@
"desc": [ "You had a puff or two.", "You smoked too much." ],
"max_intensity": 2,
"int_dur_factor": "10 m",
"scaling_mods": { "vomit_chance": [ 500 ] }
"base_mods": { "per_mod": [ 1 ] },
"scaling_mods": { "str_mod": [ -1 ], "dex_mod": [ -1 ], "per_mod": [ -1 ], "vomit_chance": [ 500 ] }
},
{
"type": "effect_type",
Expand All @@ -1292,7 +1285,6 @@
"type": "effect_type",
"id": "weed_high",
"apply_message": "You feel lightheaded.",
"miss_messages": [ [ "That critter's jumping around like a jitterbug! It needs to mellow out.", 1 ] ],
"base_mods": { "per_mod": [ -1 ] }
},
{
Expand Down Expand Up @@ -1320,6 +1312,7 @@
"int_dur_factor": "100 m",
"miss_messages": [ [ "You feel woozy.", 1 ] ],
"base_mods": {
"str_mod": [ 1 ],
"vomit_chance": [ -43 ],
"sleep_chance": [ -1003 ],
"sleep_min": [ 15000 ],
Expand All @@ -1330,13 +1323,14 @@
"pkill_tick": [ 45 ]
},
"scaling_mods": {
"per_mod": [ -0.5 ],
"dex_mod": [ -0.5 ],
"int_mod": [ -0.75 ],
"str_mod": [ -0.33 ],
"per_mod": [ -1 ],
"dex_mod": [ -1 ],
"int_mod": [ -1.42 ],
"vomit_chance": [ 21 ],
"sleep_chance": [ 501 ],
"pkill_max_val": [ 10 ],
"pkill_tick": [ -10 ]
"pkill_tick": [ -10 ],
"sleep_chance": [ 501 ]
}
},
{
Expand Down Expand Up @@ -1645,19 +1639,6 @@
"max_intensity": 3,
"scaling_mods": { "h_mod_min": [ -5 ] }
},
{
"type": "effect_type",
"id": "bad_food_ennui",
"name": [ "Gross food", "Demoralizing food", "Depressing food" ],
"desc": [
"The food you eat is disgusting.",
"Eating nothing but disgusting rations is starting to get you down.",
"Sure, you survived, but what kind of survival is this, eating these disgusting rations day in and day out?"
],
"max_intensity": 3,
"//": "No morale_mod is currently possible in effects, for some reason. As soon as it's implemented, it goes here.",
"rating": "bad"
},
{
"type": "effect_type",
"id": "cough_suppress"
Expand Down Expand Up @@ -1761,7 +1742,8 @@
{
"type": "effect_type",
"id": "irradiated",
"//": "No name or desc. Hidden from player, encourages use of radiation detection equipment",
"name": [ "Irradiated" ],
"desc": [ "You suffer symptoms of a radiation sickness that weakens your body." ],
"max_intensity": 2000,
"int_dur_factor": "10 s",
"scaling_mods": { "speed_mod": [ -0.2 ], "str_mod": [ -0.125 ], "dex_mod": [ -0.09 ], "int_mod": [ -0.1 ], "per_mod": [ -0.083 ] }
Expand All @@ -1773,7 +1755,7 @@
"desc": [ "You're very jittery and pumped up, probably from some stimulants." ],
"max_intensity": 1000,
"int_dur_factor": "1 s",
"scaling_mods": { "speed_mod": [ 0.08 ], "per_mod": [ 0.04 ] }
"scaling_mods": { "speed_mod": [ 0.33 ], "dex_mod": [ 0.1 ], "per_mod": [ 0.14 ] }
},
{
"type": "effect_type",
Expand All @@ -1782,7 +1764,7 @@
"desc": [ "You are under the influence of depressants, and in a bit of a daze." ],
"max_intensity": 1000,
"int_dur_factor": "1 s",
"scaling_mods": { "speed_mod": [ -0.1 ], "dex_mod": [ -0.05 ] },
"scaling_mods": { "speed_mod": [ -0.333 ], "dex_mod": [ -0.05 ], "per_mod": [ -0.05 ] },
"miss_messages": [ [ "You feel woozy.", 1 ] ]
},
{
Expand All @@ -1798,40 +1780,28 @@
},
{
"type": "effect_type",
"id": "weak_antibiotic_visible",
"id": "weak_antibiotic",
"name": [ "Took weak antibiotic" ],
"desc": [
"You consumed mild antibiotic some time ago to fight off infection.\nIf you don't recover you may want to take another dose, but beware overdosage."
"You consumed mild antibiotic some time ago to fight off infection.\nIt doesn't guarantee recovery, but slows down the progression of infection."
]
},
{
"type": "effect_type",
"id": "antibiotic_visible",
"id": "antibiotic",
"name": [ "Took antibiotic" ],
"desc": [
"You consumed antibiotic some time ago to fight off infection.\nIf you don't recover you may want to take another dose, but beware overdosage."
"You consumed antibiotic some time ago to fight off infection.\nThe infection is stopped from progressing for the duration and you have a high chance of recovery."
]
},
{
"type": "effect_type",
"id": "strong_antibiotic_visible",
"id": "strong_antibiotic",
"name": [ "Took strong antibiotic" ],
"desc": [
"You consumed prescription-grade antibiotic some time ago to fight off infection.\nIf you don't recover you may want to take another dose, but beware overdosage."
"You consumed prescription-grade antibiotic some time ago to fight off infection.\nThe progression of infection is reversed and you have a high chance of recovery."
]
},
{
"type": "effect_type",
"id": "weak_antibiotic"
},
{
"type": "effect_type",
"id": "antibiotic"
},
{
"type": "effect_type",
"id": "strong_antibiotic"
},
{
"type": "effect_type",
"id": "panacea",
Expand Down
20 changes: 20 additions & 0 deletions data/json/obsoletion/effects.json
View file
@@ -0,0 +1,20 @@
[
{
"type": "effect_type",
"id": "weak_antibiotic_visible"
},
{
"type": "effect_type",
"id": "antibiotic_visible"
},
{
"type": "effect_type",
"id": "strong_antibiotic_visible"
},
{
"type": "effect_type",
"id": "bad_food_ennui",
"max_intensity": 3,
"rating": "bad"
}
]
6 changes: 0 additions & 6 deletions src/iuse.cpp
View file
Expand Up @@ -139,7 +139,6 @@ static const activity_id ACT_WASH( "ACT_WASH" );

static const efftype_id effect_adrenaline( "adrenaline" );
static const efftype_id effect_antibiotic( "antibiotic" );
static const efftype_id effect_antibiotic_visible( "antibiotic_visible" );
static const efftype_id effect_asthma( "asthma" );
static const efftype_id effect_attention( "attention" );
static const efftype_id effect_beartrap( "beartrap" );
Expand Down Expand Up @@ -199,7 +198,6 @@ static const efftype_id effect_smoke( "smoke" );
static const efftype_id effect_spores( "spores" );
static const efftype_id effect_stimpack( "stimpack" );
static const efftype_id effect_strong_antibiotic( "strong_antibiotic" );
static const efftype_id effect_strong_antibiotic_visible( "strong_antibiotic_visible" );
static const efftype_id effect_stunned( "stunned" );
static const efftype_id effect_tapeworm( "tapeworm" );
static const efftype_id effect_teargas( "teargas" );
Expand All @@ -219,7 +217,6 @@ static const efftype_id effect_took_xanax_visible( "took_xanax_visible" );
static const efftype_id effect_valium( "valium" );
static const efftype_id effect_visuals( "visuals" );
static const efftype_id effect_weak_antibiotic( "weak_antibiotic" );
static const efftype_id effect_weak_antibiotic_visible( "weak_antibiotic_visible" );
static const efftype_id effect_webbed( "webbed" );
static const efftype_id effect_weed_high( "weed_high" );

Expand Down Expand Up @@ -580,7 +577,6 @@ int iuse::antibiotic( player *p, item *it, bool, const tripoint & )
_( "Maybe just placebo effect, but you feel a little better as the dose settles in." ) );
}
p->add_effect( effect_antibiotic, 12_hours );
p->add_effect( effect_antibiotic_visible, rng( 9_hours, 15_hours ) );
return it->type->charges_to_use();
}

Expand Down Expand Up @@ -9571,7 +9567,6 @@ int iuse::weak_antibiotic( player *p, item *it, bool, const tripoint & )
p->add_msg_if_player( m_good, _( "The throbbing of the infection diminishes. Slightly." ) );
}
p->add_effect( effect_weak_antibiotic, 12_hours );
p->add_effect( effect_weak_antibiotic_visible, rng( 9_hours, 15_hours ) );
return it->type->charges_to_use();
}

Expand All @@ -9582,7 +9577,6 @@ int iuse::strong_antibiotic( player *p, item *it, bool, const tripoint & )
p->add_msg_if_player( m_good, _( "You feel much better - almost entirely." ) );
}
p->add_effect( effect_strong_antibiotic, 12_hours );
p->add_effect( effect_strong_antibiotic_visible, rng( 9_hours, 15_hours ) );
return it->type->charges_to_use();
}

Expand Down
38 changes: 5 additions & 33 deletions src/player_hardcoded_effects.cpp
View file
Expand Up @@ -70,7 +70,6 @@ static const efftype_id effect_hot( "hot" );
static const efftype_id effect_infected( "infected" );
static const efftype_id effect_lying_down( "lying_down" );
static const efftype_id effect_mending( "mending" );
static const efftype_id effect_meth( "meth" );
static const efftype_id effect_motor_seizure( "motor_seizure" );
static const efftype_id effect_nausea( "nausea" );
static const efftype_id effect_narcosis( "narcosis" );
Expand Down Expand Up @@ -572,29 +571,6 @@ void player::hardcoded_effects( effect &it )
it.mult_duration( .25 );
}
}
} else if( id == effect_meth ) {
if( intense == 1 ) {
add_miss_reason( _( "The bees have started escaping your teeth." ), 2 );
if( one_in( 900 ) ) {
add_msg_if_player( m_bad, _( "You feel paranoid. They're watching you." ) );
mod_pain( 1 );
mod_fatigue( dice( 1, 6 ) );
} else if( one_in( 3000 ) ) {
add_msg_if_player( m_bad,
_( "You feel like you need less teeth. You pull one out, and it is rotten to the core." ) );
mod_pain( 1 );
} else if( one_in( 3000 ) ) {
add_msg_if_player( m_bad, _( "You notice a large abscess. You pick at it." ) );
body_part itch = random_body_part( true );
add_effect( effect_formication, 60_minutes, itch );
mod_pain( 1 );
} else if( one_in( 3000 ) ) {
add_msg_if_player( m_bad,
_( "You feel so sick, like you've been poisoned, but you need more. So much more." ) );
vomit();
mod_fatigue( dice( 1, 6 ) );
}
}
} else if( id == effect_teleglow ) {
// Default we get around 300 duration points per teleport (possibly more
// depending on the source).
Expand Down Expand Up @@ -927,12 +903,10 @@ void player::hardcoded_effects( effect &it )
} else if( has_effect( effect_strong_antibiotic ) ) {
it.mod_duration( -1_turns ); //strong antibiotic reverses!
} else if( has_effect( effect_antibiotic ) ) {
if( calendar::once_every( 8_turns ) ) {
it.mod_duration( 1_turns ); //normal antibiotic slows down progression by a factor of 8
}
// Normal antibiotic prevents progression
} else if( has_effect( effect_weak_antibiotic ) ) {
if( calendar::once_every( 2_turns ) ) {
it.mod_duration( 1_turns ); //weak antibiotic slows down by half
if( calendar::once_every( 4_turns ) ) {
it.mod_duration( 1_turns ); //weak antibiotic slows down to a quarter
}
} else {
it.mod_duration( 1_turns );
Expand Down Expand Up @@ -980,11 +954,9 @@ void player::hardcoded_effects( effect &it )
} else if( has_effect( effect_strong_antibiotic ) ) {
it.mod_duration( -1_turns );
} else if( has_effect( effect_antibiotic ) ) {
if( calendar::once_every( 8_turns ) ) {
it.mod_duration( 1_turns );
}
// No progression
} else if( has_effect( effect_weak_antibiotic ) ) {
if( calendar::once_every( 2_turns ) ) {
if( calendar::once_every( 4_turns ) ) {
it.mod_duration( 1_turns );
}
} else {
Expand Down

0 comments on commit 7739dbc

Please sign in to comment.