minor mv bowling golf balls to toys n sports (#36359)

CleverRaven · Dec 29, 2019 · 8c616da · 8c616da
1 parent bc7ad01
commit 8c616da
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 59 deletions.
diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -492,65 +492,6 @@
     "volume": 0,
     "to_hit": -3
   },
-  {
-    "id": "golf_tee",
-    "type": "GENERIC",
-    "category": "other",
-    "name": "golf tee",
-    "description": "A pin shaped piece of wood meant for holding a golf ball slightly off the ground.",
-    "weight": "3 g",
-    "volume": "250 ml",
-    "price": 1000,
-    "material": "wood",
-    "symbol": "-",
-    "color": "white"
-  },
-  {
-    "id": "golf_ball",
-    "type": "GENERIC",
-    "category": "other",
-    "name": "golf ball",
-    "description": "A small ball with round indentations on it.",
-    "weight": "50 g",
-    "volume": "250 ml",
-    "price": 2000,
-    "material": "plastic",
-    "symbol": "*",
-    "color": "white",
-    "bashing": 5,
-    "to_hit": -3
-  },
-  {
-    "type": "GENERIC",
-    "id": "pool_ball",
-    "symbol": "*",
-    "color": "blue",
-    "name": "pool ball",
-    "description": "A colorful, hard ball.  Essentially a rock.",
-    "category": "other",
-    "price": 3000,
-    "price_postapoc": 0,
-    "material": "plastic",
-    "weight": "170 g",
-    "volume": "250 ml",
-    "bashing": 8,
-    "to_hit": -3
-  },
-  {
-    "type": "GENERIC",
-    "id": "bowling_ball",
-    "symbol": "*",
-    "color": "blue",
-    "name": "bowling ball",
-    "description": "A large, heavy ball.  Before the apocalypse, its main purpose was to be rolled along waxed floors.",
-    "category": "other",
-    "price": 30,
-    "material": "ceramic",
-    "weight": "2000 g",
-    "volume": "2500 ml",
-    "bashing": 16,
-    "to_hit": -2
-  },
   {
     "type": "GENERIC",
     "id": "candlestick",

diff --git a/data/json/items/generic/toys_and_sports.json b/data/json/items/generic/toys_and_sports.json
@@ -63,6 +63,65 @@
     ],
     "magazine_well": 1
   },
+  {
+    "id": "golf_tee",
+    "type": "GENERIC",
+    "category": "other",
+    "name": "golf tee",
+    "description": "A pin shaped piece of wood meant for holding a golf ball slightly off the ground.",
+    "weight": "3 g",
+    "volume": "250 ml",
+    "price": 1000,
+    "material": "wood",
+    "symbol": "-",
+    "color": "white"
+  },
+  {
+    "id": "golf_ball",
+    "type": "GENERIC",
+    "category": "other",
+    "name": "golf ball",
+    "description": "A small ball with round indentations on it.",
+    "weight": "50 g",
+    "volume": "250 ml",
+    "price": 2000,
+    "material": "plastic",
+    "symbol": "*",
+    "color": "white",
+    "bashing": 5,
+    "to_hit": -3
+  },
+  {
+    "type": "GENERIC",
+    "id": "pool_ball",
+    "symbol": "*",
+    "color": "blue",
+    "name": "pool ball",
+    "description": "A colorful, hard ball.  Essentially a rock.",
+    "category": "other",
+    "price": 3000,
+    "price_postapoc": 0,
+    "material": "plastic",
+    "weight": "170 g",
+    "volume": "250 ml",
+    "bashing": 8,
+    "to_hit": -3
+  },
+  {
+    "type": "GENERIC",
+    "id": "bowling_ball",
+    "symbol": "*",
+    "color": "blue",
+    "name": "bowling ball",
+    "description": "A large, heavy ball.  Before the apocalypse, its main purpose was to be rolled along waxed floors.",
+    "category": "other",
+    "price": 30,
+    "material": "ceramic",
+    "weight": "2000 g",
+    "volume": "2500 ml",
+    "bashing": 16,
+    "to_hit": -2
+  },
   {
     "type": "GENERIC",
     "id": "baseball",