Resubmit Fix Tire Rims (#51798)

CleverRaven · Sep 23, 2021 · 86c3e0a · 86c3e0a
1 parent d6889eb
commit 86c3e0a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/data/json/items/vehicle/wheel.json b/data/json/items/vehicle/wheel.json
@@ -70,10 +70,10 @@
     "name": { "str": "medium steel rim" },
     "description": "A medium size steel rim for a car tire.",
     "weight": "5245 g",
-    "volume": "4 L",
+    "volume": "28 L",
     "bashing": 8,
     "to_hit": -4,
-    "longest_side": "254 mm",
+    "longest_side": "432 mm",
     "price": 5000,
     "price_postapoc": 500,
     "material": [ "steel" ],
@@ -87,10 +87,10 @@
     "name": { "str": "steel motorbike rim" },
     "description": "A steel rim for a motorbike tire.",
     "weight": "3000 g",
-    "volume": "4 L",
+    "volume": "12 L",
     "bashing": 8,
     "to_hit": -4,
-    "longest_side": "254 mm",
+    "longest_side": "508 mm",
     "price": 5000,
     "price_postapoc": 500,
     "material": [ "steel" ],
@@ -104,10 +104,10 @@
     "name": { "str": "wide steel rim" },
     "description": "A wide steel rim for a larger tire.",
     "weight": "7600 g",
-    "volume": "7500 ml",
+    "volume": "70 L",
     "bashing": 10,
     "to_hit": -4,
-    "longest_side": "254 mm",
+    "longest_side": "610 mm",
     "price": 5000,
     "price_postapoc": 500,
     "material": [ "steel" ],
@@ -119,12 +119,12 @@
     "type": "GENERIC",
     "category": "veh_parts",
     "name": { "str": "bicycle rim" },
-    "description": "A spoked rim for a bicycle tire.",
+    "description": "A large spoked rim for a bicycle tire.",
     "weight": "750 g",
-    "volume": "5 L",
+    "volume": "11 L",
     "bashing": 6,
     "to_hit": -2,
-    "longest_side": "254 mm",
+    "longest_side": "686 mm",
     "price": 5000,
     "price_postapoc": 500,
     "material": [ "steel" ],
@@ -256,7 +256,7 @@
     "name": { "str": "deflated 17\" wheel" },
     "description": "A car wheel.  It is currently deflated and will need to be inflated to be used on a vehicle.",
     "weight": "8845 g",
-    "volume": "10 L",
+    "volume": "28 L",
     "longest_side": "432 mm",
     "price": 10000,
     "price_postapoc": 750,
@@ -274,7 +274,7 @@
     "name": { "str": "deflated 16\" racing wheel" },
     "description": "A wide, smooth wheel intended for racing.  It is currently deflated and will need to be inflated to be used on a vehicle.",
     "weight": "12600 g",
-    "volume": "13750 ml",
+    "volume": "28 L",
     "longest_side": "407 mm",
     "price": 24000,
     "price_postapoc": 500,
@@ -291,7 +291,7 @@
     "name": { "str": "deflated 16\" motorbike wheel" },
     "description": "A motorbike wheel.  It is currently deflated and will need to be inflated to be used on a vehicle.",
     "weight": "5443 g",
-    "volume": "8250 ml",
+    "volume": "12 L",
     "longest_side": "407 mm",
     "price": 14000,
     "price_postapoc": 500,
@@ -316,7 +316,7 @@
     "name": { "str": "deflated 24\" wide wheel" },
     "description": "A wide wheel.  \\o/ This wide.  It is currently deflated and will need to be inflated to be used on a vehicle.",
     "weight": "22600 g",
-    "volume": "17500 ml",
+    "volume": "70 L",
     "longest_side": "610 mm",
     "price": 34000,
     "price_postapoc": 750,
@@ -340,7 +340,7 @@
     "name": { "str": "deflated 27\" bicycle wheel" },
     "description": "A bicycle wheel.  It is currently deflated and will need to be inflated to be used on a vehicle.",
     "weight": "1500 g",
-    "volume": "7 L",
+    "volume": "11 L",
     "longest_side": "686 mm",
     "price": 4000,
     "price_postapoc": 250,
@@ -364,7 +364,7 @@
     "name": { "str": "wheel" },
     "description": "A car wheel.",
     "weight": "8845 g",
-    "volume": "10 L",
+    "volume": "28 L",
     "longest_side": "432 mm",
     "price": 10000,
     "price_postapoc": 750,
@@ -383,7 +383,7 @@
     "name": { "str": "racing wheel" },
     "description": "A wide, smooth wheel intended for racing.  The slick surface provides better speed on pavement but penalizes off-road speed.",
     "weight": "12600 g",
-    "volume": "13750 ml",
+    "volume": "28 L",
     "longest_side": "407 mm",
     "price": 24000,
     "price_postapoc": 500,
@@ -440,7 +440,7 @@
     "name": { "str": "bicycle wheel" },
     "description": "A bicycle wheel.",
     "weight": "1500 g",
-    "volume": "7 L",
+    "volume": "11 L",
     "longest_side": "686 mm",
     "price": 4000,
     "price_postapoc": 250,
@@ -556,7 +556,7 @@
     "name": { "str": "motorbike wheel" },
     "description": "A motorbike wheel.",
     "weight": "5443 g",
-    "volume": "8250 ml",
+    "volume": "12 L",
     "longest_side": "407 mm",
     "price": 14000,
     "price_postapoc": 500,
@@ -679,7 +679,7 @@
     "name": { "str": "wide wheel" },
     "description": "A wide wheel.  \\o/ This wide.",
     "weight": "22600 g",
-    "volume": "17500 ml",
+    "volume": "70 L",
     "longest_side": "610 mm",
     "price": 34000,
     "price_postapoc": 750,

diff --git a/data/json/recipes/recipe_vehicle.json b/data/json/recipes/recipe_vehicle.json
@@ -223,7 +223,7 @@
     "autolearn": true,
     "reversible": true,
     "qualities": [ { "id": "PRY", "level": 1 } ],
-    "components": [ [ [ "tire_bicycle_or", 1 ] ], [ [ "wheel_rim_wide", 1 ] ] ]
+    "components": [ [ [ "tire_bicycle_or", 1 ] ], [ [ "wheel_rim_bicycle", 1 ] ] ]
   },
   {
     "result": "reins_tackle",