Skip to content

Commit

Permalink
Merge pull request #3928 from kuronekochomusuke/lightGlareSolarFlare
Browse files Browse the repository at this point in the history 
add glare and solar flare odds
  • Loading branch information
@kuronekochomusuke
kuronekochomusuke authored Apr 27, 2024
2 parents 1a8a179 + 48d1b5b commit 1f4f76e
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 61 deletions.
130 changes: 73 additions & 57 deletions MekHQ/data/terrainconditionsodds/TerrainConditionsOddsManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,32 @@ can delete this file to reload defaults
</terrains>
<odds>
<entry>
<key>LIGHT_MOONLESS</key>
<value>99</value>
<key>LIGHT_PITCH_BLACK</key>
<value>1</value>
</entry>
<entry>
<key>LIGHT_DUSK</key>
<value>200</value>
</entry>
<entry>
<key>LIGHT_FULL_MOON</key>
<value>70</value>
</entry>
<entry>
<key>LIGHT_DAY</key>
<value>600</value>
</entry>
<entry>
<key>LIGHT_FULL_MOON</key>
<value>100</value>
<key>LIGHT_SOLAR_FLARE</key>
<value>30</value>
</entry>
<entry>
<key>LIGHT_DUSK</key>
<value>200</value>
<key>LIGHT_GLARE</key>
<value>30</value>
</entry>
<entry>
<key>LIGHT_PITCH_BLACK</key>
<value>1</value>
<key>LIGHT_MOONLESS</key>
<value>69</value>
</entry>
</odds>
</TerrainConditionsOdds>
Expand All @@ -75,24 +83,32 @@ can delete this file to reload defaults
</terrains>
<odds>
<entry>
<key>LIGHT_MOONLESS</key>
<key>LIGHT_PITCH_BLACK</key>
<value>10</value>
</entry>
<entry>
<key>LIGHT_DUSK</key>
<value>20</value>
</entry>
<entry>
<key>LIGHT_FULL_MOON</key>
<value>9</value>
</entry>
<entry>
<key>LIGHT_DAY</key>
<value>50</value>
</entry>
<entry>
<key>LIGHT_FULL_MOON</key>
<value>10</value>
<key>LIGHT_SOLAR_FLARE</key>
<value>1</value>
</entry>
<entry>
<key>LIGHT_DUSK</key>
<value>20</value>
<key>LIGHT_GLARE</key>
<value>1</value>
</entry>
<entry>
<key>LIGHT_PITCH_BLACK</key>
<value>10</value>
<key>LIGHT_MOONLESS</key>
<value>9</value>
</entry>
</odds>
</TerrainConditionsOdds>
Expand Down Expand Up @@ -121,33 +137,33 @@ can delete this file to reload defaults
</terrains>
<odds>
<entry>
<key>WIND_CALM</key>
<value>70</value>
<key>WIND_STORM</key>
<value>3</value>
</entry>
<entry>
<key>WIND_LIGHT_GALE</key>
<key>WIND_MOD_GALE</key>
<value>10</value>
</entry>
<entry>
<key>WIND_TORNADO_F1_TO_F3</key>
<value>2</value>
</entry>
<entry>
<key>WIND_MOD_GALE</key>
<key>WIND_LIGHT_GALE</key>
<value>10</value>
</entry>
<entry>
<key>WIND_STORM</key>
<value>3</value>
</entry>
<entry>
<key>WIND_STRONG_GALE</key>
<value>4</value>
<key>WIND_CALM</key>
<value>70</value>
</entry>
<entry>
<key>WIND_TORNADO_F4</key>
<value>1</value>
</entry>
<entry>
<key>WIND_STRONG_GALE</key>
<value>4</value>
</entry>
</odds>
</TerrainConditionsOdds>
<TerrainConditionsOdds>
Expand All @@ -172,33 +188,33 @@ can delete this file to reload defaults
</terrains>
<odds>
<entry>
<key>WIND_CALM</key>
<value>50</value>
<key>WIND_STORM</key>
<value>5</value>
</entry>
<entry>
<key>WIND_LIGHT_GALE</key>
<value>15</value>
<key>WIND_MOD_GALE</key>
<value>14</value>
</entry>
<entry>
<key>WIND_TORNADO_F1_TO_F3</key>
<value>4</value>
</entry>
<entry>
<key>WIND_MOD_GALE</key>
<value>14</value>
</entry>
<entry>
<key>WIND_STORM</key>
<value>5</value>
<key>WIND_LIGHT_GALE</key>
<value>15</value>
</entry>
<entry>
<key>WIND_STRONG_GALE</key>
<value>10</value>
<key>WIND_CALM</key>
<value>50</value>
</entry>
<entry>
<key>WIND_TORNADO_F4</key>
<value>2</value>
</entry>
<entry>
<key>WIND_STRONG_GALE</key>
<value>10</value>
</entry>
</odds>
</TerrainConditionsOdds>
<TerrainConditionsOdds>
Expand Down Expand Up @@ -570,16 +586,16 @@ can delete this file to reload defaults
</terrains>
<odds>
<entry>
<key>FOG_LIGHT</key>
<value>5</value>
<key>FOG_NONE</key>
<value>90</value>
</entry>
<entry>
<key>FOG_HEAVY</key>
<value>5</value>
</entry>
<entry>
<key>FOG_NONE</key>
<value>90</value>
<key>FOG_LIGHT</key>
<value>5</value>
</entry>
</odds>
</TerrainConditionsOdds>
Expand All @@ -604,16 +620,16 @@ can delete this file to reload defaults
</terrains>
<odds>
<entry>
<key>FOG_LIGHT</key>
<value>20</value>
<key>FOG_NONE</key>
<value>60</value>
</entry>
<entry>
<key>FOG_HEAVY</key>
<value>20</value>
</entry>
<entry>
<key>FOG_NONE</key>
<value>60</value>
<key>FOG_LIGHT</key>
<value>20</value>
</entry>
</odds>
</TerrainConditionsOdds>
Expand All @@ -634,16 +650,16 @@ can delete this file to reload defaults
</terrains>
<odds>
<entry>
<key>FOG_LIGHT</key>
<value>20</value>
<key>FOG_NONE</key>
<value>60</value>
</entry>
<entry>
<key>FOG_HEAVY</key>
<value>20</value>
</entry>
<entry>
<key>FOG_NONE</key>
<value>60</value>
<key>FOG_LIGHT</key>
<value>20</value>
</entry>
</odds>
</TerrainConditionsOdds>
Expand Down Expand Up @@ -745,14 +761,14 @@ can delete this file to reload defaults
<terrain>Urban</terrain>
</terrains>
<odds>
<entry>
<key>EMI_NONE</key>
<value>999</value>
</entry>
<entry>
<key>EMI</key>
<value>1</value>
</entry>
<entry>
<key>EMI_NONE</key>
<value>999</value>
</entry>
</odds>
</TerrainConditionsOdds>
<TerrainConditionsOdds>
Expand All @@ -767,14 +783,14 @@ can delete this file to reload defaults
<terrain>Tundra</terrain>
</terrains>
<odds>
<entry>
<key>EMI_NONE</key>
<value>90</value>
</entry>
<entry>
<key>EMI</key>
<value>10</value>
</entry>
<entry>
<key>EMI_NONE</key>
<value>90</value>
</entry>
</odds>
</TerrainConditionsOdds>
</TerrainConditionsOddsManifest>
12 changes: 8 additions & 4 deletions MekHQ/src/mekhq/campaign/mission/TerrainConditionsOddsManifest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,10 @@ private static List<TerrainConditionsOdds> initLight() {

odds = Map.of(Light.DAY.getExternalId(), 600,
Light.DUSK.getExternalId(),200,
Light.FULL_MOON.getExternalId(),100,
Light.MOONLESS.getExternalId(),99,
Light.FULL_MOON.getExternalId(),70,
Light.GLARE.getExternalId(),30,
Light.MOONLESS.getExternalId(),69,
Light.SOLAR_FLARE.getExternalId(),30,
Light.PITCH_BLACK.getExternalId(),1);
terrain = List.of("ArcticDesert", "Badlands", "ColdFacility", "ColdForest", "ColdHills",
"ColdSea", "ColdUrban", "Desert", "Forest", "FrozenFacility", "FrozenSea",
Expand All @@ -198,8 +200,10 @@ private static List<TerrainConditionsOdds> initLight() {

odds = Map.of(Light.DAY.getExternalId(), 50,
Light.DUSK.getExternalId(),20,
Light.FULL_MOON.getExternalId(),10,
Light.MOONLESS.getExternalId(),10,
Light.FULL_MOON.getExternalId(),9,
Light.GLARE.getExternalId(),1,
Light.MOONLESS.getExternalId(),9,
Light.SOLAR_FLARE.getExternalId(), 1,
Light.PITCH_BLACK.getExternalId(),10);
terrain = List.of("ColdMountain", "Glacier", "HotMountainsDry", "HotMountainsWet", "Mountain");
t = new TerrainConditionsOdds();
Expand Down

0 comments on commit 1f4f76e

Please sign in to comment.