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

Jump to bottom

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

Merged
merged 18 commits into from
Sep 16, 2023
Merged

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

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e8f5496
Initial replacement of Munitions bit arrays with EnumSet
Sleet01 Sep 4, 2023
300e5e1
Fix a bunch of parens I messed up using Sed to find/replace
Sleet01 Sep 5, 2023
867ae3f
Cleanup and adding EnumSet, [L Enum to SerialKiller WL
Sleet01 Sep 5, 2023
866803b
Clean up ARTILLERY_TYPES, return original M_INCENDIARY_LRM handling
Sleet01 Sep 6, 2023
3daee87
Correct ADA damage handling
Sleet01 Sep 6, 2023
7709376
Fix up range/damage displays and sprites
Sleet01 Sep 6, 2023
037f04d
Further refine ADA missile, Flak Artillery, and Aero interactions
Sleet01 Sep 6, 2023
e6316e6
Refactor ADA out of Special to better utilize existing Artillery hand…
Sleet01 Sep 6, 2023
50a4590
Add To-do to remove ADA flak bonus when fix_4359 adds it for _all_ di…
Sleet01 Sep 7, 2023
26d899f
Further refactoring of ADA/non-ADA Artillery Flak restrictions
Sleet01 Sep 7, 2023
9c86fef
Step 1 in adding ADA handling to Princess: avoid firing AIV if air ta…
Sleet01 Sep 7, 2023
f77f6ff
Final refinements to Princess ADA selection and damage application.
Sleet01 Sep 9, 2023
d62f853
Fix logic error in createMunitionLabel
Sleet01 Sep 9, 2023
b474fcc
Fix illegal Clan Field Artillery infantry unit used in testing.
Sleet01 Sep 9, 2023
5a565a5
Corrections pass 1
Sleet01 Sep 12, 2023
c7d0818
Pass 2 of fixes to finish PR for #1552
Sleet01 Sep 12, 2023
95577e2
Pass 3 of requested fixes to PR for #1552
Sleet01 Sep 12, 2023
edc52fb
Set new ArrowIV base class to Abstract
Sleet01 Sep 13, 2023
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
4 changes: 1 addition & 3 deletions megamek/data/mechfiles/infantry/Field Gunners/Clan Field Artillery (ArrowIV).blk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ Auto Rifle
<Field Guns Equipment>
CLArrowIV
CLArrowIV Ammo
CLArrowIV
CLArrowIV Ammo
</Field Guns Equipment>
<type>
Clan Level 3
Expand All @@ -46,4 +44,4 @@ Intro date is based on when the weapon becomes an Advanced weapon. Since MM can'

<armorKit>
GenericKit
</armorKit>
</armorKit>
1 change: 1 addition & 0 deletions megamek/i18n/megamek/client/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3924,6 +3924,7 @@ WeaponAttackAction.LegBlockedByTerrain=Nearby terrain blocks leg weapons.
WeaponAttackAction.MinimumAlt1=attacker must be at least at elevation 1
WeaponAttackAction.NoAeroDirectArty=Airborne aerospace units cannot make direct-fire artillery attacks.
WeaponAttackAction.FlakOnGroundedAero=Grounded aerospace/vtol units are not valid Flak targets.
WeaponAttackAction.ADARangeBracket=ADA range brackets (+0/+2/+4)
WeaponAttackAction.NoAttacker=Invalid Attacker!
WeaponAttackAction.NoBombInMechMode=Cannot launch bomb in mech mode.
WeaponAttackAction.NoFiringSolution=no firing solution to target.
Expand Down
2 changes: 2 additions & 0 deletions megamek/mmconf/serialkiller.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<regexps>
<regexp>\[C$</regexp>
<regexp>\[I$</regexp>
<regexp>\[Ljava\.lang.Enum;$</regexp>
<regexp>java\.io\.File$</regexp>
<regexp>java\.lang\.Boolean$</regexp>
<regexp>java\.lang\.Enum$</regexp>
Expand All @@ -31,6 +32,7 @@
<regexp>java\.util\.concurrent\.locks\.ReentrantLock\$Sync$</regexp>
<regexp>java\.util\.UUID$</regexp>
<regexp>java\.util\.EnumMap$</regexp>
<regexp>java\.util\.EnumSet.*</regexp>
<regexp>java\.util\.HashMap$</regexp>
<regexp>java\.util\.HashSet$</regexp>
<regexp>java\.util\.Hashtable$</regexp>
Expand Down
4 changes: 2 additions & 2 deletions megamek/src/megamek/client/bot/BotClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,10 +676,10 @@ protected List<Coords> getStartingCoordsArray(Entity deployed_ent) {
if (atype.getAmmoType() == AmmoType.T_ATM) {
weapon_count++;
av_range += 15.0;
if (atype.getMunitionType() == AmmoType.M_HIGH_EXPLOSIVE) {
if (atype.getMunitionType().contains(AmmoType.Munitions.M_HIGH_EXPLOSIVE)) {
av_range -= 6;
}
if (atype.getMunitionType() == AmmoType.M_EXTENDED_RANGE) {
if (atype.getMunitionType().contains(AmmoType.Munitions.M_EXTENDED_RANGE)) {
av_range += 12.0;
}
} else if (atype.getAmmoType() == AmmoType.T_MML) {
Expand Down
Loading