From ca83714a75b110508b78d4b71a496a4b4e4c8cf4 Mon Sep 17 00:00:00 2001 From: HammerGS Date: Sun, 15 Sep 2024 09:14:46 -0600 Subject: [PATCH] Data: Fix #6005 Aero damage of RISC Hyper Laser --- megamek/docs/history.txt | 1 + megamek/src/megamek/common/AmmoType.java | 4 ++-- .../src/megamek/common/weapons/lasers/ISRISCHyperLaser.java | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/megamek/docs/history.txt b/megamek/docs/history.txt index e56387d555b..af2404afb51 100644 --- a/megamek/docs/history.txt +++ b/megamek/docs/history.txt @@ -13,6 +13,7 @@ MEGAMEK VERSION HISTORY: + Fix #5951: Orphaned ghost entity sprites in (double blind) deployment when pressing 'next unit' + PR #5981: Respecting Trademarks (Mech to Mek) + PR #5989: Another fix for various Board/GUI items being out of sync with the currently selected unit ++ Fix #6005: Aero damage of RISC Hyper Laser 0.50.0 (2024-09-01 2000 UTC) (THIS MARKS THE START OF JAVA 17 AS THE MINIMUM REQUIRED) + PR #5649: Use UTF encoding for reading MTF files (This might fix the issues #5648 and #5647) diff --git a/megamek/src/megamek/common/AmmoType.java b/megamek/src/megamek/common/AmmoType.java index 127ecead131..dd1d02187dd 100644 --- a/megamek/src/megamek/common/AmmoType.java +++ b/megamek/src/megamek/common/AmmoType.java @@ -1999,8 +1999,8 @@ public static void initializeTypes() { munitions.add(new MunitionMutator("Follow The Leader", 2, Munitions.M_FOLLOW_THE_LEADER, new TechAdvancement(TECH_BASE_IS).setTechRating(RATING_E) - .setAvailability(RATING_F, RATING_X, RATING_E, RATING_X) - .setISAdvancement(2750, DATE_NONE, DATE_NONE, 2770, 3046) + .setAvailability(RATING_F, RATING_F, RATING_F, RATING_F) + .setISAdvancement(2750, DATE_NONE, DATE_NONE, 2770, DATE_NONE) .setISApproximate(true, false, false, true, false) .setPrototypeFactions(F_TH) .setReintroductionFactions(F_FS, F_LC) diff --git a/megamek/src/megamek/common/weapons/lasers/ISRISCHyperLaser.java b/megamek/src/megamek/common/weapons/lasers/ISRISCHyperLaser.java index 3b613a5908d..f465d8a6e4c 100644 --- a/megamek/src/megamek/common/weapons/lasers/ISRISCHyperLaser.java +++ b/megamek/src/megamek/common/weapons/lasers/ISRISCHyperLaser.java @@ -50,6 +50,8 @@ public ISRISCHyperLaser() { cost = 750000; shortAV = 20; medAV = 20; + longAV = 20; + extAV = 20; maxRange = RANGE_EXT; explosionDamage = 10; explosive = true; @@ -58,6 +60,7 @@ public ISRISCHyperLaser() { techAdvancement.setTechBase(TECH_BASE_IS).setTechRating(RATING_F) .setAvailability(RATING_X, RATING_X, RATING_X, RATING_E) .setISAdvancement(3134, DATE_NONE, DATE_NONE, 3141, DATE_NONE) + .setISApproximate(false,false,false,false,false) .setPrototypeFactions(F_RS).setStaticTechLevel(SimpleTechLevel.EXPERIMENTAL); }