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.

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

update planetary conditions chance logic #3834

Merged
merged 44 commits into from
Mar 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
042caf8
lower the pitch black light condition chance
kuronekochomusuke Feb 9, 2024
cdcd74b
add common function to set light
kuronekochomusuke Feb 10, 2024
661e8ff
update weather percentages, allow overlaps
kuronekochomusuke Feb 10, 2024
4ba64aa
check restrictions
kuronekochomusuke Feb 10, 2024
ac37726
if restricted set to none
kuronekochomusuke Feb 10, 2024
b6e1204
code cleanup
kuronekochomusuke Feb 10, 2024
c37f84b
code cleanup
kuronekochomusuke Feb 10, 2024
7b907ad
code cleanup
kuronekochomusuke Feb 10, 2024
83ceb2c
set weather by terrain type
kuronekochomusuke Feb 10, 2024
8cb333a
update percentages
kuronekochomusuke Feb 10, 2024
cd6b05f
if extreme heat check blowing sand
kuronekochomusuke Feb 10, 2024
7440d9f
foggier, extreme cold
kuronekochomusuke Feb 10, 2024
00a08fb
lower chance ranges
kuronekochomusuke Feb 10, 2024
5d4b180
if blowing sand, set wind to moderate gale
kuronekochomusuke Feb 10, 2024
d83056e
add rollCondition and pass in the odds needed
kuronekochomusuke Feb 11, 2024
342a253
pass blowing sand and EMI to game when starting
kuronekochomusuke Feb 11, 2024
d4f99c2
check that values returned are valid
kuronekochomusuke Feb 12, 2024
e6c916b
move restricted check into rollBlowingSand()
kuronekochomusuke Feb 12, 2024
3e12030
correct miss chance
kuronekochomusuke Feb 12, 2024
8726653
correct miss chance
kuronekochomusuke Feb 12, 2024
7c46fc9
remove tempature logic to make converting to a config file simpler in…
kuronekochomusuke Feb 13, 2024
d27a234
use map type to determine odds
kuronekochomusuke Feb 14, 2024
dfd0433
add dark group
kuronekochomusuke Feb 14, 2024
2463b90
code cleanup
kuronekochomusuke Feb 14, 2024
03dcaaa
Merge remote-tracking branch 'origin/master' into pitchBlackChance
kuronekochomusuke Feb 14, 2024
65103dc
add emi, set odds when fixed map
kuronekochomusuke Feb 15, 2024
083e9f6
code cleanup
kuronekochomusuke Feb 15, 2024
c3a13c0
use displayable value functions
kuronekochomusuke Feb 16, 2024
38b838f
use config file to determine terrain, switch back to terran to determ…
kuronekochomusuke Feb 18, 2024
130a9f5
code cleanup
kuronekochomusuke Feb 18, 2024
aeedb6e
fix paht
kuronekochomusuke Feb 18, 2024
3707ff4
Merge remote-tracking branch 'origin/master' into pitchBlackChance
kuronekochomusuke Feb 24, 2024
b3c5705
fix warnings
kuronekochomusuke Feb 24, 2024
4116c0e
fix light case. fix heavy templates
kuronekochomusuke Feb 24, 2024
23df016
used enums. show changed tempature
kuronekochomusuke Mar 2, 2024
c833278
Merge remote-tracking branch 'origin/master' into pitchBlackChance
kuronekochomusuke Mar 2, 2024
ccce404
use config file to map terrain to weather odds
kuronekochomusuke Mar 3, 2024
c96d59f
code cleanup
kuronekochomusuke Mar 3, 2024
0bf09d6
fix error
kuronekochomusuke Mar 3, 2024
63c5fe3
fix error
kuronekochomusuke Mar 4, 2024
fce7f76
Merge remote-tracking branch 'origin/master' into pitchBlackChance
kuronekochomusuke Mar 20, 2024
03ed42a
fix imports
kuronekochomusuke Mar 20, 2024
667bb82
Merge branch 'master' into pitchBlackChance
kuronekochomusuke Mar 23, 2024
f7a11a4
Merge remote-tracking branch 'origin/master' into pitchBlackChance
kuronekochomusuke Mar 23, 2024
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
5 changes: 3 additions & 2 deletions MekHQ/data/scenariotemplates/Allied Facility - Heavy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
<isAlliedFacility>true</isAlliedFacility>
<mapParameters>
<allowedTerrainTypes>
<allowedTerrainType>3</allowedTerrainType>
<allowedTerrainType>6</allowedTerrainType>
<allowedTerrainType>ColdFacility</allowedTerrainType>
<allowedTerrainType>HotFacility</allowedTerrainType>
<allowedTerrainType>TemperateFacility</allowedTerrainType>
</allowedTerrainTypes>
<allowRotation>false</allowRotation>
<baseHeight>0</baseHeight>
Expand Down
5 changes: 3 additions & 2 deletions MekHQ/data/scenariotemplates/Allied Facility.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
<isAlliedFacility>true</isAlliedFacility>
<mapParameters>
<allowedTerrainTypes>
<allowedTerrainType>3</allowedTerrainType>
<allowedTerrainType>6</allowedTerrainType>
<allowedTerrainType>ColdFacility</allowedTerrainType>
<allowedTerrainType>HotFacility</allowedTerrainType>
<allowedTerrainType>TemperateFacility</allowedTerrainType>
</allowedTerrainTypes>
<allowRotation>false</allowRotation>
<baseHeight>0</baseHeight>
Expand Down
5 changes: 3 additions & 2 deletions MekHQ/data/scenariotemplates/Hostile Facility - Heavy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
<isHostileFacility>true</isHostileFacility>
<mapParameters>
<allowedTerrainTypes>
<allowedTerrainType>3</allowedTerrainType>
<allowedTerrainType>6</allowedTerrainType>
<allowedTerrainType>ColdFacility</allowedTerrainType>
<allowedTerrainType>HotFacility</allowedTerrainType>
<allowedTerrainType>TemperateFacility</allowedTerrainType>
</allowedTerrainTypes>
<allowRotation>false</allowRotation>
<baseHeight>0</baseHeight>
Expand Down
5 changes: 3 additions & 2 deletions MekHQ/data/scenariotemplates/Hostile Facility.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
<isHostileFacility>true</isHostileFacility>
<mapParameters>
<allowedTerrainTypes>
<allowedTerrainType>3</allowedTerrainType>
<allowedTerrainType>6</allowedTerrainType>
<allowedTerrainType>ColdFacility</allowedTerrainType>
<allowedTerrainType>HotFacility</allowedTerrainType>
<allowedTerrainType>TemperateFacility</allowedTerrainType>
</allowedTerrainTypes>
<allowRotation>false</allowRotation>
<baseHeight>0</baseHeight>
Expand Down
5 changes: 3 additions & 2 deletions MekHQ/data/scenariotemplates/Irregular Forces - Heavy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
<isAlliedFacility>false</isAlliedFacility>
<mapParameters>
<allowedTerrainTypes>
<allowedTerrainType>3</allowedTerrainType>
<allowedTerrainType>6</allowedTerrainType>
<allowedTerrainType>ColdUrban</allowedTerrainType>
<allowedTerrainType>HotUrban</allowedTerrainType>
<allowedTerrainType>Urban</allowedTerrainType>
</allowedTerrainTypes>
<allowRotation>false</allowRotation>
<baseHeight>0</baseHeight>
Expand Down
5 changes: 3 additions & 2 deletions MekHQ/data/scenariotemplates/Irregular Forces.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
<isAlliedFacility>false</isAlliedFacility>
<mapParameters>
<allowedTerrainTypes>
<allowedTerrainType>3</allowedTerrainType>
<allowedTerrainType>6</allowedTerrainType>
<allowedTerrainType>ColdUrban</allowedTerrainType>
<allowedTerrainType>HotUrban</allowedTerrainType>
<allowedTerrainType>Urban</allowedTerrainType>
</allowedTerrainTypes>
<allowRotation>false</allowRotation>
<baseHeight>0</baseHeight>
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/data/scenariotemplates/LegacyAtB/AceDuel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<isAlliedFacility>false</isAlliedFacility>
<mapParameters>
<allowedTerrainTypes>
<allowedTerrainType>1</allowedTerrainType>
<allowedTerrainType>Hills</allowedTerrainType>
</allowedTerrainTypes>
<allowRotation>false</allowRotation>
<baseHeight>0</baseHeight>
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/data/scenariotemplates/LegacyAtB/AlliedTraitors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<isAlliedFacility>false</isAlliedFacility>
<mapParameters>
<allowedTerrainTypes>
<allowedTerrainType>1</allowedTerrainType>
<allowedTerrainType>Hills</allowedTerrainType>
</allowedTerrainTypes>
<allowRotation>false</allowRotation>
<baseHeight>0</baseHeight>
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/data/scenariotemplates/LegacyAtB/OfficerDuel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<isAlliedFacility>false</isAlliedFacility>
<mapParameters>
<allowedTerrainTypes>
<allowedTerrainType>1</allowedTerrainType>
<allowedTerrainType>Hills</allowedTerrainType>
</allowedTerrainTypes>
<allowRotation>false</allowRotation>
<baseHeight>0</baseHeight>
Expand Down
Loading
Loading