From 8a3dc9a58e067d9f16c4c6b9c071c8335d4cfdd3 Mon Sep 17 00:00:00 2001 From: Weaver Date: Tue, 8 Oct 2024 10:16:33 -0700 Subject: [PATCH 1/4] Hide paid recruitment if camops & turn it off --- MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java b/MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java index f6dd037f96..04f9256fd1 100644 --- a/MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java +++ b/MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java @@ -183,7 +183,10 @@ public void windowClosing(WindowEvent e) { gridBagConstraints.anchor = GridBagConstraints.WEST; panelFilterBtns.add(comboPersonType, gridBagConstraints); - if (campaign.getCampaignOptions().isUseAtB() && !campaign.hasActiveContract()) { + boolean ATBoutofContract = campaign.getCampaignOptions().isUseAtB() && !campaign.hasActiveContract(); + boolean usingCamOpsMarkets = campaign.getCampaignOptions().getPersonnelMarketName().equals("Campaign Ops"); + if (ATBoutofContract && !usingCamOpsMarkets) { + // Paid recruitment is available radioNormalRoll.setText("Make normal roll next week"); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; @@ -229,6 +232,10 @@ public Component getListCellRendererComponent(JList list, Object value, int i } else { radioNormalRoll.setSelected(true); } + } else { + // Turn off paid recruitment if it's not available + radioNormalRoll.setSelected(true); + personnelMarket.setPaidRecruitment(false); } scrollTablePersonnel.setMinimumSize(new Dimension(500, 400)); From 981e08cd63af67e92553f67eb0eafdcaaf2249bd Mon Sep 17 00:00:00 2001 From: Weaver Date: Tue, 8 Oct 2024 11:19:40 -0700 Subject: [PATCH 2/4] PersonnelMarket selects first option if available when opened --- MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java b/MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java index 04f9256fd1..089342f200 100644 --- a/MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java +++ b/MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java @@ -555,6 +555,9 @@ void refreshPersonView() { @Override public void setVisible(boolean visible) { filterPersonnel(); + if (tablePersonnel.getRowCount() != 0) { + tablePersonnel.setRowSelectionInterval(0,0); + } super.setVisible(visible); } From 119b66df9e14d16ed6dada1a08aecd74481d228c Mon Sep 17 00:00:00 2001 From: Weaver Date: Wed, 9 Oct 2024 13:27:40 -0700 Subject: [PATCH 3/4] Variable naming conventions --- MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java b/MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java index 089342f200..2fef873d16 100644 --- a/MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java +++ b/MekHQ/src/mekhq/gui/dialog/PersonnelMarketDialog.java @@ -183,9 +183,9 @@ public void windowClosing(WindowEvent e) { gridBagConstraints.anchor = GridBagConstraints.WEST; panelFilterBtns.add(comboPersonType, gridBagConstraints); - boolean ATBoutofContract = campaign.getCampaignOptions().isUseAtB() && !campaign.hasActiveContract(); + boolean atbOutofContract = campaign.getCampaignOptions().isUseAtB() && !campaign.hasActiveContract(); boolean usingCamOpsMarkets = campaign.getCampaignOptions().getPersonnelMarketName().equals("Campaign Ops"); - if (ATBoutofContract && !usingCamOpsMarkets) { + if (atbOutofContract && !usingCamOpsMarkets) { // Paid recruitment is available radioNormalRoll.setText("Make normal roll next week"); gridBagConstraints.gridx = 0; From 8ff8b7092725e0134a26c6745d678f1cfabbb0d0 Mon Sep 17 00:00:00 2001 From: Weaver Date: Wed, 9 Oct 2024 13:53:44 -0700 Subject: [PATCH 4/4] Disable paid recruitment for camops in camp. options --- MekHQ/src/mekhq/gui/panes/CampaignOptionsPane.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MekHQ/src/mekhq/gui/panes/CampaignOptionsPane.java b/MekHQ/src/mekhq/gui/panes/CampaignOptionsPane.java index 9385b8513d..8ffa181617 100644 --- a/MekHQ/src/mekhq/gui/panes/CampaignOptionsPane.java +++ b/MekHQ/src/mekhq/gui/panes/CampaignOptionsPane.java @@ -9478,6 +9478,9 @@ public void updateOptions() { // region Markets Tab // Personnel Market options.setPersonnelMarketName(comboPersonnelMarketType.getSelectedItem()); + if (comboPersonnelMarketType.getSelectedItem().equals("Campaign Ops")) { + campaign.getPersonnelMarket().setPaidRecruitment(false); + } options.setPersonnelMarketReportRefresh(chkPersonnelMarketReportRefresh.isSelected()); for (final Entry entry : spnPersonnelMarketRandomRemovalTargets .entrySet()) {