Merge pull request #4689 from Zaweri/pepperbox

Adds 2 pepperbox pistols, Mossberg Brownie and COP 38
CleverRaven · Nov 26, 2013 · 0248ac5 · 0248ac5
2 parents adee08c + 5fad1fc
commit 0248ac5
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 0 deletions.
diff --git a/data/json/item_groups.json b/data/json/item_groups.json
@@ -655,6 +655,8 @@
         "id" : "homeguns",
     "items":[
       ["blowgun", 5],
+      ["moss_brownie", 2],
+      ["cop_38", 4],
       ["rm228", 3],
       ["dart", 5],
       ["22_lr", 9],
@@ -2983,6 +2985,8 @@
       ["rifle_flint", 5],
       ["pistol_flint", 5],
       ["flint_ammo", 5],
+      ["moss_brownie", 5],
+      ["cop_38", 5],
       ["cigar", 5],
       ["television", 10],
       ["microwave", 5],

diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json
@@ -2891,5 +2891,57 @@
     "burst": 0,
     "clip_size": 1,
     "reload": 800
+  },
+     {
+    "id": "moss_brownie",
+    "type": "GUN",
+    "symbol": "(",
+    "color": "brown",
+    "name": "Mossberg Brownie",
+    "description": "A four-barreled, .22 Long Rifle pistol, similar to a derringer or pepperbox, produced by O.F. Mossberg & Sons from 1920 to 1932.",
+    "price": 1100,
+    "material": ["steel", "wood"],
+    "flags": "RELOAD_ONE",
+    "skill": "pistol",
+    "ammo": "22",
+    "weight": 364,
+    "volume": 3,
+    "bashing": 5,
+    "cutting": 0,
+    "to_hit": -1,
+    "ranged_damage": 0,
+    "range": 3,
+    "dispersion": 20,
+    "recoil": 2,
+    "durability": 6,
+    "burst": 0,
+    "clip_size": 4,
+    "reload": 100
+  },
+   {
+    "id": "cop_38",
+    "type": "GUN",
+    "symbol": "(",
+    "color": "brown",
+    "name": "COP .38",
+    "description": "The COP 38 is a four-shot derringer-type pistol chambered for the .38 round. It was designed by Robert Hillberg, based on his earlier work on the Hillberg Insurgency Weapon.",
+    "price": 1200,
+    "material": ["steel", "wood"],
+    "flags": "RELOAD_ONE",
+    "skill": "pistol",
+    "ammo": "38",
+    "weight": 857,
+    "volume": 3,
+    "bashing": 5,
+    "cutting": 0,
+    "to_hit": -1,
+    "ranged_damage": -2,
+    "range": 3,
+    "dispersion": 15,
+    "recoil": 2,
+    "durability": 6,
+    "burst": 0,
+    "clip_size": 4,
+    "reload": 100
   }
 ]