More structure for bionic bodyparts

data/json/body_parts.json

@@ -30,6 +30,7 @@
     "bionic_slots": 80,
     "bmi_encumbrance_threshold": 9,
     "bmi_encumbrance_scalar": 0.8,
+    "windage_effect": "winded",
     "effects_on_hit": [
       {
         "id": "bleed",
@@ -390,6 +391,7 @@
     "base_hp": 60,
     "drench_capacity": 1000,
     "smash_message": "You elbow-smash the %s.",
+    "windage_effect": "winded_arm_l",
     "bionic_slots": 20,
     "bmi_encumbrance_threshold": 9,
     "bmi_encumbrance_scalar": 0.6,
@@ -475,6 +477,7 @@
     "drench_capacity": 1000,
     "smash_message": "You elbow-smash the %s.",
     "bionic_slots": 20,
+    "windage_effect": "winded_arm_r",
     "bmi_encumbrance_threshold": 9,
     "bmi_encumbrance_scalar": 0.6,
     "effects_on_hit": [
@@ -681,6 +684,7 @@
     ],
     "sub_parts": [ "leg_hip_l", "leg_upper_l", "leg_knee_l", "leg_lower_l", "leg_draped_l" ],
     "flags": [ "LIMB_LOWER" ],
+    "windage_effect": "winded_leg_l",
     "bmi_encumbrance_threshold": 9,
     "bmi_encumbrance_scalar": 0.7
   },
@@ -716,6 +720,7 @@
     "smash_message": "You bring your knee down on the %s, smashing it.",
     "bionic_slots": 30,
     "sub_parts": [ "leg_hip_r", "leg_upper_r", "leg_knee_r", "leg_lower_r", "leg_draped_r" ],
+    "windage_effect": "winded_leg_r",
     "bmi_encumbrance_threshold": 9,
     "bmi_encumbrance_scalar": 0.7,
     "effects_on_hit": [

data/json/effects.json

@@ -507,21 +507,89 @@
     "remove_message": "You catch your breath.",
     "rating": "bad",
     "max_duration": "30 s",
+    "base_mods": { "per_mod": [ -1 ], "speed_mod": [ -10 ], "pain_min": [ 1 ], "pain_chance": [ 5 ], "pain_max_val": [ 20 ] },
+    "limb_score_mods": [ { "limb_score": "reaction", "modifier": 0.5 } ],
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
+  },
+  {
+    "type": "effect_type",
+    "id": "winded_leg_l",
+    "name": [ "Winded (Left Leg)" ],
+    "desc": [ "You're short of breath.  Your left leg has impaired function until you recover." ],
+    "rating": "bad",
+    "max_duration": "30 s",
+    "base_mods": { "speed_mod": [ -5 ], "pain_min": [ 1 ], "pain_chance": [ 10 ], "pain_max_val": [ 20 ] },
+    "limb_score_mods": [
+      { "limb_score": "block", "modifier": 0.9 },
+      { "limb_score": "swim", "modifier": 0.7 },
+      { "limb_score": "move_speed", "modifier": 0.8 },
+      { "limb_score": "footing", "modifier": 0.8 },
+      { "limb_score": "balance", "modifier": 0.8 }
+    ],
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
+  },
+  {
+    "type": "effect_type",
+    "id": "winded_leg_r",
+    "name": [ "Winded (Right Leg)" ],
+    "desc": [ "You're short of breath.  Your right leg has impaired function until you recover." ],
+    "rating": "bad",
+    "max_duration": "30 s",
+    "base_mods": { "speed_mod": [ -5 ], "pain_min": [ 1 ], "pain_chance": [ 10 ], "pain_max_val": [ 20 ] },
+    "limb_score_mods": [
+      { "limb_score": "block", "modifier": 0.9 },
+      { "limb_score": "swim", "modifier": 0.7 },
+      { "limb_score": "move_speed", "modifier": 0.8 },
+      { "limb_score": "footing", "modifier": 0.8 },
+      { "limb_score": "balance", "modifier": 0.8 }
+    ],
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
+  },
+  {
+    "type": "effect_type",
+    "id": "winded_arm_l",
+    "name": [ "Winded (Left Arm)" ],
+    "desc": [ "You're short of breath.  Your left arm has impaired function until you recover." ],
+    "rating": "bad",
+    "max_duration": "30 s",
     "base_mods": {
-      "per_mod": [ -1 ],
       "dex_mod": [ -1 ],
-      "str_mod": [ -3 ],
-      "speed_mod": [ -30 ],
+      "str_mod": [ -1 ],
+      "speed_mod": [ -5 ],
       "pain_min": [ 1 ],
-      "pain_chance": [ 1 ],
+      "pain_chance": [ 10 ],
       "pain_max_val": [ 20 ]
     },
     "limb_score_mods": [
-      { "limb_score": "reaction", "modifier": 0.5 },
-      { "limb_score": "lift", "modifier": 0.75 },
-      { "limb_score": "block", "modifier": 0.75 },
-      { "limb_score": "manip", "modifier": 0.5 },
-      { "limb_score": "swim", "modifier": 0.3 }
+      { "limb_score": "lift", "modifier": 0.8 },
+      { "limb_score": "block", "modifier": 0.8 },
+      { "limb_score": "swim", "modifier": 0.8 },
+      { "limb_score": "manip", "modifier": 0.8 },
+      { "limb_score": "grip", "modifier": 0.8 }
+    ],
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
+  },
+  {
+    "type": "effect_type",
+    "id": "winded_arm_r",
+    "name": [ "Winded (Right Arm)" ],
+    "desc": [ "You're short of breath.  Your right arm has impaired function until you recover." ],
+    "rating": "bad",
+    "max_duration": "30 s",
+    "base_mods": {
+      "dex_mod": [ -1 ],
+      "str_mod": [ -1 ],
+      "speed_mod": [ -5 ],
+      "pain_min": [ 1 ],
+      "pain_chance": [ 10 ],
+      "pain_max_val": [ 20 ]
+    },
+    "limb_score_mods": [
+      { "limb_score": "block", "modifier": 0.5 },
+      { "limb_score": "swim", "modifier": 0.5 },
+      { "limb_score": "move_speed", "modifier": 0.5 },
+      { "limb_score": "footing", "modifier": 0.5 },
+      { "limb_score": "balance", "modifier": 0.5 }
     ],
     "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
   },
@@ -696,6 +764,7 @@
     "desc": [ "You have been poisoned!" ],
     "miss_messages": [ [ "You feel bad inside.", 1 ] ],
     "rating": "bad",
+    "immune_bp_flags": [ "BIONIC_LIMB" ],
     "resist_traits": [ "POISRESIST" ],
     "resist_effects": [ "prophylactic_antivenom" ],
     "pain_sizing": true,
@@ -720,6 +789,7 @@
     "desc": [ "You have been badly poisoned!" ],
     "miss_messages": [ [ "You feel bad inside.", 2 ] ],
     "rating": "bad",
+    "immune_bp_flags": [ "BIONIC_LIMB" ],
     "resist_traits": [ "POISRESIST" ],
     "resist_effects": [ "prophylactic_antivenom" ],
     "pain_sizing": true,
@@ -775,6 +845,7 @@
     "remove_message": "The burning pain subsides, but the damage is done.",
     "show_intensity": false,
     "rating": "bad",
+    "immune_bp_flags": [ "BIONIC_LIMB" ],
     "resist_traits": [ "POISRESIST" ],
     "blood_analysis_description": "Necrotizing Venom",
     "resist_effects": [ "prophylactic_antivenom" ],
@@ -808,6 +879,7 @@
     "rating": "bad",
     "resist_traits": [ "POISRESIST" ],
     "blood_analysis_description": "Systemic Inflammatory Agents",
+    "immune_bp_flags": [ "BIONIC_LIMB" ],
     "speed_name": "Poisoned",
     "resist_effects": [ "prophylactic_antivenom" ],
     "max_intensity": 125,
@@ -861,6 +933,7 @@
     "int_decay_tick": 90,
     "int_decay_remove": true,
     "resist_traits": [ "ELFA_NV" ],
+    "immune_bp_flags": [ "BIONIC_LIMB" ],
     "base_mods": { "per_mod": [ -3, 0 ] },
     "scaling_mods": { "per_mod": [ -2, -1 ] },
     "limb_score_mods": [
@@ -934,6 +1007,7 @@
     "rating": "bad",
     "max_intensity": 20,
     "resist_traits": [ "POISRESIST" ],
+    "immune_bp_flags": [ "BIONIC_LIMB" ],
     "resist_effects": [ "prophylactic_antivenom" ],
     "int_add_val": 1,
     "int_decay_tick": 600,
@@ -2176,6 +2250,7 @@
     "remove_memorial_log": "Recovered from a bite wound.",
     "apply_message": "The bite wound feels really deep…",
     "resist_traits": [ "INFRESIST" ],
+    "immune_bp_flags": [ "BIONIC_LIMB" ],
     "main_parts_only": true,
     "rating": "bad",
     "int_dur_factor": "30 m",
@@ -2722,6 +2797,7 @@
     "desc": [ "Your %s is frostnipped and has gone numb.", "Your %s is frostbitten!  Its tissues are frozen from the cold!" ],
     "part_descs": true,
     "speed_name": "Frostbite",
+    "immune_bp_flags": [ "BIONIC_LIMB" ],
     "dur_add_perc": 0,
     "max_intensity": 2,
     "scaling_mods": { "speed_mod": [ -5 ] },
@@ -2740,6 +2816,7 @@
     "id": "frostbite_recovery",
     "name": [ "Defrosting" ],
     "desc": [ "Your %s is starting to feel the damage cold has wrought." ],
+    "immune_bp_flags": [ "BIONIC_LIMB" ],
     "part_descs": true,
     "base_mods": { "pain_max_val": [ 40 ], "pain_chance": [ 2 ], "pain_min": [ 1 ] }
   },
@@ -2751,6 +2828,7 @@
     "main_parts_only": true,
     "part_descs": true,
     "miss_messages": [ [ "Your blisters distract you", 1 ] ],
+    "immune_bp_flags": [ "BIONIC_LIMB" ],
     "base_mods": {
       "dex_mod": [ -1 ],
       "str_mod": [ -1 ],
@@ -2765,6 +2843,7 @@
   {
     "type": "effect_type",
     "id": "dermatik",
+    "immune_bp_flags": [ "BIONIC_LIMB" ],
     "blood_analysis_description": "Insect Parasite"
   },
   {
@@ -2776,6 +2855,7 @@
     "rating": "bad",
     "resist_effects": [ "took_flumed", "took_antihistamine" ],
     "main_parts_only": true,
+    "immune_bp_flags": [ "BIONIC_LIMB" ],
     "max_intensity": 3,
     "base_mods": { "str_mod": [ -0.34 ], "int_mod": [ -1 ] },
     "scaling_mods": { "str_mod": [ -0.34 ], "int_mod": [ -1 ] }
@@ -3073,7 +3153,22 @@
     "rating": "good",
     "max_intensity": 2,
     "int_dur_factor": "50 s",
-    "removes_effects": [ "infected", "bite", "bleed", "fungus", "dermatik", "winded", "poison", "badpoison", "venom_dmg", "venom_weaken" ],
+    "removes_effects": [
+      "infected",
+      "bite",
+      "bleed",
+      "fungus",
+      "dermatik",
+      "poison",
+      "badpoison",
+      "venom_dmg",
+      "venom_weaken",
+      "winded",
+      "winded_leg_l",
+      "winded_leg_r",
+      "winded_arm_l",
+      "winded_arm_r"
+    ],
     "base_mods": { "str_mod": [ -1 ], "dex_mod": [ -2 ], "per_mod": [ -2 ], "int_mod": [ -1 ] },
     "scaling_mods": { "str_mod": [ 2 ], "dex_mod": [ 3 ], "per_mod": [ 3 ], "int_mod": [ 1 ] },
     "blood_analysis_description": "Healing Medication"
@@ -3088,7 +3183,7 @@
     "rating": "good",
     "max_intensity": 2,
     "int_dur_factor": "50 s",
-    "removes_effects": [ "winded" ],
+    "removes_effects": [ "winded", "winded_leg_l", "winded_leg_r", "winded_arm_l", "winded_arm_r" ],
     "base_mods": { "speed_mod": [ -5 ], "dex_mod": [ -2 ], "per_mod": [ -1 ], "int_mod": [ -2 ] },
     "scaling_mods": {
       "speed_mod": [ 15 ],
@@ -3112,7 +3207,7 @@
     "miss_messages": [ [ "Your comedown throws you off.", 1 ] ],
     "max_intensity": 2,
     "int_dur_factor": "150 s",
-    "removes_effects": [ "winded" ],
+    "removes_effects": [ "winded", "winded_leg_l", "winded_leg_r", "winded_arm_l", "winded_arm_r" ],
     "base_mods": {
       "speed_mod": [ -10 ],
       "str_mod": [ -2 ],
@@ -3443,6 +3538,7 @@
     "apply_message": "Your skin starts burning around some of your scratches.  Some aspirin might relieve the effects.",
     "remove_message": "The fever breaks.",
     "rating": "bad",
+    "immune_bp_flags": [ "BIONIC_LIMB" ],
     "resist_effects": [ "aspirin" ],
     "base_mods": {
       "stamina_min": [ -50 ],

data/json/monster_special_attacks/monster_attacks.json

@@ -532,7 +532,8 @@
     "no_dmg_msg_u": "%1$s tries to sting your %2$s, but it fails to penetrate your armor.",
     "no_dmg_msg_npc": "%1$s tries to sting <npcname>, but it fails to penetrate their armor.",
     "dodgeable": true,
-    "blockable": true
+    "blockable": true,
+    "effects_require_organic": true
   },
   {
     "type": "monster_attack",
@@ -550,7 +551,8 @@
     "miss_msg_u": "%1$s tries to sting you, but you dodge!",
     "miss_msg_npc": "%1$s tries to sting <npcname>, but they dodge!",
     "no_dmg_msg_u": "%1$s's stinger bounces off your %2$s.",
-    "no_dmg_msg_npc": "%1$s tries to sting <npcname>, but it fails to penetrate their armor."
+    "no_dmg_msg_npc": "%1$s tries to sting <npcname>, but it fails to penetrate their armor.",
+    "effects_require_organic": true
   },
   {
     "type": "monster_attack",