Planetary Conditions Enums

megamek/i18n/megamek/common/messages.properties

@@ -232,6 +232,7 @@ PlanetaryConditions.DisplayableName.Weather.Blizzard=Blizzard
 PlanetaryConditions.DisplayableName.Weather.Ice\ Storm=Ice Storm
 PlanetaryConditions.DisplayableName.Weather.Light\ Hail=Light Hail
 PlanetaryConditions.DisplayableName.Weather.Heavy\ Hail=Heavy Hail
+PlanetaryConditions.DisplayableName.Weather.Lightning\ Storm=Lightning Storm
 PlanetaryConditions.DisplayableName.WindStrength.Calm=Calm
 PlanetaryConditions.DisplayableName.WindStrength.Light\ Gale=Light Gale
 PlanetaryConditions.DisplayableName.WindStrength.Moderate\ Gale=Moderate Gale
@@ -295,6 +296,9 @@ PlanetaryConditions.Indicator.Weather.SnowFlurries=\u2744 \u2744 \u2744 \u2022
 PlanetaryConditions.Indicator.Weather.HeavySnow=\u2744 \u2744 \u2744 \u2744
 PlanetaryConditions.Indicator.Weather.Sleet=\u26C6 \u2022
 PlanetaryConditions.Indicator.Weather.IceStorm=\u26C6 \u26C6
+PlanetaryConditions.Indicator.Weather.LightHail=\u2591
+PlanetaryConditions.Indicator.Weather.HeavyHail=\u2592
+PlanetaryConditions.Indicator.Weather.LightningStorm=\u2608
 PlanetaryConditions.Indicator.Atmosphere.Vacuum=\u2726 \u2727 \u2727 \u25AF \u2727 \u2727
 PlanetaryConditions.Indicator.Atmosphere.Trace=\u2726 \u2726 \u2727 \u25AF \u2727 \u2727
 PlanetaryConditions.Indicator.Atmosphere.Thin=\u2726 \u2726 \u2726 \u25AF \u2727 \u2727

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

@@ -2025,10 +2025,10 @@ private void evadeIfNotFiring(MovePath path, boolean possibleToInflictDamage) {
      */
     private void turnOnSearchLight(MovePath path, boolean possibleToInflictDamage) {
         Entity pathEntity = path.getEntity();
-        if (possibleToInflictDamage &&
-                pathEntity.hasSearchlight() &&
-                !pathEntity.isUsingSearchlight() &&
-                (path.getGame().getPlanetaryConditions().getLight() >= PlanetaryConditions.L_FULL_MOON)) {
+        if (possibleToInflictDamage
+                && pathEntity.hasSearchlight()
+                && !pathEntity.isUsingSearchlight()
+                && path.getGame().getPlanetaryConditions().isDark()) {
             path.addStep(MoveStepType.SEARCHLIGHT);
         }
     }

megamek/src/megamek/client/ui/swing/EquipChoicePanel.java

@@ -262,7 +262,7 @@ public EquipChoicePanel(Entity entity, ClientGUI clientgui, Client client) {
 
         // Set up searchlight
         if (!entity.getsAutoExternalSearchlight()
-                && (client.getGame().getPlanetaryConditions().getLight() > PlanetaryConditions.L_DUSK)) {
+                && client.getGame().getPlanetaryConditions().isDark()) {
             add(labSearchlight, GBC.std());
             add(chSearchlight, GBC.eol());
             chSearchlight.setSelected(entity.hasSearchlight()

megamek/src/megamek/client/ui/swing/PlanetaryConditionsDialog.java

@@ -48,6 +48,8 @@
 import megamek.client.ui.swing.dialog.DialogButton;
 import megamek.common.Configuration;
 import megamek.common.PlanetaryConditions;
+import megamek.common.enums.Light;
+import megamek.common.enums.Weather;
 import megamek.common.util.ImageUtil;
 import megamek.common.util.fileUtils.MegaMekFile;
 
@@ -232,11 +234,11 @@
 
     /** Fills the dialog comboboxes. */
     private void setupCombos() {
-        for (int i = 0; i < PlanetaryConditions.L_SIZE; i++) {
-            comLight.addItem(PlanetaryConditions.getLightDisplayableName(i));
+        for (Light condition : Light.values()) {
+            comLight.addItem(condition.toString());
         }
-        for (int i = 0; i < PlanetaryConditions.WE_SIZE; i++) {
-            comWeather.addItem(PlanetaryConditions.getWeatherDisplayableName(i));
+        for (Weather condition : Weather.values()) {
+            comWeather.addItem(condition.toString());
         }
         for (int i = 0; i < PlanetaryConditions.WI_SIZE; i++) {
             comWind.addItem(PlanetaryConditions.getWindDisplayableName(i));
@@ -289,8 +291,8 @@
     /** Updates the dialog fields with values from the stored conditions. */
     private void refreshValues() {
         removeListeners();
-        comLight.setSelectedIndex(conditions.getLight());
-        comWeather.setSelectedIndex(conditions.getWeather());
+        comLight.setSelectedIndex(conditions.getLight().ordinal());
+        comWeather.setSelectedIndex(conditions.getWeather().ordinal());
         comWind.setSelectedIndex(conditions.getWindStrength());
         comWindFrom.setSelectedIndex(conditions.getMinWindStrength());
         comWindTo.setSelectedIndex(conditions.getMaxWindStrength());
@@ -313,8 +315,8 @@
      */
     private void setConditions() {
         // make the changes to the planetary conditions
-        conditions.setLight(comLight.getSelectedIndex());
-        conditions.setWeather(comWeather.getSelectedIndex());
+        conditions.setLight(Light.getLight(comLight.getSelectedIndex()));
+        conditions.setWeather(Weather.getWeather(comWeather.getSelectedIndex()));
         conditions.setWindStrength(comWind.getSelectedIndex());
         conditions.setWindDirection(comWindDirection.getSelectedIndex());
         refreshWindRange();
@@ -340,7 +342,7 @@
         StringBuilder windTip = new StringBuilder();
         StringBuilder atmoTip = new StringBuilder();
         StringBuilder sandTip = new StringBuilder();
-        int weather = comWeather.getSelectedIndex();
+        Weather weather = Weather.getWeather(comWeather.getSelectedIndex());
         int temp = 0;
         float grav = (float) 1.0;
         try {
@@ -392,21 +394,23 @@
         }
 
         // The following temperature checks are not exactly what the rules demand, but see the comment above.
-        if (((weather == WE_LIGHT_SNOW) || (weather == WE_SLEET)
-                || (weather == WE_LIGHT_HAIL) || (weather == WE_HEAVY_HAIL))
+        if ((Weather.isLightSnow(weather)
+                    || Weather.isSleet(weather)
+                    || Weather.isLightHail(weather)
+                    || Weather.isHeaveHail(weather))
                 && (temp > -40)) {
             tempTip.append(Messages.getString("PlanetaryConditionsDialog.invalid.lightSnowTemp"));
             wthrTip.append(Messages.getString("PlanetaryConditionsDialog.invalid.lightSnowTemp"));
         }
 
-        if (((weather == WE_HEAVY_SNOW) || (weather == WE_MOD_SNOW)
-                || (weather == WE_SNOW_FLURRIES))
+        if ((Weather.isHeavySnow(weather) || Weather.isModerateSnow(weather)
+                || Weather.isSnowFlurries(weather))
                 && (temp > -50)) {
             tempTip.append(Messages.getString("PlanetaryConditionsDialog.invalid.modSnowTemp"));
             wthrTip.append(Messages.getString("PlanetaryConditionsDialog.invalid.modSnowTemp"));
         }
 
-        if ((weather == WE_ICE_STORM) && (temp > -60)) {
+        if (Weather.isIceStorm(weather) && (temp > -60)) {
             tempTip.append(Messages.getString("PlanetaryConditionsDialog.invalid.iceStormTemp"));
             wthrTip.append(Messages.getString("PlanetaryConditionsDialog.invalid.iceStormTemp"));
         }
@@ -453,13 +457,13 @@
         boolean isTraceThin = comAtmosphere.getSelectedIndex() == ATMO_THIN 
                 | comAtmosphere.getSelectedIndex() == ATMO_TRACE;
         boolean isDense = !isVacuum && !isTraceThin;
-        int weather = comWeather.getSelectedIndex();
-        boolean specificWind = (weather == WE_SNOW_FLURRIES) || (weather == WE_ICE_STORM) 
-                || (weather == WE_GUSTING_RAIN) || (weather == WE_LIGHTNING_STORM);
+        Weather weather = Weather.getWeather(comWeather.getSelectedIndex());
+        boolean specificWind = Weather.isSnowFlurries(weather) || Weather.isIceStorm(weather)
+                || Weather.isGustingRain(weather) || Weather.isLightningStorm(weather);
 
         removeListeners();
         if (isTraceThin) {
-            comWeather.setSelectedIndex(PlanetaryConditions.WE_NONE);
+            comWeather.setSelectedIndex(Weather.WEATHER_NONE.ordinal());
             comFog.setSelectedIndex(PlanetaryConditions.FOG_NONE);
         }
         if (isVacuum) {
@@ -468,19 +472,20 @@
             chkShiftWindDir.setSelected(false);
             chkShiftWindStr.setSelected(false);
             comWind.setSelectedIndex(WI_NONE);
-            comWeather.setSelectedIndex(WE_NONE);
+            comWeather.setSelectedIndex(Weather.WEATHER_NONE.ordinal());
             comFog.setSelectedIndex(FOG_NONE);
         }
         if (specificWind) {
             chkShiftWindStr.setSelected(false);
             switch (weather) {
-                case WE_LIGHTNING_STORM:
-                case WE_SNOW_FLURRIES:
-                case WE_ICE_STORM:
+                case LIGHTNING_STORM:
+                case SNOW_FLURRIES:
+                case ICE_STORM:
                     comWind.setSelectedIndex(WI_MOD_GALE);
                     break;
-                case WE_GUSTING_RAIN:
+                case GUSTING_RAIN:
                     comWind.setSelectedIndex(WI_STRONG_GALE);
+                default:
             }
         }
         addListeners();
@@ -503,21 +508,21 @@
 
     /** Sets the temperature to at most -40, -50 or -60 for snow conditions. */
     private void adaptTemperature() {
-        int weather = comWeather.getSelectedIndex();
+        Weather weather = Weather.getWeather(comWeather.getSelectedIndex());
         int maxTemp = 200;
         switch (weather) {
-            case WE_LIGHT_SNOW:
-            case WE_SLEET:
-            case WE_LIGHT_HAIL:
-            case WE_HEAVY_HAIL:
+            case LIGHT_SNOW:
+            case SLEET:
+            case LIGHT_HAIL:
+            case HEAVY_HAIL:
                 maxTemp = -40;
                 break;
-            case WE_HEAVY_SNOW:
-            case WE_MOD_SNOW:
-            case WE_SNOW_FLURRIES:
+            case HEAVY_SNOW:
+            case MOD_SNOW:
+            case SNOW_FLURRIES:
                 maxTemp = -50;
                 break;
-            case WE_ICE_STORM:
+            case ICE_STORM:
                 maxTemp = -60;
         }
         setMaximumTemperature(maxTemp);

megamek/src/megamek/client/ui/swing/boardview/BoardView.java

@@ -41,6 +41,7 @@
 import megamek.common.actions.*;
 import megamek.common.annotations.Nullable;
 import megamek.common.enums.IlluminationLevel;
+import megamek.common.enums.Light;
 import megamek.common.event.*;
 import megamek.common.options.GameOptions;
 import megamek.common.options.OptionsConstants;
@@ -1388,7 +1389,7 @@ private Image createBlurredShadow(Image orig) {
             g.dispose();
             mask = createShadowMask(mask);
             mask = blurOp.filter(mask, null);
-            if (game.getPlanetaryConditions().getLight() != PlanetaryConditions.L_DAY) {
+            if (!game.getPlanetaryConditions().isDay()) {
                 mask = blurOp.filter(mask, null);
             }
             shadowImageCache.put(orig.hashCode(), mask);
@@ -1431,6 +1432,7 @@ private void updateShadowMap() {
             return;
         }
 
+        PlanetaryConditions conditions = game.getPlanetaryConditions();
         long stT = System.nanoTime();
 
         // 1) create or get the hex shadow
@@ -1456,10 +1458,9 @@ private void updateShadowMap() {
 
         // Compute shadow angle based on planentary conditions.
         double[] lightDirection = {-19, 7};
-        if ((game.getPlanetaryConditions().getLight() == PlanetaryConditions.L_MOONLESS) ||
-                (game.getPlanetaryConditions().getLight() == PlanetaryConditions.L_PITCH_BLACK)) {
+        if (conditions.isVeryDark()) {
             lightDirection = new double[]{0, 0};
-        } else if (game.getPlanetaryConditions().getLight() == PlanetaryConditions.L_DUSK) {
+        } else if (conditions.isDusk()) {
             // TODO: replace when made user controlled
             lightDirection = new double[]{-38, 14};
         } else {
@@ -2392,6 +2393,7 @@ private void drawHex(Coords c, Graphics boardGraph, boolean saveBoardImage) {
 
         final Hex hex = game.getBoard().getHex(c);
         final Point hexLoc = getHexLocation(c);
+        PlanetaryConditions conditions = game.getPlanetaryConditions();
 
         // Check the cache to see if we already have the image
         HexImageCacheEntry cacheEntry = hexImageCache.get(c);
@@ -2544,7 +2546,7 @@ private void drawHex(Coords c, Graphics boardGraph, boolean saveBoardImage) {
             Point p2DST = new Point(hex_size.width, hex_size.height);
 
             Composite svComp = g.getComposite();
-            if (game.getPlanetaryConditions().getLight() == PlanetaryConditions.L_DAY) {
+            if (conditions.isDay()) {
                 g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, 0.55f));
             } else {
                 g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, 0.45f));
@@ -2649,7 +2651,7 @@ private void drawHex(Coords c, Graphics boardGraph, boolean saveBoardImage) {
         // Darken the hex for nighttime, if applicable
         if (GUIP.getDarkenMapAtNight()
                 && IlluminationLevel.determineIlluminationLevel(game, c).isNone()
-                && (game.getPlanetaryConditions().getLight() > PlanetaryConditions.L_DAY)) {
+                && conditions.isIlluminationEffective()) {
             for (int x = 0; x < hexImage.getWidth(); ++x) {
                 for (int y = 0; y < hexImage.getHeight(); ++y) {
                     hexImage.setRGB(x, y, getNightDarkenedColor(hexImage.getRGB(x, y)));
@@ -2864,7 +2866,7 @@ private void drawOrthograph(Coords c, Graphics boardGraph) {
                 // Darken the hex for nighttime, if applicable
                 if (GUIP.getDarkenMapAtNight()
                         && IlluminationLevel.determineIlluminationLevel(game, c).isNone()
-                        && (game.getPlanetaryConditions().getLight() > PlanetaryConditions.L_DAY)) {
+                        && game.getPlanetaryConditions().isIlluminationEffective()) {
                     for (int x = 0; x < scaledImage.getWidth(null); ++x) {
                         for (int y = 0; y < scaledImage.getHeight(); ++y) {
                             scaledImage.setRGB(x, y, getNightDarkenedColor(scaledImage.getRGB(x, y)));
@@ -3026,13 +3028,13 @@ public int getNightDarkenedColor(int rgb) {
         int al = (rgb >> 24);
 
         switch (game.getPlanetaryConditions().getLight()) {
-            case PlanetaryConditions.L_FULL_MOON:
-            case PlanetaryConditions.L_MOONLESS:
+            case FULL_MOON:
+            case MOONLESS:
                 rd = rd / 4; // 1/4 red
                 gr = gr / 4; // 1/4 green
                 bl = bl / 2; // half blue
                 break;
-            case PlanetaryConditions.L_PITCH_BLACK:
+            case PITCH_BLACK:
                 int gy = (rd + gr + bl) / 16;
                 if (Math.random() < 0.3) {
                     gy = gy * 4 / 5;
@@ -3044,7 +3046,7 @@ public int getNightDarkenedColor(int rgb) {
                 gr = gy + gr / 5;
                 bl = gy + bl / 5;
                 break;
-            case PlanetaryConditions.L_DUSK:
+            case DUSK:
                 bl = bl * 3 / 4;
                 break;
             default: