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

Added Campaign Option To Reset Criminal Record #6569

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ lblReputation.tooltip=Which reputation method should your campaign be graded aga
<br><b>Recommended:</b> Campaign Operations
lblManualUnitRatingModifier.text=Manual Modifier
lblManualUnitRatingModifier.tooltip=This allows you to manually adjust your reputation rating.
lblResetCriminalRecord.text=Reset Criminal Record \u26A0 \uD83C\uDF1F
lblResetCriminalRecord.tooltip=Reset date of last crime and all penalties to Reputation from crime.\
<br>\
<br><b>Warning:</b> The Reputation report won't update to reflect this change until the next Monday.
lblClampReputationPayMultiplier.text=Clamp Reputation Pay Multiplier \u26A0 \u2714 \u2728
lblClampReputationPayMultiplier.tooltip=When using CamOps Reputation your unit's reputation score\
\ affects contract pay. This option clamps the reputation-based multiplier between 50 and 200%.\
Expand Down
16 changes: 14 additions & 2 deletions MekHQ/src/mekhq/gui/campaignOptions/contents/GeneralTab.java
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ public class GeneralTab {
private MMComboBox<UnitRatingMethod> unitRatingMethodCombo;
private JLabel lblManualUnitRatingModifier;
private JSpinner manualUnitRatingModifier;
private JCheckBox chkResetCriminalRecord;
private JCheckBox chkClampReputationPayMultiplier;
private JCheckBox chkReduceReputationPerformanceModifier;
private JCheckBox chkReputationPerformanceModifierCutOff;
Expand Down Expand Up @@ -198,6 +199,7 @@ public AbstractMHQScrollablePanel createGeneralTab() {
resources.getString("lblReputation.tooltip")));
lblManualUnitRatingModifier = new CampaignOptionsLabel("ManualUnitRatingModifier");
manualUnitRatingModifier = new CampaignOptionsSpinner("ManualUnitRatingModifier", 0, -1000, 1000, 1);
chkResetCriminalRecord = new CampaignOptionsCheckBox("ResetCriminalRecord");
chkClampReputationPayMultiplier = new CampaignOptionsCheckBox("ClampReputationPayMultiplier");
chkReduceReputationPerformanceModifier = new CampaignOptionsCheckBox("ReduceReputationPerformanceModifier");
chkReputationPerformanceModifierCutOff = new CampaignOptionsCheckBox("ReputationPerformanceModifierCutOff");
Expand Down Expand Up @@ -273,6 +275,8 @@ public AbstractMHQScrollablePanel createGeneralTab() {
panel.add(manualUnitRatingModifier, layout);
layout.gridy++;
layout.gridwidth = 3;
panel.add(chkResetCriminalRecord, layout);
layout.gridy++;
panel.add(chkClampReputationPayMultiplier, layout);
layout.gridy++;
panel.add(chkReduceReputationPerformanceModifier, layout);
Expand Down Expand Up @@ -366,6 +370,7 @@ private void initialize() {
lblManualUnitRatingModifier = new JLabel();
manualUnitRatingModifier = new JSpinner();

chkResetCriminalRecord = new JCheckBox();
chkClampReputationPayMultiplier = new JCheckBox();
chkReduceReputationPerformanceModifier = new JCheckBox();
chkReputationPerformanceModifierCutOff = new JCheckBox();
Expand Down Expand Up @@ -546,7 +551,7 @@ public void loadValuesFromCampaignOptions() {
* the campaign's default faction is used.
*/
public void loadValuesFromCampaignOptions(@Nullable CampaignOptions presetCampaignOptions,
@Nullable LocalDate presetDate, @Nullable Faction presetFaction) {
@Nullable LocalDate presetDate, @Nullable Faction presetFaction) {
CampaignOptions options = presetCampaignOptions;
if (presetCampaignOptions == null) {
options = this.campaignOptions;
Expand Down Expand Up @@ -587,7 +592,7 @@ public void loadValuesFromCampaignOptions(@Nullable CampaignOptions presetCampai
* @param isSaveAction A boolean indicating if this is a save action.
*/
public void applyCampaignOptionsToCampaign(@Nullable CampaignOptions presetCampaignOptions, boolean isStartUp,
boolean isSaveAction) {
boolean isSaveAction) {
// First, we apply any updates to the campaign
if (!isSaveAction) {
campaign.setName(txtName.getText());
Expand Down Expand Up @@ -622,6 +627,13 @@ public void applyCampaignOptionsToCampaign(@Nullable CampaignOptions presetCampa

options.setUnitRatingMethod(unitRatingMethodCombo.getSelectedItem());
options.setManualUnitRatingModifier((int) manualUnitRatingModifier.getValue());

if (chkResetCriminalRecord.isSelected()) {
campaign.setDateOfLastCrime(null);
campaign.setCrimeRating(0);
campaign.setCrimePirateModifier(0);
}

options.setClampReputationPayMultiplier(chkClampReputationPayMultiplier.isSelected());
options.setReduceReputationPerformanceModifier(chkReduceReputationPerformanceModifier.isSelected());
options.setReputationPerformanceModifierCutOff(chkReputationPerformanceModifierCutOff.isSelected());
Expand Down
Loading