From 4249ac7ced4a07b896885c1cbe2413a7cb614451 Mon Sep 17 00:00:00 2001 From: Scoppio Date: Wed, 18 Dec 2024 23:55:21 -0300 Subject: [PATCH 1/3] feat: allows gunEmplacement to be converted to Alpha Strike --- .../common/alphaStrike/conversion/ASConverter.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/megamek/src/megamek/common/alphaStrike/conversion/ASConverter.java b/megamek/src/megamek/common/alphaStrike/conversion/ASConverter.java index 3d49f9a6abf..9a06699fc8e 100644 --- a/megamek/src/megamek/common/alphaStrike/conversion/ASConverter.java +++ b/megamek/src/megamek/common/alphaStrike/conversion/ASConverter.java @@ -206,14 +206,16 @@ public ConversionData(Entity entity, AlphaStrikeElement element, CalculationRepo /** * Returns true if the given entity can be converted to AlphaStrike. This is * only - * false for entities of some special types such as TeleMissile or - * GunEmplacement. + * false for entities of some special types such as TeleMissile. + * GunEmplacement can is being allowed conversion as of 50.02 even though its not + * currently officially supported in rules as written, as it generates a valid unit that can be used in + * auto-resolution and other parts of the game. (Luana Coppio) * Also returns false if entity is null. */ public static boolean canConvert(@Nullable Entity entity) { return !(entity == null) && !((entity instanceof TeleMissile) || (entity instanceof FighterSquadron) || (entity instanceof EscapePods) || (entity instanceof EjectedCrew) - || (entity instanceof ArmlessMek) || (entity instanceof GunEmplacement)); + || (entity instanceof ArmlessMek)); } /** From 99564d3b201dd94600650421d028a8c52a863f36 Mon Sep 17 00:00:00 2001 From: Luana Coppio Date: Thu, 19 Dec 2024 00:08:57 -0300 Subject: [PATCH 2/3] Update ASConverter.java --- .../src/megamek/common/alphaStrike/conversion/ASConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/megamek/src/megamek/common/alphaStrike/conversion/ASConverter.java b/megamek/src/megamek/common/alphaStrike/conversion/ASConverter.java index 9a06699fc8e..6cc05affdc6 100644 --- a/megamek/src/megamek/common/alphaStrike/conversion/ASConverter.java +++ b/megamek/src/megamek/common/alphaStrike/conversion/ASConverter.java @@ -208,7 +208,7 @@ public ConversionData(Entity entity, AlphaStrikeElement element, CalculationRepo * only * false for entities of some special types such as TeleMissile. * GunEmplacement can is being allowed conversion as of 50.02 even though its not - * currently officially supported in rules as written, as it generates a valid unit that can be used in + * currently officially supported in rules as written, but it generates a valid unit that can be used in * auto-resolution and other parts of the game. (Luana Coppio) * Also returns false if entity is null. */ From 8eb79b03dfad62172f020f9ea225692a73e7750b Mon Sep 17 00:00:00 2001 From: Luana Coppio Date: Thu, 19 Dec 2024 22:22:57 -0300 Subject: [PATCH 3/3] Update ASConverter.java --- .../src/megamek/common/alphaStrike/conversion/ASConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/megamek/src/megamek/common/alphaStrike/conversion/ASConverter.java b/megamek/src/megamek/common/alphaStrike/conversion/ASConverter.java index 6cc05affdc6..4cae681748e 100644 --- a/megamek/src/megamek/common/alphaStrike/conversion/ASConverter.java +++ b/megamek/src/megamek/common/alphaStrike/conversion/ASConverter.java @@ -207,7 +207,7 @@ public ConversionData(Entity entity, AlphaStrikeElement element, CalculationRepo * Returns true if the given entity can be converted to AlphaStrike. This is * only * false for entities of some special types such as TeleMissile. - * GunEmplacement can is being allowed conversion as of 50.02 even though its not + * GunEmplacement is being allowed conversion as of 50.02 even though its not * currently officially supported in rules as written, but it generates a valid unit that can be used in * auto-resolution and other parts of the game. (Luana Coppio) * Also returns false if entity is null.