From 7915365205df310e66b931f5def993e6cdd60300 Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 12:41:26 +0000 Subject: [PATCH 01/18] magazine reload_time defaults to 0 --- src/item_factory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/item_factory.cpp b/src/item_factory.cpp index 51281a8473fbd..4025e85d9f196 100644 --- a/src/item_factory.cpp +++ b/src/item_factory.cpp @@ -907,7 +907,7 @@ void Item_factory::load( islot_magazine &slot, JsonObject &jo ) slot.capacity = jo.get_int( "capacity" ); slot.count = jo.get_int( "count", 0 ); slot.reliability = jo.get_int( "reliability" ); - slot.reload_time = jo.get_int( "reload_time" ); + slot.reload_time = jo.get_int( "reload_time", 0 ); slot.rigid = jo.get_bool( "rigid", true ); JsonArray alt = jo.get_array( "alternatives" ); From 064304dec0b5fd6e9c2ef0b14ad9cdf1c6f1ce36 Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 12:41:56 +0000 Subject: [PATCH 02/18] Add 223 magazines --- data/json/items/magazines.json | 94 +++++++++++++++++++++++++++++++--- 1 file changed, 87 insertions(+), 7 deletions(-) diff --git a/data/json/items/magazines.json b/data/json/items/magazines.json index d1da7dcf699d0..05ebb18eeafac 100644 --- a/data/json/items/magazines.json +++ b/data/json/items/magazines.json @@ -8,12 +8,62 @@ "description" : "A standard capacity magazine for use with STANAG compatible rifles.", "material" : "steel", "volume" : 2, - "weight" : 110, - "to_hit" : -2, + "weight" : 360, "ammo_type" : "223", "capacity" : 30, - "reliability" : 10, - "reload_time" : 30 + "reliability" : 8, + "reload_time" : 100, + "flags" : [ "COMPACT_MAG" ] + }, + { "type" : "MAGAZINE", + "id" : "stanag10", + "price" : 5000, + "name" : "Ruger 223 magazine", + "symbol" : "#", + "color" : "ltgray", + "description" : "A compact 10-round magazine commonly used with semi-automatic STANAG compatible rifles.", + "material" : "steel", + "volume" : 1, + "weight" : 100, + "ammo_type" : "223", + "capacity" : 10, + "reliability" : 9, + "reload_time" : 100, + "flags" : [ "COMPACT_MAG" ] + }, + { "type" : "MAGAZINE", + "id" : "stanag50", + "price" : 9000, + "name" : "STANAG drum magazine", + "symbol" : "#", + "color" : "ltgreen", + "description" : "A 50-round magazine with a bulky green drum for use with STANAG compatible rifles.", + "material" : [ "steel", "plastic" ], + "volume" : 4, + "weight" : 600, + "to_hit" : -2, + "ammo_type" : "223", + "capacity" : 50, + "reliability" : 7, + "reload_time" : 200, + "flags" : [ "BULKY_MAG" ] + }, + { "type" : "MAGAZINE", + "id" : "survivor223mag", + "price" : 1200, + "name" : "Survivor 223 magazine", + "symbol" : "#", + "color" : "ltgray", + "description" : "An improvised magazine consisting of little more than a bent sheet of rusted metal held together by duct tape and hope.", + "material" : "steel", + "volume" : 1, + "weight" : 80, + "to_hit" : -2, + "ammo_type" : "223", + "capacity" : 5, + "reliability" : 5, + "reload_time" : 150, + "flags" : [ "COMPACT_MAG" ] }, { "type" : "MAGAZINE", "id" : "belt223", @@ -25,15 +75,45 @@ "material" : "steel", "volume" : 0, "weight" : 0, - "to_hit" : -4, "rigid": false, "ammo_type" : "223", "capacity" : 200, "count" : 100, - "reliability" : 8, - "reload_time" : 80, + "reliability" : 6, "flags": [ "NO_RELOAD", "NO_UNLOAD" ] }, + { "type" : "MAGAZINE", + "id" : "lw223mag", + "price" : 10200, + "name" : "LW-30 magazine", + "symbol" : "#", + "color" : "ltgray", + "description" : "A 32-round polymer magazine for Leadworks LLC 223 firearms. Lightweight and reliable but somewhat more difficult to reload.", + "material" : "plastic", + "volume" : 2, + "weight" : 190, + "ammo_type" : "223", + "capacity" : 32, + "reliability" : 9, + "reload_time" : 120, + "flags" : [ "COMPACT_MAG" ] + }, + { "type" : "MAGAZINE", + "id" : "lw223bigmag", + "price" : 14200, + "name" : "LW-56 magazine", + "symbol" : "#", + "color" : "ltgray", + "description" : "A 56-round polymer magazine for Leadworks LLC 223 firearms. It's compact design makes it surprisingly easy to store. Lightweight and reliable but somewhat more difficult to reload.", + "material" : "plastic", + "volume" : 3, + "weight" : 340, + "ammo_type" : "223", + "capacity" : 56, + "reliability" : 9, + "reload_time" : 160, + "flags" : [ "COMPACT_MAG" ] + }, { "type" : "MAGAZINE", "id" : "glockmag", "price" : 4600, From d6121d4331cb0a59496ae88bed6e839be3d6d34b Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 13:01:01 +0000 Subject: [PATCH 03/18] Update 223 guns to use magazines --- data/json/items/ranged.json | 113 ++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json index f3bb02f9bdfe8..31ab0e834e754 100644 --- a/data/json/items/ranged.json +++ b/data/json/items/ranged.json @@ -2135,8 +2135,8 @@ "material": ["steel", "wood"], "skill": "rifle", "ammo": "223", - "weight": 2900, - "volume": 9, + "weight": 2800, + "volume": 8, "bashing": 12, "cutting": 0, "to_hit": -1, @@ -2146,11 +2146,11 @@ "aim_speed" : 6, "recoil": -60, "durability": 8, - "clip_size": 10, "reload": 500, "loudness" : 150, "barrel_length" : 2, - "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "magazine", 2 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "sights", 1 ]] + "magazines": [ "stanag10", "survivor223mag" ], + "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "sights", 1 ]] },{ "id": "rifle_308", "type": "GUN", @@ -2337,8 +2337,8 @@ "flags": "MODE_BURST", "skill": "rifle", "ammo": "223", - "weight": 3630, - "volume": 12, + "weight": 3270, + "volume": 10, "bashing": 12, "cutting": 0, "to_hit": -1, @@ -2349,10 +2349,10 @@ "recoil": 75, "durability": 8, "burst": 15, - "clip_size": 30, "reload": 500, "loudness" : 150, - "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "magazine", 2 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] + "magazines": [ "stanag30", "stanag10", "stanag50", "survivor223mag" ], + "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "ak47", @@ -2517,7 +2517,7 @@ "flags": "MODE_BURST", "skill": "rifle", "ammo": "223", - "weight": 2690, + "weight": 2500, "volume": 6, "bashing": 12, "cutting": 0, @@ -2530,9 +2530,9 @@ "recoil": 60, "durability": 3, "burst": 3, - "clip_size": 30, "reload": 500, "loudness" : 150, + "magazines" : [ "lw223mag", "lw223bigmag" ], "valid_mod_locations": [[ "accessories", 4 ]] }, { @@ -2548,8 +2548,8 @@ "flags": "MODE_BURST", "skill": "rifle", "ammo": "223", - "weight": 3090, - "volume": 8, + "weight": 2900, + "volume": 6, "bashing": 12, "cutting": 0, "to_hit": -1, @@ -2561,10 +2561,10 @@ "recoil": -180, "durability": 7, "burst": 5, - "clip_size": 30, "reload": 500, "loudness" : 150, - "valid_mod_locations": [[ "accessories", 2 ], [ "magazine", 2 ]] + "magazines" : [ "lw223mag", "lw223bigmag" ], + "valid_mod_locations": [[ "accessories", 2 ]] }, { "id": "acr", @@ -2579,8 +2579,8 @@ "flags": "MODE_BURST", "skill": "rifle", "ammo": "223", - "weight": 3855, - "volume": 10, + "weight": 3495, + "volume": 8, "bashing": 12, "cutting": 0, "to_hit": -1, @@ -2591,11 +2591,11 @@ "recoil": -15, "durability": 8, "burst": 3, - "clip_size": 30, "reload": 475, "loudness" : 150, "barrel_length" : 1, - "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "magazine", 2 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] + "magazines" : [ "stanag30", "stanag10", "stanag50", "survivor223mag" ], + "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "ar15", @@ -2609,8 +2609,8 @@ "material": ["steel", "plastic"], "skill": "rifle", "ammo": "223", - "weight": 3175, - "volume": 10, + "weight": 2815, + "volume": 8, "bashing": 12, "cutting": 0, "to_hit": -1, @@ -2619,11 +2619,10 @@ "aim_speed" : 6, "recoil": 0, "durability": 7, - "magazines": [ "stanag30" ], "reload": 500, "loudness" : 150, - "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]], - "default_mods": [ "stanag30" ] + "magazines" : [ "stanag30", "stanag10", "stanag50", "survivor223mag" ], + "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "m4a1", @@ -2638,8 +2637,8 @@ "flags": "MODE_BURST", "skill": "rifle", "ammo": "223", - "weight": 2880, - "volume": 9, + "weight": 2520, + "volume": 7, "bashing": 12, "cutting": 0, "to_hit": -1, @@ -2650,10 +2649,10 @@ "recoil": 30, "durability": 6, "burst": 10, - "clip_size": 30, "reload": 475, "loudness" : 150, - "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "magazine", 2 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] + "magazines" : [ "stanag30", "stanag10", "survivor223mag" ], + "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "l_mbr_223", @@ -2668,8 +2667,8 @@ "flags": "MODE_BURST", "skill": "rifle", "ammo": "223", - "weight": 3390, - "volume": 9, + "weight": 3200, + "volume": 7, "bashing": 12, "cutting": 0, "to_hit": -1, @@ -2679,10 +2678,10 @@ "recoil": -90, "durability": 7, "burst": 3, - "clip_size": 30, "reload": 500, "loudness" : 150, - "valid_mod_locations": [[ "accessories", 2 ] , [ "magazine", 2 ]] + "magazines" : [ "lw223mag", "lw223bigmag" ], + "valid_mod_locations": [[ "accessories", 2 ]] }, { "id": "scar_l", @@ -2697,8 +2696,8 @@ "flags": "MODE_BURST", "skill": "rifle", "ammo": "223", - "weight": 3290, - "volume": 10, + "weight": 2960, + "volume": 8, "bashing": 12, "cutting": 0, "to_hit": -1, @@ -2709,10 +2708,10 @@ "recoil": -60, "durability": 8, "burst": 10, - "clip_size": 30, "reload": 500, "loudness" : 150, - "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "magazine", 2 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] + "magazines" : [ "stanag30", "stanag10", "stanag50", "survivor223mag" ], + "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "scar_h", @@ -2816,8 +2815,8 @@ "flags": "MODE_BURST", "skill": "rifle", "ammo": "223", - "weight": 2280, - "volume": 9, + "weight": 1920, + "volume": 7, "bashing": 12, "cutting": 0, "to_hit": -1, @@ -2828,10 +2827,10 @@ "recoil": 30, "durability": 8, "burst": 6, - "clip_size": 30, "reload": 600, "loudness" : 150, - "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "magazine", 2 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] + "magazines" : [ "stanag30", "stanag10", "survivor223mag" ], + "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "l_dsr_223", @@ -2845,8 +2844,8 @@ "material": ["steel", "plastic"], "skill": "rifle", "ammo": "223", - "weight": 4590, - "volume": 12, + "weight": 4400, + "volume": 10, "bashing": 12, "cutting": 0, "to_hit": -1, @@ -2857,10 +2856,10 @@ "aim_speed" : 9, "recoil": -150, "durability": 7, - "clip_size": 30, "reload": 500, "loudness" : 150, - "valid_mod_locations": [[ "accessories", 2 ], [ "magazine", 2 ]] + "magazines" : [ "lw223mag", "lw223bigmag" ], + "valid_mod_locations": [[ "accessories", 2 ]] }, { "id": "m27iar", @@ -2875,8 +2874,8 @@ "flags": "MODE_BURST", "skill": "rifle", "ammo": "223", - "weight": 4095, - "volume": 11, + "weight": 3495, + "volume": 8, "bashing": 12, "cutting": 0, "to_hit": -1, @@ -2888,10 +2887,10 @@ "recoil": 120, "durability": 8, "burst": 15, - "clip_size": 45, "reload": 600, "loudness" : 150, - "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "magazine", 2 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] + "magazines" : [ "stanag50", "stanag30", "stanag10" ], + "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "l_lmg_223", @@ -2906,8 +2905,8 @@ "flags": "MODE_BURST", "skill": "rifle", "ammo": "223", - "weight": 4990, - "volume": 18, + "weight": 4180, + "volume": 13, "bashing": 12, "cutting": 0, "to_hit": -1, @@ -2919,9 +2918,9 @@ "recoil": -165, "durability": 7, "burst": 20, - "clip_size": 100, "reload": 2000, "loudness" : 150, + "magazines" : [ "lw223bigmag", "lw223mag" ], "valid_mod_locations": [[ "accessories", 2 ]] }, { @@ -2966,8 +2965,8 @@ "flags": "MODE_BURST", "skill": "rifle", "ammo": "223", - "weight": 3600, - "volume": 7, + "weight": 3240, + "volume": 6, "bashing": 12, "cutting": 0, "to_hit": -1, @@ -2978,10 +2977,10 @@ "recoil": -120, "durability": 8, "burst": 6, - "clip_size": 30, "reload": 550, "loudness" : 150, - "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "magazine", 2 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] + "magazines" : [ "stanag30", "stanag10", "survivor223mag" ], + "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "m249", @@ -2996,8 +2995,8 @@ "flags": "MODE_BURST", "skill": "rifle", "ammo": "223", - "weight": 7500, - "volume": 14, + "weight": 6800, + "volume": 12, "bashing": 12, "cutting": 0, "to_hit": -1, @@ -3010,7 +3009,7 @@ "burst": 30, "reload": 750, "loudness" : 160, - "magazines" : [ "stanag30", "belt223" ], + "magazines" : [ "stanag50", "stanag30", "belt223" ], "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ]] }, { From 6701340b8ee23c1ca5393600d94ac7311a8d19f7 Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 14:00:44 +0000 Subject: [PATCH 04/18] Add 223 magazines to item groups --- data/json/item_groups.json | 51 +++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/data/json/item_groups.json b/data/json/item_groups.json index 463468f74a5ae..7e9e290331891 100644 --- a/data/json/item_groups.json +++ b/data/json/item_groups.json @@ -2737,7 +2737,9 @@ ["improve_sights", 20], ["survnote", 1], ["shoulder_strap", 24], - ["powered_earmuffs",40] + ["powered_earmuffs",40], + ["stanag10", 10], + ["stanag30", 5] ] },{ "type" : "item_group", @@ -3676,7 +3678,9 @@ ["shot_beanbag", 14], ["223", 10], ["3006", 10], - ["survnote", 1] + ["survnote", 1], + ["stanag10", 6], + ["lw223mag", 2] ] },{ "type" : "item_group", @@ -3757,7 +3761,9 @@ ["fn_p90", 3], ["l_mp_9mm", 2], ["tazer", 15], - ["l-stick", 1] + ["l-stick", 1], + ["stanag10", 6], + ["lw223mag", 2] ] },{ "type" : "item_group", @@ -3887,7 +3893,10 @@ ["tac_helmet", 20], ["helmet_lobster", 10], ["goggles_nv", 5], - ["UPS_off", 10] + ["UPS_off", 10], + ["stanag30", 10], + ["stanag10", 5], + ["lw223mag", 5] ] },{ "type" : "item_group", @@ -4739,7 +4748,8 @@ ["rail_laser_sight", 10], ["rifle_scope", 17], ["pistol_scope", 14], - ["improve_sights", 20] + ["improve_sights", 20], + ["survivor223mag", 20] ] },{ "type" : "item_group", @@ -5211,7 +5221,8 @@ ["eboshi", 1], ["kariginu", 2], ["kimono", 3], - ["l-stick", 1] + ["l-stick", 1], + ["stanag10", 2] ] },{ "type" : "item_group", @@ -5292,7 +5303,10 @@ ["bfipowder", 20], ["sheath", 10], ["bootsheath", 10], - ["survnote", 1] + ["survnote", 1], + ["stanag10", 8], + ["stanag30", 6], + ["lw223mag", 6] ] },{ "type" : "item_group", @@ -6273,7 +6287,9 @@ ["20x66_exp", 2], ["20x66_frag", 2], ["20x66_flare", 4], - ["20x66_inc", 2] + ["20x66_inc", 2], + ["lw223mag", 20], + ["lw223bigmag", 10] ] },{ "type" : "item_group", @@ -6337,7 +6353,9 @@ ["20x66_flechette", 3], ["waterproof_gunmod", 2], ["improve_sights", 5], - ["rm11b_sniper_rifle", 1] + ["rm11b_sniper_rifle", 1], + ["lw223mag", 8], + ["lw223bigmag", 4] ] },{ "type" : "item_group", @@ -7628,7 +7646,9 @@ ["grapnel", 1], ["briefcase", 5], ["survnote", 2], - ["robot_controls", 3] + ["robot_controls", 3], + ["stanag30", 10], + ["lw223mag", 5] ] },{ "type" : "item_group", @@ -7859,7 +7879,11 @@ ["shoulder_strap", 16], ["bot_manhack", 1], ["bot_grenade_hack", 1], - ["l-stick", 1] + ["l-stick", 1], + ["stanag30", 20], + ["stanag50", 10], + ["lw223mag", 20], + ["lw223bigmag", 10] ] },{ "type" : "item_group", @@ -8053,7 +8077,10 @@ ["scrap_copper", 5], ["signal_flare", 5], ["8mm_inc", 2], - ["survnote", 1] + ["survnote", 1], + ["stanag10", 4], + ["stanag30", 2], + ["lw223mag", 1] ] },{ "type" : "item_group", From fa2cbc7d3e1d8d46003aafeb954cfdc0c6bf7da5 Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 14:01:31 +0000 Subject: [PATCH 05/18] Add crafting recipe for survivor 223 magazine --- data/json/recipes/recipe_ammo.json | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json index 84fe597dd2a82..9aabb90538df4 100644 --- a/data/json/recipes/recipe_ammo.json +++ b/data/json/recipes/recipe_ammo.json @@ -1919,6 +1919,33 @@ [ "cu_pipe", 3] ] ] +},{ + "type" : "recipe", + "result": "survivor223mag", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_BULLETS", + "skill_used": "fabrication", + "skills_required": [ "gun", 1 ], + "difficulty": 2, + "time": 20000, + "reversible": false, + "autolearn": true, + "qualities":[ + {"id":"SAW_M","level":1,"amount":1}, + {"id":"HAMMER","level":1,"amount":1}, + {"id":"SCREW_FINE","level":1,"amount":1} + ], + "components": [ + [ + [ "sheet_metal", 1 ] + ], + [ + [ "spring", 1 ] + ], + [ + [ "duct_tape", 40 ] + ] + ] },{ "type" : "recipe", "result": "reloaded_223", From 8ebc8bd65491332d71a3c4e495bf9bf14d49cee3 Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 14:09:51 +0000 Subject: [PATCH 06/18] Easier seat deconstruction to provide springs --- data/json/recipes/recipe_deconstruction.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 16ee3ef08f547..8874c3b60cb42 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -2808,16 +2808,18 @@ "category": "CC_NONCRAFT", "subcategory": "CSC_NONCRAFT", "difficulty": 0, - "time": 5000, + "time": 28000, "reversible": true, "autolearn": false, "qualities" : [ - {"id":"CUT","level":1,"amount":1} - ], "tools": [ - [ [ "oxy_torch", 12 ], [ "welder", 25 ], [ "welder_crude", 40 ], [ "toolset", 40 ] ] ], + {"id":"CUT","level":1,"amount":1}, + {"id":"SAW_M","level":1,"amount":1}, + {"id":"SCREW","level":1,"amount":1}, + {"id":"WRENCH","level":1,"amount":1} + ], "components": [ [ [ "pipe", 4 ] ], - [ [ "spring", 2 ] ], + [ [ "spring", 1 ] ], [ [ "leather", 12 ] ] ] }, From ecec340636be85d4bc1682c7eb6a77ee9a675c98 Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 15:47:34 +0000 Subject: [PATCH 07/18] Revert "Easier seat deconstruction to provide springs" This reverts commit 8ebc8bd65491332d71a3c4e495bf9bf14d49cee3. --- data/json/recipes/recipe_deconstruction.json | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 8874c3b60cb42..16ee3ef08f547 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -2808,18 +2808,16 @@ "category": "CC_NONCRAFT", "subcategory": "CSC_NONCRAFT", "difficulty": 0, - "time": 28000, + "time": 5000, "reversible": true, "autolearn": false, "qualities" : [ - {"id":"CUT","level":1,"amount":1}, - {"id":"SAW_M","level":1,"amount":1}, - {"id":"SCREW","level":1,"amount":1}, - {"id":"WRENCH","level":1,"amount":1} - ], + {"id":"CUT","level":1,"amount":1} + ], "tools": [ + [ [ "oxy_torch", 12 ], [ "welder", 25 ], [ "welder_crude", 40 ], [ "toolset", 40 ] ] ], "components": [ [ [ "pipe", 4 ] ], - [ [ "spring", 1 ] ], + [ [ "spring", 2 ] ], [ [ "leather", 12 ] ] ] }, From fc793ba3d87de453b679236cdac6c055a0fa55ae Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 15:59:29 +0000 Subject: [PATCH 08/18] Update 223 ammo weights and volumes --- data/json/items/ammo.json | 19 ++++++------ data/json/items/handloaded_bullets.json | 20 +++++++------ data/json/recipes/recipe_ammo.json | 40 ++++++++++++------------- 3 files changed, 41 insertions(+), 38 deletions(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index a612f10dad69b..4fece95c066bd 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -1353,7 +1353,7 @@ "description" : ".223 Remington ammunition with 36gr JHP bullets. The .223 round has been very popular with civilian shooters for almost a century, finding use in a wide variety of weapons. It generates lower pressure than 5.56 NATO leading to slightly decreased accuracy and recoil.", "material" : ["steel", "powder"], "volume" : 1, - "weight" : 4, + "weight" : 12, "bashing" : 1, "to_hit" : 0, "ammo_type" : "223", @@ -1377,7 +1377,7 @@ "description" : "5.56x45mm ammunition with a 62gr FMJ bullet containing a steel penetrator. Its light weight, high accuracy, and managable recoil lead to widespread use in the 20th century and it remains popular among militaries and civilians.", "material" : ["steel", "powder"], "volume" : 1, - "weight" : 4, + "weight" : 12, "bashing" : 1, "to_hit" : 0, "ammo_type" : "223", @@ -1387,8 +1387,9 @@ "range" : 38, "dispersion" : 60, "recoil" : 480, - "count" : 40, - "effects" : ["COOKOFF", "NEVER_MISFIRES"] + "count" : 30, + "effects" : ["COOKOFF", "NEVER_MISFIRES"], + "stack_size": 20 }, { "type" : "AMMO", "id" : "556_incendiary", @@ -1397,10 +1398,10 @@ "name_plural" : "5.56 NATO tracer", "symbol" : "=", "color" : "yellow", - "description" : "A belt of 5.56 NATO rounds. The ammunition is a one-in-five mix of M855A1 and M856 tracer rounds to help keep the weapon they are fired from on target.", + "description" : "This ammunition is a one-in-five mix of M855A1 and M856 tracer rounds to help keep the weapon they are fired from on target.", "material" : ["steel", "powder"], - "volume" : 3, - "weight" : 5, + "volume" : 1, + "weight" : 12, "bashing" : 1, "to_hit" : 0, "ammo_type" : "223", @@ -1411,8 +1412,8 @@ "dispersion" : 45, "recoil" : 480, "count" : 30, - "stack_size": 100, - "effects" : ["COOKOFF", "INCENDIARY", "NEVER_MISFIRES"] + "effects" : ["COOKOFF", "INCENDIARY", "NEVER_MISFIRES"], + "stack_size": 20 }, { "type" : "AMMO", "id" : "270", diff --git a/data/json/items/handloaded_bullets.json b/data/json/items/handloaded_bullets.json index 2beb27c1d90eb..3097dafc72aaf 100644 --- a/data/json/items/handloaded_bullets.json +++ b/data/json/items/handloaded_bullets.json @@ -859,7 +859,7 @@ "description" : "The .223 rifle round is a civilian variant of the 5.56 NATO round. It is designed to tumble or fragment inside a target, dealing devastating damage. The lower pressure of the .223 compared to the 5.56 results in lower accuracy. This one has been hand-reloaded.", "material" : ["steel", "powder"], "volume" : 1, - "weight" : 4, + "weight" : 12, "bashing" : 1, "ammo_type" : "223", "casing" : "223_casing", @@ -868,8 +868,9 @@ "range" : 36, "dispersion" : 90, "recoil" : 450, - "count" : 40, - "effects" : ["COOKOFF", "RECYCLED"] + "count" : 30, + "effects" : ["COOKOFF", "RECYCLED"], + "stack_size": 20 }, { "type" : "AMMO", @@ -882,7 +883,7 @@ "description" : "This rifle round has enjoyed widespread use in NATO countries, thanks to its very light weight and high damage. It is designed to shatter inside a target, inflicting massive damage. This one has been hand-reloaded.", "material" : ["steel", "powder"], "volume" : 1, - "weight" : 4, + "weight" : 12, "bashing" : 1, "ammo_type" : "223", "casing" : "223_casing", @@ -891,8 +892,9 @@ "range" : 38, "dispersion" : 70, "recoil" : 480, - "count" : 40, - "effects" : ["COOKOFF", "RECYCLED"] + "count" : 30, + "effects" : ["COOKOFF", "RECYCLED"], + "stack_size" : 20 }, { "type" : "AMMO", @@ -902,10 +904,10 @@ "name_plural" : "reloaded 5.56 NATO tracer", "symbol" : "=", "color" : "yellow", - "description" : "A belt of hand-reloaded 5.56 NATO rounds. A hand-made variant of the widely-used 5.56 NATO round, the ammunition is a one-in-five mix of hand-loaded 5.56 FMJ and 5.56 incendiary rounds designed to burn hotly when fired.", + "description" : "A hand-made variant of the widely-used 5.56 NATO round, the ammunition is a one-in-five mix of hand-loaded 5.56 FMJ and 5.56 incendiary rounds designed to burn hotly when fired.", "material" : ["steel", "powder"], "volume" : 1, - "weight" : 5, + "weight" : 12, "bashing" : 1, "ammo_type" : "223", "casing" : "223_casing", @@ -915,7 +917,7 @@ "dispersion" : 75, "recoil" : 495, "count" : 30, - "stack_size": 40, + "stack_size": 20, "effects" : ["COOKOFF", "INCENDIARY", "RECYCLED"] }, { diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json index 9aabb90538df4..23606d85e9812 100644 --- a/data/json/recipes/recipe_ammo.json +++ b/data/json/recipes/recipe_ammo.json @@ -1970,25 +1970,25 @@ ], "components": [ [ - [ "223_casing", 40 ] + [ "223_casing", 30 ] ], [ - [ "smrifle_primer", 40 ] + [ "smrifle_primer", 30 ] ], [ - [ "gunpowder", 160 ] + [ "gunpowder", 120 ] ], [ - ["22_casing", 40 ], + ["22_casing", 30 ], ["cu_pipe", 2] ], [ - [ "lead", 80 ], - [ "gold_small", 80 ] , - [ "silver_small", 80 ], - [ "tin", 80 ], - [ "bismuth", 80 ], - [ "solder_wire", 80 ] + [ "lead", 60 ], + [ "gold_small", 60 ] , + [ "silver_small", 60 ], + [ "tin", 60 ], + [ "bismuth", 60 ], + [ "solder_wire", 60 ] ] ] @@ -2016,25 +2016,25 @@ ], "components": [ [ - [ "223_casing", 40 ] + [ "223_casing", 30 ] ], [ - [ "smrifle_primer", 40 ] + [ "smrifle_primer", 30 ] ], [ - [ "gunpowder", 240 ] + [ "gunpowder", 180 ] ], [ - [ "22_casing", 40 ], + [ "22_casing", 30 ], [ "cu_pipe", 4] ], [ - [ "lead", 80 ], - [ "gold_small", 80 ] , - [ "silver_small", 80 ], - [ "tin", 80 ], - [ "bismuth", 80 ], - [ "solder_wire", 80 ] + [ "lead", 60 ], + [ "gold_small", 60 ] , + [ "silver_small", 60 ], + [ "tin", 60 ], + [ "bismuth", 60 ], + [ "solder_wire", 60 ] ] ] From 0cfae124f0b5249bd9f1836491f4c5a6dca1a67b Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 16:04:26 +0000 Subject: [PATCH 09/18] Reduce reload times for 223 guns with detachable magazines --- data/json/items/ranged.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json index 31ab0e834e754..ce4e44cae0155 100644 --- a/data/json/items/ranged.json +++ b/data/json/items/ranged.json @@ -2146,7 +2146,7 @@ "aim_speed" : 6, "recoil": -60, "durability": 8, - "reload": 500, + "reload": 100, "loudness" : 150, "barrel_length" : 2, "magazines": [ "stanag10", "survivor223mag" ], @@ -2349,7 +2349,7 @@ "recoil": 75, "durability": 8, "burst": 15, - "reload": 500, + "reload": 100, "loudness" : 150, "magazines": [ "stanag30", "stanag10", "stanag50", "survivor223mag" ], "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] @@ -2530,7 +2530,7 @@ "recoil": 60, "durability": 3, "burst": 3, - "reload": 500, + "reload": 100, "loudness" : 150, "magazines" : [ "lw223mag", "lw223bigmag" ], "valid_mod_locations": [[ "accessories", 4 ]] @@ -2561,7 +2561,7 @@ "recoil": -180, "durability": 7, "burst": 5, - "reload": 500, + "reload": 100, "loudness" : 150, "magazines" : [ "lw223mag", "lw223bigmag" ], "valid_mod_locations": [[ "accessories", 2 ]] @@ -2591,7 +2591,7 @@ "recoil": -15, "durability": 8, "burst": 3, - "reload": 475, + "reload": 100, "loudness" : 150, "barrel_length" : 1, "magazines" : [ "stanag30", "stanag10", "stanag50", "survivor223mag" ], @@ -2619,7 +2619,7 @@ "aim_speed" : 6, "recoil": 0, "durability": 7, - "reload": 500, + "reload": 100, "loudness" : 150, "magazines" : [ "stanag30", "stanag10", "stanag50", "survivor223mag" ], "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] @@ -2649,7 +2649,7 @@ "recoil": 30, "durability": 6, "burst": 10, - "reload": 475, + "reload": 100, "loudness" : 150, "magazines" : [ "stanag30", "stanag10", "survivor223mag" ], "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] @@ -2678,7 +2678,7 @@ "recoil": -90, "durability": 7, "burst": 3, - "reload": 500, + "reload": 100, "loudness" : 150, "magazines" : [ "lw223mag", "lw223bigmag" ], "valid_mod_locations": [[ "accessories", 2 ]] @@ -2708,7 +2708,7 @@ "recoil": -60, "durability": 8, "burst": 10, - "reload": 500, + "reload": 100, "loudness" : 150, "magazines" : [ "stanag30", "stanag10", "stanag50", "survivor223mag" ], "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] @@ -2827,7 +2827,7 @@ "recoil": 30, "durability": 8, "burst": 6, - "reload": 600, + "reload": 100, "loudness" : 150, "magazines" : [ "stanag30", "stanag10", "survivor223mag" ], "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] @@ -2856,7 +2856,7 @@ "aim_speed" : 9, "recoil": -150, "durability": 7, - "reload": 500, + "reload": 100, "loudness" : 150, "magazines" : [ "lw223mag", "lw223bigmag" ], "valid_mod_locations": [[ "accessories", 2 ]] @@ -2887,7 +2887,7 @@ "recoil": 120, "durability": 8, "burst": 15, - "reload": 600, + "reload": 100, "loudness" : 150, "magazines" : [ "stanag50", "stanag30", "stanag10" ], "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] @@ -2918,7 +2918,7 @@ "recoil": -165, "durability": 7, "burst": 20, - "reload": 2000, + "reload": 100, "loudness" : 150, "magazines" : [ "lw223bigmag", "lw223mag" ], "valid_mod_locations": [[ "accessories", 2 ]] @@ -2977,7 +2977,7 @@ "recoil": -120, "durability": 8, "burst": 6, - "reload": 550, + "reload": 100, "loudness" : 150, "magazines" : [ "stanag30", "stanag10", "survivor223mag" ], "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] @@ -3007,7 +3007,7 @@ "recoil": 90, "durability": 7, "burst": 30, - "reload": 750, + "reload": 400, "loudness" : 160, "magazines" : [ "stanag50", "stanag30", "belt223" ], "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ]] From 8e4199682ba4e52074e338b1bc8fe467c7d40a24 Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 16:41:25 +0000 Subject: [PATCH 10/18] fix hk416 description --- 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 ce4e44cae0155..11522d55c6e65 100644 --- a/data/json/items/ranged.json +++ b/data/json/items/ranged.json @@ -2868,7 +2868,7 @@ "color": "dark_gray", "name": "M27 IAR", "name_plural": "M27 IAR", - "description": "A H&K416 carbine outfitted with a heavier barrel and an extended magazine to enable higher amounts of suppressive fire while retaining a good degree of mobility.", + "description": "A H&K416 carbine outfitted with a heavier barrel to enable higher amounts of suppressive fire while retaining a good degree of mobility.", "price": 540000, "material": ["steel", "plastic"], "flags": "MODE_BURST", From 82373853f57aa1211fa9038db04f85c8a46e9ed9 Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 16:41:31 +0000 Subject: [PATCH 11/18] m249 accepts 10-round mags --- 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 11522d55c6e65..e3bc5a7dc9c19 100644 --- a/data/json/items/ranged.json +++ b/data/json/items/ranged.json @@ -3009,7 +3009,7 @@ "burst": 30, "reload": 400, "loudness" : 160, - "magazines" : [ "stanag50", "stanag30", "belt223" ], + "magazines" : [ "stanag50", "belt223", "stanag30", "stanag10" ], "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ]] }, { From c8d50ddf3a036a8b70c876566e31c8deea02601a Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 22:24:36 +0000 Subject: [PATCH 12/18] Add 9mm magazines (part 1) --- data/json/items/magazines.json | 137 +++++++++++++++++++++++++++++++-- 1 file changed, 129 insertions(+), 8 deletions(-) diff --git a/data/json/items/magazines.json b/data/json/items/magazines.json index 05ebb18eeafac..b25146756f1cc 100644 --- a/data/json/items/magazines.json +++ b/data/json/items/magazines.json @@ -13,7 +13,10 @@ "capacity" : 30, "reliability" : 8, "reload_time" : 100, - "flags" : [ "COMPACT_MAG" ] + "flags" : [ "COMPACT_MAG" ], + "alternatives" : [ + [ "9mm", [ "mp5mag" ] ] + ] }, { "type" : "MAGAZINE", "id" : "stanag10", @@ -46,7 +49,10 @@ "capacity" : 50, "reliability" : 7, "reload_time" : 200, - "flags" : [ "BULKY_MAG" ] + "flags" : [ "BULKY_MAG" ], + "alternatives" : [ + [ "9mm", [ "mp5bigmag" ] ] + ] }, { "type" : "MAGAZINE", "id" : "survivor223mag", @@ -96,7 +102,10 @@ "capacity" : 32, "reliability" : 9, "reload_time" : 120, - "flags" : [ "COMPACT_MAG" ] + "flags" : [ "COMPACT_MAG" ], + "alternatives" : [ + [ "9mm", [ "lw21mag" ] ] + ] }, { "type" : "MAGAZINE", "id" : "lw223bigmag", @@ -116,23 +125,135 @@ }, { "type" : "MAGAZINE", "id" : "glockmag", - "price" : 4600, + "price" : 2900, "name" : "Glock magazine", "symbol" : "#", "color" : "ltgray", "description" : "A compact light-weight polymer magazine for use with Glock compatible firearms.", "material" : "plastic", "volume" : 1, - "weight" : 60, - "to_hit" : -2, + "weight" : 105, + "ammo_type" : "9mm", + "capacity" : 15, + "reliability" : 8, + "reload_time" : 100, + "flags" : [ "COMPACT_MAG" ], + "alternatives" : [ + [ "45", [ "usp45mag" ] ] + ] + }, + { "type" : "MAGAZINE", + "id" : "glockbigmag", + "price" : 4700, + "name" : "Glock extended magazine", + "symbol" : "#", + "color" : "ltgray", + "description" : "A compact light-weight polymer magazine for use with Glock compatible firearms.", + "material" : "plastic", + "volume" : 2, + "weight" : 210, + "ammo_type" : "9mm", + "capacity" : 30, + "reliability" : 7, + "reload_time" : 140, + "flags" : [ "COMPACT_MAG" ] + }, + { "type" : "MAGAZINE", + "id" : "m9mag", + "price" : 2300, + "name" : "M9 magazine", + "symbol" : "#", + "color" : "ltgray", + "description" : "A military issue 15-round box magazine orginally intended for use with the Beretta M9 handgun.", + "material" : "steel", + "volume" : 1, + "weight" : 135, + "ammo_type" : "9mm", + "capacity" : 15, + "reliability" : 8, + "reload_time" : 100, + "flags" : [ "COMPACT_MAG" ] + }, + { "type" : "MAGAZINE", + "id" : "m9bigmag", + "price" : 3500, + "name" : "M9 extended magazine", + "symbol" : "#", + "color" : "ltgray", + "description" : "A 30-round extended magazine compatible with both the M9 handgun as well as some modern carbines.", + "material" : "steel", + "volume" : 2, + "weight" : 270, + "ammo_type" : "9mm", + "capacity" : 30, + "reliability" : 7, + "reload_time" : 140, + "flags" : [ "COMPACT_MAG" ] + }, + { "type" : "MAGAZINE", + "id" : "usp9mag", + "price" : 3850, + "name" : "USP 9mm magazine", + "symbol" : "#", + "color" : "ltgray", + "description" : "A factory specification 15-round box magazine for use with the dependable H&K USP 9mm pistol.", + "material" : "steel", + "volume" : 1, + "weight" : 75, "ammo_type" : "9mm", "capacity" : 15, "reliability" : 10, - "reload_time" : 40, + "reload_time" : 100, "alternatives" : [ [ "45", [ "usp45mag" ] ] ] }, + { "type" : "MAGAZINE", + "id" : "lw21mag", + "price" : 7600, + "name" : "LW-21 magazine", + "symbol" : "#", + "color" : "ltgray", + "description" : "A 21-round polymer magazine for Leadworks LLC 9mm firearms. Lightweight and reliable but somewhat more difficult to reload.", + "material" : "plastic", + "volume" : 2, + "weight" : 105, + "ammo_type" : "9mm", + "capacity" : 21, + "reliability" : 10, + "reload_time" : 140, + "flags" : [ "COMPACT_MAG" ] + }, + { "type" : "MAGAZINE", + "id" : "mp5mag", + "price" : 4100, + "name" : "MP5 magazine", + "symbol" : "#", + "color" : "ltgray", + "description" : "A standard capacity curved magazine for use with the H&K MP5 SMG.", + "material" : "steel", + "volume" : 2, + "weight" : 210, + "ammo_type" : "9mm", + "capacity" : 30, + "reliability" : 9, + "reload_time" : 100 + }, + { "type" : "MAGAZINE", + "id" : "mp5mag", + "price" : 6920, + "name" : "MP5 extended magazine", + "symbol" : "#", + "color" : "ltgray", + "description" : "An drum magazine for use with the H&K MP5 SMG. Much greater capacity but less reliable the factory specification magazine.", + "material" : "steel", + "volume" : 3, + "weight" : 350, + "ammo_type" : "9mm", + "capacity" : 50, + "reliability" : 8, + "reload_time" : 160 + }, { "type" : "MAGAZINE", "id" : "usp45mag", "price" : 5900, @@ -149,7 +270,7 @@ "reliability" : 10, "reload_time" : 35, "alternatives" : [ - [ "9mm", [ "glockmag" ] ] + [ "9mm", [ "usp9mag" ] ] ] } ] From 0b3045ae24ea18ed2cd1c581145d7637c5b8bdd7 Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 22:24:58 +0000 Subject: [PATCH 13/18] Add 9mm guns (part 1) --- data/json/items/ranged.json | 68 +++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json index e3bc5a7dc9c19..7c79f701f5aab 100644 --- a/data/json/items/ranged.json +++ b/data/json/items/ranged.json @@ -535,12 +535,11 @@ "aim_speed" : 4, "recoil": 90, "durability": 6, - "clip_size": 0, "reload": 300, "loudness" : 150, - "magazines": [ "glockmag" ], - "valid_mod_locations": [[ "accessories", 2 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]], - "default_mods": [ "glockmag" ] + "magazine_well" : 1, + "magazines": [ "glockmag", "glockbigmag" ], + "valid_mod_locations": [[ "accessories", 2 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "usp_9mm", @@ -554,7 +553,7 @@ "material": ["steel", "plastic"], "skill": "pistol", "ammo": "9mm", - "weight": 725, + "weight": 520, "volume": 2, "bashing": 8, "cutting": 0, @@ -565,10 +564,11 @@ "aim_speed" : 4, "recoil": 75, "durability": 9, - "clip_size": 15, - "reload": 350, + "reload": 100, "loudness" : 150, - "valid_mod_locations": [[ "accessories", 2 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "magazine", 2 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] + "magazine_well": 1, + "magazines" : [ "usp9mag" ], + "valid_mod_locations": [[ "accessories", 2 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "l_sp_9mm", @@ -583,8 +583,8 @@ "material": ["steel", "plastic"], "skill": "pistol", "ammo": "9mm", - "weight": 1140, - "volume": 3, + "weight": 935, + "volume": 2, "bashing": 8, "cutting": 0, "to_hit": -2, @@ -595,10 +595,11 @@ "aim_speed" : 4, "recoil": 60, "durability": 9, - "clip_size": 20, - "reload": 400, + "reload": 100, "loudness" : 125, - "valid_mod_locations": [[ "accessories", 2 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "magazine", 2 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] + "magazine_well" : 1, + "magazines" : [ "lw21mag" ], + "valid_mod_locations": [[ "accessories", 2 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "l_mp_9mm", @@ -613,8 +614,8 @@ "material": ["steel", "plastic"], "skill": "pistol", "ammo": "9mm", - "weight": 1170, - "volume": 3, + "weight": 1065, + "volume": 2, "bashing": 8, "cutting": 0, "to_hit": -2, @@ -627,10 +628,11 @@ "durability": 8, "//": "The M93R can go through up to 110 rounds in six seconds, FWIW.", "burst": 3, - "clip_size": 21, - "reload": 425, + "reload": 100, "loudness" : 125, - "valid_mod_locations": [[ "accessories", 2 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "magazine", 2 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] + "magazine_well" : 1, + "magazines" : [ "lw21mag" ], + "valid_mod_locations": [[ "accessories", 2 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "l_lookout_9mm", @@ -1693,8 +1695,8 @@ "flags": "MODE_BURST", "skill": "smg", "ammo": "9mm", - "weight": 2900, - "volume": 7, + "weight": 2550, + "volume": 5, "bashing": 10, "cutting": 0, "to_hit": -2, @@ -1705,10 +1707,10 @@ "recoil": -45, "durability": 8, "burst": 8, - "clip_size": 30, "reload": 400, "loudness" : 150, - "valid_mod_locations": [[ "accessories", 3 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "magazine", 2 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] + "magazines" : [ "mp5mag", "mp5bigmag" ], + "valid_mod_locations": [[ "accessories", 3 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "mac_10", @@ -1921,13 +1923,13 @@ "color": "dark_gray", "name": "Cx4 Storm", "name_plural": "Cx4 Storm", - "description": "A small pistol caliber carbine designed for police use and civilian self-defense, the CX4 Storm uses magazines that are interchangeable with handguns from the Glock series.", + "description": "A small pistol caliber carbine designed for police use and civilian self-defense, the Cx4 Storm uses magazines that are interchangeable with other Beretta 9mm handguns.", "price": 90000, "material": ["steel", "plastic"], "skill": "rifle", "ammo": "9mm", - "weight": 2575, - "volume": 7, + "weight": 2300, + "volume": 6, "bashing": 8, "cutting": 0, "to_hit": -1, @@ -1937,13 +1939,12 @@ "aim_speed" : 5, "recoil": -15, "durability": 10, - "clip_size": 0, "reload": 300, "loudness" : 150, "barrel_length" : 1, - "magazines": [ "glockmag" ], - "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]], - "default_mods": [ "glockmag" ] + "magazine_well" : 1, + "magazines": [ "m9bigmag", "m9mag" ], + "valid_mod_locations": [[ "accessories", 4 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "browning_blr", @@ -2935,7 +2936,7 @@ "material": ["steel", "plastic"], "skill": "pistol", "ammo": "9mm", - "weight": 725, + "weight": 590, "volume": 2, "bashing": 8, "cutting": 0, @@ -2947,10 +2948,11 @@ "aim_speed" : 4, "recoil": 90, "durability": 6, - "clip_size": 15, - "reload": 350, + "reload": 100, "loudness" : 150, - "valid_mod_locations": [[ "accessories", 2 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "magazine", 2 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] + "magazine_well" : 1, + "magazines" : [ "m9mag", "m9bigmag" ], + "valid_mod_locations": [[ "accessories", 2 ],[ "barrel", 1 ],[ "bore", 1 ],[ "conversion", 1 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "muzzle", 1 ],[ "rail", 1 ],[ "sights", 1 ],[ "stock", 1 ],[ "underbarrel", 1 ]] }, { "id": "steyr_aug", From 53515d573ca28a5d689b1e18f640cf8dbb2f635e Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 23:44:30 +0000 Subject: [PATCH 14/18] Add flags to 9mm magazines --- data/json/items/magazines.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/data/json/items/magazines.json b/data/json/items/magazines.json index b25146756f1cc..585e7950e8b50 100644 --- a/data/json/items/magazines.json +++ b/data/json/items/magazines.json @@ -204,6 +204,7 @@ "capacity" : 15, "reliability" : 10, "reload_time" : 100, + "flags" : [ "COMPACT_MAG" ], "alternatives" : [ [ "45", [ "usp45mag" ] ] ] @@ -237,7 +238,8 @@ "ammo_type" : "9mm", "capacity" : 30, "reliability" : 9, - "reload_time" : 100 + "reload_time" : 100, + "flags" : [ "COMPACT_MAG" ], }, { "type" : "MAGAZINE", "id" : "mp5mag", @@ -252,7 +254,8 @@ "ammo_type" : "9mm", "capacity" : 50, "reliability" : 8, - "reload_time" : 160 + "reload_time" : 160, + "flags" : [ "BULKY_MAG" ], }, { "type" : "MAGAZINE", "id" : "usp45mag", From 2bdb6aac29f66b92b19692b2bf2af583cbf87ae0 Mon Sep 17 00:00:00 2001 From: Mugling Date: Sun, 24 Jan 2016 23:46:23 +0000 Subject: [PATCH 15/18] All 9mm stacks in 50's --- data/json/items/ammo.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index 4fece95c066bd..74c20e988ee76 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -757,7 +757,8 @@ "dispersion" : 150, "recoil" : 195, "count" : 50, - "effects" : ["COOKOFF"] + "effects" : ["COOKOFF"], + "stack_size" : 50 }, { "type" : "AMMO", "id" : "9mmP", @@ -827,7 +828,8 @@ "dispersion" : 155, "recoil" : 195, "count" : 50, - "effects" : ["COOKOFF"] + "effects" : ["COOKOFF"], + "stack_size" : 50 }, { "type" : "AMMO", "id" : "9x18mm", From d7b70efca60329ccc37c00861f1cbe9170281aee Mon Sep 17 00:00:00 2001 From: Mugling Date: Mon, 25 Jan 2016 00:25:40 +0000 Subject: [PATCH 16/18] Fix JSON errors --- data/json/items/magazines.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/magazines.json b/data/json/items/magazines.json index 585e7950e8b50..4c428cc7ba904 100644 --- a/data/json/items/magazines.json +++ b/data/json/items/magazines.json @@ -239,7 +239,7 @@ "capacity" : 30, "reliability" : 9, "reload_time" : 100, - "flags" : [ "COMPACT_MAG" ], + "flags" : [ "COMPACT_MAG" ] }, { "type" : "MAGAZINE", "id" : "mp5mag", @@ -255,7 +255,7 @@ "capacity" : 50, "reliability" : 8, "reload_time" : 160, - "flags" : [ "BULKY_MAG" ], + "flags" : [ "BULKY_MAG" ] }, { "type" : "MAGAZINE", "id" : "usp45mag", From b64eb99a4aaf08f8225813d788577c33440b5259 Mon Sep 17 00:00:00 2001 From: Mugling Date: Mon, 25 Jan 2016 12:57:32 +0000 Subject: [PATCH 17/18] Add 9mm magazine drops --- data/json/item_groups.json | 55 +++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/data/json/item_groups.json b/data/json/item_groups.json index 7e9e290331891..dcdf5036cbf7f 100644 --- a/data/json/item_groups.json +++ b/data/json/item_groups.json @@ -2739,7 +2739,13 @@ ["shoulder_strap", 24], ["powered_earmuffs",40], ["stanag10", 10], - ["stanag30", 5] + ["stanag30", 5], + ["stanag10", 10], + ["glockmag", 20], + ["glockbigmag", 3], + ["m9mag", 10], + ["m9bigmag", 1], + ["usp9mag", 10] ] },{ "type" : "item_group", @@ -3680,7 +3686,10 @@ ["3006", 10], ["survnote", 1], ["stanag10", 6], - ["lw223mag", 2] + ["lw223mag", 2], + ["glockmag", 10], + ["mp5mag", 5], + ["lw21mag", 2] ] },{ "type" : "item_group", @@ -3896,7 +3905,15 @@ ["UPS_off", 10], ["stanag30", 10], ["stanag10", 5], - ["lw223mag", 5] + ["lw223mag", 5], + ["lw21mag", 5], + ["glockmag", 5], + ["glockbigmag", 5], + ["m9mag", 5], + ["m9bigmag", 5], + ["usp9mag", 5], + ["mp5mag", 15], + ["mp5bigmag", 5] ] },{ "type" : "item_group", @@ -5222,7 +5239,8 @@ ["kariginu", 2], ["kimono", 3], ["l-stick", 1], - ["stanag10", 2] + ["stanag10", 2], + ["glockmag", 2] ] },{ "type" : "item_group", @@ -5306,7 +5324,11 @@ ["survnote", 1], ["stanag10", 8], ["stanag30", 6], - ["lw223mag", 6] + ["lw223mag", 6], + ["lw21mag", 6], + ["m9mag", 20], + ["m9bigmag", 5], + ["usp9mag", 20] ] },{ "type" : "item_group", @@ -6289,7 +6311,10 @@ ["20x66_flare", 4], ["20x66_inc", 2], ["lw223mag", 20], - ["lw223bigmag", 10] + ["lw223bigmag", 10], + ["lw21mag", 10], + ["mp5mag", 5], + ["mp5bigmag", 3] ] },{ "type" : "item_group", @@ -7648,7 +7673,10 @@ ["survnote", 2], ["robot_controls", 3], ["stanag30", 10], - ["lw223mag", 5] + ["lw223mag", 5], + ["lw21mag", 5], + ["m9mag", 5], + ["usp9mag", 5] ] },{ "type" : "item_group", @@ -7883,7 +7911,11 @@ ["stanag30", 20], ["stanag50", 10], ["lw223mag", 20], - ["lw223bigmag", 10] + ["lw223bigmag", 10], + ["lw21mag", 20], + ["m9mag", 20], + ["m9bigmag", 5], + ["usp9mag", 10] ] },{ "type" : "item_group", @@ -8080,7 +8112,12 @@ ["survnote", 1], ["stanag10", 4], ["stanag30", 2], - ["lw223mag", 1] + ["lw223mag", 1], + ["lw21mag", 1], + ["usp9mag", 2], + ["m9mag", 2], + ["glockmag", 6], + ["glockbigmag",1] ] },{ "type" : "item_group", From 6084f171ee731a4f9239c30866d148177f0a8cff Mon Sep 17 00:00:00 2001 From: Mugling Date: Wed, 27 Jan 2016 22:56:09 +0000 Subject: [PATCH 18/18] Fix duplicate ID --- data/json/items/magazines.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/magazines.json b/data/json/items/magazines.json index 4c428cc7ba904..e722a6c11dd2c 100644 --- a/data/json/items/magazines.json +++ b/data/json/items/magazines.json @@ -242,7 +242,7 @@ "flags" : [ "COMPACT_MAG" ] }, { "type" : "MAGAZINE", - "id" : "mp5mag", + "id" : "mp5bigmag", "price" : 6920, "name" : "MP5 extended magazine", "symbol" : "#",