Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extended range bracket bug fix #6547 #6747

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Extended range bracket bug fix #6547 #6747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fcc86ba
Extreme range fix - Inner Sphere weapons only - Clan weapons WIP at t…
BLR-IIC Mar 22, 2025
e2db7bd
Extreme range fix - Inner Sphere weapons only - Clan weapons WIP at t…
BLR-IIC Mar 22, 2025
b171758
Extreme range fix - Clan weapons only
BLR-IIC Mar 22, 2025
8005720
Remove underwater extreme range comment for Clan ER micro laser
BLR-IIC Mar 22, 2025
dbacade
Identified more weapons with underwater ranges that were uneven and a…
BLR-IIC Mar 22, 2025
bca7ce7
Merge branch 'master' into Extended-Range-Bracket-Bug-Fix-#6547
Scoppio Mar 25, 2025
ca5a9e2
Merge branch 'master' into Extended-Range-Bracket-Bug-Fix-#6547
Scoppio Apr 1, 2025
d710f3e
Identified more weapons with underwater ranges that were uneven and a…
BLR-IIC Apr 5, 2025
fce146c
Merge remote-tracking branch 'origin/Extended-Range-Bracket-Bug-Fix-#…
BLR-IIC Apr 5, 2025
355dd48
Merge branch 'master' into Extended-Range-Bracket-Bug-Fix-#6547
Scoppio Apr 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/artillery/LongTomCannon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public LongTomCannon() {
shortRange = 6;
mediumRange = 13;
longRange = 20;
extremeRange = 26;
extremeRange = 30;
shortAV = 20;
medAV = 20;
longAV = 20;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/artillery/ThumperCannon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public ThumperCannon() {
shortRange = 4;
mediumRange = 9;
longRange = 14;
extremeRange = 18;
extremeRange = 21;
tonnage = 10;
criticals = 7;
bv = 41;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/autocannons/CLProtoMekAC2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public CLProtoMekAC2() {
shortRange = 7;
mediumRange = 14;
longRange = 20;
extremeRange = 28;
extremeRange = 30;
tonnage = 3.5;
criticals = 2;
bv = 34;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/autocannons/CLProtoMekAC8.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public CLProtoMekAC8() {
shortRange = 3;
mediumRange = 7;
longRange = 10;
extremeRange = 14;
extremeRange = 15;
tonnage = 5.5;
criticals = 4;
bv = 66;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/autocannons/CLRAC2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public CLRAC2() {
shortRange = 8;
mediumRange = 17;
longRange = 25;
extremeRange = 34;
extremeRange = 37;
tonnage = 8.0;
criticals = 4;
bv = 161;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/autocannons/ISHVAC10.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public ISHVAC10() {
shortRange = 6;
mediumRange = 12;
longRange = 20;
extremeRange = 24;
extremeRange = 30;
tonnage = 14.0;
criticals = 6;
bv = 158;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/autocannons/ISHVAC2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public ISHVAC2() {
shortRange = 10;
mediumRange = 20;
longRange = 35;
extremeRange = 40;
extremeRange = 52;
tonnage = 8.0;
criticals = 2;
bv = 53;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/autocannons/ISHVAC5.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public ISHVAC5() {
shortRange = 8;
mediumRange = 16;
longRange = 28;
extremeRange = 32;
extremeRange = 42;
tonnage = 12.0;
criticals = 4;
bv = 109;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/autocannons/ISUAC2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public ISUAC2() {
shortRange = 8;
mediumRange = 17;
longRange = 25;
extremeRange = 34;
extremeRange = 37;
tonnage = 7.0;
criticals = 3;
bv = 56;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/autocannons/ISUAC20.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public ISUAC20() {
shortRange = 3;
mediumRange = 7;
longRange = 10;
extremeRange = 14;
extremeRange = 15;
tonnage = 15.0;
criticals = 10;
bv = 281;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/autocannons/ISUAC5.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public ISUAC5() {
shortRange = 6;
mediumRange = 13;
longRange = 20;
extremeRange = 26;
extremeRange = 30;
tonnage = 9.0;
criticals = 5;
bv = 112;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/CLBACompactNarc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public CLBACompactNarc() {
shortRange = 2;
mediumRange = 4;
longRange = 5;
extremeRange = 8;
extremeRange = 7;
bv = 16;
flags = flags.or(F_NO_FIRES).or(F_BA_WEAPON).andNot(F_MEK_WEAPON).andNot(F_TANK_WEAPON).andNot(F_AERO_WEAPON).andNot(F_PROTO_WEAPON);
tonnage = .15;
Expand Down
4 changes: 2 additions & 2 deletions megamek/src/megamek/common/weapons/battlearmor/CLBAERPulseLaserMedium.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ public CLBAERPulseLaserMedium() {
shortRange = 5;
mediumRange = 9;
longRange = 14;
extremeRange = 18;
extremeRange = 21;
waterShortRange = 3;
waterMediumRange = 5;
waterLongRange = 8;
waterExtremeRange = 10;
waterExtremeRange = 12;
tonnage = .8;
criticals = 4;
bv = 117;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/CLBAERPulseLaserSmall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public CLBAERPulseLaserSmall() {
waterShortRange = 1;
waterMediumRange = 2;
waterLongRange = 4;
waterExtremeRange = 4;
waterExtremeRange = 6;
tonnage = .55;
criticals = 2;
bv = 36;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/CLBALBX.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public CLBALBX() {
shortRange = 2;
mediumRange = 5;
longRange = 8;
extremeRange = 10;
extremeRange = 12;
tonnage = 0.4;
criticals = 2;
toHitModifier = -1;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/CLBALaserERMedium.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public CLBALaserERMedium() {
waterShortRange = 3;
waterMediumRange = 7;
waterLongRange = 10;
waterExtremeRange = 14;
waterExtremeRange = 15;
tonnage = .8;
criticals = 3;
bv = 108;
Expand Down
4 changes: 2 additions & 2 deletions megamek/src/megamek/common/weapons/battlearmor/CLBALaserERMicro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ public CLBALaserERMicro() {
shortRange = 1;
mediumRange = 2;
longRange = 4;
extremeRange = 4;
extremeRange = 6;
waterShortRange = 1;
waterMediumRange = 2;
waterLongRange = 2;
waterExtremeRange = 4;
waterExtremeRange = 2;
tonnage = 0.15;
criticals = 1;
flags = flags.or(F_NO_FIRES).or(F_BA_WEAPON).andNot(F_MEK_WEAPON).andNot(F_TANK_WEAPON).andNot(F_AERO_WEAPON)
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/CLBALaserERSmall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public CLBALaserERSmall() {
waterShortRange = 1;
waterMediumRange = 2;
waterLongRange = 4;
waterExtremeRange = 4;
waterExtremeRange = 6;
tonnage = 0.35;
criticals = 2;
flags = flags.or(F_NO_FIRES).or(F_BA_WEAPON).andNot(F_MEK_WEAPON).andNot(F_TANK_WEAPON).andNot(F_AERO_WEAPON).andNot(F_PROTO_WEAPON);
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/CLBALaserHeavySmall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public CLBALaserHeavySmall() {
waterShortRange = 1;
waterMediumRange = 2;
waterLongRange = 2;
waterExtremeRange = 4;
waterExtremeRange = 2;
tonnage = 0.5;
criticals = 3;
bv = 15;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/CLBALaserSmall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public CLBALaserSmall() {
waterShortRange = 1;
waterMediumRange = 2;
waterLongRange = 2;
waterExtremeRange = 4;
waterExtremeRange = 2;
tonnage = 0.2;
criticals = 1;
flags = flags.or(F_NO_FIRES).or(F_BA_WEAPON).andNot(F_MEK_WEAPON).andNot(F_TANK_WEAPON)
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/CLBAMGBearhunterSuperheavy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public CLBAMGBearhunterSuperheavy() {
shortRange = 0;
mediumRange = 1;
longRange = 2;
extremeRange = 2;
extremeRange = 3;
tonnage = 0.15;
criticals = 2;
bv = 4;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/CLBAPulseLaserMedium.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public CLBAPulseLaserMedium() {
waterShortRange = 3;
waterMediumRange = 5;
waterLongRange = 8;
waterExtremeRange = 10;
waterExtremeRange = 12;
tonnage = .8;
criticals = 3;
bv = 111;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/CLBAPulseLaserMicro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public CLBAPulseLaserMicro() {
waterShortRange = 1;
waterMediumRange = 2;
waterLongRange = 2;
waterExtremeRange = 4;
waterExtremeRange = 2;
tonnage = 0.160;
criticals = 1;
flags = flags.or(F_NO_FIRES).or(F_BURST_FIRE).or(F_BA_WEAPON).andNot(F_MEK_WEAPON)
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/CLBAPulseLaserSmall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public CLBAPulseLaserSmall() {
waterShortRange = 1;
waterMediumRange = 2;
waterLongRange = 4;
waterExtremeRange = 4;
waterExtremeRange = 6;
tonnage = .4;
criticals = 1;
bv = 24;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/CLBASupportPPC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public CLBASupportPPC() {
waterShortRange = 1;
waterMediumRange = 3;
waterLongRange = 5;
waterExtremeRange = 6;
waterExtremeRange = 7;
bv = 14;
tonnage = 0.240;
criticals = 2;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBACompactNarc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public ISBACompactNarc() {
shortRange = 2;
mediumRange = 4;
longRange = 5;
extremeRange = 8;
extremeRange = 7;
bv = 16;
flags = flags.or(F_NO_FIRES).or(F_BA_WEAPON).andNot(F_MEK_WEAPON).andNot(F_TANK_WEAPON)
.andNot(F_AERO_WEAPON).andNot(F_PROTO_WEAPON);
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBAGaussRifleDavidLight.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public ISBAGaussRifleDavidLight() {
shortRange = 3;
mediumRange = 5;
longRange = 8;
extremeRange = 10;
extremeRange = 12;
bv = 7;
tonnage = 0.1;
criticals = 1;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBAGaussRifleGrandMauler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public ISBAGaussRifleGrandMauler() {
shortRange = 2;
mediumRange = 4;
longRange = 5;
extremeRange = 8;
extremeRange = 7;
tonnage = 0.125;
cost = 8000;
criticals = 2;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBAGaussRifleTsunami.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public ISBAGaussRifleTsunami() {
shortRange = 2;
mediumRange = 4;
longRange = 5;
extremeRange = 8;
extremeRange = 7;
tonnage = 0.125;
criticals = 2;
cost = 9500;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBALaserERMedium.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public ISBALaserERMedium() {
waterShortRange = 3;
waterMediumRange = 5;
waterLongRange = 8;
waterExtremeRange = 10;
waterExtremeRange = 12;
tonnage = 0.8;
criticals = 3;
bv = 62;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBALaserERSmall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public ISBALaserERSmall() {
shortRange = 2;
mediumRange = 4;
longRange = 5;
extremeRange = 8;
extremeRange = 7;
waterShortRange = 1;
waterMediumRange = 2;
waterLongRange = 3;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBALaserPulseSmall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public ISBALaserPulseSmall() {
waterShortRange = 1;
waterMediumRange = 2;
waterLongRange = 2;
waterExtremeRange = 4;
waterExtremeRange = 2;
tonnage = 0.4;
criticals = 1;
bv = 12;
Expand Down
3 changes: 2 additions & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBALaserSmall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ public ISBALaserSmall() {
extremeRange = 4;
waterShortRange = 1;
waterMediumRange = 2;
waterExtremeRange = 4;
waterLongRange = 2;
waterExtremeRange = 2;
tonnage = 0.2;
criticals = 1;
flags = flags.or(F_NO_FIRES).or(F_BA_WEAPON).andNot(F_MEK_WEAPON).andNot(F_TANK_WEAPON).andNot(F_AERO_WEAPON).andNot(F_PROTO_WEAPON);
Expand Down
4 changes: 2 additions & 2 deletions megamek/src/megamek/common/weapons/battlearmor/ISBALaserVSPMedium.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ public ISBALaserVSPMedium() {
shortRange = 2;
mediumRange = 5;
longRange = 9;
extremeRange = 10;
extremeRange = 13;
waterShortRange = 1;
waterMediumRange = 3;
waterLongRange = 6;
waterExtremeRange = 6;
waterExtremeRange = 9;
damageShort = 9;
damageMedium = 7;
damageLong = 5;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBAMRM1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public ISBAMRM1() {
this.shortRange = 3;
this.mediumRange = 8;
this.longRange = 15;
this.extremeRange = 16;
this.extremeRange = 22;
this.bv = 9;
cost = 5000;
tonnage = .06;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBAMRM1OS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public ISBAMRM1OS() {
shortRange = 3;
mediumRange = 8;
longRange = 15;
extremeRange = 16;
extremeRange = 22;
bv = 2;
cost = 2500;
tonnage = .05;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBAMRM2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public ISBAMRM2() {
this.shortRange = 3;
this.mediumRange = 8;
this.longRange = 15;
this.extremeRange = 16;
this.extremeRange = 22;
this.bv = 9;
cost = 10000;
tonnage = .12;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBAMRM2OS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public ISBAMRM2OS() {
shortRange = 3;
mediumRange = 8;
longRange = 15;
extremeRange = 16;
extremeRange = 22;
bv = 3;
cost = 5000;
tonnage = .1;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBAMRM3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public ISBAMRM3() {
this.shortRange = 3;
this.mediumRange = 8;
this.longRange = 15;
this.extremeRange = 16;
this.extremeRange = 22;
this.bv = 18;
cost = 15000;
tonnage = .18;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBAMRM3OS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public ISBAMRM3OS() {
shortRange = 3;
mediumRange = 8;
longRange = 15;
extremeRange = 16;
extremeRange = 22;
bv = 4;
cost = 7500;
tonnage = .15;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBAMRM4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public ISBAMRM4() {
this.shortRange = 3;
this.mediumRange = 8;
this.longRange = 15;
this.extremeRange = 16;
this.extremeRange = 22;
this.bv = 23;
cost = 20000;
tonnage = .24;
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/battlearmor/ISBAMRM4OS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public ISBAMRM4OS() {
shortRange = 3;
mediumRange = 8;
longRange = 15;
extremeRange = 16;
extremeRange = 22;
bv = 45;
cost = 10000;
tonnage = .2;
Expand Down
Loading