Fix 1552 rfe add ada air defense arrow iv munition #4762

Sleet01 · 2023-09-09T04:26:34Z

This PR adds two new features:

EnumSet of Munitions (replaces int bit array); we can now add infinite new Munitions and let Java handle the math.
Air-Defense Arrow IV missiles.

Also includes:

Princess will avoid using AIV artillery indirectly while ADA missiles are available and enemy aircraft are around.
Princess will preferentially select ADA missiles for Arrow IV AAA shots while available.
Princess will better estimate the utility of AA artillery shots and Flak shots (both to-hit and expected damage).
SerialKiller will now allow serializing EnumSets and Enums backed by Longs.
Land dead ASF/VTOL/WiGEs so that they no longer count as "airborne".

close #1552

(Rebased on later master)

(Rebased to a later master)

(rebased from later master)

…ler code (rebased from later master)

…rect-fire Artillery Flak

(rebased from later master)

…rgets and ADA both available

In cases where Princess has ADA missiles and is fighting forces with airborne units, prefer ADA over all else, including artillery attacks. Updated estimation of damage and to-hit chances when using Flak or ADA missiles. Added some extra belt-and-suspenders checks to damage application, in case ADA missiles get handled as Artillery (they should not, but still). Updated some tests to be disabled under Java 17 or later, due to issues with spying classes containing certain classes or list types. Close MegaMek#1152

megamek/src/megamek/common/Compute.java

megamek/src/megamek/common/actions/WeaponAttackAction.java

megamek/src/megamek/common/weapons/ArtilleryCannonWeaponHandler.java

megamek/src/megamek/common/actions/WeaponAttackAction.java

@@ -4496,7 +4508,7 @@
     */
    private static ToHitData compileTerrainAndLosToHitMods(Game game, Entity ae, Targetable target, int ttype, int aElev, int tElev,
                int targEl, int distance, LosEffects los, ToHitData toHit, ToHitData losMods, int toSubtract, int eistatus,
-                WeaponType wtype, Mounted weapon, int weaponId, AmmoType atype, long munition, boolean isAttackerInfantry,
+                WeaponType wtype, Mounted weapon, int weaponId, AmmoType atype, EnumSet<AmmoType.Munitions> munition, boolean isAttackerInfantry,


megamek/src/megamek/common/actions/WeaponAttackAction.java

@@ -3192,7 +3204,7 @@
     * @param isINarcGuided flag that indicates whether the target is broadcasting an iNarc beacon
     */
    private static ToHitData compileAmmoToHitMods(Game game, Entity ae, Targetable target, int ttype, ToHitData toHit,
-                WeaponType wtype, Mounted weapon, AmmoType atype, long munition, boolean bApollo, boolean bArtemisV,
+                WeaponType wtype, Mounted weapon, AmmoType atype, EnumSet<AmmoType.Munitions> munition, boolean bApollo, boolean bArtemisV,


megamek/src/megamek/common/actions/WeaponAttackAction.java

@@ -3192,7 +3204,7 @@
     * @param isINarcGuided flag that indicates whether the target is broadcasting an iNarc beacon
     */
    private static ToHitData compileAmmoToHitMods(Game game, Entity ae, Targetable target, int ttype, ToHitData toHit,
-                WeaponType wtype, Mounted weapon, AmmoType atype, long munition, boolean bApollo, boolean bArtemisV,
+                WeaponType wtype, Mounted weapon, AmmoType atype, EnumSet<AmmoType.Munitions> munition, boolean bApollo, boolean bArtemisV,


HammerGS · 2023-09-10T15:41:55Z

I'll test this later this week. Exciting to see.

Saklad5 · 2023-09-10T18:49:13Z

I'm very excited, both for ADAs specifically and the capacity for adding more munition types.

NickAragua

Looks good. Needs a little cleanup and I've got a couple of minor suggestions.

Also, and this is a requirement, please check that MekHQ and MML at least compile with these changes.

megamek/src/megamek/client/bot/princess/ArtilleryTargetingControl.java

megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java

megamek/src/megamek/common/Compute.java

megamek/src/megamek/common/Entity.java

megamek/src/megamek/common/weapons/ArtilleryCannonWeaponHandler.java

megamek/src/megamek/common/weapons/artillery/ISArrowIV.java

megamek/src/megamek/common/actions/WeaponAttackAction.java

Sleet01 · 2023-09-12T20:22:06Z

Also, and this is a requirement, please check that MekHQ and MML at least compile with these changes.

Shit. I added a PR for MML's lone usage of Munitions but missed MekHQ's somehow. I'll put up a dependent PR.

Edit: PR for MekHQ fix is #4762

Sleet01 · 2023-09-15T17:23:38Z

Not to rush anyone, but the dependent PR for MML already went in, so it's broken until this gets pulled.
Should I put up a PR to back the MML update out until this goes in?

HammerGS · 2023-09-15T17:32:35Z

I think all the requested changes are done right?

Sleet01 · 2023-09-15T18:27:36Z

I think all the requested changes are done right?

I think I got everything. I asked Nick to check it over one more time.

Sleet01 added 13 commits September 8, 2023 10:30

Initial replacement of Munitions bit arrays with EnumSet

e8f5496

(Rebased on later master)

Fix a bunch of parens I messed up using Sed to find/replace

300e5e1

(Rebased to a later master)

Cleanup and adding EnumSet, [L Enum to SerialKiller WL

867ae3f

Clean up ARTILLERY_TYPES, return original M_INCENDIARY_LRM handling

866803b

Correct ADA damage handling

3daee87

Fix up range/damage displays and sprites

7709376

Further refine ADA missile, Flak Artillery, and Aero interactions

037f04d

(rebased from later master)

Refactor ADA out of Special to better utilize existing Artillery hand…

e6316e6

…ler code (rebased from later master)

Add To-do to remove ADA flak bonus when fix_4359 adds it for _all_ di…

50a4590

…rect-fire Artillery Flak

Further refactoring of ADA/non-ADA Artillery Flak restrictions

26d899f

(rebased from later master)

Step 1 in adding ADA handling to Princess: avoid firing AIV if air ta…

9c86fef

…rgets and ADA both available

Fix logic error in createMunitionLabel

d62f853

github-advanced-security bot found potential problems Sep 9, 2023

View reviewed changes

Fix illegal Clan Field Artillery infantry unit used in testing.

b474fcc

NickAragua requested changes Sep 12, 2023

View reviewed changes

Corrections pass 1

5a565a5

Sleet01 mentioned this pull request Sep 12, 2023

Initial pass to update MekHQ for fix 1152 on MM MegaMek/mekhq#3757

Merged

Sleet01 added 3 commits September 12, 2023 14:27

Pass 2 of fixes to finish PR for MegaMek#1552

c7d0818

Pass 3 of requested fixes to PR for MegaMek#1552

95577e2

Set new ArrowIV base class to Abstract

edc52fb

Sleet01 requested a review from NickAragua September 15, 2023 17:22

NickAragua approved these changes Sep 16, 2023

View reviewed changes

NickAragua merged commit 99ac2dd into MegaMek:master Sep 16, 2023
4 checks passed

Sleet01 mentioned this pull request Sep 18, 2023

MekHQ unit tests failing due to incorrect munitions equality checks MegaMek/mekhq#3761

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix 1552 rfe add ada air defense arrow iv munition #4762

Fix 1552 rfe add ada air defense arrow iv munition #4762

Sleet01 commented Sep 9, 2023

HammerGS commented Sep 10, 2023

Saklad5 commented Sep 10, 2023

NickAragua left a comment

Sleet01 commented Sep 12, 2023 •

edited

Loading

Sleet01 commented Sep 15, 2023

HammerGS commented Sep 15, 2023

Sleet01 commented Sep 15, 2023

Fix 1552 rfe add ada air defense arrow iv munition #4762

Fix 1552 rfe add ada air defense arrow iv munition #4762

Conversation

Sleet01 commented Sep 9, 2023

HammerGS commented Sep 10, 2023

Saklad5 commented Sep 10, 2023

NickAragua left a comment

Choose a reason for hiding this comment

Sleet01 commented Sep 12, 2023 • edited Loading

Sleet01 commented Sep 15, 2023

HammerGS commented Sep 15, 2023

Sleet01 commented Sep 15, 2023

Sleet01 commented Sep 12, 2023 •

edited

Loading