Merge pull request #31345 from LaVeyanFiend/ShotBandoFix

Shotgun bandoliers update
CleverRaven · Jun 12, 2019 · 7a858a4 · 7a858a4
2 parents 8697212 + c2b5062
commit 7a858a4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json
@@ -60,7 +60,7 @@
     "coverage": 10,
     "encumbrance": 5,
     "material_thickness": 1,
-    "use_action": { "type": "bandolier", "capacity": 25, "ammo": [ "shot", "20x66mm" ], "draw_cost": 25 },
+    "use_action": { "type": "bandolier", "capacity": 25, "ammo": [ "shot", "20x66mm", "shotcanister" ], "draw_cost": 25 },
     "flags": [ "WATER_FRIENDLY", "WAIST", "OVERSIZE" ]
   },
   {
@@ -78,7 +78,7 @@
     "coverage": 12,
     "encumbrance": 15,
     "material_thickness": 1,
-    "use_action": { "type": "bandolier", "capacity": 50, "ammo": [ "shot", "20x66mm" ], "draw_cost": 35 },
+    "use_action": { "type": "bandolier", "capacity": 50, "ammo": [ "shot", "20x66mm", "shotcanister" ], "draw_cost": 35 },
     "flags": [ "WATER_FRIENDLY", "OVERSIZE", "BELTED" ]
   },
   {

diff --git a/data/mods/realguns/armor.json b/data/mods/realguns/armor.json
@@ -11,11 +11,18 @@
       "draw_cost": 20
     }
   },
+  {
+    "id": "torso_bandolier_shotgun",
+    "copy-from": "torso_bandolier_shotgun",
+    "type": "ARMOR",
+    "name": "torso shotgun bandolier",
+    "use_action": { "type": "bandolier", "capacity": 50, "ammo": [ "410", "shot", "20x66mm", "shotcanister" ], "draw_cost": 35 }
+  },
   {
     "id": "bandolier_shotgun",
     "copy-from": "bandolier_shotgun",
     "type": "ARMOR",
-    "name": "shotgun bandolier",
-    "use_action": { "type": "bandolier", "capacity": 12, "ammo": [ "410", "shot", "20x66mm" ], "draw_cost": 20 }
+    "name": "waist shotgun bandolier",
+    "use_action": { "type": "bandolier", "capacity": 12, "ammo": [ "410", "shot", "20x66mm", "shotcanister" ], "draw_cost": 20 }
   }
 ]