Skip to content

Commit

Permalink
Adjustments to bionic armor (cataclysmbnteam#2919)
Browse files Browse the repository at this point in the history
  • Loading branch information
@chaosvolt
chaosvolt authored Jun 1, 2023
1 parent 7340dcf commit 7d3c092
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 60 deletions.
73 changes: 19 additions & 54 deletions data/json/bionics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@
"id": "bio_armor_arms",
"type": "bionic",
"name": { "str": "Alloy Plating - Arms" },
"description": "The flesh on your arms and hands have been surgically replaced by alloy plating. Provides passive protection and can be used in conjunction with bionic martial arts.",
"description": "The flesh on your arms and hands have been surgically replaced by alloy plating. Provides 6 bash and cut protection, 5 ballistic protection, and can be used in conjunction with bionic martial arts.",
"occupied_bodyparts": [ [ "arm_l", 4 ], [ "arm_r", 4 ], [ "hand_l", 1 ], [ "hand_r", 1 ] ],
"bash_protec": [ [ "arm_l", 3 ], [ "arm_r", 3 ], [ "hand_l", 3 ], [ "hand_r", 3 ] ],
"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 ] ],
"bash_protec": [ [ "arm_l", 6 ], [ "arm_r", 6 ], [ "hand_l", 6 ], [ "hand_r", 6 ] ],
"cut_protec": [ [ "arm_l", 6 ], [ "arm_r", 6 ], [ "hand_l", 6 ], [ "hand_r", 6 ] ],
"bullet_protec": [ [ "arm_l", 5 ], [ "arm_r", 5 ], [ "hand_l", 5 ], [ "hand_r", 5 ] ],
"flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
},
{
"id": "bio_armor_eyes",
"type": "bionic",
"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.",
"description": "Your eye sockets have been surgically sealed with highly protective mirrored lenses and your tear ducts have been re-routed to your mouth. Provides 3 bash and cut protection, and 7 environmental protection.",
"occupied_bodyparts": [ [ "eyes", 1 ] ],
"env_protec": [ [ "eyes", 7 ] ],
"bash_protec": [ [ "eyes", 3 ] ],
Expand All @@ -64,33 +64,33 @@
"id": "bio_armor_head",
"type": "bionic",
"name": { "str": "Alloy Plating - head" },
"description": "The flesh on your head has been surgically replaced by alloy plating, protecting both your head and jaw regions.",
"description": "The flesh on your head has been surgically replaced by alloy plating, protecting both your head and jaw regions. Provides 6 bash and cut protection, and 5 ballistic protection.",
"occupied_bodyparts": [ [ "head", 5 ], [ "mouth", 1 ] ],
"bash_protec": [ [ "head", 3 ], [ "mouth", 3 ] ],
"cut_protec": [ [ "head", 3 ], [ "mouth", 3 ] ],
"bullet_protec": [ [ "head", 3 ], [ "mouth", 3 ] ],
"bash_protec": [ [ "head", 6 ], [ "mouth", 6 ] ],
"cut_protec": [ [ "head", 6 ], [ "mouth", 6 ] ],
"bullet_protec": [ [ "head", 5 ], [ "mouth", 5 ] ],
"flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
},
{
"id": "bio_armor_legs",
"type": "bionic",
"name": { "str": "Alloy Plating - Legs" },
"description": "The flesh on your legs and feet have been surgically replaced by alloy plating. Provides passive protection and can be used in conjunction with bionic martial arts.",
"description": "The flesh on your legs and feet have been surgically replaced by alloy plating. Provides 6 bash and cut protection, 5 ballistic protection, and can be used in conjunction with bionic martial arts.",
"occupied_bodyparts": [ [ "leg_l", 6 ], [ "leg_r", 6 ], [ "foot_l", 1 ], [ "foot_r", 1 ] ],
"bash_protec": [ [ "leg_l", 3 ], [ "leg_r", 3 ], [ "foot_l", 3 ], [ "foot_r", 3 ] ],
"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 ] ],
"bash_protec": [ [ "leg_l", 6 ], [ "leg_r", 6 ], [ "foot_l", 6 ], [ "foot_r", 6 ] ],
"cut_protec": [ [ "leg_l", 6 ], [ "leg_r", 6 ], [ "foot_l", 6 ], [ "foot_r", 6 ] ],
"bullet_protec": [ [ "leg_l", 5 ], [ "leg_r", 5 ], [ "foot_l", 5 ], [ "foot_r", 5 ] ],
"flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
},
{
"id": "bio_armor_torso",
"type": "bionic",
"name": { "str": "Alloy Plating - torso" },
"description": "The flesh on your torso has been surgically replaced by alloy plating, protecting it from physical trauma.",
"description": "The flesh on your torso has been surgically replaced by alloy plating, protecting it from physical trauma. Provides 6 bash and cut protection, and 5 ballistic protection.",
"occupied_bodyparts": [ [ "torso", 10 ] ],
"bash_protec": [ [ "torso", 3 ] ],
"cut_protec": [ [ "torso", 3 ] ],
"bullet_protec": [ [ "torso", 3 ] ],
"bash_protec": [ [ "torso", 6 ] ],
"cut_protec": [ [ "torso", 6 ] ],
"bullet_protec": [ [ "torso", 5 ] ],
"flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
},
{
Expand Down Expand Up @@ -165,7 +165,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 reduces all bashing damage by 5%, cutting damage by 10%, and ballistic damage by 15%.",
"occupied_bodyparts": [
[ "torso", 5 ],
[ "head", 2 ],
Expand All @@ -178,42 +178,7 @@
[ "foot_l", 1 ],
[ "foot_r", 1 ]
],
"bash_protec": [
[ "torso", 2 ],
[ "head", 2 ],
[ "arm_l", 2 ],
[ "arm_r", 2 ],
[ "hand_l", 2 ],
[ "hand_r", 2 ],
[ "leg_l", 2 ],
[ "leg_r", 2 ],
[ "foot_l", 2 ],
[ "foot_r", 2 ]
],
"cut_protec": [
[ "torso", 4 ],
[ "head", 4 ],
[ "arm_l", 4 ],
[ "arm_r", 4 ],
[ "hand_l", 4 ],
[ "hand_r", 4 ],
[ "leg_l", 4 ],
[ "leg_r", 4 ],
[ "foot_l", 4 ],
[ "foot_r", 4 ]
],
"bullet_protec": [
[ "torso", 4 ],
[ "head", 4 ],
[ "arm_l", 4 ],
[ "arm_r", 4 ],
[ "hand_l", 4 ],
[ "hand_r", 4 ],
[ "leg_l", 4 ],
[ "leg_r", 4 ],
[ "foot_l", 4 ],
[ "foot_r", 4 ]
],
"enchantments": [ "ENCH_BIO_CARBON" ],
"flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
},
{
Expand Down
11 changes: 11 additions & 0 deletions data/json/enchantments.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,16 @@
"condition": "ACTIVE",
"ench_effects": [ { "effect": "invisibility", "intensity": 1 } ],
"emitter": "emit_shadow_field"
},
{
"type": "enchantment",
"id": "ENCH_BIO_CARBON",
"condition": "ALWAYS",
"values": [
{ "value": "ARMOR_BASH", "multiply": -0.05 },
{ "value": "ARMOR_CUT", "multiply": -0.1 },
{ "value": "ARMOR_STAB", "multiply": -0.08 },
{ "value": "ARMOR_BULLET", "multiply": -0.15 }
]
}
]
12 changes: 6 additions & 6 deletions data/json/items/bionics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"copy-from": "bionic_general_npc_usable",
"type": "BIONIC_ITEM",
"name": { "str": "Arms Alloy Plating CBM" },
"description": "Alloy plating that replaces the flesh on the user's arms. Provides passive protection and can be used in conjunction with bionic martial arts.",
"description": "Alloy plating that replaces the flesh on the user's arms. Provides 6 bash and cut protection, 5 ballistic protection, and can be used in conjunction with bionic martial arts.",
"price": 350000,
"difficulty": 3,
"installation_data": "AID_bio_armor_arms"
Expand All @@ -83,7 +83,7 @@
"type": "BIONIC_ITEM",
"name": { "str": "Protective Lenses CBM" },
"looks_like": "bio_int_enhancer",
"description": "A bionic package that seals the user's eye sockets with highly protective mirrored lenses and re-routes their tear ducts to their mouth. When the user cries, they must spit out or swallow their tears.",
"description": "A bionic package that seals the user's eye sockets with highly protective mirrored lenses and re-routes their tear ducts to their mouth. Provides 3 bash and cut protection, and 7 environmental protection.",
"price": 550000,
"weight": "500 g",
"difficulty": 5
Expand All @@ -94,7 +94,7 @@
"type": "BIONIC_ITEM",
"name": { "str": "Head Alloy Plating CBM" },
"looks_like": "bio_int_enhancer",
"description": "Alloy plating that replaces the flesh on the user's head, protecting both their head and jaw regions.",
"description": "Alloy plating that replaces the flesh on the user's head, protecting both their head and jaw regions. Provides 6 bash and cut protection, and 5 ballistic protection.",
"price": 350000,
"weight": "1000 g",
"difficulty": 5
Expand All @@ -105,7 +105,7 @@
"type": "BIONIC_ITEM",
"name": { "str": "Legs Alloy Plating CBM" },
"looks_like": "bio_int_enhancer",
"description": "Alloy plating that replaces the flesh on the user's legs. Provides passive protection and can be used in conjunction with bionic martial arts.",
"description": "Alloy plating that replaces the flesh on the user's legs. Provides 6 bash and cut protection, 5 ballistic protection, and can be used in conjunction with bionic martial arts.",
"price": 350000,
"difficulty": 3,
"installation_data": "AID_bio_armor_legs"
Expand All @@ -116,7 +116,7 @@
"type": "BIONIC_ITEM",
"name": { "str": "Torso Alloy Plating CBM" },
"looks_like": "bio_int_enhancer",
"description": "Alloy plating that replaces the flesh on the user's torso, protecting it from physical trauma.",
"description": "Alloy plating that replaces the flesh on the user's torso, protecting it from physical trauma. Provides 6 bash and cut protection, and 5 ballistic protection.",
"price": 350000,
"weight": "3000 g",
"difficulty": 4
Expand Down Expand Up @@ -195,7 +195,7 @@
"type": "BIONIC_ITEM",
"name": { "str": "Subdermal Carbon Filament CBM" },
"looks_like": "bio_int_enhancer",
"description": "A thin armor made of carbon nanotubes, implanted just beneath the skin. This reduces bashing damage by 2 and cutting damage by 4.",
"description": "A thin armor made of carbon nanotubes, implanted just beneath the skin. This reduces all bashing damage by 5%, cutting damage by 10%, and ballistic damage by 15%.",
"price": 750000,
"difficulty": 9
},
Expand Down

0 comments on commit 7d3c092

Please sign in to comment.