From 8d6575f96707989fa62cdebca8875566d2be4ccb Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 9 Nov 2021 09:38:02 +0100 Subject: [PATCH] fixed my drunk firearm balancing --- .../hbm/handler/guncfg/Gun12GaugeFactory.java | 16 ++++---- .../hbm/handler/guncfg/Gun20GaugeFactory.java | 28 ++++++------- .../hbm/handler/guncfg/Gun22LRFactory.java | 8 ++-- .../handler/guncfg/Gun357MagnumFactory.java | 30 +++++++------- .../handler/guncfg/Gun44MagnumFactory.java | 32 +++++++-------- .../hbm/handler/guncfg/Gun4GaugeFactory.java | 24 +++++------ .../hbm/handler/guncfg/Gun50AEFactory.java | 16 ++++---- .../hbm/handler/guncfg/Gun50BMGFactory.java | 40 +++++++++---------- .../hbm/handler/guncfg/Gun556mmFactory.java | 34 ++++++++-------- .../com/hbm/handler/guncfg/Gun5mmFactory.java | 16 ++++---- .../hbm/handler/guncfg/Gun75BoltFactory.java | 12 +++--- .../com/hbm/handler/guncfg/Gun9mmFactory.java | 12 +++--- 12 files changed, 135 insertions(+), 133 deletions(-) diff --git a/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java index c462517e6..729da3771 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java @@ -115,8 +115,8 @@ public class Gun12GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); bullet.ammo = ModItems.ammo_12gauge; - bullet.dmgMin = 1; - bullet.dmgMax = 4; + bullet.dmgMin = 5; + bullet.dmgMax = 7; return bullet; } @@ -127,8 +127,8 @@ public class Gun12GaugeFactory { bullet.ammo = ModItems.ammo_12gauge_incendiary; bullet.wear = 15; - bullet.dmgMin = 1; - bullet.dmgMax = 4; + bullet.dmgMin = 5; + bullet.dmgMax = 7; bullet.incendiary = 5; return bullet; @@ -140,8 +140,8 @@ public class Gun12GaugeFactory { bullet.ammo = ModItems.ammo_12gauge_shrapnel; bullet.wear = 15; - bullet.dmgMin = 2; - bullet.dmgMax = 6; + bullet.dmgMin = 10; + bullet.dmgMax = 17; bullet.ricochetAngle = 15; bullet.HBRC = 80; bullet.LBRC = 95; @@ -155,8 +155,8 @@ public class Gun12GaugeFactory { bullet.ammo = ModItems.ammo_12gauge_du; bullet.wear = 20; - bullet.dmgMin = 3; - bullet.dmgMax = 8; + bullet.dmgMin = 18; + bullet.dmgMax = 22; bullet.doesPenetrate = true; bullet.leadChance = 50; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun20GaugeFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun20GaugeFactory.java index 23d784e63..9a78fcafb 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun20GaugeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun20GaugeFactory.java @@ -206,8 +206,8 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); bullet.ammo = ModItems.ammo_20gauge; - bullet.dmgMin = 1; - bullet.dmgMax = 3; + bullet.dmgMin = 3; + bullet.dmgMax = 5; return bullet; } @@ -217,8 +217,8 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.ammo_20gauge_slug; - bullet.dmgMin = 10; - bullet.dmgMax = 15; + bullet.dmgMin = 18; + bullet.dmgMax = 22; bullet.wear = 7; bullet.style = BulletConfiguration.STYLE_NORMAL; @@ -230,8 +230,8 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); bullet.ammo = ModItems.ammo_20gauge_flechette; - bullet.dmgMin = 3; - bullet.dmgMax = 6; + bullet.dmgMin = 8; + bullet.dmgMax = 15; bullet.wear = 15; bullet.style = BulletConfiguration.STYLE_FLECHETTE; bullet.HBRC = 2; @@ -245,8 +245,8 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); bullet.ammo = ModItems.ammo_20gauge_incendiary; - bullet.dmgMin = 1; - bullet.dmgMax = 4; + bullet.dmgMin = 3; + bullet.dmgMax = 6; bullet.wear = 15; bullet.incendiary = 5; @@ -259,8 +259,8 @@ public class Gun20GaugeFactory { bullet.ammo = ModItems.ammo_20gauge_shrapnel; bullet.wear = 15; - bullet.dmgMin = 2; - bullet.dmgMax = 6; + bullet.dmgMin = 7; + bullet.dmgMax = 12; bullet.ricochetAngle = 15; bullet.HBRC = 80; bullet.LBRC = 95; @@ -273,8 +273,8 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); bullet.ammo = ModItems.ammo_20gauge_explosive; - bullet.dmgMin = 6; - bullet.dmgMax = 8; + bullet.dmgMin = 7; + bullet.dmgMax = 12; bullet.wear = 25; bullet.explosive = 0.5F; @@ -286,8 +286,8 @@ public class Gun20GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); bullet.ammo = ModItems.ammo_20gauge_caustic; - bullet.dmgMin = 2; - bullet.dmgMax = 6; + bullet.dmgMin = 3; + bullet.dmgMax = 7; bullet.wear = 25; bullet.caustic = 5; bullet.doesRicochet = false; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun22LRFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun22LRFactory.java index d50a5a02e..5158a693a 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun22LRFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun22LRFactory.java @@ -65,8 +65,8 @@ public class Gun22LRFactory { bullet.ammo = ModItems.ammo_22lr; bullet.spread *= inaccuracy; - bullet.dmgMin = 2; - bullet.dmgMax = 4; + bullet.dmgMin = 6; + bullet.dmgMax = 8; return bullet; } @@ -77,8 +77,8 @@ public class Gun22LRFactory { bullet.ammo = ModItems.ammo_22lr_ap; bullet.spread *= inaccuracy; - bullet.dmgMin = 6; - bullet.dmgMax = 8; + bullet.dmgMin = 12; + bullet.dmgMax = 16; bullet.leadChance = 10; bullet.wear = 15; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun357MagnumFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun357MagnumFactory.java index a8415ca7e..e050b315d 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun357MagnumFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun357MagnumFactory.java @@ -196,8 +196,8 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.gun_revolver_iron_ammo; - bullet.dmgMin = 2; - bullet.dmgMax = 4; + bullet.dmgMin = 8; + bullet.dmgMax = 10; return bullet; } @@ -207,8 +207,8 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.gun_revolver_ammo; - bullet.dmgMin = 3; - bullet.dmgMax = 5; + bullet.dmgMin = 18; + bullet.dmgMax = 22; return bullet; } @@ -218,8 +218,8 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.gun_revolver_lead_ammo; - bullet.dmgMin = 2; - bullet.dmgMax = 3; + bullet.dmgMin = 10; + bullet.dmgMax = 15; bullet.effects = new ArrayList(); bullet.effects.add(new PotionEffect(HbmPotion.radiation.id, 10 * 20, 4)); @@ -232,8 +232,8 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.gun_revolver_gold_ammo; - bullet.dmgMin = 10; - bullet.dmgMax = 15; + bullet.dmgMin = 25; + bullet.dmgMax = 28; return bullet; } @@ -243,8 +243,8 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.ammo_357_desh; - bullet.dmgMin = 15; - bullet.dmgMax = 17; + bullet.dmgMin = 30; + bullet.dmgMax = 33; return bullet; } @@ -266,8 +266,8 @@ public class Gun357MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.gun_revolver_cursed_ammo; - bullet.dmgMin = 12; - bullet.dmgMax = 15; + bullet.dmgMin = 18; + bullet.dmgMax = 25; return bullet; } @@ -278,7 +278,7 @@ public class Gun357MagnumFactory { bullet.ammo = ModItems.gun_revolver_nightmare_ammo; bullet.dmgMin = 1; - bullet.dmgMax = 50; + bullet.dmgMax = 100; return bullet; } @@ -291,8 +291,8 @@ public class Gun357MagnumFactory { bullet.spread *= 10; bullet.bulletsMin = 4; bullet.bulletsMax = 6; - bullet.dmgMin = 50; - bullet.dmgMax = 150; + bullet.dmgMin = 25; + bullet.dmgMax = 100; bullet.doesRicochet = false; bullet.destroysBlocks = true; bullet.style = bullet.STYLE_BOLT; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun44MagnumFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun44MagnumFactory.java index d81216f43..09da3c53d 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun44MagnumFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun44MagnumFactory.java @@ -172,8 +172,8 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.ammo_44; - bullet.dmgMin = 5; - bullet.dmgMax = 7; + bullet.dmgMin = 18; + bullet.dmgMax = 26; return bullet; } @@ -183,8 +183,8 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.ammo_44_ap; - bullet.dmgMin = 7; - bullet.dmgMax = 10; + bullet.dmgMin = 25; + bullet.dmgMax = 32; bullet.wear = 15; bullet.leadChance = 10; @@ -196,8 +196,8 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.ammo_44_du; - bullet.dmgMin = 7; - bullet.dmgMax = 10; + bullet.dmgMin = 28; + bullet.dmgMax = 40; bullet.wear = 25; bullet.leadChance = 50; @@ -209,8 +209,8 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.ammo_44_phosphorus; - bullet.dmgMin = 5; - bullet.dmgMax = 7; + bullet.dmgMin = 18; + bullet.dmgMax = 26; bullet.wear = 15; bullet.incendiary = 5; bullet.doesPenetrate = false; @@ -243,8 +243,8 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.ammo_44_star; - bullet.dmgMin = 14; - bullet.dmgMax = 20; + bullet.dmgMin = 42; + bullet.dmgMax = 50; bullet.wear = 25; bullet.leadChance = 100; @@ -256,8 +256,8 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.ammo_44_pip; - bullet.dmgMin = 4; - bullet.dmgMax = 5; + bullet.dmgMin = 30; + bullet.dmgMax = 36; bullet.wear = 25; bullet.doesPenetrate = false; @@ -293,8 +293,8 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.ammo_44_bj; - bullet.dmgMin = 4; - bullet.dmgMax = 5; + bullet.dmgMin = 30; + bullet.dmgMax = 36; bullet.wear = 25; bullet.doesPenetrate = false; @@ -331,8 +331,8 @@ public class Gun44MagnumFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.ammo_44_silver; - bullet.dmgMin = 4; - bullet.dmgMax = 5; + bullet.dmgMin = 30; + bullet.dmgMax = 36; bullet.wear = 25; bullet.doesPenetrate = false; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java index af804a9a3..687580995 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java @@ -146,8 +146,8 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); bullet.ammo = ModItems.ammo_4gauge; - bullet.dmgMin = 3; - bullet.dmgMax = 6; + bullet.dmgMin = 5; + bullet.dmgMax = 8; bullet.bulletsMin *= 2; bullet.bulletsMax *= 2; @@ -159,8 +159,8 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBulletConfig(); bullet.ammo = ModItems.ammo_4gauge_slug; - bullet.dmgMin = 15; - bullet.dmgMax = 20; + bullet.dmgMin = 25; + bullet.dmgMax = 32; bullet.wear = 7; bullet.style = BulletConfiguration.STYLE_NORMAL; @@ -172,8 +172,8 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); bullet.ammo = ModItems.ammo_4gauge_flechette; - bullet.dmgMin = 5; - bullet.dmgMax = 8; + bullet.dmgMin = 8; + bullet.dmgMax = 15; bullet.bulletsMin *= 2; bullet.bulletsMax *= 2; bullet.wear = 15; @@ -189,8 +189,8 @@ public class Gun4GaugeFactory { BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); bullet.ammo = ModItems.ammo_4gauge_flechette; - bullet.dmgMin = 5; - bullet.dmgMax = 8; + bullet.dmgMin = 8; + bullet.dmgMax = 15; bullet.bulletsMin *= 2; bullet.bulletsMax *= 2; bullet.wear = 15; @@ -231,8 +231,8 @@ public class Gun4GaugeFactory { bullet.ammo = ModItems.ammo_4gauge_explosive; bullet.velocity *= 2; bullet.gravity *= 2; - bullet.dmgMin = 10; - bullet.dmgMax = 15; + bullet.dmgMin = 20; + bullet.dmgMax = 25; bullet.wear = 25; bullet.trail = 1; @@ -280,8 +280,8 @@ public class Gun4GaugeFactory { bullet.ammo = ModItems.ammo_4gauge_balefire; bullet.velocity *= 2; bullet.gravity *= 2; - bullet.dmgMin = 10; - bullet.dmgMax = 15; + bullet.dmgMin = 50; + bullet.dmgMax = 65; bullet.wear = 25; bullet.trail = 1; bullet.explosive = 0.0F; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun50AEFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun50AEFactory.java index 8eaee43b2..dc7d07191 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun50AEFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun50AEFactory.java @@ -58,8 +58,8 @@ public class Gun50AEFactory { bullet.ammo = ModItems.ammo_50ae; bullet.spread *= inaccuracy; - bullet.dmgMin = 15; - bullet.dmgMax = 18; + bullet.dmgMin = 28; + bullet.dmgMax = 32; return bullet; } @@ -70,8 +70,8 @@ public class Gun50AEFactory { bullet.ammo = ModItems.ammo_50ae_ap; bullet.spread *= inaccuracy; - bullet.dmgMin = 20; - bullet.dmgMax = 22; + bullet.dmgMin = 30; + bullet.dmgMax = 36; bullet.leadChance = 10; bullet.wear = 15; @@ -84,8 +84,8 @@ public class Gun50AEFactory { bullet.ammo = ModItems.ammo_50ae_du; bullet.spread *= inaccuracy; - bullet.dmgMin = 24; - bullet.dmgMax = 28; + bullet.dmgMin = 38; + bullet.dmgMax = 46; bullet.leadChance = 50; bullet.wear = 25; @@ -98,8 +98,8 @@ public class Gun50AEFactory { bullet.ammo = ModItems.ammo_50ae_star; bullet.spread *= inaccuracy; - bullet.dmgMin = 48; - bullet.dmgMax = 56; + bullet.dmgMin = 52; + bullet.dmgMax = 60; bullet.leadChance = 100; bullet.wear = 25; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun50BMGFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun50BMGFactory.java index dd2b328b6..e56a4a969 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun50BMGFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun50BMGFactory.java @@ -141,8 +141,8 @@ public class Gun50BMGFactory { bullet.ammo = ModItems.ammo_50bmg; bullet.spread *= inaccuracy; - bullet.dmgMin = 15; - bullet.dmgMax = 18; + bullet.dmgMin = 30; + bullet.dmgMax = 36; return bullet; } @@ -153,8 +153,8 @@ public class Gun50BMGFactory { bullet.ammo = ModItems.ammo_50bmg_incendiary; bullet.spread *= inaccuracy; - bullet.dmgMin = 15; - bullet.dmgMax = 18; + bullet.dmgMin = 30; + bullet.dmgMax = 36; bullet.wear = 15; bullet.incendiary = 5; @@ -167,8 +167,8 @@ public class Gun50BMGFactory { bullet.ammo = ModItems.ammo_50bmg_phosphorus; bullet.spread *= inaccuracy; - bullet.dmgMin = 15; - bullet.dmgMax = 18; + bullet.dmgMin = 30; + bullet.dmgMax = 36; bullet.wear = 15; bullet.incendiary = 5; bullet.doesPenetrate = false; @@ -202,8 +202,8 @@ public class Gun50BMGFactory { bullet.ammo = ModItems.ammo_50bmg_explosive; bullet.spread *= inaccuracy; - bullet.dmgMin = 20; - bullet.dmgMax = 25; + bullet.dmgMin = 60; + bullet.dmgMax = 64; bullet.wear = 25; bullet.explosive = 1; @@ -216,8 +216,8 @@ public class Gun50BMGFactory { bullet.ammo = ModItems.ammo_50bmg_ap; bullet.spread *= inaccuracy; - bullet.dmgMin = 25; - bullet.dmgMax = 30; + bullet.dmgMin = 62; + bullet.dmgMax = 68; bullet.wear = 15; bullet.leadChance = 10; @@ -230,8 +230,8 @@ public class Gun50BMGFactory { bullet.ammo = ModItems.ammo_50bmg_du; bullet.spread *= inaccuracy; - bullet.dmgMin = 40; - bullet.dmgMax = 45; + bullet.dmgMin = 80; + bullet.dmgMax = 86; bullet.wear = 25; bullet.leadChance = 50; @@ -244,8 +244,8 @@ public class Gun50BMGFactory { bullet.ammo = ModItems.ammo_50bmg_star; bullet.spread *= inaccuracy; - bullet.dmgMin = 50; - bullet.dmgMax = 70; + bullet.dmgMin = 98; + bullet.dmgMax = 102; bullet.wear = 25; bullet.leadChance = 100; @@ -308,8 +308,8 @@ public class Gun50BMGFactory { bullet.ammo = ModItems.ammo_50bmg_flechette; bullet.spread *= inaccuracy; - bullet.dmgMin = 20; - bullet.dmgMax = 25; + bullet.dmgMin = 50; + bullet.dmgMax = 54; bullet.style = bullet.STYLE_FLECHETTE; return bullet; @@ -321,8 +321,8 @@ public class Gun50BMGFactory { bullet.ammo = ModItems.ammo_50bmg_flechette_am; bullet.spread *= inaccuracy; - bullet.dmgMin = 50; - bullet.dmgMax = 65; + bullet.dmgMin = 60; + bullet.dmgMax = 64; bullet.style = bullet.STYLE_FLECHETTE; bullet.bHit = new IBulletHitBehavior() { @@ -348,8 +348,8 @@ public class Gun50BMGFactory { bullet.ammo = ModItems.ammo_50bmg_flechette_po; bullet.spread *= inaccuracy; - bullet.dmgMin = 30; - bullet.dmgMax = 40; + bullet.dmgMin = 60; + bullet.dmgMax = 64; bullet.style = bullet.STYLE_FLECHETTE; bullet.bHit = new IBulletHitBehavior() { diff --git a/src/main/java/com/hbm/handler/guncfg/Gun556mmFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun556mmFactory.java index dd0cd93c2..49198fa4c 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun556mmFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun556mmFactory.java @@ -153,8 +153,8 @@ public class Gun556mmFactory { bullet.ammo = ModItems.ammo_556; bullet.spread *= inaccuracy; - bullet.dmgMin = 2; - bullet.dmgMax = 4; + bullet.dmgMin = 16; + bullet.dmgMax = 20; return bullet; } @@ -164,6 +164,8 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556Config(); bullet.ammo = ModItems.ammo_566_gold; + bullet.dmgMin = 250; + bullet.dmgMax = 320; bullet.spread = 0.0F; return bullet; @@ -206,8 +208,8 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556Config(); bullet.ammo = ModItems.ammo_556_ap; - bullet.dmgMin = 4; - bullet.dmgMax = 6; + bullet.dmgMin = 20; + bullet.dmgMax = 26; bullet.wear = 15; bullet.leadChance = 10; @@ -219,8 +221,8 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556Config(); bullet.ammo = ModItems.ammo_556_du; - bullet.dmgMin = 8; - bullet.dmgMax = 10; + bullet.dmgMin = 24; + bullet.dmgMax = 32; bullet.wear = 25; bullet.leadChance = 50; @@ -232,8 +234,8 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556Config(); bullet.ammo = ModItems.ammo_556_star; - bullet.dmgMin = 15; - bullet.dmgMax = 20; + bullet.dmgMin = 30; + bullet.dmgMax = 36; bullet.wear = 25; bullet.leadChance = 100; @@ -245,8 +247,8 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556Config(); bullet.ammo = ModItems.ammo_556_sleek; - bullet.dmgMin = 15; - bullet.dmgMax = 20; + bullet.dmgMin = 45; + bullet.dmgMax = 50; bullet.wear = 10; bullet.leadChance = 100; bullet.doesPenetrate = false; @@ -304,8 +306,8 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556Config(); bullet.ammo = ModItems.ammo_556_flechette; - bullet.dmgMin = 6; - bullet.dmgMax = 8; + bullet.dmgMin = 26; + bullet.dmgMax = 32; bullet.HBRC = 2; bullet.LBRC = 95; bullet.wear = 15; @@ -360,8 +362,8 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556FlechetteConfig(); bullet.ammo = ModItems.ammo_556_flechette_du; - bullet.dmgMin = 12; - bullet.dmgMax = 16; + bullet.dmgMin = 46; + bullet.dmgMax = 52; bullet.wear = 25; bullet.leadChance = 50; bullet.doesPenetrate = true; @@ -374,8 +376,8 @@ public class Gun556mmFactory { BulletConfiguration bullet = get556FlechetteConfig(); bullet.ammo = ModItems.ammo_556_flechette_sleek; - bullet.dmgMin = 12; - bullet.dmgMax = 16; + bullet.dmgMin = 45; + bullet.dmgMax = 50; bullet.wear = 10; bullet.leadChance = 50; bullet.doesPenetrate = false; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun5mmFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun5mmFactory.java index 559d8d28a..fb5890a7e 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun5mmFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun5mmFactory.java @@ -83,8 +83,8 @@ public class Gun5mmFactory { bullet.ammo = ModItems.ammo_5mm; bullet.spread *= inaccuracy; - bullet.dmgMin = 3; - bullet.dmgMax = 5; + bullet.dmgMin = 12; + bullet.dmgMax = 14; return bullet; } @@ -95,8 +95,8 @@ public class Gun5mmFactory { bullet.ammo = ModItems.ammo_5mm_explosive; bullet.spread *= inaccuracy; - bullet.dmgMin = 4; - bullet.dmgMax = 7; + bullet.dmgMin = 30; + bullet.dmgMax = 32; bullet.explosive = 1F; bullet.wear = 25; @@ -109,8 +109,8 @@ public class Gun5mmFactory { bullet.ammo = ModItems.ammo_5mm_du; bullet.spread *= inaccuracy; - bullet.dmgMin = 6; - bullet.dmgMax = 10; + bullet.dmgMin = 36; + bullet.dmgMax = 40; bullet.wear = 25; bullet.leadChance = 50; @@ -123,8 +123,8 @@ public class Gun5mmFactory { bullet.ammo = ModItems.ammo_5mm_star; bullet.spread *= inaccuracy; - bullet.dmgMin = 12; - bullet.dmgMax = 20; + bullet.dmgMin = 46; + bullet.dmgMax = 50; bullet.wear = 25; bullet.leadChance = 100; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun75BoltFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun75BoltFactory.java index 215d24b35..6a2ceb71b 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun75BoltFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun75BoltFactory.java @@ -91,8 +91,8 @@ public class Gun75BoltFactory { bullet.ammo = ModItems.ammo_75bolt; bullet.ammoCount = 30; bullet.spread *= inaccuracy; - bullet.dmgMin = 24; - bullet.dmgMax = 32; + bullet.dmgMin = 74; + bullet.dmgMax = 82; bullet.doesRicochet = false; bullet.explosive = 0.25F; @@ -129,8 +129,8 @@ public class Gun75BoltFactory { bullet.ammo = ModItems.ammo_75bolt_incendiary; bullet.ammoCount = 30; bullet.spread *= inaccuracy; - bullet.dmgMin = 26; - bullet.dmgMax = 36; + bullet.dmgMin = 72; + bullet.dmgMax = 76; bullet.doesRicochet = false; bullet.explosive = 0.25F; @@ -167,8 +167,8 @@ public class Gun75BoltFactory { bullet.ammo = ModItems.ammo_75bolt_he; bullet.ammoCount = 30; bullet.spread *= inaccuracy; - bullet.dmgMin = 32; - bullet.dmgMax = 48; + bullet.dmgMin = 94; + bullet.dmgMax = 100; bullet.doesRicochet = false; bullet.explosive = 2.5F; bullet.blockDamage = false; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun9mmFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun9mmFactory.java index 2bb880a9f..aae7fb0f3 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun9mmFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun9mmFactory.java @@ -81,8 +81,8 @@ public class Gun9mmFactory { bullet.ammo = ModItems.ammo_9mm; bullet.spread *= inaccuracy; - bullet.dmgMin = 2; - bullet.dmgMax = 4; + bullet.dmgMin = 10; + bullet.dmgMax = 14; return bullet; } @@ -93,8 +93,8 @@ public class Gun9mmFactory { bullet.ammo = ModItems.ammo_9mm_ap; bullet.spread *= inaccuracy; - bullet.dmgMin = 6; - bullet.dmgMax = 8; + bullet.dmgMin = 18; + bullet.dmgMax = 20; bullet.leadChance = 10; bullet.wear = 15; @@ -107,8 +107,8 @@ public class Gun9mmFactory { bullet.ammo = ModItems.ammo_9mm_du; bullet.spread *= inaccuracy; - bullet.dmgMin = 6; - bullet.dmgMax = 8; + bullet.dmgMin = 22; + bullet.dmgMax = 26; bullet.leadChance = 50; bullet.wear = 25;