Skip to content

Commit

Permalink
Further rebalancing of ballistic armor (cataclysmbnteam#2108)
Browse files Browse the repository at this point in the history
* Further rebalancing of ballistic armor

* Update ammo_pouch.json

* Update ballistic_armor.json

* Remove NO_REPAIR per feedback
  • Loading branch information
chaosvolt authored Nov 2, 2022
1 parent d01ff98 commit 4298700
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions data/json/items/armor/ammo_pouch.json
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@
"id": "modularvestceramic",
"type": "ARMOR",
"name": { "str": "MBR vest (ceramic plates)", "str_pl": "MBR vests (ceramic plates)" },
"description": "A Modular Bullet Resistant Vest. Ceramic plates have been inserted to improve its protection. The ceramic plates cannot be repaired, only replaced. It has four pouches capable of carrying magazines.",
"description": "A Modular Bullet Resistant Vest. Ceramic plates have been inserted to improve its protection, offering good resistance to bullets at the expense of being less durable than other plate options. It has four pouches capable of carrying magazines.",
"weight": "4308 g",
"volume": "6 L",
"price": 39900,
Expand All @@ -306,7 +306,7 @@
"draw_cost": 60,
"flags": [ "MAG_COMPACT" ]
},
"flags": [ "STURDY", "OUTER" ]
"flags": [ "OUTER" ]
},
{
"id": "modularvesthard",
Expand Down Expand Up @@ -361,7 +361,7 @@
"encumbrance": 20,
"storage": "1 L",
"warmth": 15,
"material_thickness": 7,
"material_thickness": 8,
"use_action": {
"type": "holster",
"holster_prompt": "Stash ammo",
Expand Down Expand Up @@ -394,7 +394,7 @@
"encumbrance": 15,
"storage": "1 L",
"warmth": 15,
"material_thickness": 6,
"material_thickness": 8,
"use_action": {
"type": "holster",
"holster_prompt": "Stash ammo",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/armor/ballistic_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"color": "light_red",
"covers": [ "torso" ],
"coverage": 95,
"encumbrance": 8,
"encumbrance": 12,
"warmth": 12,
"material_thickness": 3,
"material_thickness": 5,
"//": "Ceramic disks inside block addition of steel plating modification",
"flags": [ "STURDY", "OUTER", "NO_REPAIR" ]
"flags": [ "OUTER", "NO_REPAIR" ]
},
{
"id": "dragonskinempty",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/armor/power_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
"encumbrance": 60,
"storage": "4 L",
"warmth": 60,
"material_thickness": 12,
"material_thickness": 11,
"environmental_protection": 16,
"use_action": {
"type": "set_transform",
Expand Down Expand Up @@ -296,7 +296,7 @@
"coverage": 100,
"encumbrance": 60,
"warmth": 60,
"material_thickness": 12,
"material_thickness": 11,
"environmental_protection": 16,
"qualities": [ [ "GLARE", 2 ] ],
"use_action": {
Expand Down
4 changes: 2 additions & 2 deletions data/json/materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
"reinforces": true,
"bash_resist": 4,
"cut_resist": 8,
"bullet_resist": 7,
"bullet_resist": 10,
"acid_resist": 10,
"fire_resist": 10,
"elec_resist": 10,
Expand Down Expand Up @@ -631,7 +631,7 @@
"reinforces": true,
"bash_resist": 10,
"cut_resist": 16,
"bullet_resist": 13,
"bullet_resist": 16,
"acid_resist": 6,
"fire_resist": 3,
"elec_resist": 0,
Expand Down

0 comments on commit 4298700

Please sign in to comment.