Changes storage cell disassembly

CleverRaven · Dec 22, 2015 · 1bfe9b29dbf30a18ae9d0d071c51e875fa621fa5 · 1bfe9b2
1 parent 6b05aa8
commit 1bfe9b29dbf30a18ae9d0d071c51e875fa621fa5
Unified Split

Showing with 61 additions and 43 deletions.

+27 −24 data/json/items/vehicle_parts.json

+30 −15 data/json/recipes/recipe_electronics.json

+4 −4 data/json/vehicle_parts.json
diff --git a/data/json/items/vehicle_parts.json b/data/json/items/vehicle_parts.json
@@ -371,12 +371,13 @@
        "name" : "small storage battery",
        "name_plural" : "small storage batteries",
        "description" : "A small storage battery.  Useful for crafting.",
-  
-        "weight" : 230,
+  
+        "weight" : 450,
        "to_hit" : -2,
        "color" : "light_cyan",
        "symbol" : ":",
        "material" : ["plastic", "null"],
-  
-        "volume" : 2,
+  
+        "flags": ["NO_SALVAGE"],
+  
+        "volume" : 1,
        "bashing" : 1,
        "cutting" : 0,
        "category" : "veh_parts",
@@ -388,24 +389,43 @@
        "name" : "medium storage battery",
        "name_plural" : "medium storage batteries",
        "description" : "A medium storage battery.",
-  
-        "weight" : 2300,
+  
+        "weight" : 2600,
        "to_hit" : -2,
        "color" : "light_cyan",
        "symbol" : ":",
        "material" : ["plastic", "null"],
-  
-        "volume" : 4,
+  
+        "flags": ["NO_SALVAGE"],
+  
+        "volume" : 3,
        "bashing" : 2,
        "cutting" : 0,
        "category" : "veh_parts",
-  
-        "price" : 6500
+  
+        "price" : 10000
+  
+    },
+  
+    {
+  
+        "type":"GENERIC",
+  
+        "id" : "storage_battery",
+  
+        "name" : "storage battery",
+  
+        "name_plural" : "storage batteries",
+  
+        "description" : "A large storage battery.  Useful for crafting.  Could be installed into a storage battery case for easy removal from a vehicle, or just welded straight in.",
+  
+        "weight" : 12600,
+  
+        "to_hit" : -2,
+  
+        "color" : "light_cyan",
+  
+        "symbol" : ":",
+  
+        "material" : ["plastic", "steel"],
+  
+        "flags": ["NO_SALVAGE"],
+  
+        "volume" : 12,
+  
+        "bashing" : 6,
+  
+        "cutting" : 0,
+  
+        "category" : "veh_parts",
+  
+        "price" : 20000
    },
    {
        "type":"GENERIC",
        "id" : "battery_motorbike",
        "name" : "motorbike battery",
        "name_plural" : "motorbike batteries",
        "description" : "A 12v lead-acid battery used to power smaller vehicles' electrical systems.",
-  
-        "weight" : 13250,
+  
+        "weight" : 3250,
        "to_hit" : -2,
        "color" : "light_cyan",
        "symbol" : ":",
@@ -422,7 +442,7 @@
        "name" : "car battery",
        "name_plural" : "car batteries",
        "description" : "A 12v lead-acid battery used to power car electrical systems.",
-  
-        "weight" : 17640,
+  
+        "weight" : 7640,
        "to_hit" : -2,
        "color" : "light_cyan",
        "symbol" : ":",
@@ -530,23 +550,6 @@
        "category" : "veh_parts",
        "price" : 30000
    },
-  
-    {
-  
-        "type":"GENERIC",
-  
-        "id" : "storage_battery",
-  
-        "name" : "storage battery",
-  
-        "name_plural" : "storage batteries",
-  
-        "description" : "A large storage battery.  Useful for crafting.  Could be installed into a storage battery case for easy removal from a vehicle, or just welded straight in.",
-  
-        "weight" : 22679,
-  
-        "to_hit" : -2,
-  
-        "color" : "light_cyan",
-  
-        "symbol" : ":",
-  
-        "material" : ["plastic", "steel"],
-  
-        "volume" : 8,
-  
-        "bashing" : 6,
-  
-        "cutting" : 0,
-  
-        "category" : "veh_parts",
-  
-        "price" : 8000
-  
-    },
    {
        "type":"GENERIC",
        "id" : "it_battery_mount",

diff --git a/data/json/recipes/recipe_electronics.json b/data/json/recipes/recipe_electronics.json
@@ -1776,38 +1776,53 @@
  ]
 },{
  "type" : "recipe",
-  
-  "result": "small_storage_battery",
+  
+  "result": "medium_storage_battery",
  "category": "CC_ELECTRONIC",
  "subcategory": "CSC_ELECTRONIC_PARTS",
  "skill_used": "electronics",
  "skills_required": [ "fabrication", 1 ],
-  
-  "difficulty": 3,
-  
-  "time": 30000,
+  
+  "difficulty": 2,
+  
+  "time": 10000,
  "reversible": true,
  "decomp_learn": 2,
  "autolearn": false,
  "book_learn": [[ "manual_electronics", 2 ] , [ "mag_electronics", 2 ] , [ "manual_mechanics", 3]],
  "qualities" : [ {"id":"SCREW","level":1,"amount":1} ],
  "tools": [
-  
-    [ ["mold_plastic", -1] ],
-  
-    [
-  
-      ["hotplate", 2],
-  
-      ["toolset", 2],
-  
-      ["fire", -1]
-  
-    ],
    [
      [ "soldering_iron", 5 ],
      [ "toolset", 5 ]
    ]
  ],
  "components": [
-  
-    [ [ "plastic_chunk", 3 ] ],
+  
+    [ [ "small_storage_battery", 4 ] ],
    [ [ "scrap", 1 ] ],
-  
-    [ [ "lead_plate", 2 ] ],
-  
-    [ [ "water_clean", 3 ] ],
-  
-    [ [ "acid", 1 ] ],
-  
-    [ [ "rag", 1 ] ],
-  
-    [ [ "cable", 1 ] ]
+  
+    [ [ "cable", 5 ] ]
+  
+  ]
+  
+},{
+  
+  "type" : "recipe",
+  
+  "result": "storage_battery",
+  
+  "category": "CC_ELECTRONIC",
+  
+  "subcategory": "CSC_ELECTRONIC_PARTS",
+  
+  "skill_used": "electronics",
+  
+  "skills_required": [ "fabrication", 1 ],
+  
+  "difficulty": 2,
+  
+  "time": 20000,
+  
+  "reversible": true,
+  
+  "decomp_learn": 2,
+  
+  "autolearn": false,
+  
+  "book_learn": [[ "manual_electronics", 2 ] , [ "mag_electronics", 2 ] , [ "manual_mechanics", 3]],
+  
+  "qualities" : [ {"id":"SCREW","level":1,"amount":1} ],
+  
+  "tools": [
+  
+    [
+  
+      [ "soldering_iron", 5 ],
+  
+      [ "toolset", 5 ]
+  
+    ]
+  
+  ],
+  
+  "components": [
+  
+    [ [ "medium_storage_battery", 4 ] ],
+  
+    [ [ "scrap", 2 ] ],
+  
+    [ [ "cable", 10 ] ]
  ]
 },{
  "type" : "recipe",

diff --git a/data/json/vehicle_parts.json b/data/json/vehicle_parts.json
@@ -2987,13 +2987,13 @@
        "broken_color" : "red",
        "damage_modifier" : 80,
        "durability" : 200,
-  
-        "size" : 1000,
+  
+        "size" : 2000,
        "fuel_type" : "battery",
        "item" : "small_storage_battery",
        "difficulty" : 1,
        "location" : "fuel_source",
        "flags" : ["FUEL_TANK", "TOOL_NONE", "FOLDABLE"],
-  
-        "folded_volume" : 2,
+  
+        "folded_volume" : 1,
        "breaks_into" : [
            {"item": "scrap", "count": [1, 2]}
        ]
@@ -3007,13 +3007,13 @@
        "broken_color" : "red",
        "damage_modifier" : 80,
        "durability" : 250,
-  
-        "size" : 10000,
+  
+        "size" : 20000,
        "fuel_type" : "battery",
        "item" : "medium_storage_battery",
        "difficulty" : 1,
        "location" : "fuel_source",
        "flags" : ["FUEL_TANK", "TOOL_NONE", "FOLDABLE"],
-  
-        "folded_volume" : 4,
+  
+        "folded_volume" : 3,
        "breaks_into" : [
            {"item": "scrap", "count": [1, 2]}
        ]