Skip to content

Commit 202be00

Browse files
Holli-GitHolli-Git
authored
Remove some old armor (#83590)
* Remove some old armor * fix tests maybe * fix recipe maychance * fix times * Update crafting_test.cpp * Update crafting_test.cpp
1 parent c5ce2ba commit 202be00

File tree

16 files changed

+63
-206
lines changed

16 files changed

+63
-206
lines changed

‎data/json/itemgroups/Clothing_Gear/clothing.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3438,8 +3438,8 @@
34383438
{ "item": "boots_plate", "prob": 60, "damage": [ 2, 4 ] },
34393439
{ "item": "armor_junk_lightplate", "prob": 45, "damage": [ 2, 4 ] },
34403440
{ "item": "cuirass_lightplate", "prob": 45, "damage": [ 2, 4 ] },
3441-
{ "item": "armguard_lightplate", "prob": 30, "damage": [ 2, 4 ] },
3442-
{ "item": "legguard_lightplate", "prob": 30, "damage": [ 2, 4 ] },
3441+
{ "item": "armor_lc_armguard", "prob": 30, "damage": [ 2, 4 ] },
3442+
{ "item": "armor_lc_leg_guard", "prob": 30, "damage": [ 2, 4 ] },
34433443
{ "item": "helmet_barbute", "prob": 50, "damage": [ 2, 4 ] },
34443444
{ "item": "helmet_conical", "prob": 30, "damage": [ 2, 4 ] },
34453445
{ "item": "armor_lamellar", "prob": 20, "damage": [ 2, 4 ] },
@@ -3477,7 +3477,7 @@
34773477
"type": "item_group",
34783478
"id": "museum_armor_legs",
34793479
"items": [
3480-
{ "item": "legguard_lightplate", "prob": 30, "damage": [ 2, 4 ] },
3480+
{ "item": "armor_lc_leg_guard", "prob": 30, "damage": [ 2, 4 ] },
34813481
{ "item": "legguard_metal", "prob": 10, "damage": [ 2, 4 ] },
34823482
{ "item": "legguard_bronze", "prob": 20, "damage": [ 2, 4 ] },
34833483
{ "item": "chainmail_junk_legs", "prob": 10, "damage": [ 2, 4 ] }
@@ -3507,7 +3507,7 @@
35073507
"type": "item_group",
35083508
"id": "museum_armor_arms",
35093509
"items": [
3510-
{ "item": "armguard_lightplate", "prob": 30, "damage": [ 2, 4 ] },
3510+
{ "item": "armor_lc_armguard", "prob": 30, "damage": [ 2, 4 ] },
35113511
{ "item": "gloves_plate", "prob": 60, "damage": [ 2, 4 ] },
35123512
{ "item": "chainmail_junk_arms", "prob": 30, "damage": [ 2, 4 ] },
35133513
{ "item": "chainmail_junk_hands", "prob": 30, "damage": [ 2, 4 ] }

‎data/json/itemgroups/art_antiques_crafts.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@
114114
{ "item": "armor_lamellar", "prob": 2 },
115115
{ "item": "armor_junk_lightplate", "prob": 1 },
116116
{ "item": "cuirass_lightplate", "prob": 2 },
117-
{ "item": "armguard_lightplate", "prob": 1 },
118-
{ "item": "legguard_lightplate", "prob": 1 },
117+
{ "item": "armor_lc_armguard", "prob": 1 },
118+
{ "item": "armor_lc_leg_guard", "prob": 1 },
119119
{ "item": "armor_samurai", "prob": 1 },
120120
{ "item": "helmet_kabuto", "prob": 1 },
121121
{ "item": "gloves_plate", "prob": 1 },

‎data/json/items/armor/arms_armor.json‎

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -336,55 +336,6 @@
336336
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
337337
"extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
338338
},
339-
{
340-
"id": "armguard_lightplate",
341-
"type": "ITEM",
342-
"subtypes": [ "ARMOR" ],
343-
"category": "armor",
344-
"name": { "str_sp": "steel arm guards (pair)" },
345-
"description": "A full assembly of medieval arm protection. Rerebraces, couters, and vambraces, with leather straps to secure each piece and connect it as part of a set.",
346-
"weight": "2720 g",
347-
"volume": "5500 ml",
348-
"price": "200 USD",
349-
"price_postapoc": "120 USD",
350-
"material": [ "steel", "leather" ],
351-
"symbol": "[",
352-
"looks_like": "armguard_metal",
353-
"color": "light_gray",
354-
"warmth": 20,
355-
"material_thickness": 4,
356-
"flags": [ "VARSIZE", "OUTER", "STURDY", "BLOCK_WHILE_WORN" ],
357-
"armor": [
358-
{
359-
"covers": [ "arm_l", "arm_r" ],
360-
"encumbrance": 16,
361-
"coverage": 95,
362-
"cover_melee": 95,
363-
"cover_ranged": 95,
364-
"cover_vitals": 90,
365-
"specifically_covers": [ "arm_lower_r", "arm_lower_l", "arm_elbow_r", "arm_elbow_l", "arm_upper_r", "arm_upper_l" ]
366-
}
367-
]
368-
},
369-
{
370-
"id": "xl_armguard_lightplate",
371-
"type": "ITEM",
372-
"subtypes": [ "ARMOR" ],
373-
"name": { "str_sp": "steel arm guards (pair)" },
374-
"weight": "3243 g",
375-
"volume": "7 L",
376-
"copy-from": "armguard_lightplate",
377-
"extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] }
378-
},
379-
{
380-
"id": "xs_armguard_lightplate",
381-
"type": "ITEM",
382-
"subtypes": [ "ARMOR" ],
383-
"copy-from": "armguard_lightplate",
384-
"name": { "str_sp": "steel arm guards (pair)" },
385-
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
386-
"extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
387-
},
388339
{
389340
"id": "armguard_metal",
390341
"type": "ITEM",
@@ -443,7 +394,7 @@
443394
"material": [ "lc_steel" ],
444395
"repairs_with": [ "steel" ],
445396
"symbol": "[",
446-
"looks_like": "armguard_lightplate",
397+
"looks_like": "armor_lc_armguard",
447398
"color": "light_gray",
448399
"warmth": 10,
449400
"material_thickness": 1.5,
@@ -1188,7 +1139,7 @@
11881139
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "uneven" },
11891140
"material": [ "bronze", "leather" ],
11901141
"symbol": "[",
1191-
"looks_like": "armguard_lightplate",
1142+
"looks_like": "armor_lc_armguard",
11921143
"color": "yellow",
11931144
"warmth": 15,
11941145
"material_thickness": 4,

‎data/json/items/armor/brigandine.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@
897897
"price_postapoc": "10 USD",
898898
"material": [ "lc_steel", "canvas" ],
899899
"symbol": "[",
900-
"looks_like": "legguard_lightplate",
900+
"looks_like": "armor_lc_leg_guard",
901901
"color": "light_gray",
902902
"environmental_protection": 1,
903903
"flags": [ "OUTER", "STURDY", "ABLATIVE_CHAINMAIL_LEGS", "VARSIZE" ],

‎data/json/items/armor/legs_armor.json‎

Lines changed: 5 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@
837837
"price_postapoc": "7 USD 50 cent",
838838
"material": [ "bronze", "leather" ],
839839
"symbol": "[",
840-
"looks_like": "legguard_lightplate",
840+
"looks_like": "armor_lc_leg_guard",
841841
"color": "yellow",
842842
"warmth": 15,
843843
"material_thickness": 4,
@@ -903,54 +903,6 @@
903903
}
904904
]
905905
},
906-
{
907-
"id": "legguard_lightplate",
908-
"type": "ITEM",
909-
"subtypes": [ "ARMOR" ],
910-
"category": "armor",
911-
"name": { "str_sp": "steel leg guards (pair)" },
912-
"description": "A full assembly of medieval leg protection. Cuisses, poleyns, and greaves, with leather straps to secure each piece and connect it as part of a set.",
913-
"weight": "4080 g",
914-
"volume": "6 L",
915-
"price": "200 USD",
916-
"price_postapoc": "40 USD",
917-
"material": [ "steel", "leather" ],
918-
"symbol": "[",
919-
"looks_like": "legguard_hard",
920-
"color": "light_gray",
921-
"warmth": 20,
922-
"material_thickness": 4,
923-
"flags": [ "VARSIZE", "OUTER", "STURDY", "BLOCK_WHILE_WORN" ],
924-
"armor": [
925-
{
926-
"covers": [ "leg_l", "leg_r" ],
927-
"encumbrance": 8,
928-
"coverage": 95,
929-
"cover_melee": 95,
930-
"cover_ranged": 95,
931-
"cover_vitals": 90,
932-
"specifically_covers": [ "leg_lower_r", "leg_lower_l", "leg_knee_r", "leg_knee_l", "leg_upper_r", "leg_upper_l" ]
933-
}
934-
]
935-
},
936-
{
937-
"id": "xl_legguard_lightplate",
938-
"type": "ITEM",
939-
"subtypes": [ "ARMOR" ],
940-
"copy-from": "legguard_lightplate",
941-
"name": { "str_sp": "steel leg guards (pair)" },
942-
"proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
943-
"extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] }
944-
},
945-
{
946-
"id": "xs_legguard_lightplate",
947-
"type": "ITEM",
948-
"subtypes": [ "ARMOR" ],
949-
"copy-from": "legguard_lightplate",
950-
"name": { "str_sp": "steel leg guards (pair)" },
951-
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
952-
"extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
953-
},
954906
{
955907
"id": "legguard_metal",
956908
"type": "ITEM",
@@ -964,7 +916,7 @@
964916
"price_postapoc": "10 USD",
965917
"material": [ "iron", "leather" ],
966918
"symbol": "[",
967-
"looks_like": "legguard_lightplate",
919+
"looks_like": "armor_lc_leg_guard",
968920
"color": "light_gray",
969921
"warmth": 10,
970922
"material_thickness": 4,
@@ -1013,7 +965,7 @@
1013965
"price_postapoc": "10 USD",
1014966
"material": [ "lc_steel" ],
1015967
"symbol": "[",
1016-
"looks_like": "legguard_lightplate",
968+
"looks_like": "armor_lc_leg_guard",
1017969
"color": "light_gray",
1018970
"warmth": 10,
1019971
"material_thickness": 1.5,
@@ -1055,7 +1007,7 @@
10551007
"price_postapoc": "5 USD",
10561008
"material": [ "lc_steel" ],
10571009
"symbol": "[",
1058-
"looks_like": "legguard_lightplate",
1010+
"looks_like": "armor_lc_leg_guard",
10591011
"color": "light_gray",
10601012
"warmth": 10,
10611013
"material_thickness": 1.5,
@@ -1602,7 +1554,7 @@
16021554
"to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" },
16031555
"material": [ "lc_steel", "lc_steel_chain" ],
16041556
"symbol": "[",
1605-
"looks_like": "legguard_lightplate",
1557+
"looks_like": "armor_lc_leg_guard",
16061558
"color": "light_gray",
16071559
"warmth": 20,
16081560
"longest_side": "60 cm",

‎data/json/mapgen/pawn_shop.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,9 +504,9 @@
504504
"items": [
505505
[ "helmet_plate", 100 ],
506506
[ "boots_plate", 100 ],
507-
[ "armguard_lightplate", 100 ],
507+
[ "armor_lc_armguard", 100 ],
508508
[ "gloves_plate", 100 ],
509-
[ "legguard_lightplate", 100 ],
509+
[ "armor_lc_leg_guard", 100 ],
510510
[ "armor_junk_plate", 100 ],
511511
{ "item": "chainmail_junk_hauberk", "prob": 1 }
512512
]

‎data/json/monsterdrops/feral_humans.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,8 @@
484484
{
485485
"collection": [
486486
{ "item": "cuirass_lightplate", "prob": 80, "damage": [ 2, 4 ] },
487-
{ "item": "armguard_lightplate", "prob": 60, "damage": [ 1, 4 ] },
488-
{ "item": "legguard_lightplate", "prob": 60, "damage": [ 1, 4 ] }
487+
{ "item": "armor_lc_armguard", "prob": 60, "damage": [ 1, 4 ] },
488+
{ "item": "armor_lc_leg_guard", "prob": 60, "damage": [ 1, 4 ] }
489489
],
490490
"prob": 60
491491
}

‎data/json/npcs/isolated_road/isolated_road_item_groups.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
{ "item": "gambeson", "prob": 2 },
3232
{ "item": "armor_lamellar", "prob": 2 },
3333
{ "item": "cuirass_lightplate", "prob": 2 },
34-
{ "item": "armguard_lightplate", "prob": 2 },
35-
{ "item": "legguard_lightplate", "prob": 2 },
34+
{ "item": "armor_lc_armguard", "prob": 2 },
35+
{ "item": "armor_lc_leg_guard", "prob": 2 },
3636
{ "item": "armor_samurai", "prob": 2 },
3737
{ "item": "helmet_kabuto", "prob": 2 },
3838
{ "item": "gloves_plate", "prob": 2 },

‎data/json/obsoletion_and_migration_0.J/migration_items.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,36 @@
144144
"id": "homewrecker",
145145
"replace": "hammer_sledge"
146146
},
147+
{
148+
"type": "MIGRATION",
149+
"id": "armguard_lightplate",
150+
"replace": "armor_lc_armguard"
151+
},
152+
{
153+
"type": "MIGRATION",
154+
"id": "xl_armguard_lightplate",
155+
"replace": "xl_armor_lc_armguard"
156+
},
157+
{
158+
"type": "MIGRATION",
159+
"id": "xs_armguard_lightplate",
160+
"replace": "armor_lc_armguard"
161+
},
162+
{
163+
"type": "MIGRATION",
164+
"id": "legguard_lightplate",
165+
"replace": "armor_lc_leg_guard"
166+
},
167+
{
168+
"type": "MIGRATION",
169+
"id": "xl_legguard_lightplate",
170+
"replace": "xl_armor_lc_leg_guard"
171+
},
172+
{
173+
"type": "MIGRATION",
174+
"id": "xs_legguard_lightplate",
175+
"replace": "armor_lc_leg_guard"
176+
},
147177
{
148178
"type": "MIGRATION",
149179
"id": "sewage",

‎data/json/recipes/armor/arms.json‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -179,46 +179,6 @@
179179
"byproducts": [ [ "leather", 2 ], [ "scrap_leather", 1 ] ],
180180
"using": [ [ "tailoring_leather_patchwork", 5 ] ]
181181
},
182-
{
183-
"result": "armguard_lightplate",
184-
"type": "recipe",
185-
"activity_level": "BRISK_EXERCISE",
186-
"category": "CC_ARMOR",
187-
"subcategory": "CSC_ARMOR_ARMS",
188-
"skill_used": "fabrication",
189-
"difficulty": 7,
190-
"skills_required": [ [ "tailor", 3 ] ],
191-
"time": "900 m",
192-
"book_learn": [ [ "textbook_armwest", 6 ] ],
193-
"using": [ [ "blacksmithing_standard", 8 ], [ "steel_standard", 2 ], [ "tailoring_leather_patchwork", 2 ] ],
194-
"qualities": [ { "id": "CHISEL", "level": 3 } ],
195-
"tools": [ [ [ "swage", -1 ] ] ],
196-
"proficiencies": [
197-
{ "proficiency": "prof_metalworking" },
198-
{ "proficiency": "prof_blacksmithing" },
199-
{ "proficiency": "prof_armorsmithing" },
200-
{ "proficiency": "prof_leatherworking_basic", "skill_penalty": 0 },
201-
{ "proficiency": "prof_articulation" }
202-
]
203-
},
204-
{
205-
"result": "xs_armguard_lightplate",
206-
"type": "recipe",
207-
"copy-from": "armguard_lightplate",
208-
"time": "900 m",
209-
"using": [ [ "blacksmithing_standard", 4 ], [ "steel_standard", 1 ], [ "tailoring_leather_patchwork", 1 ] ],
210-
"qualities": [ { "id": "CHISEL", "level": 3 } ],
211-
"tools": [ [ [ "swage", -1 ] ] ]
212-
},
213-
{
214-
"result": "xl_armguard_lightplate",
215-
"type": "recipe",
216-
"copy-from": "armguard_lightplate",
217-
"time": "1010 m",
218-
"using": [ [ "blacksmithing_standard", 12 ], [ "steel_standard", 3 ], [ "tailoring_leather_patchwork", 3 ] ],
219-
"qualities": [ { "id": "CHISEL", "level": 3 } ],
220-
"tools": [ [ [ "swage", -1 ] ] ]
221-
},
222182
{
223183
"result": "carpet_armguards",
224184
"type": "recipe",

0 commit comments

Comments
 (0)