From ee560b64cf82a26b7297b5ca34c4b2c7b4bafaae Mon Sep 17 00:00:00 2001 From: Zaweri Date: Mon, 25 Nov 2013 17:03:37 +0200 Subject: [PATCH 1/4] Item groups for COP 38 --- data/json/item_groups.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/json/item_groups.json b/data/json/item_groups.json index c59d3bde20bc3..e1db476ee9e14 100644 --- 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], From a28c84b9bf13144ad2a4614a99366afdacc111b1 Mon Sep 17 00:00:00 2001 From: Zaweri Date: Mon, 25 Nov 2013 17:05:40 +0200 Subject: [PATCH 2/4] Adds COP 38 and Mossberg Brownie --- data/json/items/ranged.json | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json index 6fc0708317789..dd8ec1b5d20d1 100644 --- a/data/json/items/ranged.json +++ b/data/json/items/ranged.json @@ -2891,5 +2891,55 @@ "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"], + "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": 1, + "reload": 400 + }, + { + "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"], + "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": 1, + "reload": 400 } ] From e65cf2014ae49f93ad44aac6b1f3306902b33581 Mon Sep 17 00:00:00 2001 From: Zaweri Date: Mon, 25 Nov 2013 17:08:52 +0200 Subject: [PATCH 3/4] Fixes typo --- data/json/items/ranged.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json index dd8ec1b5d20d1..d38bfe60a6af9 100644 --- a/data/json/items/ranged.json +++ b/data/json/items/ranged.json @@ -2939,7 +2939,7 @@ "recoil": 2, "durability": 6, "burst": 0, - "clip_size": 1, + "clip_size": 4, "reload": 400 } ] From 5fad1fc91d2b9874be70d996ec47975efe34d971 Mon Sep 17 00:00:00 2001 From: Zaweri Date: Tue, 26 Nov 2013 09:37:02 +0200 Subject: [PATCH 4/4] Fixes --- data/json/items/ranged.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json index d38bfe60a6af9..a99450148b2cb 100644 --- a/data/json/items/ranged.json +++ b/data/json/items/ranged.json @@ -2901,6 +2901,7 @@ "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, @@ -2914,8 +2915,8 @@ "recoil": 2, "durability": 6, "burst": 0, - "clip_size": 1, - "reload": 400 + "clip_size": 4, + "reload": 100 }, { "id": "cop_38", @@ -2926,6 +2927,7 @@ "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, @@ -2940,6 +2942,6 @@ "durability": 6, "burst": 0, "clip_size": 4, - "reload": 400 + "reload": 100 } ]