Skip to content

Commit 4f28506

Browse files
authored
feat(balance): sanity-check recipe carbon fiber recipes, add steel sub-material to weapons that also use steel in the recipe (#9758)
* feat(balance): sanity-check recipe carbon fiber recipes, add steel sub-material to weapons that also use steel in the recipe * Update vehicles.json
1 parent 204857f commit 4f28506

13 files changed

Lines changed: 36 additions & 33 deletions

File tree

data/json/items/gun/223.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,12 +627,12 @@
627627
"looks_like": "ar15",
628628
"type": "GUN",
629629
"name": { "str": "carbon fiber assault rifle" },
630-
"description": "This assault rifle was made using a 3D printer, resulting in a very lightweight weapon.",
630+
"description": "This assault rifle was made using a 3D printer with no metal parts except the barrel, resulting in a very lightweight weapon.",
631631
"weight": "1590 g",
632632
"volume": "2 L",
633633
"price": "2343 USD",
634634
"price_postapoc": "60 USD",
635-
"material": [ "carbon_fiber" ],
635+
"material": [ "carbon_fiber", "steel" ],
636636
"color": "dark_gray",
637637
"ammo": "223",
638638
"dispersion": 150,

data/json/items/gun/9mm.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -628,8 +628,8 @@
628628
"looks_like": "90two",
629629
"type": "GUN",
630630
"name": { "str": "carbon fiber machine pistol" },
631-
"description": "This 3D printed machine pistol is made completely without any metal parts. As a result, it is very lightweight.",
632-
"material": [ "carbon_fiber" ],
631+
"description": "This 3D printed machine pistol is made completely without any metal parts except the barrel. As a result, it is very lightweight.",
632+
"material": [ "carbon_fiber", "steel" ],
633633
"durability": 3,
634634
"weight": "370 g",
635635
"volume": "600 ml",

data/json/items/gunmod/mechanism.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@
390390
"type": "GUNMOD",
391391
"name": { "str": "carbon fiber upper receiver" },
392392
"description": "A 3D-printed carbon fiber replacement upper receiver for AR-15 pattern rifles. Significantly lighter than the original aluminum receiver with no impact on accuracy or reliability.",
393-
"weight": "80 g",
393+
"weight": "240 g",
394394
"volume": "250 ml",
395395
"integral_volume": "0 ml",
396396
"integral_weight": "-400 g",

data/json/items/melee/spears_and_polearms.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,8 +622,8 @@
622622
"type": "GENERIC",
623623
"copy-from": "spear_steel",
624624
"name": { "str": "carbon fiber spear" },
625-
"description": "A custom 3D-printed spear made out of carbon fiber. It is more lightweight than a normal spear thanks to its method of manufacturing, but it can only be repaired using a 3D printer.",
626-
"material": [ "carbon_fiber" ],
625+
"description": "A custom 3D-printed spear made out of carbon fiber with a steel-edged speartip. It is more lightweight than a normal spear thanks to its method of manufacturing.",
626+
"material": [ "carbon_fiber", "steel" ],
627627
"proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 }
628628
},
629629
{

data/json/items/melee/swords_and_blades.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1963,44 +1963,44 @@
19631963
"type": "GENERIC",
19641964
"copy-from": "knife_combat",
19651965
"name": { "str": "carbon fiber knife" },
1966-
"description": "A custom 3D-printed combat knife made out of carbon fiber. It is more lightweight than a normal knife thanks to its method of manufacturing, but it can only be repaired using a 3D printer.",
1966+
"description": "A custom 3D-printed combat knife made out of carbon fiber and a steel edge. It is more lightweight than a normal knife thanks to its method of manufacturing.",
19671967
"weight": "300 g",
1968-
"material": [ "carbon_fiber" ]
1968+
"material": [ "carbon_fiber", "steel" ]
19691969
},
19701970
{
19711971
"id": "sword_carbon",
19721972
"type": "GENERIC",
19731973
"copy-from": "katana",
19741974
"name": { "str": "carbon fiber katana" },
1975-
"description": "A custom 3D-printed single-bladed sword made out of carbon fiber. It is more lightweight than a normal sword thanks to its method of manufacturing, but it can only be repaired using a 3D printer.",
1976-
"material": [ "carbon_fiber" ],
1975+
"description": "A custom 3D-printed single-bladed sword made out of carbon fiber and a steel edge. It is more lightweight than a normal sword thanks to its method of manufacturing.",
1976+
"material": [ "carbon_fiber", "steel" ],
19771977
"proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 }
19781978
},
19791979
{
19801980
"id": "broadsword_carbon",
19811981
"type": "GENERIC",
19821982
"copy-from": "broadsword",
19831983
"name": { "str": "carbon fiber sword" },
1984-
"description": "A custom 3D-printed double-bladed sword made out of carbon fiber. It is more lightweight than a normal sword thanks to its method of manufacturing, but it can only be repaired using a 3D printer.",
1985-
"material": [ "carbon_fiber" ],
1984+
"description": "A custom 3D-printed double-bladed sword made out of carbon fiber and a steel edge. It is more lightweight than a normal sword thanks to its method of manufacturing.",
1985+
"material": [ "carbon_fiber", "steel" ],
19861986
"proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 }
19871987
},
19881988
{
19891989
"id": "nodachi_carbon",
19901990
"type": "GENERIC",
19911991
"copy-from": "nodachi",
19921992
"name": { "str": "carbon fiber nodachi" },
1993-
"description": "A custom 3D-printed single-bladed two-handed sword made out of carbon fiber. It is more lightweight than a normal sword thanks to its method of manufacturing, but it can only be repaired using a 3D printer.",
1994-
"material": [ "carbon_fiber" ],
1993+
"description": "A custom 3D-printed single-bladed two-handed sword made out of carbon fiber and a steel edge. It is more lightweight than a normal sword thanks to its method of manufacturing.",
1994+
"material": [ "carbon_fiber", "steel" ],
19951995
"proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 }
19961996
},
19971997
{
19981998
"id": "greatsword_carbon",
19991999
"type": "GENERIC",
20002000
"copy-from": "zweihander",
20012001
"name": { "str": "carbon fiber greatsword" },
2002-
"description": "A custom 3D-printed two-handed sword made out of carbon fiber. It is more lightweight than a normal sword thanks to its method of manufacturing, but it can only be repaired using a 3D printer.",
2003-
"material": [ "carbon_fiber" ],
2002+
"description": "A custom 3D-printed two-handed sword made out of carbon fiber and a steel edge. It is more lightweight than a normal sword thanks to its method of manufacturing.",
2003+
"material": [ "carbon_fiber", "steel" ],
20042004
"proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 }
20052005
},
20062006
{

data/json/items/melee/unarmed_weapons.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,16 +210,16 @@
210210
"type": "GENERIC",
211211
"copy-from": "jamadhar",
212212
"name": { "str": "carbon fiber jamadhar" },
213-
"description": "A custom 3D-printed jamadhar made out of carbon fiber. It is more lightweight than a normal weapon thanks to its method of manufacturing, but it can only be repaired using a 3D printer.",
214-
"material": [ "carbon_fiber" ],
213+
"description": "A custom 3D-printed jamadhar made out of carbon fiber with steel-edged blades. It is more lightweight than a normal weapon thanks to its method of manufacturing.",
214+
"material": [ "carbon_fiber", "steel" ],
215215
"proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 }
216216
},
217217
{
218218
"id": "katar_carbon",
219219
"type": "GENERIC",
220220
"copy-from": "katar",
221221
"name": { "str": "carbon fiber katar" },
222-
"description": "A custom 3D-printed katar made out of carbon fiber. It is more lightweight than a normal weapon thanks to its method of manufacturing, but it can only be repaired using a 3D printer.",
222+
"description": "A custom 3D-printed katar made out of carbon fiber and a steel edge. It is more lightweight than a normal weapon thanks to its method of manufacturing.",
223223
"material": [ "carbon_fiber" ],
224224
"proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 }
225225
},

data/json/items/vehicle/cargo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"type": "GENERIC",
7575
"name": { "str": "carbon cargo carrier" },
7676
"description": "A sturdy, yet lightweight carbon structure outfitted with tie-downs and attachment points for carrying cargo.",
77-
"weight": "10000 g",
77+
"weight": "9 kg",
7878
"to_hit": -3,
7979
"material": [ "carbon_fiber" ],
8080
"price": "1000 USD",

data/json/recipes/armor/feet.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@
631631
"time": "17 m",
632632
"book_learn": [ [ "textbook_computer", 2 ], [ "advanced_electronics", 2 ], [ "reference_fabrication1", 2 ] ],
633633
"using": [ [ "3d_printing_standard", 17 ] ],
634-
"components": [ [ [ "carbon_fiber_filament", 170 ] ] ]
634+
"components": [ [ [ "carbon_fiber_filament", 230 ] ] ]
635635
},
636636
{
637637
"result": "boots_scute",

data/json/recipes/armor/head.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,7 @@
16381638
"autolearn": true,
16391639
"book_learn": [ [ "textbook_computer", 1 ], [ "advanced_electronics", 1 ], [ "reference_fabrication1", 1 ] ],
16401640
"using": [ [ "3d_printing_standard", 18 ] ],
1641-
"components": [ [ [ "carbon_fiber_filament", 175 ] ] ]
1641+
"components": [ [ [ "carbon_fiber_filament", 145 ] ] ]
16421642
},
16431643
{
16441644
"result": "bondage_mask",

data/json/recipes/armor/suit.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,7 @@
950950
"time": "2 h 33 m",
951951
"book_learn": [ [ "textbook_robots", 0 ], [ "advanced_electronics", 0 ], [ "reference_fabrication1", 0 ] ],
952952
"using": [ [ "3d_printing_standard", 153 ] ],
953-
"components": [ [ [ "carbon_fiber_filament", 1530 ] ] ]
953+
"components": [ [ [ "carbon_fiber_filament", 1330 ] ] ]
954954
},
955955
{
956956
"result": "armor_carbonplate",

0 commit comments

Comments
 (0)