Obsolete shotcanister ammo & recipes (CleverRaven#40002)

Drewscriver · Apr 30, 2020 · a025357 · a025357
1 parent 189e1c0
commit a025357
Show file tree

Hide file tree

Showing 5 changed files with 114 additions and 150 deletions.
diff --git a/data/json/items/ammo/shotcanister.json b/data/json/items/ammo/shotcanister.json
diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
@@ -65,12 +65,6 @@
     "name": "rocks",
     "default": "rock"
   },
-  {
-    "type": "ammunition_type",
-    "id": "shotcanister",
-    "name": "shotcanisters",
-    "default": "shotcanister_scrap"
-  },
   {
     "type": "ammunition_type",
     "id": "shot",

diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json
@@ -2567,5 +2567,99 @@
       "flags": [ "MAG_COMPACT" ]
     },
     "flags": [ "STURDY", "OUTER" ]
+  },
+  {
+    "type": "AMMO",
+    "id": "shotcanister_scrap",
+    "price": 1000,
+    "price_postapoc": 250,
+    "name": { "str": "scrap shotcanister" },
+    "symbol": "=",
+    "color": "green",
+    "description": "This small paper canister resembling a crude shotshell is filled to the brim with assorted pieces of scrap metal.",
+    "material": [ "steel" ],
+    "volume": "250 ml",
+    "weight": "55 g",
+    "bashing": 2,
+    "cutting": 1,
+    "ammo_type": "shotcanister",
+    "looks_like": "shot_scrap",
+    "range": 1,
+    "damage": { "damage_type": "stab", "amount": 10 },
+    "dispersion": 250,
+    "loudness": 0,
+    "count": 10
+  },
+  {
+    "type": "AMMO",
+    "id": "shotcanister_pebble",
+    "price": 1000,
+    "price_postapoc": 50,
+    "name": { "str": "pebble shotcanister" },
+    "symbol": "=",
+    "color": "green",
+    "description": "This small paper canister resembling a crude shotshell is filled to the brim with tiny pebbles.  Damage is pathetic but flight is much more stable than scrap.",
+    "material": [ "stone" ],
+    "volume": "250 ml",
+    "weight": "55 g",
+    "bashing": 2,
+    "cutting": 1,
+    "ammo_type": "shotcanister",
+    "looks_like": "shot_scrap",
+    "range": 2,
+    "damage": { "damage_type": "stab", "amount": 7, "armor_penetration": 1 },
+    "dispersion": 80,
+    "loudness": 0,
+    "count": 10
+  },
+  {
+    "type": "AMMO",
+    "id": "shotcanister_flechette",
+    "price": 1000,
+    "price_postapoc": 250,
+    "name": { "str": "flechette shotcanister" },
+    "symbol": "=",
+    "color": "green",
+    "description": "This small paper canister resembling a crude shotshell is filled to the brim with handmade flechettes, giving it some armor piercing capabilities.",
+    "material": [ "steel" ],
+    "volume": "250 ml",
+    "weight": "55 g",
+    "bashing": 2,
+    "cutting": 1,
+    "ammo_type": "shotcanister",
+    "looks_like": "shot_scrap",
+    "range": 3,
+    "damage": { "damage_type": "stab", "amount": 13, "armor_penetration": 7 },
+    "dispersion": 50,
+    "loudness": 0,
+    "count": 10
+  },
+  {
+    "type": "AMMO",
+    "id": "shotcanister_bearing",
+    "price": 1000,
+    "price_postapoc": 250,
+    "name": { "str": "bearing shotcanister" },
+    "symbol": "=",
+    "color": "green",
+    "description": "This small paper canister resembling a crude shotshell is filled to the brim with handmade bearings, stabilizing its flight pattern a tiny bit.",
+    "material": [ "steel" ],
+    "volume": "250 ml",
+    "weight": "55 g",
+    "bashing": 2,
+    "cutting": 1,
+    "ammo_type": "shotcanister",
+    "looks_like": "shot_scrap",
+    "range": 2,
+    "damage": { "damage_type": "stab", "amount": 12, "armor_penetration": 2 },
+    "dispersion": 100,
+    "loudness": 0,
+    "count": 10
+  },
+  {
+    "type": "ammunition_type",
+    "id": "shotcanister",
+    "name": "shotcanisters",
+    "default": "shotcanister_scrap"
   }
 ]
diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json
@@ -601,60 +601,6 @@
       [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ]
     ]
   },
-  {
-    "type": "recipe",
-    "result": "shotcanister_scrap",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_SHOT",
-    "skill_used": "fabrication",
-    "skills_required": [ "gun", 1 ],
-    "difficulty": 3,
-    "time": "1 m",
-    "autolearn": true,
-    "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ],
-    "components": [ [ [ "scrap", 1 ] ], [ [ "paper", 2 ] ] ]
-  },
-  {
-    "type": "recipe",
-    "result": "shotcanister_flechette",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_SHOT",
-    "skill_used": "fabrication",
-    "skills_required": [ "gun", 1 ],
-    "difficulty": 3,
-    "time": "1 m",
-    "autolearn": true,
-    "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ],
-    "components": [ [ [ "combatnail", 10 ] ], [ [ "paper", 2 ] ] ]
-  },
-  {
-    "type": "recipe",
-    "result": "shotcanister_bearing",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_SHOT",
-    "skill_used": "fabrication",
-    "skills_required": [ "gun", 1 ],
-    "difficulty": 3,
-    "time": "1 m",
-    "autolearn": true,
-    "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ],
-    "components": [ [ [ "bearing", 10 ] ], [ [ "paper", 2 ] ] ]
-  },
-  {
-    "type": "recipe",
-    "result": "shotcanister_pebble",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_SHOT",
-    "skill_used": "fabrication",
-    "skills_required": [ "gun", 1 ],
-    "difficulty": 3,
-    "time": "1 m",
-    "autolearn": true,
-    "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ],
-    "qualities": [  ],
-    "using": [  ],
-    "components": [ [ [ "pebble", 10 ] ], [ [ "paper", 2 ] ] ]
-  },
   {
     "type": "recipe",
     "result": "arrow_plastic",

diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json
@@ -2439,5 +2439,25 @@
     "type": "recipe",
     "result": "modularvestceramic",
     "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "shotcanister_scrap",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "shotcanister_flechette",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "shotcanister_bearing",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "shotcanister_pebble",
+    "obsolete": true
   }
 ]