From a21ab54f9c53fe7ca44d7907bddbb9f12f38b692 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Thu, 14 Dec 2023 03:05:55 -0600 Subject: [PATCH] fix: change small storage batteries back down to 500 ml, related fixes (#3893) fix: change small storage batteries back down to 500 ml --- data/json/construction.json | 2 +- .../furniture_and_terrain/furniture-appliances.json | 11 +++++------ data/json/furniture_and_terrain/furniture-tools.json | 4 ++-- data/json/itemgroups/vehicles_fuel_related.json | 2 +- data/json/items/corpses/inactive_bots.json | 4 ++-- data/json/items/tool/electronics.json | 11 +---------- data/json/items/vehicle/battery.json | 6 +++--- .../basecamps/recipe_modular_field_common.json | 2 +- .../basecamps/recipe_modular_firestation1.json | 2 +- .../recipe_modular_shelter_common.json | 2 +- .../recipe_modular_shelter_1_common.json | 2 +- .../recipe_modular_shelter_2_common.json | 2 +- .../recipes/basecamps/recipe_primitive_field.json | 2 +- data/json/recipes/electronic/parts.json | 4 ++-- data/json/uncraft/generic.json | 4 ++-- data/json/vehicleparts/battery.json | 6 +++--- tests/vehicle_drag_test.cpp | 2 +- 17 files changed, 29 insertions(+), 39 deletions(-) diff --git a/data/json/construction.json b/data/json/construction.json index bb07f05c7cc1..8f2858307483 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -3649,7 +3649,7 @@ [ "solar_panel_v2", 2 ], [ "reinforced_solar_panel_v2", 2 ] ], - [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 25 ] ], + [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 100 ] ], [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], [ [ "pipe", 24 ] ] ], diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json index 00d49a413b42..2e56466a8201 100644 --- a/data/json/furniture_and_terrain/furniture-appliances.json +++ b/data/json/furniture_and_terrain/furniture-appliances.json @@ -918,7 +918,7 @@ { "item": "sheet_metal_small", "count": [ 1, 4 ] }, { "item": "pipe", "count": 1 }, { "item": "cable", "charges": [ 2, 8 ] }, - { "item": "small_storage_battery", "count": [ 1, 4 ] } + { "item": "small_storage_battery", "count": [ 4, 16 ] } ] } }, @@ -957,7 +957,7 @@ { "item": "sheet_metal_small", "count": [ 1, 4 ] }, { "item": "pipe", "count": 1 }, { "item": "cable", "charges": [ 2, 8 ] }, - { "item": "small_storage_battery", "count": [ 5, 20 ] } + { "item": "small_storage_battery", "count": [ 20, 80 ] } ] } }, @@ -996,7 +996,7 @@ { "item": "sheet_metal_small", "count": [ 1, 4 ] }, { "item": "pipe", "count": 1 }, { "item": "cable", "charges": [ 2, 8 ] }, - { "item": "small_storage_battery", "count": [ 10, 40 ] } + { "item": "small_storage_battery", "count": [ 40, 160 ] } ] } }, @@ -1011,7 +1011,7 @@ "color": "blue_white", "move_cost_mod": 2, "coverage": 10, - "active": [ "battery", { "max_stored": 2000 } ], + "active": [ "battery", { "max_stored": 500 } ], "deconstruct": { "items": [ { "item": "solder_wire", "charges": 10 }, @@ -1118,8 +1118,7 @@ { "item": "plastic_chunk", "count": [ 1, 2 ] }, { "item": "sheet_metal_small", "count": [ 1, 4 ] }, { "item": "pipe", "count": 1 }, - { "item": "cable", "charges": [ 2, 8 ] }, - { "item": "small_storage_battery", "count": [ 5, 10 ] } + { "item": "cable", "charges": [ 2, 8 ] } ] } }, diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json index d4fc64940564..0252cd3237a4 100644 --- a/data/json/furniture_and_terrain/furniture-tools.json +++ b/data/json/furniture_and_terrain/furniture-tools.json @@ -191,7 +191,7 @@ { "item": "pipe", "count": [ 0, 3 ] }, { "item": "clamp", "prob": 25 }, { "item": "motor_tiny", "prob": 25 }, - { "item": "small_storage_battery", "count": [ 4, 8 ] }, + { "item": "small_storage_battery", "count": [ 13, 32 ] }, { "item": "steel_lump", "count": [ 5, 10 ] }, { "item": "steel_chunk", "count": [ 5, 20 ] }, { "item": "scrap", "count": [ 10, 50 ] } @@ -237,7 +237,7 @@ { "item": "pipe", "count": [ 0, 3 ] }, { "item": "clamp", "prob": 25 }, { "item": "motor_tiny", "prob": 25 }, - { "item": "small_storage_battery", "count": [ 4, 8 ] }, + { "item": "small_storage_battery", "count": [ 16, 32 ] }, { "item": "steel_lump", "count": [ 5, 10 ] }, { "item": "steel_chunk", "count": [ 5, 20 ] }, { "item": "scrap", "count": [ 10, 50 ] } diff --git a/data/json/itemgroups/vehicles_fuel_related.json b/data/json/itemgroups/vehicles_fuel_related.json index 6ce8f1e20923..46cad4adac84 100644 --- a/data/json/itemgroups/vehicles_fuel_related.json +++ b/data/json/itemgroups/vehicles_fuel_related.json @@ -82,7 +82,7 @@ { "item": "storage_battery", "prob": 15, "charges-min": 25000, "charges-max": 50000 }, { "item": "storage_battery", "prob": 40, "charges-min": 5000, "charges-max": 30000 }, { "item": "storage_battery", "prob": 60, "charges-min": 0, "charges-max": 10000 }, - { "item": "small_storage_battery", "prob": 15, "charges-min": 1000, "charges-max": 2000 }, + { "item": "small_storage_battery", "prob": 15, "charges-min": 250, "charges-max": 500 }, { "item": "small_storage_battery", "prob": 40, "charges-min": 0, "charges-max": 400 }, { "item": "medium_storage_battery", "prob": 15, "charges-min": 0, "charges-max": 10000 }, { "item": "medium_storage_battery", "prob": 40, "charges-min": 0, "charges-max": 2000 }, diff --git a/data/json/items/corpses/inactive_bots.json b/data/json/items/corpses/inactive_bots.json index 63ec84ec5078..33be3027582b 100644 --- a/data/json/items/corpses/inactive_bots.json +++ b/data/json/items/corpses/inactive_bots.json @@ -31,7 +31,7 @@ "name": { "str": "inactive C-4 hack" }, "description": "This is an inactive C-4 hack. C-4 hacks are fist-sized robots that fly through the air. This one contains some C-4 and attacks by flying at its target and detonating. Use this item to reprogram and activate the C-4 hack. Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.", "weight": "4920 g", - "volume": "250 ml", + "volume": "1500 ml", "price": "675 USD", "price_postapoc": "30 USD", "to_hit": -3, @@ -109,7 +109,7 @@ "name": { "str": "inactive grenade hack" }, "description": "This is an inactive grenade hack. Grenade hacks are fist-sized robots that fly through the air. This one contains a grenade and attacks by flying at its target and detonating. Use this item to reprogram and activate the grenade hack. Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.", "weight": "3750 g", - "volume": "250 ml", + "volume": "750 ml", "price": "600 USD", "price_postapoc": "10 USD", "to_hit": -3, diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json index c0e0f5c65f3c..12af87a830bc 100644 --- a/data/json/items/tool/electronics.json +++ b/data/json/items/tool/electronics.json @@ -516,16 +516,7 @@ "color": "light_gray", "ammo": "battery", "magazines": [ - [ - "battery", - [ - "heavy_plus_battery_cell", - "heavy_battery_cell", - "heavy_atomic_battery_cell", - "heavy_disposable_cell", - "small_storage_battery" - ] - ] + [ "battery", [ "heavy_plus_battery_cell", "heavy_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] ], "magazine_well": "2000 ml", "flags": [ "IS_UPS" ] diff --git a/data/json/items/vehicle/battery.json b/data/json/items/vehicle/battery.json index 507a4ad945da..214eade74607 100644 --- a/data/json/items/vehicle/battery.json +++ b/data/json/items/vehicle/battery.json @@ -93,12 +93,12 @@ "type": "MAGAZINE", "name": { "str": "small storage battery", "str_pl": "small storage batteries" }, "description": "A small storage battery created with pre-Cataclysm lithium-ion technology. Useful for crafting.", - "weight": "3 kg", - "volume": "2 L", + "weight": "750 g", + "volume": "500 ml", "price": "50 USD", "price_postapoc": "5 USD", "bashing": 7, - "capacity": 2000 + "capacity": 500 }, { "id": "storage_battery", diff --git a/data/json/recipes/basecamps/recipe_modular_field_common.json b/data/json/recipes/basecamps/recipe_modular_field_common.json index 3528e24800bd..2c2159b1c455 100644 --- a/data/json/recipes/basecamps/recipe_modular_field_common.json +++ b/data/json/recipes/basecamps/recipe_modular_field_common.json @@ -925,7 +925,7 @@ [ "solar_panel_v2", 2 ], [ "reinforced_solar_panel_v2", 2 ] ], - [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 25 ] ], + [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 100 ] ], [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], [ [ "pipe", 24 ] ] ], diff --git a/data/json/recipes/basecamps/recipe_modular_firestation1.json b/data/json/recipes/basecamps/recipe_modular_firestation1.json index 2fb4cd4fef18..a97bda59aceb 100644 --- a/data/json/recipes/basecamps/recipe_modular_firestation1.json +++ b/data/json/recipes/basecamps/recipe_modular_firestation1.json @@ -90,7 +90,7 @@ [ "solar_panel_v2", 2 ], [ "reinforced_solar_panel_v2", 2 ] ], - [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 25 ] ], + [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 100 ] ], [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], [ [ "pipe", 24 ] ], [ [ "processor", 2 ] ], diff --git a/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json b/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json index b65e0e490cd8..8c56caeaa9f1 100644 --- a/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json +++ b/data/json/recipes/basecamps/recipe_modular_shelter/recipe_modular_shelter_common.json @@ -706,7 +706,7 @@ [ "solar_panel_v2", 2 ], [ "reinforced_solar_panel_v2", 2 ] ], - [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 25 ] ], + [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 100 ] ], [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], [ [ "pipe", 24 ] ], [ [ "processor", 2 ] ], diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json index 0dc62a408883..dae5f10cb3c4 100644 --- a/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json +++ b/data/json/recipes/basecamps/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json @@ -904,7 +904,7 @@ [ "solar_panel_v2", 2 ], [ "reinforced_solar_panel_v2", 2 ] ], - [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 25 ] ], + [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 100 ] ], [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], [ [ "pipe", 24 ] ], [ [ "processor", 2 ] ], diff --git a/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json b/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json index 140497cfdc61..489b50479cc0 100644 --- a/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json +++ b/data/json/recipes/basecamps/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json @@ -1254,7 +1254,7 @@ [ "solar_panel_v2", 2 ], [ "reinforced_solar_panel_v2", 2 ] ], - [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 25 ] ], + [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 100 ] ], [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], [ [ "pipe", 24 ] ], [ [ "processor", 2 ] ], diff --git a/data/json/recipes/basecamps/recipe_primitive_field.json b/data/json/recipes/basecamps/recipe_primitive_field.json index cfd8e6f4bbca..b6625ddafed1 100644 --- a/data/json/recipes/basecamps/recipe_primitive_field.json +++ b/data/json/recipes/basecamps/recipe_primitive_field.json @@ -437,7 +437,7 @@ [ "solar_panel_v2", 2 ], [ "reinforced_solar_panel_v2", 2 ] ], - [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 25 ] ], + [ [ "storage_battery", 1 ], [ "medium_storage_battery", 5 ], [ "small_storage_battery", 100 ] ], [ [ "sheet_metal", 2 ], [ "wire", 8 ] ], [ [ "pipe", 24 ] ] ], diff --git a/data/json/recipes/electronic/parts.json b/data/json/recipes/electronic/parts.json index cc8f8642dc24..9d7d4af39e04 100644 --- a/data/json/recipes/electronic/parts.json +++ b/data/json/recipes/electronic/parts.json @@ -347,7 +347,7 @@ "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ], [ "manual_mechanics", 3 ] ], "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "small_storage_battery", 5 ] ], [ [ "e_scrap", 4 ] ], [ [ "scrap", 8 ] ], [ [ "cable", 5 ] ] ] + "components": [ [ [ "small_storage_battery", 20 ] ], [ [ "e_scrap", 4 ] ], [ [ "scrap", 8 ] ], [ [ "cable", 5 ] ] ] }, { "type": "recipe", @@ -376,7 +376,7 @@ "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ], [ "manual_mechanics", 3 ] ], "using": [ [ "soldering_standard", 80 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "small_storage_battery", 25 ] ], [ [ "e_scrap", 16 ] ], [ [ "scrap", 32 ] ], [ [ "cable", 20 ] ] ] + "components": [ [ [ "small_storage_battery", 100 ] ], [ [ "e_scrap", 16 ] ], [ [ "scrap", 32 ] ], [ [ "cable", 20 ] ] ] }, { "type": "recipe", diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json index a73fa13d21fa..0a95b266dda9 100644 --- a/data/json/uncraft/generic.json +++ b/data/json/uncraft/generic.json @@ -3549,7 +3549,7 @@ "decomp_learn": [ [ "electronics", 3 ], [ "fabrication", 1 ] ], "using": [ [ "soldering_standard", 20 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "small_storage_battery", 5 ] ], [ [ "e_scrap", 3 ] ], [ [ "scrap", 7 ] ], [ [ "cable", 4 ] ] ] + "components": [ [ [ "small_storage_battery", 20 ] ], [ [ "e_scrap", 3 ] ], [ [ "scrap", 7 ] ], [ [ "cable", 4 ] ] ] }, { "result": "storage_battery", @@ -3560,7 +3560,7 @@ "decomp_learn": [ [ "electronics", 3 ], [ "fabrication", 2 ] ], "using": [ [ "soldering_standard", 80 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], - "components": [ [ [ "small_storage_battery", 25 ] ], [ [ "e_scrap", 15 ] ], [ [ "scrap", 31 ] ], [ [ "cable", 19 ] ] ] + "components": [ [ [ "medium_storage_battery", 5 ] ], [ [ "e_scrap", 4 ] ], [ [ "scrap", 8 ] ], [ [ "cable", 5 ] ] ] }, { "result": "electric_blanket", diff --git a/data/json/vehicleparts/battery.json b/data/json/vehicleparts/battery.json index 8efeafaff64a..916d733d2cf9 100644 --- a/data/json/vehicleparts/battery.json +++ b/data/json/vehicleparts/battery.json @@ -62,7 +62,7 @@ { "item": "steel_lump", "count": [ 10, 20 ] }, { "item": "steel_chunk", "count": [ 5, 10 ] }, { "item": "scrap", "count": [ 5, 10 ] }, - { "item": "small_storage_battery", "count": [ 10, 40 ] } + { "item": "small_storage_battery", "count": [ 40, 160 ] } ], "requirements": { "repair": { @@ -100,7 +100,7 @@ "difficulty": 1, "durability": 250, "folded_volume": "2500 ml", - "breaks_into": [ { "item": "scrap", "count": [ 1, 4 ] }, { "item": "small_storage_battery", "count": [ 1, 4 ] } ], + "breaks_into": [ { "item": "scrap", "count": [ 1, 4 ] }, { "item": "small_storage_battery", "count": [ 4, 16 ] } ], "requirements": { "install": { "skills": [ [ "mechanics", 0 ] ], "time": "200 s", "using": "vehicle_screw" }, "removal": { "skills": [ [ "mechanics", 0 ] ], "time": "200 s", "using": "vehicle_screw" }, @@ -146,7 +146,7 @@ { "item": "steel_lump", "count": [ 5, 10 ] }, { "item": "steel_chunk", "count": [ 5, 10 ] }, { "item": "scrap", "count": [ 5, 10 ] }, - { "item": "small_storage_battery", "count": [ 5, 20 ] } + { "item": "small_storage_battery", "count": [ 20, 80 ] } ], "requirements": { "install": { "skills": [ [ "mechanics", 2 ] ], "time": "600 s", "using": [ [ "welding_standard", 5 ] ] }, diff --git a/tests/vehicle_drag_test.cpp b/tests/vehicle_drag_test.cpp index 3a0ecf283716..8ac40be5f3bc 100644 --- a/tests/vehicle_drag_test.cpp +++ b/tests/vehicle_drag_test.cpp @@ -232,7 +232,7 @@ TEST_CASE( "vehicle_drag", "[vehicle] [engine]" ) { clear_all_state(); test_vehicle_drag( "bicycle", 0.609525, 0.017205, 43.304167, 2355, 3078 ); - test_vehicle_drag( "bicycle_electric", 0.609525, 0.027581, 69.420833, 2753, 3268 ); + test_vehicle_drag( "bicycle_electric", 0.609525, 0.025659, 64.583333, 2754, 3268 ); test_vehicle_drag( "motorcycle", 0.609525, 0.569952, 254.820312, 7296, 8687 ); test_vehicle_drag( "motorcycle_sidecart", 0.880425, 0.859065, 455.206250, 6423, 7657 ); test_vehicle_drag( "quad_bike", 0.537285, 1.112797, 710.745536, 7457, 8918 );