From 3ae86eb17eeac107d9672edf57d356d9c20f20dd Mon Sep 17 00:00:00 2001 From: HammerGS Date: Tue, 14 Nov 2023 11:28:04 -0700 Subject: [PATCH] + Data: Correcting various Prototype weapon BVs. --- megamek/docs/history.txt | 1 + .../megamek/common/weapons/battlearmor/ISBASupportPPC.java | 2 +- .../common/weapons/prototypes/CLStreakSRM4Prototype.java | 2 +- .../common/weapons/prototypes/CLStreakSRM6Prototype.java | 2 +- .../common/weapons/prototypes/ISERLaserLargePrototype.java | 4 ++-- .../megamek/common/weapons/prototypes/ISNarcPrototype.java | 2 +- .../common/weapons/prototypes/ISPulseLaserLargePrototype.java | 2 +- .../weapons/prototypes/ISPulseLaserMediumPrototype.java | 2 +- .../common/weapons/prototypes/ISPulseLaserSmallPrototype.java | 2 +- .../src/megamek/common/weapons/prototypes/PrototypeRL10.java | 2 +- .../src/megamek/common/weapons/prototypes/PrototypeRL15.java | 2 +- .../src/megamek/common/weapons/prototypes/PrototypeRL20.java | 2 +- 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/megamek/docs/history.txt b/megamek/docs/history.txt index 14f8f2c8e78..27810fb9cb2 100644 --- a/megamek/docs/history.txt +++ b/megamek/docs/history.txt @@ -12,6 +12,7 @@ VERSION HISTORY: + PR #4875: Done and skip buttons handle changes in GUI Scale better + Issue #4861: Fix for RAC and UAC ammo bingo state hanging game + PR #4853: Fixes MekHQ #3594, MekHQ #3773 ++ Data: Correcting various Prototype weapon BVs. 0.49.15 (2023-10-21 1530 UTC) diff --git a/megamek/src/megamek/common/weapons/battlearmor/ISBASupportPPC.java b/megamek/src/megamek/common/weapons/battlearmor/ISBASupportPPC.java index c19c1424955..28b6738a00e 100644 --- a/megamek/src/megamek/common/weapons/battlearmor/ISBASupportPPC.java +++ b/megamek/src/megamek/common/weapons/battlearmor/ISBASupportPPC.java @@ -45,7 +45,7 @@ public ISBASupportPPC() { criticals = 2; flags = flags.or(F_BA_WEAPON).andNot(F_MECH_WEAPON).andNot(F_TANK_WEAPON) .andNot(F_AERO_WEAPON).andNot(F_PROTO_WEAPON); - bv = 12; + bv = 14; cost = 14000; rulesRefs = "267, TM"; techAdvancement.setTechBase(TechAdvancement.TECH_BASE_IS) diff --git a/megamek/src/megamek/common/weapons/prototypes/CLStreakSRM4Prototype.java b/megamek/src/megamek/common/weapons/prototypes/CLStreakSRM4Prototype.java index 7d487b09708..1f6ae4fb3d8 100644 --- a/megamek/src/megamek/common/weapons/prototypes/CLStreakSRM4Prototype.java +++ b/megamek/src/megamek/common/weapons/prototypes/CLStreakSRM4Prototype.java @@ -47,7 +47,7 @@ public CLStreakSRM4Prototype() { extremeRange = 12; tonnage = 3.0; criticals = 2; - bv = 39; + bv = 59; cost = 60000; shortAV = 4; maxRange = RANGE_SHORT; diff --git a/megamek/src/megamek/common/weapons/prototypes/CLStreakSRM6Prototype.java b/megamek/src/megamek/common/weapons/prototypes/CLStreakSRM6Prototype.java index fb5bda385b8..df58c306b04 100644 --- a/megamek/src/megamek/common/weapons/prototypes/CLStreakSRM6Prototype.java +++ b/megamek/src/megamek/common/weapons/prototypes/CLStreakSRM6Prototype.java @@ -47,7 +47,7 @@ public CLStreakSRM6Prototype() { extremeRange = 12; tonnage = 4.5; criticals = 2; - bv = 59; + bv = 89; cost = 120000; shortAV = 8; maxRange = RANGE_SHORT; diff --git a/megamek/src/megamek/common/weapons/prototypes/ISERLaserLargePrototype.java b/megamek/src/megamek/common/weapons/prototypes/ISERLaserLargePrototype.java index dffb4957f20..34e315c310e 100644 --- a/megamek/src/megamek/common/weapons/prototypes/ISERLaserLargePrototype.java +++ b/megamek/src/megamek/common/weapons/prototypes/ISERLaserLargePrototype.java @@ -40,7 +40,7 @@ public ISERLaserLargePrototype() { shortName = "ER Large Laser (P)"; toHitModifier = 1; flags = flags.or(F_PROTOTYPE); - heat = 18; + heat = 12; damage = 8; shortRange = 7; mediumRange = 14; @@ -56,7 +56,7 @@ public ISERLaserLargePrototype() { maxRange = RANGE_LONG; tonnage = 5.0; criticals = 2; - bv = 163; + bv = 136; cost = 600000; rulesRefs = "103, IO"; flags = flags.or(F_PROTOTYPE); diff --git a/megamek/src/megamek/common/weapons/prototypes/ISNarcPrototype.java b/megamek/src/megamek/common/weapons/prototypes/ISNarcPrototype.java index 4225f21f20b..e98126f0698 100644 --- a/megamek/src/megamek/common/weapons/prototypes/ISNarcPrototype.java +++ b/megamek/src/megamek/common/weapons/prototypes/ISNarcPrototype.java @@ -37,7 +37,7 @@ public ISNarcPrototype() { this.extremeRange = 12; this.tonnage = 3.0; this.criticals = 2; - this.bv = 30; + this.bv = 15; this.cost = 300000; flags = flags.or(F_PROTOTYPE); rulesRefs = "71, IO"; diff --git a/megamek/src/megamek/common/weapons/prototypes/ISPulseLaserLargePrototype.java b/megamek/src/megamek/common/weapons/prototypes/ISPulseLaserLargePrototype.java index 22d7911d067..3557777d4e3 100644 --- a/megamek/src/megamek/common/weapons/prototypes/ISPulseLaserLargePrototype.java +++ b/megamek/src/megamek/common/weapons/prototypes/ISPulseLaserLargePrototype.java @@ -50,7 +50,7 @@ public ISPulseLaserLargePrototype() { waterExtremeRange = 10; tonnage = 7.0; criticals = 2; - bv = 119; + bv = 108; cost = 875000; shortAV = 9; medAV = 9; diff --git a/megamek/src/megamek/common/weapons/prototypes/ISPulseLaserMediumPrototype.java b/megamek/src/megamek/common/weapons/prototypes/ISPulseLaserMediumPrototype.java index f1893ab1db7..10be4938dc1 100644 --- a/megamek/src/megamek/common/weapons/prototypes/ISPulseLaserMediumPrototype.java +++ b/megamek/src/megamek/common/weapons/prototypes/ISPulseLaserMediumPrototype.java @@ -65,7 +65,7 @@ public ISPulseLaserMediumPrototype() { waterExtremeRange = 6; tonnage = 2.0; criticals = 1; - bv = 48; + bv = 43; cost = 300000; rulesRefs = "71, IO"; techAdvancement.setTechBase(TECH_BASE_IS) diff --git a/megamek/src/megamek/common/weapons/prototypes/ISPulseLaserSmallPrototype.java b/megamek/src/megamek/common/weapons/prototypes/ISPulseLaserSmallPrototype.java index eab025a5cb1..1d5f7789be5 100644 --- a/megamek/src/megamek/common/weapons/prototypes/ISPulseLaserSmallPrototype.java +++ b/megamek/src/megamek/common/weapons/prototypes/ISPulseLaserSmallPrototype.java @@ -51,7 +51,7 @@ public ISPulseLaserSmallPrototype() { this.waterExtremeRange = 4; this.tonnage = 1.0; this.criticals = 1; - this.bv = 12; + this.bv = 11; this.cost = 80000; this.shortAV = 3; this.maxRange = RANGE_SHORT; diff --git a/megamek/src/megamek/common/weapons/prototypes/PrototypeRL10.java b/megamek/src/megamek/common/weapons/prototypes/PrototypeRL10.java index c88e948f1a1..3a9f528b81d 100644 --- a/megamek/src/megamek/common/weapons/prototypes/PrototypeRL10.java +++ b/megamek/src/megamek/common/weapons/prototypes/PrototypeRL10.java @@ -35,7 +35,7 @@ public PrototypeRL10() { extremeRange = 22; tonnage = .5; criticals = 1; - bv = 17; + bv = 15; cost = 15000; shortAV = 6; medAV = 6; diff --git a/megamek/src/megamek/common/weapons/prototypes/PrototypeRL15.java b/megamek/src/megamek/common/weapons/prototypes/PrototypeRL15.java index 168469e3410..9b6c00a42cc 100644 --- a/megamek/src/megamek/common/weapons/prototypes/PrototypeRL15.java +++ b/megamek/src/megamek/common/weapons/prototypes/PrototypeRL15.java @@ -36,7 +36,7 @@ public PrototypeRL15() { extremeRange = 18; tonnage = 1.0; criticals = 2; - bv = 21; + bv = 18; cost = 30000; shortAV = 9; medAV = 9; diff --git a/megamek/src/megamek/common/weapons/prototypes/PrototypeRL20.java b/megamek/src/megamek/common/weapons/prototypes/PrototypeRL20.java index deb20c06b8d..30f37bf7a1c 100644 --- a/megamek/src/megamek/common/weapons/prototypes/PrototypeRL20.java +++ b/megamek/src/megamek/common/weapons/prototypes/PrototypeRL20.java @@ -36,7 +36,7 @@ public PrototypeRL20() { extremeRange = 14; tonnage = 1.5; criticals = 3; - bv = 22; + bv = 19; cost = 45000; shortAV = 12; medAV = 12;