Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Military armor balance #36853

Merged
merged 21 commits into from
Apr 11, 2020
Merged

Military armor balance #36853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b2f6cd4
Add files via upload
Brian-Otten Feb 6, 2019
966e6d4
Rebalances martial arts.
Brian-Otten Feb 8, 2019
952be7a
Merge pull request #1 from Brian-Otten/Martialartsrebalance
Brian-Otten Feb 8, 2019
006e175
Add files via upload
Brian-Otten Feb 8, 2019
5d9f384
Delete martialarts.json
Brian-Otten Feb 8, 2019
ffd82fa
Delete techniques.json
Brian-Otten Feb 8, 2019
83bdf99
Delete mutations.json
Brian-Otten Feb 8, 2019
64cfd0c
Add files via upload
Brian-Otten Feb 8, 2019
6cf3cb1
Delete monstergroups.json
Brian-Otten Feb 8, 2019
3a71e81
Add files via upload
Brian-Otten Feb 8, 2019
77aecd4
Add files via upload
Brian-Otten Feb 8, 2019
9708690
Mutations.json changed back to standard
Brian-Otten Feb 8, 2019
638356a
Description fixes
Brian-Otten Feb 9, 2019
18d8939
Update martialarts.json
Brian-Otten Jan 9, 2020
0061ec6
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Brian-Otten Jan 9, 2020
eb0bed3
Military armor rebalance
Brian-Otten Jan 9, 2020
315a308
Made kevlar MBR more encumbering to fit new armor values.
Brian-Otten Jan 10, 2020
64d6bdd
Remove storage from AEP suit
Brian-Otten Jan 11, 2020
8b2ff11
Merge branch 'Military-Armor-Balance' of https://github.com/Brian-Ott…
Brian-Otten Apr 6, 2020
b943e44
Merge branch 'master' into Military-Armor-Balance
Brian-Otten Apr 6, 2020
df954a5
Fix merge conflicts
Brian-Otten Apr 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions data/json/items/armor/ammo_pouch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
"encumbrance": 15,
"storage": "1 L",
"warmth": 15,
"material_thickness": 5,
"material_thickness": 9,
"use_action": {
"type": "holster",
"holster_prompt": "Stash ammo",
Expand Down Expand Up @@ -322,10 +322,10 @@
"color": "light_cyan",
"covers": [ "TORSO" ],
"coverage": 85,
"encumbrance": 45,
"encumbrance": 25,
"storage": "1 L",
"warmth": 15,
"material_thickness": 4,
"material_thickness": 5,
"use_action": {
"type": "holster",
"holster_prompt": "Stash ammo",
Expand Down Expand Up @@ -356,10 +356,10 @@
"color": "light_gray",
"covers": [ "TORSO" ],
"coverage": 85,
"encumbrance": 8,
"encumbrance": 12,
"storage": "1 L",
"warmth": 15,
"material_thickness": 5,
"material_thickness": 6,
"use_action": {
"type": "holster",
"holster_prompt": "Stash ammo",
Expand Down Expand Up @@ -390,10 +390,10 @@
"color": "light_cyan",
"covers": [ "TORSO" ],
"coverage": 85,
"encumbrance": 30,
"encumbrance": 20,
"storage": "1 L",
"warmth": 15,
"material_thickness": 5,
"material_thickness": 7,
"use_action": {
"type": "holster",
"holster_prompt": "Stash ammo",
Expand Down Expand Up @@ -427,7 +427,7 @@
"encumbrance": 15,
"storage": "1 L",
"warmth": 15,
"material_thickness": 5,
"material_thickness": 6,
"use_action": {
"type": "holster",
"holster_prompt": "Stash ammo",
Expand Down
11 changes: 5 additions & 6 deletions data/json/items/armor/suits_protection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
"color": "light_red",
"covers": [ "LEGS", "TORSO", "ARMS" ],
"coverage": 100,
"encumbrance": 30,
"storage": "4 L",
"encumbrance": 20,
"warmth": 35,
"material_thickness": 3,
"material_thickness": 7,
"environmental_protection": 9,
"flags": [ "VARSIZE", "WATERPROOF", "HOOD", "RAINPROOF", "STURDY", "RAD_RESIST", "OUTER" ]
},
Expand All @@ -36,9 +35,9 @@
"color": "light_red",
"covers": [ "HEAD", "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
"coverage": 100,
"encumbrance": 45,
"encumbrance": 35,
"warmth": 50,
"material_thickness": 3,
"material_thickness": 7,
"environmental_protection": 20,
"flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "GAS_PROOF", "STURDY", "RAD_PROOF", "ELECTRIC_IMMUNE", "OUTER" ]
},
Expand Down Expand Up @@ -717,7 +716,7 @@
"encumbrance": 25,
"storage": "5 L",
"warmth": 35,
"material_thickness": 7,
"material_thickness": 11,
"valid_mods": [ "steel_padded" ],
"environmental_protection": 4,
"flags": [ "POCKETS", "STURDY" ]
Expand Down