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

Fix #4648: Update AT Classes for MekMortar and IS BA Tube Arty #5027

Merged
merged 2 commits into from
Jan 13, 2024
Merged

Fix #4648: Update AT Classes for MekMortar and IS BA Tube Arty #5027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e439139
Update AT Classes for MekMortar and IS BA Tube Arty
Sleet01 Jan 9, 2024
e6b4cdc
Replace apparent typo in classNames
Sleet01 Jan 10, 2024
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
3 changes: 2 additions & 1 deletion megamek/src/megamek/common/WeaponType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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", "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" };

Expand Down
6 changes: 3 additions & 3 deletions megamek/src/megamek/common/weapons/battlearmor/ISBATubeArtillery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/common/weapons/mortars/MekMortarWeapon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading