Skip to content

Commit

Permalink
Limb/Armor Fun Part 1: Support for similar limbs on armor (CleverRave…
Browse files Browse the repository at this point in the history 
…n#71896)

* First

* Clang_wants_every_single_test_variable_to_be_eleven_thousand_char_long_and_is_a_dumdum

* Fix

* Not helping your case, clang

* ASan, hopefully

* Look at me being an idiot

* Copy-from-dum-dum
  • Loading branch information
@Venera3
Venera3 authored Feb 28, 2024
1 parent 5643586 commit d8ebc75
Show file tree
Hide file tree
Showing 13 changed files with 1,074 additions and 257 deletions.
20 changes: 10 additions & 10 deletions data/mods/Limb_WIP/armor/limb_armor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
"copy-from": "helmet_scrap",
"armor": [
{
"material": [ { "type": "kevlar_rigid", "covered_by_mat": 100, "thickness": 1.0 } ],
"encumbrance": 300,
"coverage": 100,
"covers": [ "eyes_insect_2" ],
"specifically_covers": [ "eyes_compound_mono", "head_nape" ]
"covers": [ "head_dragonfly", "eyes_dragonfly" ]
}
]
},
Expand All @@ -70,7 +70,7 @@
{ "type": "kevlar_rigid", "covered_by_mat": 100, "thickness": 1.0 },
{ "type": "superalloy", "covered_by_mat": 95, "thickness": 1.0 }
],
"covers": [ "bionic_basic_arm_l", "bionic_basic_arm_r", "bionic_basic_hand_l", "bionic_basic_hand_r" ],
"covers": [ "arm_bionic_basic_l", "arm_bionic_basic_r", "hand_bionic_basic_l", "hand_bionic_basic_r" ],
"specifically_covers": [
"arm_shoulder_l",
"arm_shoulder_r",
Expand Down Expand Up @@ -107,7 +107,7 @@
{ "type": "kevlar_rigid", "covered_by_mat": 100, "thickness": 1.0 },
{ "type": "superalloy", "covered_by_mat": 95, "thickness": 1.0 }
],
"covers": [ "bionic_basic_arm_l", "bionic_basic_arm_l" ],
"covers": [ "arm_bionic_basic_l", "arm_bionic_basic_l" ],
"specifically_covers": [
"arm_shoulder_l",
"arm_upper_l",
Expand Down Expand Up @@ -135,7 +135,7 @@
{ "type": "kevlar_rigid", "covered_by_mat": 100, "thickness": 1.0 },
{ "type": "superalloy", "covered_by_mat": 95, "thickness": 1.0 }
],
"covers": [ "bionic_basic_arm_r", "bionic_basic_arm_r" ],
"covers": [ "arm_bionic_basic_r", "arm_bionic_basic_r" ],
"specifically_covers": [
"arm_shoulder_r",
"arm_upper_r",
Expand Down Expand Up @@ -174,7 +174,7 @@
{ "type": "kevlar_rigid", "covered_by_mat": 100, "thickness": 1.0 },
{ "type": "superalloy", "covered_by_mat": 95, "thickness": 1.0 }
],
"covers": [ "bionic_basic_leg_l", "bionic_basic_leg_r", "bionic_basic_foot_l", "bionic_basic_foot_r" ],
"covers": [ "leg_bionic_basic_l", "leg_bionic_basic_r", "foot_bionic_basic_l", "foot_bionic_basic_r" ],
"specifically_covers": [
"leg_hip_l",
"leg_hip_r",
Expand Down Expand Up @@ -213,7 +213,7 @@
{ "type": "kevlar_rigid", "covered_by_mat": 100, "thickness": 1.0 },
{ "type": "superalloy", "covered_by_mat": 95, "thickness": 1.0 }
],
"covers": [ "bionic_basic_leg_l", "bionic_basic_foot_l" ],
"covers": [ "leg_bionic_basic_l", "foot_bionic_basic_l" ],
"specifically_covers": [
"leg_hip_l",
"leg_upper_l",
Expand Down Expand Up @@ -242,7 +242,7 @@
{ "type": "kevlar_rigid", "covered_by_mat": 100, "thickness": 1.0 },
{ "type": "superalloy", "covered_by_mat": 95, "thickness": 1.0 }
],
"covers": [ "bionic_basic_leg_r", "bionic_basic_foot_r" ],
"covers": [ "leg_bionic_basic_r", "foot_bionic_basic_r" ],
"specifically_covers": [
"leg_hip_r",
"leg_upper_r",
Expand Down Expand Up @@ -294,7 +294,7 @@
{ "type": "superalloy", "covered_by_mat": 100, "thickness": 4.0 },
{ "type": "qt_steel", "covered_by_mat": 95, "thickness": 4.0 }
],
"covers": [ "bionic_treads_leg" ],
"covers": [ "leg_bionic_treads" ],
"specifically_covers": [ "bionic_treads_body" ],
"coverage": 100,
"encumbrance": [ 0, 0 ],
Expand All @@ -305,7 +305,7 @@
{ "type": "rubber", "covered_by_mat": 100, "thickness": 4.0 },
{ "type": "qt_steel", "covered_by_mat": 100, "thickness": 1.0 }
],
"covers": [ "bionic_treads_leg" ],
"covers": [ "leg_bionic_treads" ],
"specifically_covers": [ "bionic_treads_treads" ],
"coverage": 100,
"encumbrance": [ 0, 0 ],
Expand Down
26 changes: 13 additions & 13 deletions data/mods/Limb_WIP/enchantments.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@
"modified_bodyparts": [
{ "lose": "hand_l" },
{ "lose": "hand_r" },
{ "gain": "bionic_basic_arm_l" },
{ "gain": "bionic_basic_arm_r" },
{ "gain": "bionic_basic_hand_l" },
{ "gain": "bionic_basic_hand_r" }
{ "gain": "arm_bionic_basic_l" },
{ "gain": "arm_bionic_basic_r" },
{ "gain": "hand_bionic_basic_l" },
{ "gain": "hand_bionic_basic_r" }
]
},
{
Expand All @@ -130,10 +130,10 @@
{ "lose": "leg_r" },
{ "lose": "foot_l" },
{ "lose": "foot_r" },
{ "gain": "bionic_basic_leg_l" },
{ "gain": "bionic_basic_leg_r" },
{ "gain": "bionic_basic_foot_l" },
{ "gain": "bionic_basic_foot_r" }
{ "gain": "leg_bionic_basic_l" },
{ "gain": "leg_bionic_basic_r" },
{ "gain": "foot_bionic_basic_l" },
{ "gain": "foot_bionic_basic_r" }
]
},
{
Expand All @@ -145,31 +145,31 @@
{ "lose": "leg_r" },
{ "lose": "foot_l" },
{ "lose": "foot_r" },
{ "gain": "bionic_treads_leg" }
{ "gain": "leg_bionic_treads" }
]
},
{
"type": "enchantment",
"id": "ENCH_BIONIC_ARM_L",
"condition": "ALWAYS",
"modified_bodyparts": [ { "lose": "arm_l" }, { "lose": "hand_l" }, { "gain": "bionic_basic_arm_l" }, { "gain": "bionic_basic_hand_l" } ]
"modified_bodyparts": [ { "lose": "arm_l" }, { "lose": "hand_l" }, { "gain": "arm_bionic_basic_l" }, { "gain": "hand_bionic_basic_l" } ]
},
{
"type": "enchantment",
"id": "ENCH_BIONIC_ARM_R",
"condition": "ALWAYS",
"modified_bodyparts": [ { "lose": "arm_r" }, { "lose": "hand_r" }, { "gain": "bionic_basic_arm_r" }, { "gain": "bionic_basic_hand_r" } ]
"modified_bodyparts": [ { "lose": "arm_r" }, { "lose": "hand_r" }, { "gain": "arm_bionic_basic_r" }, { "gain": "hand_bionic_basic_r" } ]
},
{
"type": "enchantment",
"id": "ENCH_BIONIC_LEG_L",
"condition": "ALWAYS",
"modified_bodyparts": [ { "lose": "leg_l" }, { "lose": "foot_l" }, { "gain": "bionic_basic_leg_l" }, { "gain": "bionic_basic_foot_l" } ]
"modified_bodyparts": [ { "lose": "leg_l" }, { "lose": "foot_l" }, { "gain": "leg_bionic_basic_l" }, { "gain": "foot_bionic_basic_l" } ]
},
{
"type": "enchantment",
"id": "ENCH_BIONIC_LEG_R",
"condition": "ALWAYS",
"modified_bodyparts": [ { "lose": "leg_r" }, { "lose": "foot_r" }, { "gain": "bionic_basic_leg_r" }, { "gain": "bionic_basic_foot_r" } ]
"modified_bodyparts": [ { "lose": "leg_r" }, { "lose": "foot_r" }, { "gain": "leg_bionic_basic_r" }, { "gain": "foot_bionic_basic_r" } ]
}
]
Loading

0 comments on commit d8ebc75

Please sign in to comment.