From 2496db32dbef489d82b35cbd5851a1f0140d31da Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Mon, 23 Sep 2019 14:47:28 +0700 Subject: [PATCH 01/29] 2 new weapon added DSR-50 and PGM Hecate II --- data/json/items/gun/50.json | 48 +++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index f0c2cf9e4ece7..868dbbce73c31 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -109,5 +109,53 @@ "magazine_well": 1, "magazines": [ [ "50", [ "as50mag" ] ] ], "flags": [ "NEVER_JAMS" ] + }, + { + "id": "dsr50", + "copy-from": "rifle_base", + "type": "GUN", + "name": "DSR-50", + "description": "Bullpup, Bolt-Action anti-material rifle made by DSR-Precision, successor of DSR-1, the bullpup design make this weapon balanced and manageable.", + "weight": "10300 g", + "volume": "3100 ml", + "price": 12500000, + "to-hit": -1, + "bashing": 12, + "material": "steel", + "ammo": "50", + "range": 50, + "ranged_damage": -5, + "dispersion": 110, + "durability": 8, + "reload": 450, + "barrel_length": 5, + "default_mods": [ "recoil_stock", "rifle_scope", "muzzle_brake", "bipod" ], + "magazine_well": 1, + "magazine": [ [ "50", [ "dsr50mag" ] ] ], + "flags": [ "NEVER_JAMS" ] + }, + { + "id": "hecate2", + "copy-from": "rifle_base", + "type": "GUN", + "name": "PGM Hecate II", + "description": "Bolt-Action anti-material rifle made by PGM Precision. standard sniper rifle of French Army, this is the biggest weapon ever made by PGM Precision.", + "weight": "13300 g", + "volume": "3600 ml", + "price": 13500000, + "to-hit": -2, + "bashing": 13, + "material": "steel", + "ammo": "50", + "range": 45, + "ranged_damage": -5, + "dispersion": 100, + "durability": 8, + "reload": 400, + "barrel_length": 5, + "default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ], + "magazine_well": 1, + "magazine": [ [ "50", [ "hecate2mag" ] ] ], + "flags": [ "NEVER_JAMS" ] } ] From 997563aee10dc4d1bc38c277f6d0b608f546deed Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Mon, 23 Sep 2019 15:03:59 +0700 Subject: [PATCH 02/29] 2 new magazine --- data/json/items/magazine/50.json | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/data/json/items/magazine/50.json b/data/json/items/magazine/50.json index 9d7db5dc9596c..34e6a9b6fc9f3 100644 --- a/data/json/items/magazine/50.json +++ b/data/json/items/magazine/50.json @@ -44,5 +44,39 @@ "reliability": 9, "reload_time": 110, "flags": [ "MAG_BULKY" ] + }, + { + "id": "dsr50mag", + "type": "MAGAZINE", + "name": "DSR-50 Magazine", + "description": "3-Round box magazine for DSR-50.", + "weight": "470 g", + "volume": "500 ml", + "price": 15000, + "material": "steel", + "symbol": "#", + "color": "dark_gray", + "ammo_type": "50", + "capacity": 3, + "reliability": 9, + "reload_time": 150, + "flags": [ "MAG_BULKY" ] + }, + { + "id": "hecate2mag", + "type": "MAGAZINE", + "name": "Hecate II Magazine", + "description": "7-Round box magazine for PGM Hecate II", + "weight": "560 g", + "volume": "500 ml", + "price": 15000, + "material": "steel", + "symbol": "#", + "color": "dark_gray", + "ammo_type": "50", + "capacity": 7, + "reliability": 8, + "reload_time": 150, + "flags": [ "MAG_BULKY" ] } ] From ed173549bbc53dfcd20212fd55b60b747ba3348f Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Mon, 23 Sep 2019 15:07:50 +0700 Subject: [PATCH 03/29] Update guns.json --- data/json/itemgroups/guns.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index d097d34eeb874..0ab0fb3ef81c0 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -227,6 +227,8 @@ { "item": "h&k416a5", "prob": 50, "charges-min": 0, "charges-max": 30 }, { "item": "m107a1", "prob": 30, "charges-min": 0, "charges-max": 10 }, { "item": "as50", "prob": 20, "charges-min": 0, "charges-max": 10 }, + { "item": "dsr50", "prob": 20, "charges-min": 0, "charges-max": 3 }, + { "item": "hecate2", "prob": 20, "charges-min": 0, "charges-max": 7 }, { "item": "m134", "prob": 10, "charges-min": 0, "charges-max": 100 }, { "item": "m14ebr", "prob": 10, "charges-min": 0, "charges-max": 20 }, { "item": "m2010", "prob": 20, "charges-min": 0, "charges-max": 5 }, From d5c2da6dac4d002d30df18935c9083f658096fd4 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Mon, 23 Sep 2019 15:11:51 +0700 Subject: [PATCH 04/29] Update magazines.json --- data/json/itemgroups/magazines.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/json/itemgroups/magazines.json b/data/json/itemgroups/magazines.json index f308f7b991632..0929a41ce1e7b 100644 --- a/data/json/itemgroups/magazines.json +++ b/data/json/itemgroups/magazines.json @@ -22,6 +22,8 @@ [ "hk46bigmag", 5 ], [ "m107a1mag", 50 ], [ "as50mag", 50 ], + [ "dsr50mag", 50 ], + [ "hecate2mag", 50 ], [ "m2010mag", 10 ], [ "scarhmag", 50 ], [ "scarhbigmag", 20 ], From 1d6f2c97b0884b923a62c758150fcce3d9be28c9 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Mon, 23 Sep 2019 18:24:58 +0700 Subject: [PATCH 05/29] fix description Co-Authored-By: Anton Burmistrov --- data/json/items/gun/50.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index 868dbbce73c31..7b0dfef872807 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -115,7 +115,7 @@ "copy-from": "rifle_base", "type": "GUN", "name": "DSR-50", - "description": "Bullpup, Bolt-Action anti-material rifle made by DSR-Precision, successor of DSR-1, the bullpup design make this weapon balanced and manageable.", + "description": "Bolt-action anti-materiel rifle made by DSR-Precision, successor of DSR-1. The bullpup design make this weapon balanced and manageable.", "weight": "10300 g", "volume": "3100 ml", "price": 12500000, From 50030f0798a54e82a0abc80216204dc3e572f60e Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Mon, 23 Sep 2019 18:26:28 +0700 Subject: [PATCH 06/29] fix capital misplacement. Co-Authored-By: Anton Burmistrov --- data/json/items/magazine/50.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/magazine/50.json b/data/json/items/magazine/50.json index 34e6a9b6fc9f3..5a8a290693364 100644 --- a/data/json/items/magazine/50.json +++ b/data/json/items/magazine/50.json @@ -49,7 +49,7 @@ "id": "dsr50mag", "type": "MAGAZINE", "name": "DSR-50 Magazine", - "description": "3-Round box magazine for DSR-50.", + "description": "3-round box magazine for DSR-50.", "weight": "470 g", "volume": "500 ml", "price": 15000, From 9cebe40e1970cf54e6d512bc7aaf20f7c8549f89 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Mon, 23 Sep 2019 18:27:25 +0700 Subject: [PATCH 07/29] fix capital misplacement 2 Co-Authored-By: Anton Burmistrov --- data/json/items/magazine/50.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/magazine/50.json b/data/json/items/magazine/50.json index 5a8a290693364..4d857ff82d874 100644 --- a/data/json/items/magazine/50.json +++ b/data/json/items/magazine/50.json @@ -65,7 +65,7 @@ { "id": "hecate2mag", "type": "MAGAZINE", - "name": "Hecate II Magazine", + "name": "Hecate II magazine", "description": "7-Round box magazine for PGM Hecate II", "weight": "560 g", "volume": "500 ml", From dc6ce82cdc85aa41bb44004645a814c5cbdfb4f5 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Mon, 23 Sep 2019 18:36:00 +0700 Subject: [PATCH 08/29] fix magazine price (added "price_postapoc" ) --- data/json/items/magazine/50.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/json/items/magazine/50.json b/data/json/items/magazine/50.json index 4d857ff82d874..92ec0cabf2b66 100644 --- a/data/json/items/magazine/50.json +++ b/data/json/items/magazine/50.json @@ -52,7 +52,8 @@ "description": "3-round box magazine for DSR-50.", "weight": "470 g", "volume": "500 ml", - "price": 15000, + "price": 3000000, + "price_postapoc": 1500000, "material": "steel", "symbol": "#", "color": "dark_gray", @@ -69,7 +70,8 @@ "description": "7-Round box magazine for PGM Hecate II", "weight": "560 g", "volume": "500 ml", - "price": 15000, + "price": 4000000, + "price_postapoc": 2000000, "material": "steel", "symbol": "#", "color": "dark_gray", From 597575c6d7f6f444d9b7935cdb188102b78e3360 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Mon, 23 Sep 2019 18:38:23 +0700 Subject: [PATCH 09/29] capital fix Co-Authored-By: Anton Burmistrov --- data/json/items/magazine/50.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/magazine/50.json b/data/json/items/magazine/50.json index 92ec0cabf2b66..ad6e106d524b1 100644 --- a/data/json/items/magazine/50.json +++ b/data/json/items/magazine/50.json @@ -67,7 +67,7 @@ "id": "hecate2mag", "type": "MAGAZINE", "name": "Hecate II magazine", - "description": "7-Round box magazine for PGM Hecate II", + "description": "7-round box magazine for PGM Hecate II.", "weight": "560 g", "volume": "500 ml", "price": 4000000, From fbd605dfba06486963d583ecc15b40e8a7cc7f04 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Mon, 23 Sep 2019 18:41:09 +0700 Subject: [PATCH 10/29] capital fix 2 Co-Authored-By: Anton Burmistrov --- data/json/items/gun/50.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index 7b0dfef872807..027e55c4253bd 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -139,7 +139,7 @@ "copy-from": "rifle_base", "type": "GUN", "name": "PGM Hecate II", - "description": "Bolt-Action anti-material rifle made by PGM Precision. standard sniper rifle of French Army, this is the biggest weapon ever made by PGM Precision.", + "description": "Bolt-action anti-materiel rifle made by PGM Precision. Standard sniper rifle of French Army, this is the biggest weapon ever made by PGM Precision.", "weight": "13300 g", "volume": "3600 ml", "price": 13500000, From 1647db9b9d3809724e38bbe56de806a4494ab313 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Mon, 23 Sep 2019 18:42:03 +0700 Subject: [PATCH 11/29] magazine capital fix Co-Authored-By: Anton Burmistrov --- data/json/items/magazine/50.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/magazine/50.json b/data/json/items/magazine/50.json index ad6e106d524b1..4fb377ee8a784 100644 --- a/data/json/items/magazine/50.json +++ b/data/json/items/magazine/50.json @@ -48,7 +48,7 @@ { "id": "dsr50mag", "type": "MAGAZINE", - "name": "DSR-50 Magazine", + "name": "DSR-50 magazine", "description": "3-round box magazine for DSR-50.", "weight": "470 g", "volume": "500 ml", From 13977c2ddfe53feca768723331a8633b84da01c0 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Mon, 23 Sep 2019 19:24:11 +0700 Subject: [PATCH 12/29] price fix --- data/json/items/magazine/50.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/magazine/50.json b/data/json/items/magazine/50.json index 4fb377ee8a784..fbe8748cfdc34 100644 --- a/data/json/items/magazine/50.json +++ b/data/json/items/magazine/50.json @@ -52,7 +52,7 @@ "description": "3-round box magazine for DSR-50.", "weight": "470 g", "volume": "500 ml", - "price": 3000000, + "price": 2000000, "price_postapoc": 1500000, "material": "steel", "symbol": "#", @@ -70,7 +70,7 @@ "description": "7-round box magazine for PGM Hecate II.", "weight": "560 g", "volume": "500 ml", - "price": 4000000, + "price": 3500000, "price_postapoc": 2000000, "material": "steel", "symbol": "#", From f894292f0e33f3c63b1cbbd175db6df7e59ab7ac Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Tue, 24 Sep 2019 00:51:31 +0700 Subject: [PATCH 13/29] price fix 2 (based on current 50 BMG price) --- data/json/items/magazine/50.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/magazine/50.json b/data/json/items/magazine/50.json index fbe8748cfdc34..688395a32635b 100644 --- a/data/json/items/magazine/50.json +++ b/data/json/items/magazine/50.json @@ -52,8 +52,8 @@ "description": "3-round box magazine for DSR-50.", "weight": "470 g", "volume": "500 ml", - "price": 2000000, - "price_postapoc": 1500000, + "price": 63000, + "price_postapoc": 43000, "material": "steel", "symbol": "#", "color": "dark_gray", @@ -70,8 +70,8 @@ "description": "7-round box magazine for PGM Hecate II.", "weight": "560 g", "volume": "500 ml", - "price": 3500000, - "price_postapoc": 2000000, + "price": 63000, + "price_postapoc": 47000, "material": "steel", "symbol": "#", "color": "dark_gray", From 7a3cc0e1fdc28c2dd5e06fd482e9c2beedfbb309 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Tue, 24 Sep 2019 04:50:52 +0700 Subject: [PATCH 14/29] change to weapon's range --- data/json/items/gun/50.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index 027e55c4253bd..61cdba29ebc91 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -123,7 +123,7 @@ "bashing": 12, "material": "steel", "ammo": "50", - "range": 50, + "range": 45, "ranged_damage": -5, "dispersion": 110, "durability": 8, From e0e47d47a81502b403a430657f4bacbff3c729d6 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Tue, 24 Sep 2019 15:08:28 +0700 Subject: [PATCH 15/29] weapon change (requested) --- data/json/items/gun/50.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index 61cdba29ebc91..3eed02a79a63a 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -111,13 +111,13 @@ "flags": [ "NEVER_JAMS" ] }, { - "id": "dsr50", + "id": "tac50", "copy-from": "rifle_base", "type": "GUN", - "name": "DSR-50", - "description": "Bolt-action anti-materiel rifle made by DSR-Precision, successor of DSR-1. The bullpup design make this weapon balanced and manageable.", - "weight": "10300 g", - "volume": "3100 ml", + "name": "Mcmillan TAC-50", + "description": "Long-range anti-materiel, and anti-personnel sniper rifle made by Mcmillan Firearms. this weapon has made many records for longest kill range.", + "weight": "11800 g", + "volume": "2185 ml", "price": 12500000, "to-hit": -1, "bashing": 12, @@ -125,23 +125,23 @@ "ammo": "50", "range": 45, "ranged_damage": -5, - "dispersion": 110, + "dispersion": 180, "durability": 8, "reload": 450, "barrel_length": 5, "default_mods": [ "recoil_stock", "rifle_scope", "muzzle_brake", "bipod" ], "magazine_well": 1, - "magazine": [ [ "50", [ "dsr50mag" ] ] ], + "magazine": [ [ "50", [ "tac50mag" ] ] ], "flags": [ "NEVER_JAMS" ] }, { - "id": "hecate2", + "id": "ar50", "copy-from": "rifle_base", "type": "GUN", - "name": "PGM Hecate II", - "description": "Bolt-action anti-materiel rifle made by PGM Precision. Standard sniper rifle of French Army, this is the biggest weapon ever made by PGM Precision.", - "weight": "13300 g", - "volume": "3600 ml", + "name": "ArmaLite AR-50", + "description": "Single-shot, bolt-action rifle made by ArmaLite, with great accuracy at long-range and manageable recoil makes this weapon a powerful choice.", + "weight": "15500 g", + "volume": "1511 ml", "price": 13500000, "to-hit": -2, "bashing": 13, @@ -149,13 +149,13 @@ "ammo": "50", "range": 45, "ranged_damage": -5, - "dispersion": 100, + "dispersion": 140, "durability": 8, "reload": 400, "barrel_length": 5, - "default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ], + "default_mods": [ "bipod", "rifle_scope", "muzzle_brake", "recoil_stock" ], "magazine_well": 1, - "magazine": [ [ "50", [ "hecate2mag" ] ] ], + "magazine": [ [ "50", [ "ar50mag" ] ] ], "flags": [ "NEVER_JAMS" ] } ] From 89d476e679b42e84a2a8bc1d1e19b38055dc2777 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Tue, 24 Sep 2019 15:12:31 +0700 Subject: [PATCH 16/29] magazine change (requested) --- data/json/items/magazine/50.json | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/data/json/items/magazine/50.json b/data/json/items/magazine/50.json index 688395a32635b..10c1e7344ce36 100644 --- a/data/json/items/magazine/50.json +++ b/data/json/items/magazine/50.json @@ -46,10 +46,10 @@ "flags": [ "MAG_BULKY" ] }, { - "id": "dsr50mag", + "id": "tac50mag", "type": "MAGAZINE", - "name": "DSR-50 magazine", - "description": "3-round box magazine for DSR-50.", + "name": "TAC-50 magazine", + "description": "5-round box magazine for Mcmillan TAC-50.", "weight": "470 g", "volume": "500 ml", "price": 63000, @@ -58,27 +58,9 @@ "symbol": "#", "color": "dark_gray", "ammo_type": "50", - "capacity": 3, + "capacity": 5, "reliability": 9, "reload_time": 150, "flags": [ "MAG_BULKY" ] - }, - { - "id": "hecate2mag", - "type": "MAGAZINE", - "name": "Hecate II magazine", - "description": "7-round box magazine for PGM Hecate II.", - "weight": "560 g", - "volume": "500 ml", - "price": 63000, - "price_postapoc": 47000, - "material": "steel", - "symbol": "#", - "color": "dark_gray", - "ammo_type": "50", - "capacity": 7, - "reliability": 8, - "reload_time": 150, - "flags": [ "MAG_BULKY" ] } ] From 44e4ff30520220ee78e974be331ac51874f76b3e Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Tue, 24 Sep 2019 15:17:13 +0700 Subject: [PATCH 17/29] final touch (requested) --- data/json/items/gun/50.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index 3eed02a79a63a..dcf8848524744 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -154,8 +154,7 @@ "reload": 400, "barrel_length": 5, "default_mods": [ "bipod", "rifle_scope", "muzzle_brake", "recoil_stock" ], - "magazine_well": 1, - "magazine": [ [ "50", [ "ar50mag" ] ] ], - "flags": [ "NEVER_JAMS" ] + "clip_size": 1, + "flags": [ "NEVER_JAMS", "RELOAD_ONE" ] } ] From dfa30dae9c998f2f9ec5d4dbec6ba1ef0e3b807e Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Tue, 24 Sep 2019 16:11:40 +0700 Subject: [PATCH 18/29] description fix Co-Authored-By: Tonkatsu --- data/json/items/gun/50.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index dcf8848524744..133d6c125b962 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -139,7 +139,7 @@ "copy-from": "rifle_base", "type": "GUN", "name": "ArmaLite AR-50", - "description": "Single-shot, bolt-action rifle made by ArmaLite, with great accuracy at long-range and manageable recoil makes this weapon a powerful choice.", + "description": "A single-shot, bolt-action rifle made by ArmaLite, with great accuracy at long-range and manageable recoil. Affordable pricing and excellent performance make this weapon a popular choice.", "weight": "15500 g", "volume": "1511 ml", "price": 13500000, From bb1b6cc702643d670a87c08583b94109a596b8cb Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Tue, 24 Sep 2019 16:19:22 +0700 Subject: [PATCH 19/29] change request --- data/json/items/gun/50.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index 133d6c125b962..589ace89c54b2 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -118,14 +118,14 @@ "description": "Long-range anti-materiel, and anti-personnel sniper rifle made by Mcmillan Firearms. this weapon has made many records for longest kill range.", "weight": "11800 g", "volume": "2185 ml", - "price": 12500000, + "price": 870000, "to-hit": -1, "bashing": 12, "material": "steel", "ammo": "50", "range": 45, "ranged_damage": -5, - "dispersion": 180, + "dispersion": 50, "durability": 8, "reload": 450, "barrel_length": 5, @@ -142,18 +142,18 @@ "description": "A single-shot, bolt-action rifle made by ArmaLite, with great accuracy at long-range and manageable recoil. Affordable pricing and excellent performance make this weapon a popular choice.", "weight": "15500 g", "volume": "1511 ml", - "price": 13500000, + "price": 302900, "to-hit": -2, "bashing": 13, "material": "steel", "ammo": "50", "range": 45, "ranged_damage": -5, - "dispersion": 140, + "dispersion": 95, "durability": 8, "reload": 400, "barrel_length": 5, - "default_mods": [ "bipod", "rifle_scope", "muzzle_brake", "recoil_stock" ], + "default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ], "clip_size": 1, "flags": [ "NEVER_JAMS", "RELOAD_ONE" ] } From e763ab526c10e2a4e7aa5cc11a6f2c7d99616175 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Tue, 24 Sep 2019 16:21:25 +0700 Subject: [PATCH 20/29] description fix Co-Authored-By: Tonkatsu --- data/json/items/gun/50.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index 589ace89c54b2..668a6e9cb0289 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -115,7 +115,7 @@ "copy-from": "rifle_base", "type": "GUN", "name": "Mcmillan TAC-50", - "description": "Long-range anti-materiel, and anti-personnel sniper rifle made by Mcmillan Firearms. this weapon has made many records for longest kill range.", + "description": "A long-range anti-materiel, and anti-personnel sniper rifle made by McMillan Firearms, serving the Canadian Army since 2000 as the C15, and the Navy Seals as the Mk 15 Mod 0. This .50 caliber bolt-action rifle is capable of defeating light vehicles, radar installations and crew served weapons at extreme distances. It notably holds the longest range confirmed sniper kill, as well as the 4th and 5th longest.", "weight": "11800 g", "volume": "2185 ml", "price": 870000, From 9ed11783d22ab3303188ae7bc294da6794de7d85 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Tue, 24 Sep 2019 16:52:26 +0700 Subject: [PATCH 21/29] itemgroup change --- data/json/itemgroups/guns.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index 0ab0fb3ef81c0..54f3ee6396517 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -227,8 +227,8 @@ { "item": "h&k416a5", "prob": 50, "charges-min": 0, "charges-max": 30 }, { "item": "m107a1", "prob": 30, "charges-min": 0, "charges-max": 10 }, { "item": "as50", "prob": 20, "charges-min": 0, "charges-max": 10 }, - { "item": "dsr50", "prob": 20, "charges-min": 0, "charges-max": 3 }, - { "item": "hecate2", "prob": 20, "charges-min": 0, "charges-max": 7 }, + { "item": "tac50", "prob": 20, "charges-min": 0, "charges-max": 5 }, + { "item": "ar50", "prob": 20, "charges-min": 0, "charges-max": 1 }, { "item": "m134", "prob": 10, "charges-min": 0, "charges-max": 100 }, { "item": "m14ebr", "prob": 10, "charges-min": 0, "charges-max": 20 }, { "item": "m2010", "prob": 20, "charges-min": 0, "charges-max": 5 }, From c22e0b99dbebeeb54b0c921c1fed6a6c8f130ef3 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Tue, 24 Sep 2019 16:53:31 +0700 Subject: [PATCH 22/29] magazine itemgroup change --- data/json/itemgroups/magazines.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/json/itemgroups/magazines.json b/data/json/itemgroups/magazines.json index 0929a41ce1e7b..3bb3bbcfc4af7 100644 --- a/data/json/itemgroups/magazines.json +++ b/data/json/itemgroups/magazines.json @@ -22,8 +22,7 @@ [ "hk46bigmag", 5 ], [ "m107a1mag", 50 ], [ "as50mag", 50 ], - [ "dsr50mag", 50 ], - [ "hecate2mag", 50 ], + [ "tac50mag", 50 ], [ "m2010mag", 10 ], [ "scarhmag", 50 ], [ "scarhbigmag", 20 ], From dc458cc1ac7010e42ded62453580dcfa39da9a42 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Tue, 24 Sep 2019 17:44:31 +0700 Subject: [PATCH 23/29] itemgroup re-adjustment --- data/json/itemgroups/guns.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index 54f3ee6396517..b063a03eb2cd4 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -176,6 +176,7 @@ { "item": "cx4", "prob": 45, "charges-min": 0, "charges-max": 15 }, { "item": "ksub2000", "prob": 30, "charges-min": 0, "charges-max": 15 }, { "item": "m1a", "prob": 50, "charges-min": 0, "charges-max": 5 }, + { "item": "ar50", "prob": 40, "charges-min": 0, "charges-max": 1 }, { "item": "marlin_9a", "prob": 80, "charges-min": 0, "charges-max": 19 }, { "item": "mosin44", "prob": 15, "charges-min": 0, "charges-max": 5 }, { "item": "mosin91_30", "prob": 25, "charges-min": 0, "charges-max": 5 }, @@ -204,6 +205,8 @@ { "item": "l_mbr_223", "prob": 10, "charges-min": 0, "charges-max": 32 }, { "item": "l_long_45", "prob": 30, "charges-min": 0, "charges-max": 12 }, { "item": "m14ebr", "prob": 15, "charges-min": 0, "charges-max": 20 }, + { "item": "ar50", "prob": 15, "charges-min": 0, "charges-max": 1 }, + { "item": "as50", "prob": 20, "charges-min": 0, "charges-max": 10 }, { "item": "M24", "prob": 15, "charges-min": 0, "charges-max": 20 }, { "item": "m4a1", "prob": 45, "charges-min": 0, "charges-max": 30 }, { "item": "m1903", "prob": 15, "charges-min": 0, "charges-max": 5 }, @@ -226,9 +229,7 @@ "items": [ { "item": "h&k416a5", "prob": 50, "charges-min": 0, "charges-max": 30 }, { "item": "m107a1", "prob": 30, "charges-min": 0, "charges-max": 10 }, - { "item": "as50", "prob": 20, "charges-min": 0, "charges-max": 10 }, { "item": "tac50", "prob": 20, "charges-min": 0, "charges-max": 5 }, - { "item": "ar50", "prob": 20, "charges-min": 0, "charges-max": 1 }, { "item": "m134", "prob": 10, "charges-min": 0, "charges-max": 100 }, { "item": "m14ebr", "prob": 10, "charges-min": 0, "charges-max": 20 }, { "item": "m2010", "prob": 20, "charges-min": 0, "charges-max": 5 }, From 30a749618bc8c6cf4b96fc568a7abe0b5d4ecece Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Wed, 25 Sep 2019 01:46:16 +0700 Subject: [PATCH 24/29] probability adjustment --- data/json/itemgroups/guns.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index b063a03eb2cd4..9b9f28309da5c 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -176,7 +176,7 @@ { "item": "cx4", "prob": 45, "charges-min": 0, "charges-max": 15 }, { "item": "ksub2000", "prob": 30, "charges-min": 0, "charges-max": 15 }, { "item": "m1a", "prob": 50, "charges-min": 0, "charges-max": 5 }, - { "item": "ar50", "prob": 40, "charges-min": 0, "charges-max": 1 }, + { "item": "ar50", "prob": 4, "charges-min": 0, "charges-max": 1 }, { "item": "marlin_9a", "prob": 80, "charges-min": 0, "charges-max": 19 }, { "item": "mosin44", "prob": 15, "charges-min": 0, "charges-max": 5 }, { "item": "mosin91_30", "prob": 25, "charges-min": 0, "charges-max": 5 }, From 177cbdab45c68a99caec9d8976e1325c9aaec1ed Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Wed, 25 Sep 2019 05:31:08 +0700 Subject: [PATCH 25/29] small bit of change --- data/json/itemgroups/guns.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index 9b9f28309da5c..5c1f8992f9f9d 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -176,7 +176,7 @@ { "item": "cx4", "prob": 45, "charges-min": 0, "charges-max": 15 }, { "item": "ksub2000", "prob": 30, "charges-min": 0, "charges-max": 15 }, { "item": "m1a", "prob": 50, "charges-min": 0, "charges-max": 5 }, - { "item": "ar50", "prob": 4, "charges-min": 0, "charges-max": 1 }, + { "item": "ar50", "prob": 5, "charges-min": 0, "charges-max": 1 }, { "item": "marlin_9a", "prob": 80, "charges-min": 0, "charges-max": 19 }, { "item": "mosin44", "prob": 15, "charges-min": 0, "charges-max": 5 }, { "item": "mosin91_30", "prob": 25, "charges-min": 0, "charges-max": 5 }, From da99ab5440715e8e4746bf9b4673efe2fc82388a Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Thu, 26 Sep 2019 07:59:26 +0700 Subject: [PATCH 26/29] moved AS-50 to obscure category --- data/json/itemgroups/guns.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index 8817363c17c5a..45914d960fe69 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -206,7 +206,6 @@ { "item": "l_long_45", "prob": 30, "charges-min": 0, "charges-max": 12 }, { "item": "m14ebr", "prob": 15, "charges-min": 0, "charges-max": 20 }, { "item": "ar50", "prob": 15, "charges-min": 0, "charges-max": 1 }, - { "item": "as50", "prob": 20, "charges-min": 0, "charges-max": 10 }, { "item": "M24", "prob": 15, "charges-min": 0, "charges-max": 20 }, { "item": "m4a1", "prob": 45, "charges-min": 0, "charges-max": 30 }, { "item": "m1903", "prob": 15, "charges-min": 0, "charges-max": 5 }, @@ -269,6 +268,7 @@ { "item": "ak74", "prob": 60, "charges-min": 0, "charges-max": 30 }, { "item": "an94", "prob": 40, "charges-min": 0, "charges-max": 30 }, { "item": "bh_m89", "prob": 20, "charges-min": 0, "charges-max": 7 }, + { "item": "as50", "prob": 20, "charges-min": 0, "charges-max": 10 }, { "item": "carbine_flintlock", "prob": 140 }, { "item": "rifle_flintlock", "prob": 180 }, { "item": "steyr_aug", "prob": 40, "charges-min": 0, "charges-max": 30 }, From fae5ccc6781d85bfb9b97992e8d5af8fc1515551 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Thu, 26 Sep 2019 08:29:22 +0700 Subject: [PATCH 27/29] removed AS 50 from group. --- data/json/itemgroups/guns.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index 45914d960fe69..84a6f0ddd9e92 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -268,7 +268,6 @@ { "item": "ak74", "prob": 60, "charges-min": 0, "charges-max": 30 }, { "item": "an94", "prob": 40, "charges-min": 0, "charges-max": 30 }, { "item": "bh_m89", "prob": 20, "charges-min": 0, "charges-max": 7 }, - { "item": "as50", "prob": 20, "charges-min": 0, "charges-max": 10 }, { "item": "carbine_flintlock", "prob": 140 }, { "item": "rifle_flintlock", "prob": 180 }, { "item": "steyr_aug", "prob": 40, "charges-min": 0, "charges-max": 30 }, From 207c74e3f3ee8b6104aa622a97e03cd7de4d30ee Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Thu, 26 Sep 2019 08:32:32 +0700 Subject: [PATCH 28/29] Removed AS 50 --- data/json/items/gun/50.json | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index 668a6e9cb0289..9b0b696da7f41 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -86,30 +86,6 @@ "relative": { "weight": -21500, "volume": -6, "price": -1210000, "ranged_damage": -4, "dispersion": 60, "barrel_length": -1 }, "flags": [ "RELOAD_EJECT" ] }, - { - "id": "as50", - "copy-from": "rifle_base", - "type": "GUN", - "name": "AI AS50", - "description": ".50 caliber anti-material rifle made by Accuracy International. with high accuracy for long range target and high fire rate, this weapon is still being used by Greek national guard.", - "weight": "14000 g", - "volume": "3500 ml", - "price": 1500000, - "to-hit": -1, - "bashing": 13, - "material": "steel", - "ammo": "50", - "range": 45, - "ranged_damage": -5, - "dispersion": 80, - "durability": 7, - "reload": 400, - "barrel_length": 5, - "default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ], - "magazine_well": 1, - "magazines": [ [ "50", [ "as50mag" ] ] ], - "flags": [ "NEVER_JAMS" ] - }, { "id": "tac50", "copy-from": "rifle_base", From eec4d06f38bbcae946d502033fb859bd50485f20 Mon Sep 17 00:00:00 2001 From: RickyVanz <45474242+RickyVanz@users.noreply.github.com> Date: Thu, 26 Sep 2019 08:35:26 +0700 Subject: [PATCH 29/29] AS 50 magazine removal --- data/json/itemgroups/magazines.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/itemgroups/magazines.json b/data/json/itemgroups/magazines.json index 711faf788218b..b280d8224ccb0 100644 --- a/data/json/itemgroups/magazines.json +++ b/data/json/itemgroups/magazines.json @@ -21,7 +21,6 @@ [ "hk46mag", 15 ], [ "hk46bigmag", 5 ], [ "m107a1mag", 50 ], - [ "as50mag", 10 ], [ "tac50mag", 10 ], [ "m2010mag", 10 ], [ "scarhmag", 50 ],