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.

Sign up for GitHub

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

Backport Fix for MHQ #4062 to 0.49.19.1 #4067

Merged
merged 1 commit into from
May 9, 2024
Merged

Backport Fix for MHQ #4062 to 0.49.19.1 #4067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 15 additions & 9 deletions MekHQ/src/mekhq/AtBGameThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,21 @@ public void run() {
Thread.sleep(MekHQ.getMHQOptions().getStartGameDelay());

PlanetaryConditions planetaryConditions = new PlanetaryConditions();
planetaryConditions.setLight(scenario.getLight());
planetaryConditions.setWeather(scenario.getWeather());
planetaryConditions.setWind(scenario.getWind());
planetaryConditions.setFog(scenario.getFog());
planetaryConditions.setAtmosphere(scenario.getAtmosphere());
planetaryConditions.setGravity(scenario.getGravity());
planetaryConditions.setEMI(scenario.getEMI());
planetaryConditions.setBlowingSand(scenario.getBlowingSand());
planetaryConditions.setTemperature(scenario.getModifiedTemperature());
if (campaign.getCampaignOptions().isUseLightConditions()) {
planetaryConditions.setLight(scenario.getLight());
}
if (campaign.getCampaignOptions().isUseWeatherConditions()) {
planetaryConditions.setWeather(scenario.getWeather());
planetaryConditions.setWind(scenario.getWind());
planetaryConditions.setFog(scenario.getFog());
planetaryConditions.setEMI(scenario.getEMI());
planetaryConditions.setBlowingSand(scenario.getBlowingSand());
planetaryConditions.setTemperature(scenario.getModifiedTemperature());
}
if (campaign.getCampaignOptions().isUsePlanetaryConditions()) {
planetaryConditions.setAtmosphere(scenario.getAtmosphere());
planetaryConditions.setGravity(scenario.getGravity());
}
client.sendPlanetaryConditions(planetaryConditions);
Thread.sleep(MekHQ.getMHQOptions().getStartGameDelay());

Expand Down
2 changes: 1 addition & 1 deletion MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ private static void setLightConditions(AtBDynamicScenario scenario) {
* @param scenario The scenario for which to set weather conditions.
*/
private static void setWeather(AtBDynamicScenario scenario) {
scenario.setWeather();
scenario.setWeatherConditions();
}

/**
Expand Down
12 changes: 6 additions & 6 deletions MekHQ/src/mekhq/campaign/mission/AtBScenario.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,15 +280,15 @@ public ResourceBundle getResourceBundle() {
*/
private void initBattle(Campaign campaign) {
setTerrain();
if (campaign.getCampaignOptions().isUsePlanetaryConditions() &&
null != campaign.getMission(getMissionId())) {
setPlanetaryConditions(campaign.getMission(getMissionId()), campaign);
}
if (campaign.getCampaignOptions().isUseLightConditions()) {
setLightConditions();
}
if (campaign.getCampaignOptions().isUseWeatherConditions()) {
setWeather();
}
if (campaign.getCampaignOptions().isUsePlanetaryConditions() &&
null != campaign.getMission(getMissionId())) {
setPlanetaryConditions(campaign.getMission(getMissionId()), campaign);
setWeatherConditions();
}
setMapSize();
setMapFile();
Expand Down Expand Up @@ -324,7 +324,7 @@ public void setLightConditions() {
setLight(TCO.rollLightCondition(getTerrainType()));
}

public void setWeather() {
public void setWeatherConditions() {
// weather is irrelevant in these situations.
if (getBoardType() == AtBScenario.T_SPACE ||
getBoardType() == AtBScenario.T_ATMOSPHERE) {
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/src/mekhq/campaign/mission/atb/scenario/AceDuelBuiltInScenario.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void setLightConditions() {
}

@Override
public void setWeather() {
public void setWeatherConditions() {
setWeather(Weather.CLEAR);
setWind(Wind.CALM);
setFog(Fog.FOG_NONE);
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/src/mekhq/campaign/mission/atb/scenario/OfficerDuelBuiltInScenario.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void setLightConditions() {
}

@Override
public void setWeather() {
public void setWeatherConditions() {
setWeather(Weather.CLEAR);
setWind(Wind.CALM);
setFog(Fog.FOG_NONE);
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public static void setScenarioParametersFromBiome(StratconTrackState track, Stra
backingScenario.setMap(mapTypeList.get(Compute.randomInt(mapTypeList.size())));
}
backingScenario.setLightConditions();
backingScenario.setWeather();
backingScenario.setWeatherConditions();
}
}

Expand Down
2 changes: 1 addition & 1 deletion MekHQ/src/mekhq/gui/view/AtBScenarioViewPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ private void rerollBattleConditions() {
lblLightDesc.setText(scenario.getLight().toString());
}
if (chkReroll[REROLL_WEATHER] != null && chkReroll[REROLL_WEATHER].isSelected()) {
scenario.setWeather();
scenario.setWeatherConditions();
scenario.useReroll();
chkReroll[REROLL_WEATHER].setSelected(false);
lblWeatherDesc.setText(scenario.getWeather().toString());
Expand Down