Backport #70721 (move prosthetics etc to WIP limb mod) for 0.H (#76175)

* Add WIP Limb Stuff mod and move mainline limby stuff over (#70721) * First migration * Second * Migration From Hell's Heart I lint at thee We'll get there * Ravenfolk fix Actual fix fix maybe? Fix fix fix + test armor Imma have to squash this mess to oblivion I swear to Glob This is getting awkward * Done playin * Ravenfolk test failures * Try to fix WINGS_BIRD categories --------- Co-authored-by: Venera3 <[email protected]>
CleverRaven · Sep 7, 2024 · c513797 · c513797
1 parent d80c1f0
commit c513797
Show file tree

Hide file tree

Showing 28 changed files with 2,672 additions and 957 deletions.
diff --git a/.github/reviewers.yml b/.github/reviewers.yml
@@ -36,6 +36,8 @@ files:
     - Night-Pryanik
   'data/mods/Tamable_Wildlife/**':
     - Termineitor244
+  'data/mods/Limb_WIP/**':
+    - Venera3
 
   '**/.clang-tidy':
     - jbytheway

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -4602,80 +4602,6 @@
     "show_in_info": true,
     "chance_kill": [ [ 1, 20 ] ]
   },
-  {
-    "type": "effect_type",
-    "id": "prosthetic_leg_l_fake_blocker",
-    "name": [ "" ],
-    "desc": [ "" ],
-    "blocks_effects": [
-      "bite",
-      "poison",
-      "badpoison",
-      "paralyzepoison",
-      "frostbite",
-      "paincysts",
-      "spores",
-      "venom_dmg",
-      "venom_pain",
-      "venom_weaken"
-    ]
-  },
-  {
-    "type": "effect_type",
-    "id": "prosthetic_leg_r_fake_blocker",
-    "name": [ "" ],
-    "desc": [ "" ],
-    "blocks_effects": [
-      "bite",
-      "poison",
-      "badpoison",
-      "paralyzepoison",
-      "frostbite",
-      "paincysts",
-      "spores",
-      "venom_dmg",
-      "venom_pain",
-      "venom_weaken"
-    ]
-  },
-  {
-    "type": "effect_type",
-    "id": "prosthetic_arm_l_fake_blocker",
-    "name": [ "" ],
-    "desc": [ "" ],
-    "blocks_effects": [
-      "bite",
-      "poison",
-      "badpoison",
-      "paralyzepoison",
-      "frostbite",
-      "paincysts",
-      "spores",
-      "shakes",
-      "venom_dmg",
-      "venom_pain",
-      "venom_weaken"
-    ]
-  },
-  {
-    "type": "effect_type",
-    "id": "prosthetic_arm_r_fake_blocker",
-    "name": [ "" ],
-    "desc": [ "" ],
-    "blocks_effects": [
-      "bite",
-      "poison",
-      "badpoison",
-      "paralyzepoison",
-      "frostbite",
-      "paincysts",
-      "spores",
-      "shakes",
-      "venom_dmg",
-      "venom_pain",
-      "venom_weaken"
-    ]
-  },
   {
     "type": "effect_type",
     "id": "ink_gland_ink",

diff --git a/data/json/enchantments.json b/data/json/enchantments.json
@@ -27,96 +27,6 @@
     "condition": "ALWAYS",
     "modified_bodyparts": [ { "lose": "head" }, { "gain": "big_head" } ]
   },
-  {
-    "type": "enchantment",
-    "id": "ENCH_GASTROPOD_FOOT",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "leg_l" }, { "lose": "leg_r" }, { "lose": "foot_r" }, { "lose": "foot_l" }, { "gain": "gastropod_foot" } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ENCH_NO_RIGHT_LEG",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "leg_r" }, { "lose": "foot_r" }, { "gain": "leg_stub_r" } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ENCH_NO_LEFT_LEG",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "leg_l" }, { "lose": "foot_l" }, { "gain": "leg_stub_l" } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ENCH_RIGHT_PROSTHETIC",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "leg_stub_r" }, { "gain": "leg_prosthetic_r" }, { "gain": "foot_prosthetic_r" } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ENCH_LEFT_PROSTHETIC",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "leg_stub_l" }, { "gain": "leg_prosthetic_l" }, { "gain": "foot_prosthetic_l" } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ENCH_RIGHT_PEGLEG",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "leg_stub_r" }, { "gain": "leg_peg_r" } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ENCH_LEFT_PEGLEG",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "leg_stub_l" }, { "gain": "leg_peg_l" } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ENCH_NO_LEFT_ARM",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "arm_l" }, { "lose": "hand_l" }, { "gain": "arm_stub_l" } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ENCH_NO_RIGHT_ARM",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "arm_r" }, { "lose": "hand_r" }, { "gain": "arm_stub_r" } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ENCH_RIGHT_ARM_PROSTHETIC",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "arm_stub_r" }, { "gain": "arm_prosthetic_r" }, { "gain": "hand_prosthetic_r" } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ENCH_LEFT_ARM_PROSTHETIC",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "arm_stub_l" }, { "gain": "arm_prosthetic_l" }, { "gain": "hand_prosthetic_l" } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ENCH_RIGHT_ARM_NEUROPROSTHETIC",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "arm_stub_r" }, { "gain": "arm_neuroprosthetic_r" }, { "gain": "hand_neuroprosthetic_r" } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ENCH_LEFT_ARM_NEUROPROSTHETIC",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "arm_stub_l" }, { "gain": "arm_neuroprosthetic_l" }, { "gain": "hand_neuroprosthetic_l" } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ENCH_RIGHT_ARM_COSMETIC_PROSTHETIC",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "arm_stub_r" }, { "gain": "arm_prosthetic_cosmetic_r" }, { "gain": "hand_prosthetic_r" } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ENCH_LEFT_ARM_COSMETIC_PROSTHETIC",
-    "condition": "ALWAYS",
-    "modified_bodyparts": [ { "lose": "arm_stub_l" }, { "gain": "arm_prosthetic_cosmetic_r" }, { "gain": "hand_prosthetic_l" } ]
-  },
   {
     "type": "enchantment",
     "id": "RM13",

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -123,13 +123,7 @@
       { "group": "surgery", "prob": 80 },
       { "group": "drugs_emergency", "prob": 40 },
       { "group": "softdrugs", "prob": 20 },
-      { "group": "harddrugs", "prob": 5 },
-      { "item": "left_leg_prosthetic", "prob": 5 },
-      { "item": "right_leg_prosthetic", "prob": 5 },
-      { "item": "right_arm_prosthetic", "prob": 5 },
-      { "item": "right_arm_prosthetic", "prob": 5 },
-      { "item": "right_arm_neuroprosthetic", "prob": 2 },
-      { "item": "right_arm_neuroprosthetic", "prob": 2 }
+      { "group": "harddrugs", "prob": 5 }
     ]
   },
   {
@@ -199,12 +193,6 @@
       [ "strong_antibiotic", 1 ],
       [ "antibiotics", 5 ],
       [ "weak_antibiotic", 15 ],
-      { "item": "left_leg_prosthetic", "prob": 5 },
-      { "item": "right_leg_prosthetic", "prob": 5 },
-      { "item": "left_arm_prosthetic", "prob": 5 },
-      { "item": "right_arm_prosthetic", "prob": 5 },
-      { "item": "left_arm_neuroprosthetic", "prob": 2 },
-      { "item": "right_arm_neuroprosthetic", "prob": 2 },
       [ "crutches", 5 ]
     ]
   },
@@ -255,8 +243,6 @@
       [ "lanyard", 1 ],
       [ "tourist_table", 1 ],
       [ "thermos", 10 ],
-      [ "left_leg_prosthetic", 40 ],
-      [ "right_leg_prosthetic", 40 ],
       [ "crutches", 5 ]
     ]
   },
@@ -1071,11 +1057,7 @@
       { "item": "bone_fossil", "prob": 20, "damage": [ 2, 4 ] },
       { "item": "large_bone_fossil", "prob": 20, "damage": [ 2, 4 ] },
       { "item": "bone_plaster", "prob": 50, "damage": [ 2, 4 ] },
-      { "item": "large_bone_plaster", "prob": 50, "damage": [ 2, 4 ] },
-      { "item": "left_peg_leg", "prob": 10, "damage": [ 2, 4 ] },
-      { "item": "right_peg_leg", "prob": 10, "damage": [ 2, 4 ] },
-      { "item": "left_arm_prosthetic_wood", "prob": 10, "damage": [ 2, 4 ] },
-      { "item": "right_arm_prosthetic_wood", "prob": 10, "damage": [ 2, 4 ] }
+      { "item": "large_bone_plaster", "prob": 50, "damage": [ 2, 4 ] }
     ]
   },
   {
@@ -1179,15 +1161,7 @@
       { "item": "ceramic_cup", "prob": 90, "damage": [ 2, 4 ] },
       { "group": "tinware", "prob": 50, "damage": [ 2, 4 ] },
       { "item": "crown_golden", "prob": 10, "damage": [ 2, 4 ] },
-      { "item": "fluid_preserved_brain", "prob": 20 },
-      { "item": "left_peg_leg", "prob": 15, "damage": [ 2, 4 ] },
-      { "item": "right_peg_leg", "prob": 15, "damage": [ 2, 4 ] },
-      { "item": "right_leg_prosthetic_steel", "prob": 15, "damage": [ 2, 4 ] },
-      { "item": "left_leg_prosthetic_steel", "prob": 15, "damage": [ 2, 4 ] },
-      { "item": "left_arm_prosthetic_wood", "prob": 15, "damage": [ 2, 4 ] },
-      { "item": "right_arm_prosthetic_wood", "prob": 15, "damage": [ 2, 4 ] },
-      { "item": "left_arm_prosthetic_steel", "prob": 15, "damage": [ 2, 4 ] },
-      { "item": "right_arm_prosthetic_steel", "prob": 15, "damage": [ 2, 4 ] }
+      { "item": "fluid_preserved_brain", "prob": 20 }
     ]
   },
   {
@@ -1715,13 +1689,7 @@
       { "group": "tools_medical", "prob": 100 },
       { "group": "drugs_emergency", "prob": 50 },
       { "prob": 10, "group": "quikclot_bag_plastic_1_6" },
-      { "item": "badge_doctor", "prob": 2 },
-      { "item": "left_leg_prosthetic", "prob": 2 },
-      { "item": "right_leg_prosthetic", "prob": 2 },
-      { "item": "left_arm_prosthetic", "prob": 2 },
-      { "item": "right_arm_prosthetic", "prob": 2 },
-      { "item": "left_arm_neuroprosthetic", "prob": 1 },
-      { "item": "right_arm_neuroprosthetic", "prob": 1 }
+      { "item": "badge_doctor", "prob": 2 }
     ]
   },
   {
@@ -2699,16 +2667,7 @@
     "id": "mil_base_bed_hospital",
     "type": "item_group",
     "subtype": "distribution",
-    "entries": [
-      { "item": "blanket", "prob": 50 },
-      { "item": "cotton_patchwork", "prob": 100, "custom-flags": [ "FILTHY" ] },
-      { "item": "left_leg_prosthetic", "prob": 20 },
-      { "item": "right_leg_prosthetic", "prob": 20 },
-      { "item": "left_arm_prosthetic", "prob": 20 },
-      { "item": "right_arm_prosthetic", "prob": 20 },
-      { "item": "left_arm_neuroprosthetic", "prob": 10 },
-      { "item": "right_arm_neuroprosthetic", "prob": 10 }
-    ]
+    "entries": [ { "item": "blanket", "prob": 200 }, { "item": "cotton_patchwork", "prob": 400, "custom-flags": [ "FILTHY" ] } ]
   },
   {
     "id": "mil_base_table_hospital",

diff --git a/data/json/itemgroups/Locations_MapExtras/map_extras.json b/data/json/itemgroups/Locations_MapExtras/map_extras.json
@@ -19,9 +19,7 @@
       { "group": "socks_unisex", "damage": [ 1, 3 ] },
       { "group": "lab_shoes", "damage": [ 1, 3 ] },
       { "group": "lab_torso", "damage": [ 1, 3 ] },
-      { "group": "underwear", "damage": [ 1, 3 ] },
-      { "item": "left_leg_prosthetic", "prob": 2 },
-      { "item": "right_leg_prosthetic", "prob": 2 }
+      { "group": "underwear", "damage": [ 1, 3 ] }
     ]
   },
   {