From 65ef3399063dba5d9978fd12da5ffa7bc6c2d7a5 Mon Sep 17 00:00:00 2001 From: AtomicFox556 Date: Thu, 12 May 2022 22:22:09 +0300 Subject: [PATCH 01/11] Add disassembly recipes for Exodii material blocks, attempt 2 --- .../furniture-fakes.json | 2 +- data/json/items/resources/metal.json | 60 ++++++ data/json/items/resources/plastic.json | 30 +++ data/json/uncraft/generic.json | 172 ++++++++++++++++++ 4 files changed, 263 insertions(+), 1 deletion(-) diff --git a/data/json/furniture_and_terrain/furniture-fakes.json b/data/json/furniture_and_terrain/furniture-fakes.json index e29343254faf4..911e50155a76c 100644 --- a/data/json/furniture_and_terrain/furniture-fakes.json +++ b/data/json/furniture_and_terrain/furniture-fakes.json @@ -37,7 +37,7 @@ "bash": { "str_min": 0, "str_max": 0, "items": [ ] }, "flags": [ "PLACE_ITEM", "TRANSPARENT", "EASY_DECONSTRUCT", "NOCOLLIDE" ], "examine_action": "workbench", - "workbench": { "multiplier": 0.7, "mass": 1000000, "volume": "1000L" } + "workbench": { "multiplier": 0.7, "mass": 10000000, "volume": "1000L" } }, { "type": "furniture", diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json index f3735ce03321d..588796a267f49 100644 --- a/data/json/items/resources/metal.json +++ b/data/json/items/resources/metal.json @@ -712,6 +712,66 @@ "color": "brown", "ammo_type": "components" }, + { + "id": "10ltin", + "type": "AMMO", + "category": "spare_parts", + "name": { "str": "10L tin ingot" }, + "description": "A ten-liter ingot of solid tin.", + "weight": "68500 g", + "volume": "10 L", + "price": 23150, + "price_postapoc": 230, + "material": [ "tin" ], + "symbol": "=", + "color": "light_gray", + "ammo_type": "components" + }, + { + "id": "5ltin", + "type": "AMMO", + "category": "spare_parts", + "name": { "str": "5L tin ingot" }, + "description": "A five-liter ingot of solid tin.", + "weight": "34250 g", + "volume": "5 L", + "price": 11575, + "price_postapoc": 116, + "material": [ "tin" ], + "symbol": "=", + "color": "light_gray", + "ammo_type": "components" + }, + { + "id": "10zinc", + "type": "AMMO", + "category": "spare_parts", + "name": { "str": "10L zinc ingot" }, + "description": "A ten-liter ingot of solid zinc.", + "weight": "71 kg", + "volume": "10 L", + "price": 23150, + "price_postapoc": 230, + "material": [ "zinc" ], + "symbol": "=", + "color": "white", + "ammo_type": "components" + }, + { + "id": "5lzinc", + "type": "AMMO", + "category": "spare_parts", + "name": { "str": "5L zinc ingot" }, + "description": "A five-liter ingot of solid zinc.", + "weight": "35500 g", + "volume": "5 L", + "price": 11575, + "price_postapoc": 116, + "material": [ "zinc" ], + "symbol": "=", + "color": "white", + "ammo_type": "components" + }, { "id": "5lgold", "type": "AMMO", diff --git a/data/json/items/resources/plastic.json b/data/json/items/resources/plastic.json index 389e049f6456f..51546ee385d3f 100644 --- a/data/json/items/resources/plastic.json +++ b/data/json/items/resources/plastic.json @@ -29,6 +29,36 @@ "color": "light_blue", "flags": [ "NO_SALVAGE" ] }, + { + "id": "10lplastic", + "type": "AMMO", + "category": "spare_parts", + "name": { "str": "10L plastic block" }, + "description": "A ten-liter block of solid plastic.", + "weight": "10 kg", + "volume": "10 L", + "price": 23150, + "price_postapoc": 230, + "material": [ "plastic" ], + "symbol": "=", + "color": "light_blue", + "ammo_type": "components" + }, + { + "id": "5lplastic", + "type": "AMMO", + "category": "spare_parts", + "name": { "str": "5L plastic block" }, + "description": "A five-liter block of solid plastic.", + "weight": "5 kg", + "volume": "5 L", + "price": 11575, + "price_postapoc": 116, + "material": [ "plastic" ], + "symbol": "=", + "color": "light_blue", + "ammo_type": "components" + }, { "id": "plastic_chunk", "type": "TOOL", diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json index fc3163425f0bb..8e9fb5e978557 100644 --- a/data/json/uncraft/generic.json +++ b/data/json/uncraft/generic.json @@ -52,6 +52,178 @@ "qualities": [ { "id": "SAW_M", "level": 2 } ], "components": [ [ [ "scrap", 5 ] ] ] }, + { + "result": "exodii_ingot_tin", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "16 h", + "tools": [ [ [ "angle_grinder", 500 ] ] ], + "components": [ [ [ "10ltin", 80 ] ] ] + }, + { + "result": "10ltin", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "10 m", + "tools": [ [ [ "angle_grinder", 10 ] ] ], + "components": [ [ [ "5ltin", 2 ] ] ] + }, + { + "result": "5ltin", + "components": [ [ [ "block_tin", 100 ] ] ] + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "1 h", + "tools": [ [ [ "angle_grinder", 50 ] ] ], + "components": [ [ [ "scrap_tin", 94 ] ] ] + }, + { + "result": "exodii_ingot_lead", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "16 h", + "tools": [ [ [ "angle_grinder", 500 ] ] ], + "components": [ [ [ "10llead", 80 ] ] ] + }, + { + "result": "10llead", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "10 m", + "tools": [ [ [ "angle_grinder", 10 ] ] ], + "components": [ [ [ "5llead", 2 ] ] ] + }, + { + "result": "5llead", + "components": [ [ [ "block_lead", 100 ] ] ] + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "1 h", + "tools": [ [ [ "angle_grinder", 50 ] ] ], + "components": [ [ [ "lead", 18900 ] ] ] + }, + { + "result": "exodii_ingot_zinc", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "16 h", + "tools": [ [ [ "angle_grinder", 500 ] ] ], + "components": [ [ [ "10lzinc", 80 ] ] ] + }, + { + "result": "10lzinc", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "10 m", + "tools": [ [ [ "angle_grinder", 10 ] ] ], + "components": [ [ [ "5lzinc", 2 ] ] ] + }, + { + "result": "5lzinc", + "components": [ [ [ "block_zinc", 100 ] ] ] + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "1 h", + "tools": [ [ [ "angle_grinder", 50 ] ] ], + "components": [ [ [ "zinc_metal", 5071 ] ] ] + }, + { + "result": "exodii_ingot_steel", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "16 h", + "tools": [ [ [ "angle_grinder", 500 ] ] ], + "components": [ [ [ "10lsteel", 80 ] ] ] + }, + { + "result": "10lsteel", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "10 m", + "tools": [ [ [ "angle_grinder", 10 ] ] ], + "components": [ [ [ "5lsteel", 2 ] ] ] + }, + { + "result": "5lsteel", + "components": [ [ [ "block_steel", 100 ] ] ] + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "1 h", + "tools": [ [ [ "angle_grinder", 50 ] ] ], + "components": [ [ [ "steel_lump", 39 ] ] ] + }, + { + "result": "exodii_ingot_copper", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "16 h", + "tools": [ [ [ "angle_grinder", 500 ] ] ], + "components": [ [ [ "10lcopper", 80 ] ] ] + }, + { + "result": "10lcopper", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "10 m", + "tools": [ [ [ "angle_grinder", 10 ] ] ], + "components": [ [ [ "5lcopper", 2 ] ] ] + }, + { + "result": "5lcopper", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "1 h", + "tools": [ [ [ "angle_grinder", 50 ] ] ], + "components": [ [ [ "scrap_copper", 103 ] ] ] + }, + { + "result": "exodii_ingot_aluminum", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "16 h", + "tools": [ [ [ "angle_grinder", 500 ] ] ], + "components": [ [ [ "10laluminum", 80 ] ] ] + }, + { + "result": "10laluminum", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "10 m", + "tools": [ [ [ "angle_grinder", 10 ] ] ], + "components": [ [ [ "5laluminum", 2 ] ] ] + }, + { + "result": "5laluminum", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "1 h", + "tools": [ [ [ "angle_grinder", 50 ] ] ], + "components": [ [ [ "material_aluminium_ingot", 20 ] ] ] + }, + { + "result": "exodii_ingot_plastic", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "16 h", + "tools": [ [ [ "reciprocating_saw", 500 ], [ "circsaw_off", 500 ] ] ], + "components": [ [ [ "10lplastic", 80 ] ] ] + }, + { + "result": "10lplastic", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "10 m", + "tools": [ [ [ "reciprocating_saw", 10 ], [ "circsaw_off", 10 ] ] ], + "components": [ [ [ "5lplastic", 2 ] ] ] + }, + { + "result": "5lplastic", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "1 h", + "tools": [ [ [ "reciprocating_saw", 50 ], [ "circsaw_off", 50 ] ] ], + "components": [ [ [ "plastic_chunk", 100 ] ] ] + }, { "result": "atgm_spent", "type": "uncraft", From 291677996c049681c58139ab18c210743ea65242 Mon Sep 17 00:00:00 2001 From: AtomicFox556 Date: Thu, 12 May 2022 22:30:16 +0300 Subject: [PATCH 02/11] REEE --- data/json/uncraft/generic.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json index 8e9fb5e978557..336930d36120d 100644 --- a/data/json/uncraft/generic.json +++ b/data/json/uncraft/generic.json @@ -70,7 +70,6 @@ }, { "result": "5ltin", - "components": [ [ [ "block_tin", 100 ] ] ] "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "1 h", @@ -95,7 +94,6 @@ }, { "result": "5llead", - "components": [ [ [ "block_lead", 100 ] ] ] "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "1 h", @@ -120,7 +118,6 @@ }, { "result": "5lzinc", - "components": [ [ [ "block_zinc", 100 ] ] ] "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "1 h", @@ -145,7 +142,6 @@ }, { "result": "5lsteel", - "components": [ [ [ "block_steel", 100 ] ] ] "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "1 h", From d3e28e4aa62623c128bb2e7933e5b96b9a126290 Mon Sep 17 00:00:00 2001 From: AtomicFox556 Date: Thu, 12 May 2022 23:32:41 +0300 Subject: [PATCH 03/11] More fixes --- data/json/items/resources/metal.json | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json index 588796a267f49..819b220e99f7e 100644 --- a/data/json/items/resources/metal.json +++ b/data/json/items/resources/metal.json @@ -414,6 +414,23 @@ "bashing": 1, "to_hit": -2 }, + { + "type": "GENERIC", + "id": "scrap_tin", + "symbol": ",", + "color": "light_gray", + "name": { "str_sp": "scrap tin" }, + "category": "spare_parts", + "description": "A small chunk of tin, usable for crafting or repairs.", + "price": 1000, + "price_postapoc": 10, + "material": [ "tin" ], + "//": "Density of 7.265g/cm³ = 363.25g/50ml ~ 363g", + "volume": "50 ml", + "weight": "363 g", + "bashing": 1, + "to_hit": -2 + }, { "type": "AMMO", "id": "tin", @@ -743,7 +760,7 @@ "ammo_type": "components" }, { - "id": "10zinc", + "id": "10lzinc", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L zinc ingot" }, From 7851fffdf855afa6fd4d8df484e1f5c67dbc194d Mon Sep 17 00:00:00 2001 From: Drew4484 <57647637+Drew4484@users.noreply.github.com> Date: Wed, 7 Sep 2022 16:48:16 -0700 Subject: [PATCH 04/11] Adds carbon steel ingot uncrafts --- data/json/uncraft/generic.json | 48 ++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json index 336930d36120d..7ca0e0bb60470 100644 --- a/data/json/uncraft/generic.json +++ b/data/json/uncraft/generic.json @@ -220,6 +220,54 @@ "tools": [ [ [ "reciprocating_saw", 50 ], [ "circsaw_off", 50 ] ] ], "components": [ [ [ "plastic_chunk", 100 ] ] ] }, + { + "result": "10llcsteel", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "10 m", + "tools": [ [ [ "angle_grinder", 10 ] ] ], + "components": [ [ [ "5llcsteel", 2 ] ] ] + }, + { + "result": "5llcsteel", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "1 h", + "tools": [ [ [ "angle_grinder", 50 ] ] ], + "components": [ [ [ "lc_steel_lump", 39 ] ] ] + }, + { + "result": "10lmcsteel", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "10 m", + "tools": [ [ [ "angle_grinder", 10 ] ] ], + "components": [ [ [ "5lmcsteel", 2 ] ] ] + }, + { + "result": "5lmcsteel", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "1 h", + "tools": [ [ [ "angle_grinder", 50 ] ] ], + "components": [ [ [ "mc_steel_lump", 39 ] ] ] + }, + { + "result": "10lhcsteel", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "10 m", + "tools": [ [ [ "angle_grinder", 10 ] ] ], + "components": [ [ [ "5lhcsteel", 2 ] ] ] + }, + { + "result": "5lhcsteel", + "type": "uncraft", + "activity_level": "MODERATE_EXERCISE", + "time": "1 h", + "tools": [ [ [ "angle_grinder", 50 ] ] ], + "components": [ [ [ "hc_steel_lump", 39 ] ] ] + }, { "result": "atgm_spent", "type": "uncraft", From e9256514366fe68c6d004bd145e8e035515f9814 Mon Sep 17 00:00:00 2001 From: Drew4484 <57647637+Drew4484@users.noreply.github.com> Date: Wed, 7 Sep 2022 17:55:55 -0700 Subject: [PATCH 05/11] Tin fixes --- data/json/items/resources/metal.json | 5 ++--- data/json/materials.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json index 819b220e99f7e..3d7a888ad6b99 100644 --- a/data/json/items/resources/metal.json +++ b/data/json/items/resources/metal.json @@ -444,7 +444,6 @@ "material": [ "tin" ], "volume": "50ml", "weight": "2 g", - "//": "Density 7.28g/cm³ ~ 1820kg/250ml @ stack 1000 = 2g/unit", "ammo_type": "components", "count": 100, "stack_size": 200 @@ -735,7 +734,7 @@ "category": "spare_parts", "name": { "str": "10L tin ingot" }, "description": "A ten-liter ingot of solid tin.", - "weight": "68500 g", + "weight": "72750 g", "volume": "10 L", "price": 23150, "price_postapoc": 230, @@ -750,7 +749,7 @@ "category": "spare_parts", "name": { "str": "5L tin ingot" }, "description": "A five-liter ingot of solid tin.", - "weight": "34250 g", + "weight": "36350 g", "volume": "5 L", "price": 11575, "price_postapoc": 116, diff --git a/data/json/materials.json b/data/json/materials.json index 44b6fc32bb08d..23a22f01ee155 100644 --- a/data/json/materials.json +++ b/data/json/materials.json @@ -2231,7 +2231,7 @@ "id": "tin", "name": "Tin", "//": "Tin's density is a little more than half that of silver.", - "density": 5.8, + "density": 7.27, "//2": "Specific heat of liquid: https://www.engineeringtoolbox.com/liquid-metal-boiling-points-specific-heat-d_1893.html", "specific_heat_liquid": 0.24, "//3": "Specific heat as solid from http://www2.ucdsb.on.ca/tiss/stretton/database/Specific_Heat_Capacity_Table.html", From 27af471336d43565820b29d804a346bd41768f7d Mon Sep 17 00:00:00 2001 From: Drew4484 <57647637+Drew4484@users.noreply.github.com> Date: Wed, 7 Sep 2022 19:11:19 -0700 Subject: [PATCH 06/11] Standardize naming --- data/json/items/resources/metal.json | 94 ++++++++++------------------ data/json/uncraft/generic.json | 74 +++++++++++----------- 2 files changed, 69 insertions(+), 99 deletions(-) diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json index 3d7a888ad6b99..b5d190572ae92 100644 --- a/data/json/items/resources/metal.json +++ b/data/json/items/resources/metal.json @@ -609,7 +609,7 @@ "qualities": [ [ "HAMMER", 1 ] ] }, { - "id": "5laluminum", + "id": "5l_aluminum", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L aluminum ingot" }, @@ -624,7 +624,7 @@ "ammo_type": "components" }, { - "id": "10laluminum", + "id": "10l_aluminum", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L aluminum ingot" }, @@ -639,7 +639,7 @@ "ammo_type": "components" }, { - "id": "5lbrass", + "id": "5l_brass", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L brass ingot" }, @@ -654,7 +654,7 @@ "ammo_type": "components" }, { - "id": "10lbrass", + "id": "10l_brass", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L brass ingot" }, @@ -669,7 +669,7 @@ "ammo_type": "components" }, { - "id": "5lbronze", + "id": "5l_bronze", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L bronze ingot" }, @@ -684,7 +684,7 @@ "ammo_type": "components" }, { - "id": "10lbronze", + "id": "10l_bronze", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L bronze ingot" }, @@ -699,7 +699,7 @@ "ammo_type": "components" }, { - "id": "5lcopper", + "id": "5l_copper", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L copper ingot" }, @@ -714,7 +714,7 @@ "ammo_type": "components" }, { - "id": "10lcopper", + "id": "10l_copper", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L copper ingot" }, @@ -729,7 +729,7 @@ "ammo_type": "components" }, { - "id": "10ltin", + "id": "10l_tin", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L tin ingot" }, @@ -744,7 +744,7 @@ "ammo_type": "components" }, { - "id": "5ltin", + "id": "5l_tin", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L tin ingot" }, @@ -759,7 +759,7 @@ "ammo_type": "components" }, { - "id": "10lzinc", + "id": "10l_zinc", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L zinc ingot" }, @@ -774,7 +774,7 @@ "ammo_type": "components" }, { - "id": "5lzinc", + "id": "5l_zinc", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L zinc ingot" }, @@ -789,7 +789,7 @@ "ammo_type": "components" }, { - "id": "5lgold", + "id": "5l_gold", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L gold ingot" }, @@ -804,7 +804,7 @@ "ammo_type": "components" }, { - "id": "10lgold", + "id": "10l_gold", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L gold ingot" }, @@ -819,7 +819,7 @@ "ammo_type": "components" }, { - "id": "5liron", + "id": "5l_iron", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L iron ingot" }, @@ -834,7 +834,7 @@ "ammo_type": "components" }, { - "id": "10liron", + "id": "10l_iron", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L iron ingot" }, @@ -849,7 +849,7 @@ "ammo_type": "components" }, { - "id": "5llead", + "id": "5l_lead", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L lead ingot" }, @@ -864,7 +864,7 @@ "ammo_type": "components" }, { - "id": "10llead", + "id": "10l_lead", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L lead ingot" }, @@ -879,7 +879,7 @@ "ammo_type": "components" }, { - "id": "5lplatinum", + "id": "5l_platinum", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L platinum ingot" }, @@ -894,7 +894,7 @@ "ammo_type": "components" }, { - "id": "10lplatinum", + "id": "10l_platinum", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L platinum ingot" }, @@ -909,7 +909,7 @@ "ammo_type": "components" }, { - "id": "5lsilver", + "id": "5l_silver", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L silver ingot" }, @@ -924,7 +924,7 @@ "ammo_type": "components" }, { - "id": "10lsilver", + "id": "10l_silver", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L silver ingot" }, @@ -939,7 +939,7 @@ "ammo_type": "components" }, { - "id": "5lsteel", + "id": "5l_steel", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L steel ingot" }, @@ -954,7 +954,7 @@ "ammo_type": "components" }, { - "id": "10lsteel", + "id": "10l_steel", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L steel ingot" }, @@ -969,7 +969,7 @@ "ammo_type": "components" }, { - "id": "5lbudget_steel", + "id": "5l_budget_steel", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L budget steel ingot" }, @@ -984,7 +984,7 @@ "ammo_type": "components" }, { - "id": "10lbudget_steel", + "id": "10l_budget_steel", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L budget steel ingot" }, @@ -999,7 +999,7 @@ "ammo_type": "components" }, { - "id": "5llc_steel", + "id": "5l_lc_steel", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L mild steel ingot" }, @@ -1014,7 +1014,7 @@ "ammo_type": "components" }, { - "id": "10llc_steel", + "id": "10l_lc_steel", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L mild steel ingot" }, @@ -1029,7 +1029,7 @@ "ammo_type": "components" }, { - "id": "5lmc_steel", + "id": "5l_mc_steel", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L medium steel ingot" }, @@ -1044,7 +1044,7 @@ "ammo_type": "components" }, { - "id": "10lmc_steel", + "id": "10l_mc_steel", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L medium steel ingot" }, @@ -1059,7 +1059,7 @@ "ammo_type": "components" }, { - "id": "5lhc_steel", + "id": "5l_hc_steel", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L high steel ingot" }, @@ -1074,7 +1074,7 @@ "ammo_type": "components" }, { - "id": "10lhc_steel", + "id": "10l_hc_steel", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L high steel ingot" }, @@ -1088,36 +1088,6 @@ "color": "light_gray", "ammo_type": "components" }, - { - "id": "5lch_steel", - "type": "AMMO", - "category": "spare_parts", - "name": { "str": "5L high steel ingot" }, - "description": "A five-liter ingot of solid steel.", - "weight": "39295 g", - "volume": "5 L", - "price": 26000, - "price_postapoc": 260, - "material": [ "ch_steel" ], - "symbol": "=", - "color": "light_gray", - "ammo_type": "components" - }, - { - "id": "10lch_steel", - "type": "AMMO", - "category": "spare_parts", - "name": { "str": "10L high steel ingot" }, - "description": "A ten-liter ingot of solid steel.", - "weight": "78590 g", - "volume": "10 L", - "price": 52000, - "price_postapoc": 520, - "material": [ "ch_steel" ], - "symbol": "=", - "color": "light_gray", - "ammo_type": "components" - }, { "id": "budget_steel_chunk", "type": "AMMO", diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json index 7ca0e0bb60470..31b2616d7e733 100644 --- a/data/json/uncraft/generic.json +++ b/data/json/uncraft/generic.json @@ -58,18 +58,18 @@ "activity_level": "MODERATE_EXERCISE", "time": "16 h", "tools": [ [ [ "angle_grinder", 500 ] ] ], - "components": [ [ [ "10ltin", 80 ] ] ] + "components": [ [ [ "10l_tin", 80 ] ] ] }, { - "result": "10ltin", + "result": "10l_tin", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "10 m", "tools": [ [ [ "angle_grinder", 10 ] ] ], - "components": [ [ [ "5ltin", 2 ] ] ] + "components": [ [ [ "5l_tin", 2 ] ] ] }, { - "result": "5ltin", + "result": "5l_tin", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "1 h", @@ -82,18 +82,18 @@ "activity_level": "MODERATE_EXERCISE", "time": "16 h", "tools": [ [ [ "angle_grinder", 500 ] ] ], - "components": [ [ [ "10llead", 80 ] ] ] + "components": [ [ [ "10l_lead", 80 ] ] ] }, { - "result": "10llead", + "result": "10l_lead", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "10 m", "tools": [ [ [ "angle_grinder", 10 ] ] ], - "components": [ [ [ "5llead", 2 ] ] ] + "components": [ [ [ "5l_lead", 2 ] ] ] }, { - "result": "5llead", + "result": "5l_lead", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "1 h", @@ -106,18 +106,18 @@ "activity_level": "MODERATE_EXERCISE", "time": "16 h", "tools": [ [ [ "angle_grinder", 500 ] ] ], - "components": [ [ [ "10lzinc", 80 ] ] ] + "components": [ [ [ "10l_zinc", 80 ] ] ] }, { - "result": "10lzinc", + "result": "10l_zinc", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "10 m", "tools": [ [ [ "angle_grinder", 10 ] ] ], - "components": [ [ [ "5lzinc", 2 ] ] ] + "components": [ [ [ "5l_zinc", 2 ] ] ] }, { - "result": "5lzinc", + "result": "5l_zinc", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "1 h", @@ -130,18 +130,18 @@ "activity_level": "MODERATE_EXERCISE", "time": "16 h", "tools": [ [ [ "angle_grinder", 500 ] ] ], - "components": [ [ [ "10lsteel", 80 ] ] ] + "components": [ [ [ "10l_steel", 80 ] ] ] }, { - "result": "10lsteel", + "result": "10l_steel", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "10 m", "tools": [ [ [ "angle_grinder", 10 ] ] ], - "components": [ [ [ "5lsteel", 2 ] ] ] + "components": [ [ [ "5l_steel", 2 ] ] ] }, { - "result": "5lsteel", + "result": "5l_steel", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "1 h", @@ -154,18 +154,18 @@ "activity_level": "MODERATE_EXERCISE", "time": "16 h", "tools": [ [ [ "angle_grinder", 500 ] ] ], - "components": [ [ [ "10lcopper", 80 ] ] ] + "components": [ [ [ "10l_copper", 80 ] ] ] }, { - "result": "10lcopper", + "result": "10l_copper", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "10 m", "tools": [ [ [ "angle_grinder", 10 ] ] ], - "components": [ [ [ "5lcopper", 2 ] ] ] + "components": [ [ [ "5l_copper", 2 ] ] ] }, { - "result": "5lcopper", + "result": "5l_copper", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "1 h", @@ -178,18 +178,18 @@ "activity_level": "MODERATE_EXERCISE", "time": "16 h", "tools": [ [ [ "angle_grinder", 500 ] ] ], - "components": [ [ [ "10laluminum", 80 ] ] ] + "components": [ [ [ "10l_aluminum", 80 ] ] ] }, { - "result": "10laluminum", + "result": "10l_aluminum", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "10 m", "tools": [ [ [ "angle_grinder", 10 ] ] ], - "components": [ [ [ "5laluminum", 2 ] ] ] + "components": [ [ [ "5l_aluminum", 2 ] ] ] }, { - "result": "5laluminum", + "result": "5l_aluminum", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "1 h", @@ -202,18 +202,18 @@ "activity_level": "MODERATE_EXERCISE", "time": "16 h", "tools": [ [ [ "reciprocating_saw", 500 ], [ "circsaw_off", 500 ] ] ], - "components": [ [ [ "10lplastic", 80 ] ] ] + "components": [ [ [ "10l_plastic", 80 ] ] ] }, { - "result": "10lplastic", + "result": "10l_plastic", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "10 m", "tools": [ [ [ "reciprocating_saw", 10 ], [ "circsaw_off", 10 ] ] ], - "components": [ [ [ "5lplastic", 2 ] ] ] + "components": [ [ [ "5l_plastic", 2 ] ] ] }, { - "result": "5lplastic", + "result": "5l_plastic", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "1 h", @@ -221,15 +221,15 @@ "components": [ [ [ "plastic_chunk", 100 ] ] ] }, { - "result": "10llcsteel", + "result": "10l_lc_steel", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "10 m", "tools": [ [ [ "angle_grinder", 10 ] ] ], - "components": [ [ [ "5llcsteel", 2 ] ] ] + "components": [ [ [ "5l_lc_steel", 2 ] ] ] }, { - "result": "5llcsteel", + "result": "5l_lc_steel", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "1 h", @@ -237,15 +237,15 @@ "components": [ [ [ "lc_steel_lump", 39 ] ] ] }, { - "result": "10lmcsteel", + "result": "10l_mcsteel", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "10 m", "tools": [ [ [ "angle_grinder", 10 ] ] ], - "components": [ [ [ "5lmcsteel", 2 ] ] ] + "components": [ [ [ "5l_mc_steel", 2 ] ] ] }, { - "result": "5lmcsteel", + "result": "5l_mc_steel", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "1 h", @@ -253,15 +253,15 @@ "components": [ [ [ "mc_steel_lump", 39 ] ] ] }, { - "result": "10lhcsteel", + "result": "10l_hc_steel", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "10 m", "tools": [ [ [ "angle_grinder", 10 ] ] ], - "components": [ [ [ "5lhcsteel", 2 ] ] ] + "components": [ [ [ "5l_hc_steel", 2 ] ] ] }, { - "result": "5lhcsteel", + "result": "5l_hc_steel", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "1 h", From 437e521cf101c400879cf36741708605b43d9187 Mon Sep 17 00:00:00 2001 From: Drew4484 <57647637+Drew4484@users.noreply.github.com> Date: Wed, 7 Sep 2022 19:27:44 -0700 Subject: [PATCH 07/11] More density --- data/json/items/resources/metal.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json index b5d190572ae92..c1e65761358e1 100644 --- a/data/json/items/resources/metal.json +++ b/data/json/items/resources/metal.json @@ -689,7 +689,7 @@ "category": "spare_parts", "name": { "str": "10L bronze ingot" }, "description": "A ten-liter ingot of solid bronze.", - "weight": "89600 g", + "weight": "88 kg", "volume": "10 L", "price": 1300400, "price_postapoc": 13000, @@ -734,7 +734,7 @@ "category": "spare_parts", "name": { "str": "10L tin ingot" }, "description": "A ten-liter ingot of solid tin.", - "weight": "72750 g", + "weight": "72650 g", "volume": "10 L", "price": 23150, "price_postapoc": 230, @@ -824,7 +824,7 @@ "category": "spare_parts", "name": { "str": "5L iron ingot" }, "description": "A five-liter ingot of solid iron.", - "weight": "56700 g", + "weight": "39365 g", "volume": "5 L", "price": 10000, "price_postapoc": 200, @@ -839,7 +839,7 @@ "category": "spare_parts", "name": { "str": "10L iron ingot" }, "description": "A ten-liter ingot of solid iron.", - "weight": "113400 g", + "weight": "78730 g", "volume": "10 L", "price": 20000, "price_postapoc": 400, @@ -854,7 +854,7 @@ "category": "spare_parts", "name": { "str": "5L lead ingot" }, "description": "A five-liter ingot of solid lead.", - "weight": "56700 g", + "weight": "56710 g", "volume": "5 L", "price": 8333300, "price_postapoc": 16600, From 3a90436c0e615a1c89d50614ad91c7fca0939632 Mon Sep 17 00:00:00 2001 From: Drew4484 <57647637+Drew4484@users.noreply.github.com> Date: Wed, 7 Sep 2022 19:39:48 -0700 Subject: [PATCH 08/11] Update materials.json --- data/json/materials.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/materials.json b/data/json/materials.json index 23a22f01ee155..4bcb775d4158a 100644 --- a/data/json/materials.json +++ b/data/json/materials.json @@ -1248,7 +1248,7 @@ "type": "material", "id": "lead", "name": "Lead", - "density": 11.3, + "density": 11.342, "specific_heat_liquid": 0.13, "specific_heat_solid": 0.14, "latent_heat": 2, From 98c208a8f90cfa779437b2f984b137a90f7b678b Mon Sep 17 00:00:00 2001 From: Drew4484 <57647637+Drew4484@users.noreply.github.com> Date: Wed, 7 Sep 2022 19:42:26 -0700 Subject: [PATCH 09/11] Update known_bad_density.json --- data/mods/TEST_DATA/known_bad_density.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 58936dd1d225f..06184541f3685 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -783,7 +783,6 @@ "badge_deputy", "offal_canned", "radiocontrol", - "exodii_ingot_tin", "meat_pickled", "cigar", "plastic_spoon", From 51122bab58a8d4bc8ef705a0067cfe2596eceee4 Mon Sep 17 00:00:00 2001 From: Drew4484 <57647637+Drew4484@users.noreply.github.com> Date: Wed, 7 Sep 2022 19:50:43 -0700 Subject: [PATCH 10/11] Steel densities --- data/json/items/resources/metal.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json index c1e65761358e1..ad7c56539e78c 100644 --- a/data/json/items/resources/metal.json +++ b/data/json/items/resources/metal.json @@ -245,7 +245,7 @@ "name": { "str": "chunk of steel", "str_pl": "chunks of steel" }, "description": "A misshapen chunk of steel. Makes a decent weapon in a pinch, and is also useful for some crafting recipes.", "weight": "250 g", - "volume": "63 ml", + "volume": "31 ml", "price": 1000, "price_postapoc": 10, "bashing": 8, @@ -265,7 +265,7 @@ "name": { "str": "lump of steel", "str_pl": "lumps of steel" }, "description": "A heavy formed piece of steel. Useful for some crafting recipes.", "weight": "1000 g", - "volume": "125 ml", + "volume": "126 ml", "price": 2000, "price_postapoc": 50, "bashing": 12, @@ -285,7 +285,7 @@ "name": { "str": "lump of mild steel", "str_pl": "lumps of mild steel" }, "description": "A heavy formed piece of mild steel. Useful for some crafting recipes.", "weight": "1000 g", - "volume": "125 ml", + "volume": "126 ml", "price": 2000, "price_postapoc": 50, "bashing": 12, @@ -305,7 +305,7 @@ "name": { "str": "lump of medium steel", "str_pl": "lumps of medium steel" }, "description": "A heavy formed piece of medium steel. Useful for some crafting recipes.", "weight": "1000 g", - "volume": "125 ml", + "volume": "126 ml", "price": 2000, "price_postapoc": 50, "bashing": 12, @@ -325,7 +325,7 @@ "name": { "str": "lump of high steel", "str_pl": "lumps of high steel" }, "description": "A heavy formed piece of high steel. Useful for some crafting recipes.", "weight": "1000 g", - "volume": "125 ml", + "volume": "126 ml", "price": 2000, "price_postapoc": 50, "bashing": 12, @@ -345,7 +345,7 @@ "name": { "str": "lump of hardened steel", "str_pl": "lumps of hardened steel" }, "description": "A heavy formed piece of hardened steel. Useful for some crafting recipes.", "weight": "1000 g", - "volume": "125 ml", + "volume": "126 ml", "price": 2000, "price_postapoc": 50, "bashing": 12, @@ -365,7 +365,7 @@ "name": { "str": "lump of tempered steel", "str_pl": "lumps of tempered steel" }, "description": "A heavy formed piece of tempered steel. Useful for some crafting recipes.", "weight": "1000 g", - "volume": "125 ml", + "volume": "126 ml", "price": 2000, "price_postapoc": 50, "bashing": 12, @@ -520,7 +520,7 @@ "name": { "str": "chunk of low carbon steel", "str_pl": "chunks of low carbon steel" }, "description": "A misshapen chunk of low carbon steel. Makes a decent weapon in a pinch, and is also useful for some crafting recipes.", "weight": "250 g", - "volume": "63 ml", + "volume": "31 ml", "price": 1000, "price_postapoc": 10, "bashing": 8, @@ -539,7 +539,7 @@ "name": { "str": "chunk of medium carbon steel", "str_pl": "chunks of medium carbon steel" }, "description": "A misshapen chunk of medium carbon steel. Makes a decent weapon in a pinch, and is also useful for some crafting recipes.", "weight": "250 g", - "volume": "63 ml", + "volume": "31 ml", "price": 1000, "price_postapoc": 10, "bashing": 8, @@ -558,7 +558,7 @@ "name": { "str": "chunk of high carbon steel", "str_pl": "chunks of high carbon steel" }, "description": "A misshapen chunk of high carbon steel. Makes a decent weapon in a pinch, and is also useful for some crafting recipes.", "weight": "250 g", - "volume": "63 ml", + "volume": "31 ml", "price": 1000, "price_postapoc": 10, "bashing": 8, @@ -577,7 +577,7 @@ "name": { "str": "chunk of hardened steel", "str_pl": "chunks of hardened steel" }, "description": "A misshapen chunk of hardened steel. Makes a decent weapon in a pinch, and is also useful for some crafting recipes.", "weight": "250 g", - "volume": "63 ml", + "volume": "31 ml", "price": 1000, "price_postapoc": 10, "bashing": 8, @@ -596,7 +596,7 @@ "name": { "str": "chunk of tempered steel", "str_pl": "chunks of tempered steel" }, "description": "A misshapen chunk of tempered steel. Makes a decent weapon in a pinch, and is also useful for some crafting recipes.", "weight": "250 g", - "volume": "63 ml", + "volume": "31 ml", "price": 1000, "price_postapoc": 10, "bashing": 8, @@ -1095,7 +1095,7 @@ "name": { "str": "chunk of budget steel", "str_pl": "chunks of budget steel" }, "description": "A misshapen chunk of budget steel. Makes a decent weapon in a pinch, and is also useful for some crafting recipes.", "weight": "250 g", - "volume": "63 ml", + "volume": "31 ml", "price": 1000, "price_postapoc": 10, "bashing": 8, @@ -1114,7 +1114,7 @@ "name": { "str": "lump of budget steel", "str_pl": "lumps of budget steel" }, "description": "A heavy formed piece of budget steel. Useful for some crafting recipes.", "weight": "1000 g", - "volume": "125 ml", + "volume": "126 ml", "price": 2000, "price_postapoc": 50, "bashing": 12, From f4ca620672efc1f078ffb1d661313fa3016f897a Mon Sep 17 00:00:00 2001 From: Drew4484 <57647637+Drew4484@users.noreply.github.com> Date: Wed, 7 Sep 2022 19:56:49 -0700 Subject: [PATCH 11/11] Underscores --- data/json/items/resources/plastic.json | 4 ++-- data/json/uncraft/generic.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/items/resources/plastic.json b/data/json/items/resources/plastic.json index 51546ee385d3f..9197682f68c32 100644 --- a/data/json/items/resources/plastic.json +++ b/data/json/items/resources/plastic.json @@ -30,7 +30,7 @@ "flags": [ "NO_SALVAGE" ] }, { - "id": "10lplastic", + "id": "10l_plastic", "type": "AMMO", "category": "spare_parts", "name": { "str": "10L plastic block" }, @@ -45,7 +45,7 @@ "ammo_type": "components" }, { - "id": "5lplastic", + "id": "5l_plastic", "type": "AMMO", "category": "spare_parts", "name": { "str": "5L plastic block" }, diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json index 31b2616d7e733..04c73afa946c3 100644 --- a/data/json/uncraft/generic.json +++ b/data/json/uncraft/generic.json @@ -237,7 +237,7 @@ "components": [ [ [ "lc_steel_lump", 39 ] ] ] }, { - "result": "10l_mcsteel", + "result": "10l_mc_steel", "type": "uncraft", "activity_level": "MODERATE_EXERCISE", "time": "10 m",