Bionics can use integrated armor system (CleverRaven#59216)

* Update integrated.json * alloy plating cbms * clarify allows_natural_attacks flag * Update bionics items to reflect new changes * remove dupes from AFS * Bionics apply and remove integrated armor * remove a dupe * well_distributed to bionic torso armor * add a couple missed flags to armor * fix an error * further fixes * astyle Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix a description * buff the cyborgs * another integrated armor tweak * coverage * fix legs armor not including feet * hopefully final correction * undo cyborg changes for a later date * add damage to some integrated parts * add some comments to JSON entries * JSON comments * density fixes * Alter the implementation to layered thin plates * rework into layers of dermal plates, adjust conflicts * clarify descriptions * fixes * lint * lint * lint * coverage * hopefully fix coverage failures * syntax * syntax * coverage tests attempt #3 * syntax * astyle * typo * add minimum 100% coverage layer * carbon lattice * adjust density and description * convert flesh to nanotubes * lower thickness * remove BASHING from feet * final coverage adjust * subdermal carbon filament * carbon filament * revert alloy changes * revert alloy plating changes * remove alloy integrated armors * clarify removeability * filament allows natural attacks * "//:" -> "//": * commas * fixes * Update integrated.json * Update integrated.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
GuardianDll · Aug 5, 2022 · 86f7525 · 86f7525
1 parent b108656
commit 86f7525
Show file tree

Hide file tree

Showing 7 changed files with 116 additions and 432 deletions.
diff --git a/data/json/bionics.json b/data/json/bionics.json
@@ -51,7 +51,7 @@
     "cut_protec": [ [ "arm_l", 3 ], [ "arm_r", 3 ], [ "hand_l", 3 ], [ "hand_r", 3 ] ],
     "bullet_protec": [ [ "arm_l", 3 ], [ "arm_r", 3 ], [ "hand_l", 3 ], [ "hand_r", 3 ] ],
     "encumbrance": [ [ "arm_l", 1 ], [ "arm_r", 1 ], [ "hand_l", 1 ], [ "hand_r", 1 ] ],
-    "cant_remove_reason": "The Alloy Plating is too thoroughly entwined to be removed safely.",
+    "//": "cant_remove_reason removed for now as these are presently functionally obsolete and characters should be able to remove them to get with the times.",
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
     "mutation_conflicts": [
       "THICKSKIN",
@@ -149,13 +149,9 @@
     "name": { "str": "Protective Lenses" },
     "description": "Your eye sockets have been surgically sealed with highly protective mirrored lenses and your tear ducts have been re-routed to your mouth.  When you cry, you must spit out or swallow your tears.",
     "occupied_bodyparts": [ [ "eyes", 1 ] ],
-    "env_protec": [ [ "eyes", 7 ] ],
-    "bash_protec": [ [ "eyes", 3 ] ],
-    "cut_protec": [ [ "eyes", 3 ] ],
-    "bullet_protec": [ [ "eyes", 3 ] ],
-    "encumbrance": [ [ "eyes", 1 ] ],
     "mutation_conflicts": [ "COMPOUND_EYES", "CEPH_VISION", "CEPH_EYES", "EYEBULGE", "EYESTALKS1", "EYESTALKS2" ],
-    "social_modifiers": { "intimidate": 10 }
+    "social_modifiers": { "intimidate": 10 },
+    "passive_pseudo_items": [ "armor_bio_eyes" ]
   },
   {
     "id": "bio_armor_head",
@@ -167,7 +163,7 @@
     "cut_protec": [ [ "head", 3 ], [ "mouth", 3 ] ],
     "bullet_protec": [ [ "head", 3 ], [ "mouth", 3 ] ],
     "encumbrance": [ [ "head", 1 ] ],
-    "cant_remove_reason": "The Alloy Plating is too thoroughly entwined to be removed safely.",
+    "//": "cant_remove_reason removed for now as these are presently functionally obsolete and characters should be able to remove them to get with the times.",
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
     "mutation_conflicts": [
       "THICKSKIN",
@@ -285,7 +281,7 @@
     "cut_protec": [ [ "leg_l", 3 ], [ "leg_r", 3 ], [ "foot_l", 3 ], [ "foot_r", 3 ] ],
     "bullet_protec": [ [ "leg_l", 3 ], [ "leg_r", 3 ], [ "foot_l", 3 ], [ "foot_r", 3 ] ],
     "encumbrance": [ [ "leg_l", 1 ], [ "leg_r", 1 ], [ "foot_l", 1 ], [ "foot_r", 1 ] ],
-    "cant_remove_reason": "The Alloy Plating is too thoroughly entwined to be removed safely.",
+    "//": "cant_remove_reason removed for now as these are presently functionally obsolete and characters should be able to remove them to get with the times.",
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
     "mutation_conflicts": [
       "THICKSKIN",
@@ -383,7 +379,7 @@
     "bullet_protec": [ [ "torso", 3 ] ],
     "encumbrance": [ [ "torso", 1 ] ],
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
-    "cant_remove_reason": "The Alloy Plating is too thoroughly entwined to be removed safely.",
+    "//": "cant_remove_reason removed for now as these are presently functionally obsolete and characters should be able to remove them to get with the times.",
     "canceled_mutations": [ "VINES1", "VINES2", "VINES3" ],
     "mutation_conflicts": [
       "THICKSKIN",
@@ -535,7 +531,7 @@
     "id": "bio_carbon",
     "type": "bionic",
     "name": { "str": "Subdermal Carbon Filament" },
-    "description": "Lying just beneath your skin is a thin armor made of carbon nanotubes.  This reduces bashing damage by 2 and cutting damage by 4.",
+    "description": "Lying just beneath your skin is a thin armor made of carbon nanotubes.  This has little impact on blunt trauma but will protect you against deep cuts.",
     "occupied_bodyparts": [
       [ "torso", 6 ],
       [ "head", 2 ],
@@ -546,45 +542,11 @@
       [ "foot_l", 1 ],
       [ "foot_r", 1 ],
       [ "hand_l", 1 ],
-      [ "hand_r", 1 ]
-    ],
-    "bash_protec": [
-      [ "torso", 2 ],
-      [ "head", 2 ],
-      [ "arm_l", 2 ],
-      [ "arm_r", 2 ],
-      [ "leg_l", 2 ],
-      [ "leg_r", 2 ],
-      [ "foot_l", 2 ],
-      [ "foot_r", 2 ],
-      [ "hand_l", 2 ],
-      [ "hand_r", 2 ]
-    ],
-    "cut_protec": [
-      [ "torso", 4 ],
-      [ "head", 4 ],
-      [ "arm_l", 4 ],
-      [ "arm_r", 4 ],
-      [ "leg_l", 4 ],
-      [ "leg_r", 4 ],
-      [ "foot_l", 4 ],
-      [ "foot_r", 4 ],
-      [ "hand_l", 4 ],
-      [ "hand_r", 4 ]
-    ],
-    "bullet_protec": [
-      [ "torso", 4 ],
-      [ "head", 4 ],
-      [ "arm_l", 4 ],
-      [ "arm_r", 4 ],
-      [ "leg_l", 4 ],
-      [ "leg_r", 4 ],
-      [ "foot_l", 4 ],
-      [ "foot_r", 4 ],
-      [ "hand_l", 4 ],
-      [ "hand_r", 4 ]
+      [ "hand_r", 1 ],
+      [ "mouth", 1 ]
     ],
-    "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
+    "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
+    "passive_pseudo_items": [ "armor_bio_carbon_filament" ]
   },
   {
     "id": "bio_chain_lightning",

diff --git a/data/json/flags.json b/data/json/flags.json
@@ -44,7 +44,7 @@
   {
     "id": "ALLOWS_NATURAL_ATTACKS",
     "type": "json_flag",
-    "info": "This clothing won't hinder special attacks that involve <info>mutated anatomy</info>."
+    "info": "This clothing won't hinder special attacks that involve <info>mutated or cybernetic anatomy</info>."
   },
   {
     "id": "ALLOWS_REMOTE_USE",

diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
@@ -786,5 +786,68 @@
         "encumbrance": 10
       }
     ]
+  },
+  {
+    "id": "armor_bio_eyes",
+    "//": "These do not preclude wearing glasses, but you'll get double-up penalties.  If you really needed to you could likely still situate the lenses in front of them.  You should probably just augment your eyes though.",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str_sp": "protective lenses" },
+    "description": "Highly protective lenses which seal off your eyes from danger, routing your tear ducts to your mouth.",
+    "weight": "180 g",
+    "volume": "250 ml",
+    "price": 0,
+    "price_postapoc": 0,
+    "to_hit": -2,
+    "material": [ "plastic", "lvl4ballisticglass" ],
+    "symbol": "[",
+    "color": "dark_gray",
+    "warmth": 5,
+    "material_thickness": 1.5,
+    "environmental_protection": 10,
+    "flags": [ "INTEGRATED", "UNBREAKABLE", "SKINTIGHT", "SOFT", "WATER_FRIENDLY", "SUN_GLASSES", "NO_REPAIR", "SWIM_GOGGLES" ],
+    "armor": [
+      {
+        "material": [
+          { "type": "plastic", "covered_by_mat": 100, "thickness": 0.5 },
+          { "type": "lvl4ballisticglass", "covered_by_mat": 100, "thickness": 1.0 }
+        ],
+        "covers": [ "eyes" ],
+        "coverage": 100,
+        "encumbrance": 5,
+        "rigid_layer_only": true,
+        "cover_vitals": 90
+      }
+    ]
+  },
+  {
+    "id": "armor_bio_carbon_filament",
+    "type": "ARMOR",
+    "category": "armor",
+    "weight": "500 g",
+    "volume": "1200 ml",
+    "price": 0,
+    "price_postapoc": 0,
+    "symbol": ",",
+    "color": "brown",
+    "warmth": 0,
+    "environmental_protection": 1,
+    "material_thickness": 1.25,
+    "flags": [ "INTEGRATED", "UNBREAKABLE", "PERSONAL", "PADDED", "WATER_FRIENDLY", "SOFT", "NO_REPAIR", "ALLOWS_NATURAL_ATTACKS" ],
+    "material": [ "nanotubes" ],
+    "name": { "str_sp": "subdermal carbon filament" },
+    "description": "A layer of thin carbon nanotubes implanted in your skin.  Helps protect your vitals from laceration.",
+    "armor": [
+      {
+        "material": [
+          { "type": "nanotubes", "covered_by_mat": 100, "thickness": 1 },
+          { "type": "nanotubes", "covered_by_mat": 75, "thickness": 0.25 }
+        ],
+        "covers": [ "torso", "head", "mouth", "leg_l", "leg_r", "arm_l", "arm_r", "hand_l", "hand_r", "foot_l", "foot_r" ],
+        "coverage": 100,
+        "encumbrance": 0,
+        "cover_vitals": 60
+      }
+    ]
   }
 ]
diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json
@@ -72,7 +72,7 @@
     "copy-from": "bionic_general_npc_usable",
     "type": "BIONIC_ITEM",
     "name": { "str": "Arms Alloy Plating CBM" },
-    "description": "An advanced protective mesh that weaves into the user's flesh.  Provides passive protection at the cost of mild encumbrance and can be used in conjunction with bionic martial arts.  A warning indicates that this CBM cannot be removed safely after being installed.",
+    "description": "An advanced protective mesh that weaves into the user's flesh.  Provides passive protection at the cost of mild encumbrance and can be used in conjunction with bionic martial arts.",
     "price": 350000,
     "difficulty": 6,
     "installation_data": "AID_bio_armor_arms"
@@ -94,7 +94,7 @@
     "type": "BIONIC_ITEM",
     "name": { "str": "Head Alloy Plating CBM" },
     "looks_like": "bio_int_enhancer",
-    "description": "An advanced protective mesh that weaves into the user's flesh, protecting both their head and jaw regions at the cost of mild encumbrance.  A warning indicates that this CBM cannot be removed safely after being installed.",
+    "description": "An advanced protective mesh that weaves into the user's flesh, protecting both their head and jaw regions at the cost of mild encumbrance.",
     "price": 350000,
     "weight": "1000 g",
     "difficulty": 6
@@ -105,7 +105,7 @@
     "type": "BIONIC_ITEM",
     "name": { "str": "Legs Alloy Plating CBM" },
     "looks_like": "bio_int_enhancer",
-    "description": "An advanced protective mesh that weaves into the user's flesh.  Provides passive protection at the cost of mild encumbrance and can be used in conjunction with bionic martial arts.  A warning indicates that this CBM cannot be removed safely after being installed.",
+    "description": "An advanced protective mesh that weaves into the user's flesh.  Provides passive protection at the cost of mild encumbrance and can be used in conjunction with bionic martial arts.",
     "price": 350000,
     "difficulty": 6,
     "installation_data": "AID_bio_armor_legs"
@@ -116,7 +116,7 @@
     "type": "BIONIC_ITEM",
     "name": { "str": "Torso Alloy Plating CBM" },
     "looks_like": "bio_int_enhancer",
-    "description": "An advanced protective mesh that weaves into the user's flesh, protecting it from physical trauma at the cost of mild encumbrance.  A warning indicates that this CBM cannot be removed safely after being installed.",
+    "description": "An advanced protective mesh that weaves into the user's flesh, protecting it from physical trauma at the cost of mild encumbrance.",
     "price": 350000,
     "weight": "3000 g",
     "difficulty": 6

diff --git a/data/json/materials.json b/data/json/materials.json
@@ -2819,5 +2819,25 @@
       { "fuel": 600, "smoke": 0, "burn": 2 },
       { "fuel": 900, "smoke": 0, "burn": 3 }
     ]
+  },
+  {
+    "type": "material",
+    "id": "nanotubes",
+    "//": "fictional carbon nanotubing, intended for bionic implants",
+    "density": 3.5,
+    "name": "Carbon Lattice",
+    "breathability": "SECOND_SKIN",
+    "specific_heat_liquid": 0.82,
+    "specific_heat_solid": 0.45,
+    "latent_heat": 273,
+    "bash_resist": 1,
+    "cut_resist": 4,
+    "bullet_resist": 4,
+    "acid_resist": 4,
+    "fire_resist": 3,
+    "chip_resist": 20,
+    "dmg_adj": [ "marked", "dented", "smashed", "shattered" ],
+    "bash_dmg_verb": "dented",
+    "cut_dmg_verb": "scratched"
   }
 ]