From e4391390d3a6af740195ae04a563edd1700b7947 Mon Sep 17 00:00:00 2001 From: sleet01 Date: Mon, 8 Jan 2024 16:07:55 -0800 Subject: [PATCH 1/2] Update AT Classes for MekMortar and IS BA Tube Arty --- megamek/src/megamek/common/WeaponType.java | 3 ++- .../common/weapons/battlearmor/ISBATubeArtillery.java | 6 +++--- .../src/megamek/common/weapons/mortars/MekMortarWeapon.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/megamek/src/megamek/common/WeaponType.java b/megamek/src/megamek/common/WeaponType.java index b8585228f0a..52316debffa 100644 --- a/megamek/src/megamek/common/WeaponType.java +++ b/megamek/src/megamek/common/WeaponType.java @@ -230,6 +230,7 @@ public class WeaponType extends EquipmentType { public static final int CLASS_TELE_MISSILE = 25; public static final int CLASS_GAUSS = 26; public static final int CLASS_THUNDERBOLT = 27; + public static final int CLASS_MORTAR = 28; public static final int WEAPON_DIRECT_FIRE = 0; public static final int WEAPON_CLUSTER_BALLISTIC = 1; @@ -249,7 +250,7 @@ public class WeaponType extends EquipmentType { // Used for BA vs BA damage for BA Plasma Rifle public static final int WEAPON_PLASMA = 15; - public static String[] classNames = { "Unknown", "Laser", "Point Defense", "PPC", "Pulse Laser", "Artilery", "AMS", + public static String[] classNames = { "Unknown", "Laser", "Point Defense", "PPC", "Pulse Laser", "Artillery", "AMS", "AC", "LBX", "LRM", "SRM", "MRM", "ATM", "Rocket Launcher", "Capital Laser", "Capital PPC", "Capital AC", "Capital Gauss", "Capital Missile", "AR10", "Screen", "Sub Capital Cannon", "Capital Mass Driver", "AMS" }; diff --git a/megamek/src/megamek/common/weapons/battlearmor/ISBATubeArtillery.java b/megamek/src/megamek/common/weapons/battlearmor/ISBATubeArtillery.java index f675a484e53..1c468b044fd 100644 --- a/megamek/src/megamek/common/weapons/battlearmor/ISBATubeArtillery.java +++ b/megamek/src/megamek/common/weapons/battlearmor/ISBATubeArtillery.java @@ -43,7 +43,7 @@ public ISBATubeArtillery() { rulesRefs = "284, TO"; flags = flags.or(F_BA_WEAPON).andNot(F_MECH_WEAPON).andNot(F_TANK_WEAPON).or(F_MEK_MORTAR).or(F_MISSILE); damage = DAMAGE_BY_CLUSTERTABLE; - atClass = CLASS_NONE; + atClass = CLASS_ARTILLERY; infDamageClass = WEAPON_CLUSTER_MISSILE; techAdvancement.setTechBase(TECH_BASE_IS) .setIntroLevel(false) @@ -55,12 +55,12 @@ public ISBATubeArtillery() { .setPrototypeFactions(F_CS) .setProductionFactions(F_CS); } - + @Override public boolean hasIndirectFire() { return true; } - + @Override public void adaptToGameOptions(GameOptions gOp) { super.adaptToGameOptions(gOp); diff --git a/megamek/src/megamek/common/weapons/mortars/MekMortarWeapon.java b/megamek/src/megamek/common/weapons/mortars/MekMortarWeapon.java index 902a36a5540..4e1dfce4593 100644 --- a/megamek/src/megamek/common/weapons/mortars/MekMortarWeapon.java +++ b/megamek/src/megamek/common/weapons/mortars/MekMortarWeapon.java @@ -47,7 +47,7 @@ public MekMortarWeapon() { super(); ammoType = AmmoType.T_MEK_MORTAR; damage = DAMAGE_BY_CLUSTERTABLE; - atClass = CLASS_NONE; + atClass = CLASS_MORTAR; flags = flags.or(F_MEK_MORTAR).or(F_MORTARTYPE_INDIRECT).or(F_MECH_WEAPON).or(F_MISSILE).or(F_TANK_WEAPON); infDamageClass = WEAPON_CLUSTER_MISSILE; } From e6b4cdc2980a212d47613636a1ab5fba0a96b590 Mon Sep 17 00:00:00 2001 From: sleet01 Date: Wed, 10 Jan 2024 08:20:37 -0800 Subject: [PATCH 2/2] Replace apparent typo in classNames --- megamek/src/megamek/common/WeaponType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/megamek/src/megamek/common/WeaponType.java b/megamek/src/megamek/common/WeaponType.java index 52316debffa..ea8ad386cce 100644 --- a/megamek/src/megamek/common/WeaponType.java +++ b/megamek/src/megamek/common/WeaponType.java @@ -250,7 +250,7 @@ public class WeaponType extends EquipmentType { // Used for BA vs BA damage for BA Plasma Rifle public static final int WEAPON_PLASMA = 15; - public static String[] classNames = { "Unknown", "Laser", "Point Defense", "PPC", "Pulse Laser", "Artillery", "AMS", + public static String[] classNames = { "Unknown", "Laser", "Point Defense", "PPC", "Pulse Laser", "Artillery", "Plasma", "AC", "LBX", "LRM", "SRM", "MRM", "ATM", "Rocket Launcher", "Capital Laser", "Capital PPC", "Capital AC", "Capital Gauss", "Capital Missile", "AR10", "Screen", "Sub Capital Cannon", "Capital Mass Driver", "AMS" };