1 files changed, 30 insertions, 22 deletions
diff --git a/ammo.json b/ammo.json
index 60ebd3c..1f888ee 100644
--- a/ammo.json
+++ b/ammo.json
@@ -1,39 +1,47 @@
 [
   {
-    "type": "AMMO",
+    "type": "GENERIC",
+    "id": "throwing_knife",
+    "category": "weapons",
+    "price": 5200,
+    "price_postapoc": 500,
+    "name": { "str": "throwing knife", "str_pl": "throwing knives" },
+    "symbol": ";",
+    "color": "light_gray",
+    "description": "A thin and flat knife made for throwing.  Its ineffective cutting edge and odd shape makes it unsuitable for use as a tool.",
+    "material": [ "steel" ],
+    "volume": "100 ml",
+    "weight": "460 g",
+    "to_hit": -2,
+    "bashing": 1,
+    "cutting": 10,
+    "flags": [ "STAB", "SHEATH_KNIFE" ],
+    "thrown_damage": [ { "damage_type": "stab", "amount": 14 } ]
+  },
+  {
     "id": "assassins_throwing_dagger",
+    "copy-from": "throwing_knife",
+    "type": "GENERIC",
     "category": "weapons",
     "price": 9000,
+    "price_postapoc": 900,
     "name": { "str": "assassin's throwing knife" },
-    "symbol": "/",
-    "color": "light_gray",
     "description": "A nimble blade meant for ranged assassination, but makes an improvised cutlery tool in a pinch. It's very lightweight and silent and can be used on both zombies and games involving apples.",
-    "material": [ "steel", "leather" ],
-    "volume": "1 L",
-    "weight": "750 g",
-    "cutting": 21,
+    "weight": "360 g",
+    "cutting": 20,
     "to_hit": 2,
-    "flags": [ "SPEAR", "SHEATH_KNIFE" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 10 ] ],
-    "ammo_type": "assassins_throwing_dagger",
-    "count": 4,
-    "stack_size": 4
+    "thrown_damage": [ { "damage_type": "stab", "amount": 25 } ]
   },
   {
-    "type": "AMMO",
     "id": "makeshift_throwing_knife",
+    "copy-from": "throwing_knife",
+    "type": "GENERIC",
     "category": "weapons",
-    "price": 5200,
     "name": { "str": "makeshift throwing knife" },
-    "symbol": ";",
-    "color": "light_gray",
     "description": "A crude and simple throwing knife made from a sharpened piece of salvaged steel with cloth wrapped around it. It's better than throwing rocks, at least.",
-    "material": [ "steel" ],
-    "volume": "250 ml",
-    "weight": "600 g",
-    "bashing": 3,
-    "cutting": 9,
-    "ammo_type": "makeshift_throwing_knife",
-    "count": 5
+    "bashing": 0,
+    "cutting": 7,
+    "thrown_damage": [ { "damage_type": "stab", "amount": 10 } ]
   }
 ]