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

Refactored AutoAwardsController and Fixed Scenario Awards Support #4648

Merged
merged 1 commit into from
Aug 16, 2024
Merged

Refactored AutoAwardsController and Fixed Scenario Awards Support #4648

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
44 changes: 26 additions & 18 deletions MekHQ/src/mekhq/campaign/personnel/autoAwards/AutoAwardsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ public class AutoAwardsController {
/**
* The controller for the manual-automatic processing of Awards
*
* @param c the campaign to be processed
* @param campaign the campaign to be processed
*/
public void ManualController(Campaign c, boolean isManualPrompt) {
public void ManualController(Campaign campaign, boolean isManualPrompt) {
logger.info("autoAwards (Manual) has started");

campaign = c;
this.campaign = campaign;
mission = null;

buildAwardLists(0);
Expand Down Expand Up @@ -95,12 +95,12 @@ public void ManualController(Campaign c, boolean isManualPrompt) {
/**
* The controller for the processing of awards prompted by a change in rank
*
* @param c the campaign to be processed
* @param campaign the campaign to be processed
*/
public void PromotionController(Campaign c, boolean isManualPrompt) {
public void PromotionController(Campaign campaign, boolean isManualPrompt) {
logger.info("autoAwards (Promotion) has started");

campaign = c;
this.campaign = campaign;
mission = null;

buildAwardLists(4);
Expand All @@ -121,15 +121,15 @@ public void PromotionController(Campaign c, boolean isManualPrompt) {
/**
* The primary controller for the automatic processing of Awards
*
* @param c the campaign to be processed
* @param m the mission just completed
* @param campaign the campaign to be processed
* @param mission the mission just completed
* @param missionWasSuccessful true if the Mission was a complete Success, otherwise false
*/
public void PostMissionController(Campaign c, Mission m, Boolean missionWasSuccessful) {
public void PostMissionController(Campaign campaign, Mission mission, Boolean missionWasSuccessful) {
logger.info("autoAwards (Mission Conclusion) has started");

campaign = c;
mission = m;
this.campaign = campaign;
this.mission = mission;

buildAwardLists(1);

Expand All @@ -149,15 +149,15 @@ public void PostMissionController(Campaign c, Mission m, Boolean missionWasSucce
/**
* Processes awards after a scenario is concluded.
*
* @param c the campaign
* @param campaign the campaign
* @param personnel the personnel involved in the scenario, mapped by their UUID
* @param scenarioKills the kills made during the scenario, mapped by personnel UUID
* @param wasCivilianHelp whether the scenario (if any) was AtB Scenario CIVILIANHELP
*/
public void PostScenarioController(Campaign c, HashMap<UUID, Integer> personnel, HashMap<UUID, List<Kill>>scenarioKills, boolean wasCivilianHelp) {
public void PostScenarioController(Campaign campaign, HashMap<UUID, Integer> personnel, HashMap<UUID, List<Kill>>scenarioKills, boolean wasCivilianHelp) {
logger.info("autoAwards (Scenario Conclusion) has started");

campaign = c;
this.campaign = campaign;

buildAwardLists(2);

Expand Down Expand Up @@ -205,7 +205,7 @@ public void PostScenarioController(Campaign c, HashMap<UUID, Integer> personnel,
}

if (!allAwardData.isEmpty()) {
AutoAwardsDialog autoAwardsDialog = new AutoAwardsDialog(campaign, allAwardData, 0);
AutoAwardsDialog autoAwardsDialog = new AutoAwardsDialog(this.campaign, allAwardData, 0);
autoAwardsDialog.setModalityType(ModalityType.APPLICATION_MODAL);
autoAwardsDialog.setLocation(autoAwardsDialog.getLocation().x, 0);
autoAwardsDialog.setVisible(true);
Expand All @@ -219,12 +219,12 @@ public void PostScenarioController(Campaign c, HashMap<UUID, Integer> personnel,
/**
* The primary controller for the automatic processing of Training Awards
*
* @param c the campaign to be processed
* @param campaign the campaign to be processed
*/
public void PostGraduationController(Campaign c, List<UUID> personnel, HashMap<UUID, List<Object>> academyAttributes) {
public void PostGraduationController(Campaign campaign, List<UUID> personnel, HashMap<UUID, List<Object>> academyAttributes) {
logger.info("autoAwards (Education Conclusion) has started");

campaign = c;
this.campaign = campaign;

buildAwardLists(3);

Expand Down Expand Up @@ -516,6 +516,13 @@ private void buildAwardLists(int awardListCase) {
ignoredAwards.add(award);
}
break;
case "scenario":
if (campaign.getCampaignOptions().isEnableScenarioAwards()) {
scenarioAwards.add(award);
} else {
ignoredAwards.add(award);
}
break;
default:
ignoredAwards.add(award);
}
Expand All @@ -524,6 +531,7 @@ private void buildAwardLists(int awardListCase) {
logger.info("autoAwards found {} Scenario Kill Awards (excluding Mission & Lifetime Kill Awards)", killAwards.size());
logger.info("autoAwards found {} Injury Awards", injuryAwards.size());
logger.info("autoAwards found {} Misc Awards", miscAwards.size());
logger.info("autoAwards found {} Scenario Awards", scenarioAwards.size());
logger.info("autoAwards is ignoring {} Awards", ignoredAwards.size());

break;
Expand Down