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

Removed Legacy AtB Guaranteed SPAs #5225

Merged
merged 1 commit into from
Nov 23, 2024
+11 −105
Merged

Removed Legacy AtB Guaranteed SPAs #5225

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
40 changes: 0 additions & 40 deletions MekHQ/src/mekhq/campaign/personnel/generator/DefaultSpecialAbilityGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import mekhq.Utilities;
import mekhq.campaign.Campaign;
import mekhq.campaign.personnel.Person;
import mekhq.campaign.personnel.SkillType;

public class DefaultSpecialAbilityGenerator extends AbstractSpecialAbilityGenerator {
@Override
Expand All @@ -41,45 +40,6 @@ public boolean generateSpecialAbilities(final Campaign campaign, final Person pe
numAbilities--;
}

// Based on the AtB rules, veteran recruits gain one and elite recruits gain two
// additional special abilities. Further, these are converted to edge if they
// cannot be
// generated.
if (campaign.getCampaignOptions().isUseAtB() && (expLvl >= SkillType.EXP_VETERAN)) {
// If we have more than 0 remaining abilities we can skip trying to generate
// after
// deciding on the number of further rolls and just convert it into edge
final boolean instantEdgeConversion = numAbilities != 0;

// then we set the number of abilities to generate at 1 for veteran and 2 for
// elite
switch (expLvl) {
case SkillType.EXP_VETERAN:
numAbilities = 1;
break;
case SkillType.EXP_ELITE:
numAbilities = 2;
break;
}

// If we aren't going to immediately convert into edge, we attempt to generate
// special
// abilities for the person
if (!instantEdgeConversion) {
while ((numAbilities > 0)
&& singleSpecialAbilityGenerator.generateSpecialAbilities(campaign, person, expLvl)) {
numAbilities--;
}
}

// If edge is enabled and there are any leftover abilities that cannot be
// generated
// we assign edge
if (campaign.getCampaignOptions().isUseEdge() && (instantEdgeConversion || (numAbilities > 0))) {
person.changeEdge(numAbilities);
}
}

return true;
}

Expand Down
25 changes: 0 additions & 25 deletions MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
import mekhq.campaign.personnel.enums.*;
import mekhq.campaign.personnel.enums.education.EducationLevel;
import mekhq.campaign.personnel.enums.education.EducationStage;
import mekhq.campaign.personnel.generator.SingleSpecialAbilityGenerator;
import mekhq.campaign.personnel.randomEvents.PersonalityController;
import mekhq.campaign.personnel.ranks.Rank;
import mekhq.campaign.personnel.ranks.RankSystem;
Expand Down Expand Up @@ -480,30 +479,6 @@ public void actionPerformed(ActionEvent action) {
gui.getCampaign().addReport(String.format(resources.getString("improved.format"),
selectedPerson.getHyperlinkedName(), type));

if (gui.getCampaign().getCampaignOptions().isUseAtB()
&& gui.getCampaign().getCampaignOptions().isUseAbilities()) {
if (selectedPerson.getPrimaryRole().isCombat()
&& (selectedPerson.getExperienceLevel(gui.getCampaign(), false) > oldExpLevel)
&& (oldExpLevel >= SkillType.EXP_REGULAR)) {
SingleSpecialAbilityGenerator spaGenerator = new SingleSpecialAbilityGenerator();
String spa = spaGenerator.rollSPA(gui.getCampaign(), selectedPerson);
if (spa == null) {
if (gui.getCampaign().getCampaignOptions().isUseEdge()) {
selectedPerson.changeEdge(1);
selectedPerson.changeCurrentEdge(1);
PersonalLogger.gainedEdge(gui.getCampaign(), selectedPerson,
gui.getCampaign().getLocalDate());
gui.getCampaign().addReport(String.format(resources.getString("gainedEdge.format"),
selectedPerson.getHyperlinkedName()));
}
} else {
PersonalLogger.gainedSPA(gui.getCampaign(), selectedPerson,
gui.getCampaign().getLocalDate(), spa);
gui.getCampaign().addReport(String.format(resources.getString("gained.format"),
selectedPerson.getHyperlinkedName(), spa));
}
}
}
gui.getCampaign().personUpdated(selectedPerson);
break;
}
Expand Down
51 changes: 11 additions & 40 deletions MekHQ/src/mekhq/gui/dialog/BatchXPDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,8 @@
*/
package mekhq.gui.dialog;

import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.GridLayout;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.ResourceBundle;

import javax.swing.*;
import javax.swing.RowSorter.SortKey;
import javax.swing.table.TableColumn;
import javax.swing.table.TableRowSorter;

import megamek.client.ui.models.XTableColumnModel;
import megamek.client.ui.preferences.JComboBoxPreference;
import megamek.client.ui.preferences.JIntNumberSpinnerPreference;
import megamek.client.ui.preferences.JToggleButtonPreference;
import megamek.client.ui.preferences.JWindowPreference;
import megamek.client.ui.preferences.PreferencesNode;
import megamek.client.ui.preferences.*;
import megamek.codeUtilities.MathUtility;
import megamek.common.enums.SkillLevel;
import megamek.logging.MMLogger;
Expand All @@ -49,13 +31,22 @@
import mekhq.campaign.personnel.SkillType;
import mekhq.campaign.personnel.Skills;
import mekhq.campaign.personnel.enums.PersonnelRole;
import mekhq.campaign.personnel.generator.SingleSpecialAbilityGenerator;
import mekhq.campaign.personnel.ranks.Rank;
import mekhq.gui.enums.PersonnelTableModelColumn;
import mekhq.gui.model.PersonnelTableModel;
import mekhq.gui.utilities.JScrollPaneWithSpeed;
import mekhq.gui.utilities.MekHqTableCellRenderer;

import javax.swing.*;
import javax.swing.RowSorter.SortKey;
import javax.swing.table.TableColumn;
import javax.swing.table.TableRowSorter;
import java.awt.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.ResourceBundle;

public final class BatchXPDialog extends JDialog {
private static final MMLogger logger = MMLogger.create(BatchXPDialog.class);

Expand Down Expand Up @@ -403,26 +394,6 @@ private void spendXP() {
p.spendXP(cost);
PersonalLogger.improvedSkill(campaign, p, campaign.getLocalDate(),
p.getSkill(skillName).getType().getName(), p.getSkill(skillName).toString());

// The next part isn't ideal and doesn't belong here, but as long as we hardcode
// AtB ...
if (campaign.getCampaignOptions().isUseAtB()) {
if (p.getPrimaryRole().isCombat() && !p.getPrimaryRole().isVesselCrew()
&& (p.getExperienceLevel(campaign, false) > startingExperienceLevel)
&& (startingExperienceLevel >= SkillType.EXP_REGULAR)) {
final SingleSpecialAbilityGenerator spaGenerator = new SingleSpecialAbilityGenerator();
final String spa = spaGenerator.rollSPA(campaign, p);
if (spa == null) {
if (campaign.getCampaignOptions().isUseEdge()) {
p.changeEdge(1);
p.changeCurrentEdge(1);
PersonalLogger.gainedEdge(campaign, p, campaign.getLocalDate());
}
} else {
PersonalLogger.gainedSPA(campaign, p, campaign.getLocalDate(), spa);
}
}
}
campaign.personUpdated(p);
}

Expand Down