diff --git a/data/json/effects.json b/data/json/effects.json index 5d1a53940e7ce..8861e3e941875 100644 --- a/data/json/effects.json +++ b/data/json/effects.json @@ -479,6 +479,7 @@ "show_intensity": false, "rating": "bad", "resist_traits": [ "POISRESIST" ], + "blood_analysis_description": "Necrotizing Venom", "resist_effects": [ "prophylactic_antivenom" ], "pain_sizing": true, "hurt_sizing": true, @@ -496,7 +497,7 @@ "hurt_amount": [ 5, 0 ], "hurt_min": [ 2, 1 ], "hurt_chance": [ 13, 100 ], - "hurt_tick": [ 30 ] + "hurt_tick": [ 36 ] }, "scaling_mods": { "pain_min": [ 0.05, 0.01 ], "pain_chance": [ -0.15, -0.8 ], "hurt_chance": [ -0.11, -0.81 ] } }, @@ -509,6 +510,7 @@ "remove_message": "The weight on your chest lessens.", "rating": "bad", "resist_traits": [ "POISRESIST" ], + "blood_analysis_description": "Systemic Inflammatory Agents", "resist_effects": [ "prophylactic_antivenom" ], "max_intensity": 125, "max_effective_intensity": 100, diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 88251fb4a7f33..cae9a557f7f7f 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -1064,8 +1064,8 @@ "melee_dice": 1, "melee_dice_sides": 6, "melee_cut": 6, - "attack_effs": [ { "id": "venom_dmg", "duration": 750, "affect_hit_bp": true } ], - "//": "3 hits to max intensity, 3 hits to max duration", + "attack_effs": [ { "id": "venom_dmg", "duration": 400, "affect_hit_bp": true } ], + "//": "5 hits to max intensity, 6 hits to max duration", "dodge": 2, "armor_bash": 2, "armor_cut": 6, diff --git a/src/bionics.cpp b/src/bionics.cpp index a13862a4a3ea0..50ac488763229 100644 --- a/src/bionics.cpp +++ b/src/bionics.cpp @@ -89,6 +89,7 @@ static const efftype_id effect_adrenaline( "adrenaline" ); static const efftype_id effect_antifungal( "antifungal" ); static const efftype_id effect_assisted( "assisted" ); static const efftype_id effect_asthma( "asthma" ); +static const efftype_id effect_badpoison( "badpoison" ); static const efftype_id effect_bleed( "bleed" ); static const efftype_id effect_bloodworms( "bloodworms" ); static const efftype_id effect_cig( "cig" ); @@ -103,6 +104,7 @@ static const efftype_id effect_iodine( "iodine" ); static const efftype_id effect_meth( "meth" ); static const efftype_id effect_narcosis( "narcosis" ); static const efftype_id effect_operating( "operating" ); +static const efftype_id effect_paralysepoison( "paralysepoison" ); static const efftype_id effect_pblue( "pblue" ); static const efftype_id effect_pkill_l( "pkill_l" ); static const efftype_id effect_pkill1( "pkill1" ); @@ -118,6 +120,8 @@ static const efftype_id effect_took_prozac( "took_prozac" ); static const efftype_id effect_took_prozac_bad( "took_prozac_bad" ); static const efftype_id effect_took_xanax( "took_xanax" ); static const efftype_id effect_under_operation( "under_operation" ); +static const efftype_id effect_venom_dmg( "venom_dmg" ); +static const efftype_id effect_venom_weaken( "venom_weaken" ); static const efftype_id effect_visuals( "visuals" ); static const material_id fuel_type_battery( "battery" ); @@ -730,12 +734,13 @@ bool Character::activate_bionic( int b, bool eff_only, bool *close_bionics_ui ) add_msg_activate(); static const std::vector removable = {{ effect_fungus, effect_dermatik, effect_bloodworms, - effect_tetanus, effect_poison, effect_stung, + effect_tetanus, effect_poison, effect_badpoison, effect_stung, effect_pkill1, effect_pkill2, effect_pkill3, effect_pkill_l, effect_drunk, effect_cig, effect_high, effect_hallu, effect_visuals, effect_pblue, effect_iodine, effect_datura, effect_took_xanax, effect_took_prozac, effect_took_prozac_bad, - effect_took_flumed, effect_antifungal + effect_took_flumed, effect_antifungal, effect_venom_weaken, + effect_venom_dmg, effect_paralysepoison } };