Skip to content
Draft
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 @@ -602,6 +602,10 @@ lblUseFunctionalEscapeArtist.tooltip=If enabled, player-owned characters can use
lblResetTemporaryPrisonerCapacity.text=Reset Prisoner Capacity Reductions
lblResetTemporaryPrisonerCapacity.tooltip=This option removes any penalties to Prisoner Capacity that might have been\
\ added by Prisoner Events.
lblDisableIntelBreachChance.text=Disable Intel Breach Chance
lblDisableIntelBreachChance.tooltip=If enabled, releasing prisoners will not trigger intel breach events. When \
disabled (default), releasing prisoners may cause intel breaches that increase contract morale levels. Only \
available when using MekHQ prisoner capture rules.
# createDependentsPanel
lblDependentsPanel.text=Civilians
lblUseRandomDependentAddition.text=Random Addition
Expand Down
10 changes: 10 additions & 0 deletions MekHQ/src/mekhq/campaign/campaignOptions/CampaignOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ public static String getTechLevelName(final int techLevel) {
// Prisoners
private PrisonerCaptureStyle prisonerCaptureStyle;
private boolean useFunctionalEscapeArtist;
private boolean disableIntelBreachChance;

// Dependent
private boolean useRandomDependentAddition;
Expand Down Expand Up @@ -869,6 +870,7 @@ public CampaignOptions() {
// Prisoners
setPrisonerCaptureStyle(PrisonerCaptureStyle.NONE);
useFunctionalEscapeArtist = false;
disableIntelBreachChance = false;

// Dependent
setUseRandomDependentAddition(false);
Expand Down Expand Up @@ -2137,6 +2139,14 @@ public boolean isUseFunctionalEscapeArtist() {
public void setUseFunctionalEscapeArtist(final boolean useFunctionalEscapeArtist) {
this.useFunctionalEscapeArtist = useFunctionalEscapeArtist;
}

public boolean isDisableIntelBreachChance() {
return disableIntelBreachChance;
}

public void setDisableIntelBreachChance(final boolean disableIntelBreachChance) {
this.disableIntelBreachChance = disableIntelBreachChance;
}
// endregion Prisoners

// region Personnel Randomization
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,10 @@ public static void writeCampaignOptionsToXML(final CampaignOptions campaignOptio
indent,
"useFunctionalEscapeArtist",
campaignOptions.isUseFunctionalEscapeArtist());
MHQXMLUtility.writeSimpleXMLTag(pw,
indent,
"disableIntelBreachChance",
campaignOptions.isDisableIntelBreachChance());
// endregion Prisoners

// region Dependent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,8 @@ private static boolean parseNodeName(Version version, String nodeName, CampaignO
nodeContents));
case "useFunctionalEscapeArtist" -> campaignOptions.setUseFunctionalEscapeArtist(parseBoolean(
nodeContents));
case "disableIntelBreachChance" -> campaignOptions.setDisableIntelBreachChance(parseBoolean(
nodeContents));
case "useRandomDependentAddition" -> campaignOptions.setUseRandomDependentAddition(parseBoolean(
nodeContents));
case "useRandomDependentRemoval" -> campaignOptions.setUseRandomDependentRemoval(parseBoolean(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,10 @@ public static void checkForIntelBreachEvent(Campaign campaign, int freedPrisoner
return;
}

if (campaign.getCampaignOptions().isDisableIntelBreachChance()) {
return;
}

List<AtBContract> activeContracts = campaign.getActiveAtBContracts();
activeContracts.removeIf(contract -> contract.getMoraleLevel().isOverwhelming() ||
contract.getMoraleLevel().isRouted());
Expand Down
22 changes: 22 additions & 0 deletions MekHQ/src/mekhq/gui/campaignOptions/contents/PersonnelTab.java
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@
private MMComboBox<PrisonerCaptureStyle> comboPrisonerCaptureStyle;
private JCheckBox chkResetTemporaryPrisonerCapacity;
private JCheckBox chkUseFunctionalEscapeArtist;
private JCheckBox chkDisableIntelBreachChance;

private JPanel dependentsPanel;
private JCheckBox chkUseRandomDependentAddition;
Expand Down Expand Up @@ -250,6 +251,7 @@
comboPrisonerCaptureStyle = new MMComboBox<>("comboPrisonerCaptureStyle", PrisonerCaptureStyle.values());
chkResetTemporaryPrisonerCapacity = new JCheckBox();
chkUseFunctionalEscapeArtist = new JCheckBox();
chkDisableIntelBreachChance = new JCheckBox();

dependentsPanel = new JPanel();
chkUseRandomDependentAddition = new JCheckBox();
Expand Down Expand Up @@ -1198,6 +1200,14 @@
});
comboPrisonerCaptureStyle.addMouseListener(createTipPanelUpdater(prisonersAndDependentsHeader,
"PrisonerCaptureStyle"));
comboPrisonerCaptureStyle.addItemListener(e -> {

Check notice

Code scanning / CodeQL

Useless parameter Note

The parameter 'e' is never used.
PrisonerCaptureStyle selectedStyle = comboPrisonerCaptureStyle.getSelectedItem();
boolean isMekHQ = selectedStyle != null && selectedStyle.isMekHQ();
chkDisableIntelBreachChance.setEnabled(isMekHQ);
if (!isMekHQ) {
chkDisableIntelBreachChance.setSelected(false);
}
});

chkResetTemporaryPrisonerCapacity = new CampaignOptionsCheckBox("ResetTemporaryPrisonerCapacity");
chkResetTemporaryPrisonerCapacity.addMouseListener(createTipPanelUpdater(prisonersAndDependentsHeader,
Expand All @@ -1207,6 +1217,10 @@
chkUseFunctionalEscapeArtist.addMouseListener(createTipPanelUpdater(prisonersAndDependentsHeader,
"UseFunctionalEscapeArtist"));

chkDisableIntelBreachChance = new CampaignOptionsCheckBox("DisableIntelBreachChance");
chkDisableIntelBreachChance.addMouseListener(createTipPanelUpdater(prisonersAndDependentsHeader,
"DisableIntelBreachChance"));

// Layout the Panel
final JPanel panel = new CampaignOptionsStandardPanel("PrisonersPanel", true, "PrisonersPanel");
final GridBagConstraints layout = new CampaignOptionsGridBagConstraints(panel);
Expand All @@ -1228,6 +1242,11 @@
layout.gridwidth = 2;
panel.add(chkResetTemporaryPrisonerCapacity, layout);

layout.gridy++;
layout.gridx = 0;
layout.gridwidth = 2;
panel.add(chkDisableIntelBreachChance, layout);

return panel;
}

Expand Down Expand Up @@ -1422,6 +1441,8 @@
// Prisoners and Dependents
comboPrisonerCaptureStyle.setSelectedItem(options.getPrisonerCaptureStyle());
chkUseFunctionalEscapeArtist.setSelected(options.isUseFunctionalEscapeArtist());
chkDisableIntelBreachChance.setSelected(options.isDisableIntelBreachChance());
chkDisableIntelBreachChance.setEnabled(options.getPrisonerCaptureStyle().isMekHQ());
chkUseRandomDependentAddition.setSelected(options.isUseRandomDependentAddition());
chkUseRandomDependentRemoval.setSelected(options.isUseRandomDependentRemoval());
spnDependentProfessionDieSize.setValue(options.getDependentProfessionDieSize());
Expand Down Expand Up @@ -1524,6 +1545,7 @@
// Prisoners and Dependents
options.setPrisonerCaptureStyle(comboPrisonerCaptureStyle.getSelectedItem());
options.setUseFunctionalEscapeArtist(chkUseFunctionalEscapeArtist.isSelected());
options.setDisableIntelBreachChance(chkDisableIntelBreachChance.isSelected());
if (chkResetTemporaryPrisonerCapacity.isSelected()) {
campaign.setTemporaryPrisonerCapacity(DEFAULT_TEMPORARY_CAPACITY);
}
Expand Down