From e01248b985604f2e74815afc8ff722fbd0c7d41a Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Mon, 17 Jun 2024 09:54:33 -0500 Subject: [PATCH 1/4] feat: Updated market panel descriptions - Renamed `lblBlackMarketWarning` to `lblMarketDescriptions` - Updated market descriptions content in `GUI.properties` --- MekHQ/resources/mekhq/resources/GUI.properties | 5 +++-- MekHQ/src/mekhq/gui/panes/UnitMarketPane.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/MekHQ/resources/mekhq/resources/GUI.properties b/MekHQ/resources/mekhq/resources/GUI.properties index 0838bd8f9e..d4bc23c5bb 100644 --- a/MekHQ/resources/mekhq/resources/GUI.properties +++ b/MekHQ/resources/mekhq/resources/GUI.properties @@ -1287,8 +1287,9 @@ chkFilterByPercentageOfCost.text=Show only units at chkFilterByPercentageOfCost.toolTipText=Filter out units above the specified percentage of market value. spnFilterByPercentageOfCost.toolTipText=Filter out units with market value above this percentage when the filter is enabled. lblCostPercentageThreshold.text=% of market value or lower -### Black Market Panel -lblBlackMarketWarning.text=Open Market & Mercenary Auction: The public sale of units available to your campaign faction\ +### Market Description Panel +lblMarketDescriptions.text=Open Market: The public sale of units available to your campaign faction\ +
Mercenary Auction: The sale of unwanted units sold through the MRBC (or the era-appropriate equivalent)\
Employer Market: Units or salvage no longer wanted by your employer\
Factory Line: Brand-new units fresh off the production line\
Black Market: Potentially brand-new units which come with the risk of being swindled diff --git a/MekHQ/src/mekhq/gui/panes/UnitMarketPane.java b/MekHQ/src/mekhq/gui/panes/UnitMarketPane.java index 1aba6005de..8ce7d9eb40 100644 --- a/MekHQ/src/mekhq/gui/panes/UnitMarketPane.java +++ b/MekHQ/src/mekhq/gui/panes/UnitMarketPane.java @@ -198,7 +198,7 @@ protected Component createLeftComponent() { final JScrollPane marketTableScrollPane = createMarketTablePane(); - final JLabel lblBlackMarketWarning = new JLabel(resources.getString("lblBlackMarketWarning.text")); + final JLabel lblMarketDescriptions = new JLabel(resources.getString("lblMarketDescriptions.text")); // Layout the UI JPanel panel = new JPanel(); @@ -215,7 +215,7 @@ protected Component createLeftComponent() { .addComponent(filtersPanel) .addComponent(getEntityImagePanel(), Alignment.LEADING)) .addComponent(marketTableScrollPane) - .addComponent(lblBlackMarketWarning) + .addComponent(lblMarketDescriptions) ); layout.setHorizontalGroup( @@ -224,7 +224,7 @@ protected Component createLeftComponent() { .addComponent(filtersPanel) .addComponent(getEntityImagePanel())) .addComponent(marketTableScrollPane) - .addComponent(lblBlackMarketWarning, Alignment.TRAILING) + .addComponent(lblMarketDescriptions, Alignment.TRAILING) ); return panel; } From d3cdd974bfcdabbb73ee45d43a2ccf11bcacd1d5 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Mon, 17 Jun 2024 10:48:25 -0500 Subject: [PATCH 2/4] feat: Modified unit price computation in AtBMonthlyUnitMarket * Added getPricePercentage function to UnitMarketType class * Adjusted price modifier and percentage calculation for different unit and market types * Refactored addOffers method to use new pricing approach * Replaced static price target with a dynamic price modifier --- .../campaign/market/enums/UnitMarketType.java | 41 +++++++++++++ .../unitMarket/AtBMonthlyUnitMarket.java | 61 ++++++++++--------- 2 files changed, 72 insertions(+), 30 deletions(-) diff --git a/MekHQ/src/mekhq/campaign/market/enums/UnitMarketType.java b/MekHQ/src/mekhq/campaign/market/enums/UnitMarketType.java index 8081ca259a..563ee2cdde 100644 --- a/MekHQ/src/mekhq/campaign/market/enums/UnitMarketType.java +++ b/MekHQ/src/mekhq/campaign/market/enums/UnitMarketType.java @@ -108,7 +108,48 @@ public String toString() { return name; } + /** + * Calculates the price percentage based on a given modifier and d6 roll. + * + * @param modifier the modifier to adjust the price (a positive modifier decreases price, negative decreases price) + * @return the calculated price + * @throws IllegalStateException if the roll value is unexpected + */ + public static int getPricePercentage(int modifier) { + int roll = Compute.d6(2); + int value = 0; + switch (roll) { + case 2: + value = 3 + modifier; + break; + case 3: + value = 2 + modifier; + break; + case 4: + case 5: + value = 1 + modifier; + break; + case 6: + case 7: + case 8: + break; + case 9: + case 10: + value = -1 + modifier; + break; + case 11: + value = -2 + modifier; + break; + case 12: + value = -3 + modifier; + break; + default: + throw new IllegalStateException("Unexpected value in mekhq/campaign/market/unitMarket/AtBMonthlyUnitMarket.java/getPrice: " + roll); + } + + return 100 + (value * 5); + } /** * Returns the quality of a unit based on the given market type. diff --git a/MekHQ/src/mekhq/campaign/market/unitMarket/AtBMonthlyUnitMarket.java b/MekHQ/src/mekhq/campaign/market/unitMarket/AtBMonthlyUnitMarket.java index 1f20e06489..79d9597c87 100644 --- a/MekHQ/src/mekhq/campaign/market/unitMarket/AtBMonthlyUnitMarket.java +++ b/MekHQ/src/mekhq/campaign/market/unitMarket/AtBMonthlyUnitMarket.java @@ -39,6 +39,8 @@ import java.util.Collection; import java.util.List; +import static mekhq.campaign.market.enums.UnitMarketType.getPricePercentage; + public class AtBMonthlyUnitMarket extends AbstractUnitMarket { //region Constructors public AtBMonthlyUnitMarket() { @@ -76,47 +78,47 @@ public void generateUnitOffers(final Campaign campaign) { Faction faction = campaign.getFaction(); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.OPEN, UnitType.MEK, - faction, IUnitRating.DRAGOON_F, 6); + faction, IUnitRating.DRAGOON_F, -1); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.OPEN, UnitType.AEROSPACEFIGHTER, - faction, IUnitRating.DRAGOON_F, 6); + faction, IUnitRating.DRAGOON_F, -1); addOffers(campaign, getMarketItemCount("very common"), UnitMarketType.OPEN, UnitType.TANK, - faction, IUnitRating.DRAGOON_F, 6); + faction, IUnitRating.DRAGOON_F, -1); addOffers(campaign, getMarketItemCount("common"), UnitMarketType.OPEN, UnitType.CONV_FIGHTER, - faction, IUnitRating.DRAGOON_F, 6); + faction, IUnitRating.DRAGOON_F, -1); if ((contract != null) && (campaign.getLocalDate().isAfter(contract.getStartDate().minusDays(1)))) { // Employer Market faction = contract.getEmployerFaction(); addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.EMPLOYER, UnitType.MEK, - faction, IUnitRating.DRAGOON_D, 8); + faction, IUnitRating.DRAGOON_D, 1); addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.EMPLOYER, UnitType.AEROSPACEFIGHTER, - faction, IUnitRating.DRAGOON_D, 8); + faction, IUnitRating.DRAGOON_D, 1); addOffers(campaign, getMarketItemCount("common"), UnitMarketType.EMPLOYER, UnitType.TANK, - faction, IUnitRating.DRAGOON_D, 8); + faction, IUnitRating.DRAGOON_D, 1); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.EMPLOYER, UnitType.CONV_FIGHTER, - faction, IUnitRating.DRAGOON_D, 8); + faction, IUnitRating.DRAGOON_D, 1); // Unwanted Salvage Market faction = contract.getEnemy(); addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.EMPLOYER, UnitType.MEK, - faction, IUnitRating.DRAGOON_F, 5); + faction, IUnitRating.DRAGOON_F, -2); addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.EMPLOYER, UnitType.AEROSPACEFIGHTER, - faction, IUnitRating.DRAGOON_F, 5); + faction, IUnitRating.DRAGOON_F, -2); addOffers(campaign, getMarketItemCount("common"), UnitMarketType.EMPLOYER, UnitType.TANK, - faction, IUnitRating.DRAGOON_F, 5); + faction, IUnitRating.DRAGOON_F, -2); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.EMPLOYER, UnitType.CONV_FIGHTER, - faction, IUnitRating.DRAGOON_F, 5); + faction, IUnitRating.DRAGOON_F, -2); } // Mercenary Market @@ -130,16 +132,16 @@ public void generateUnitOffers(final Campaign campaign) { } addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.MERCENARY, UnitType.MEK, - faction, IUnitRating.DRAGOON_C, 7 + modifier); + faction, IUnitRating.DRAGOON_C, modifier); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.MERCENARY, UnitType.AEROSPACEFIGHTER, - faction, IUnitRating.DRAGOON_C, 7 + modifier); + faction, IUnitRating.DRAGOON_C, modifier); addOffers(campaign, getMarketItemCount("very common"), UnitMarketType.MERCENARY, UnitType.TANK, - faction, IUnitRating.DRAGOON_C, 7 + modifier); + faction, IUnitRating.DRAGOON_C, modifier); addOffers(campaign, getMarketItemCount("common"), UnitMarketType.MERCENARY, UnitType.CONV_FIGHTER, - faction, IUnitRating.DRAGOON_C, 7 + modifier); + faction, IUnitRating.DRAGOON_C, modifier); } // Factory Market @@ -149,16 +151,16 @@ public void generateUnitOffers(final Campaign campaign) { if ((!campaign.getFaction().isClan()) && (faction != null) && (!faction.isClan())) { addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.FACTORY, UnitType.MEK, - faction, IUnitRating.DRAGOON_A, 6); + faction, IUnitRating.DRAGOON_A, -2); addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.FACTORY, UnitType.AEROSPACEFIGHTER, - faction, IUnitRating.DRAGOON_A, 6); + faction, IUnitRating.DRAGOON_A, -2); addOffers(campaign, getMarketItemCount("common"), UnitMarketType.FACTORY, UnitType.TANK, - faction, IUnitRating.DRAGOON_A, 6); + faction, IUnitRating.DRAGOON_A, -2); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.FACTORY, UnitType.CONV_FIGHTER, - faction, IUnitRating.DRAGOON_A, 6); + faction, IUnitRating.DRAGOON_A, -2); } } @@ -167,13 +169,13 @@ public void generateUnitOffers(final Campaign campaign) { // Clan Factory Market if ((faction.isClan()) && (campaign.getCurrentSystem().getFactionSet(campaign.getLocalDate()).contains(faction))) { addOffers(campaign, getMarketItemCount("very common"), UnitMarketType.FACTORY, UnitType.MEK, - faction, IUnitRating.DRAGOON_A, 9); + faction, IUnitRating.DRAGOON_A, 4); addOffers(campaign, getMarketItemCount("common"), UnitMarketType.FACTORY, UnitType.AEROSPACEFIGHTER, - faction, IUnitRating.DRAGOON_A, 9); + faction, IUnitRating.DRAGOON_A, 4); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.FACTORY, UnitType.TANK, - faction, IUnitRating.DRAGOON_A, 9); + faction, IUnitRating.DRAGOON_A, 4); } // Black Market @@ -182,16 +184,16 @@ public void generateUnitOffers(final Campaign campaign) { .getFactionSet(campaign.getLocalDate())); addOffers(campaign, getMarketItemCount("very rare"), UnitMarketType.BLACK_MARKET, UnitType.MEK, - faction, IUnitRating.DRAGOON_A, 9); + faction, IUnitRating.DRAGOON_A, 4); addOffers(campaign, getMarketItemCount("very rare"), UnitMarketType.BLACK_MARKET, UnitType.AEROSPACEFIGHTER, - faction, IUnitRating.DRAGOON_A, 9); + faction, IUnitRating.DRAGOON_A, 4); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.BLACK_MARKET, UnitType.TANK, - faction, IUnitRating.DRAGOON_A, 9); + faction, IUnitRating.DRAGOON_A, 4); addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.BLACK_MARKET, UnitType.CONV_FIGHTER, - faction, IUnitRating.DRAGOON_A, 9); + faction, IUnitRating.DRAGOON_A, 4); } writeRefreshReport(campaign); @@ -224,7 +226,7 @@ private int getMarketItemCount(String rarity) { @Override public void addOffers(final Campaign campaign, final int num, UnitMarketType market, final int unitType, @Nullable Faction faction, final int quality, - final int priceTarget) { + final int priceModifier) { if (faction == null) { faction = RandomFactionGenerator.getInstance().getEmployerFaction(); } @@ -268,8 +270,7 @@ public void addOffers(final Campaign campaign, final int num, UnitMarketType mar } } - final int percent = 100 - (Compute.d6(2) - priceTarget) * 5; - addSingleUnit(campaign, market, unitType, faction, quality, movementModes, missionRoles, percent); + addSingleUnit(campaign, market, unitType, faction, quality, movementModes, missionRoles, getPricePercentage(priceModifier)); } } From 8bb6f12c35a4f56a1d97e2e46869465a3bed4fee Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Mon, 17 Jun 2024 11:45:38 -0500 Subject: [PATCH 3/4] feat: Adjusted unit market price modifier in AtBMonthlyUnitMarket - Changed price modifier in various market types; positive values now increase price, negative decrease - Fixed inaccurate comment in UnitMarketType regarding price modifier adjustment --- .../campaign/market/enums/UnitMarketType.java | 2 +- .../unitMarket/AtBMonthlyUnitMarket.java | 50 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/MekHQ/src/mekhq/campaign/market/enums/UnitMarketType.java b/MekHQ/src/mekhq/campaign/market/enums/UnitMarketType.java index 563ee2cdde..a529ca5099 100644 --- a/MekHQ/src/mekhq/campaign/market/enums/UnitMarketType.java +++ b/MekHQ/src/mekhq/campaign/market/enums/UnitMarketType.java @@ -111,7 +111,7 @@ public String toString() { /** * Calculates the price percentage based on a given modifier and d6 roll. * - * @param modifier the modifier to adjust the price (a positive modifier decreases price, negative decreases price) + * @param modifier the modifier to adjust the price (a negative modifier decreases price, positive increases price) * @return the calculated price * @throws IllegalStateException if the roll value is unexpected */ diff --git a/MekHQ/src/mekhq/campaign/market/unitMarket/AtBMonthlyUnitMarket.java b/MekHQ/src/mekhq/campaign/market/unitMarket/AtBMonthlyUnitMarket.java index 79d9597c87..057aac33dd 100644 --- a/MekHQ/src/mekhq/campaign/market/unitMarket/AtBMonthlyUnitMarket.java +++ b/MekHQ/src/mekhq/campaign/market/unitMarket/AtBMonthlyUnitMarket.java @@ -78,57 +78,57 @@ public void generateUnitOffers(final Campaign campaign) { Faction faction = campaign.getFaction(); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.OPEN, UnitType.MEK, - faction, IUnitRating.DRAGOON_F, -1); + faction, IUnitRating.DRAGOON_F, 1); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.OPEN, UnitType.AEROSPACEFIGHTER, - faction, IUnitRating.DRAGOON_F, -1); + faction, IUnitRating.DRAGOON_F, 1); addOffers(campaign, getMarketItemCount("very common"), UnitMarketType.OPEN, UnitType.TANK, - faction, IUnitRating.DRAGOON_F, -1); + faction, IUnitRating.DRAGOON_F, 1); addOffers(campaign, getMarketItemCount("common"), UnitMarketType.OPEN, UnitType.CONV_FIGHTER, - faction, IUnitRating.DRAGOON_F, -1); + faction, IUnitRating.DRAGOON_F, 1); if ((contract != null) && (campaign.getLocalDate().isAfter(contract.getStartDate().minusDays(1)))) { // Employer Market faction = contract.getEmployerFaction(); addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.EMPLOYER, UnitType.MEK, - faction, IUnitRating.DRAGOON_D, 1); + faction, IUnitRating.DRAGOON_D, -1); addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.EMPLOYER, UnitType.AEROSPACEFIGHTER, - faction, IUnitRating.DRAGOON_D, 1); + faction, IUnitRating.DRAGOON_D, -1); addOffers(campaign, getMarketItemCount("common"), UnitMarketType.EMPLOYER, UnitType.TANK, - faction, IUnitRating.DRAGOON_D, 1); + faction, IUnitRating.DRAGOON_D, -1); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.EMPLOYER, UnitType.CONV_FIGHTER, - faction, IUnitRating.DRAGOON_D, 1); + faction, IUnitRating.DRAGOON_D, -1); // Unwanted Salvage Market faction = contract.getEnemy(); addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.EMPLOYER, UnitType.MEK, - faction, IUnitRating.DRAGOON_F, -2); + faction, IUnitRating.DRAGOON_F, 2); addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.EMPLOYER, UnitType.AEROSPACEFIGHTER, - faction, IUnitRating.DRAGOON_F, -2); + faction, IUnitRating.DRAGOON_F, 2); addOffers(campaign, getMarketItemCount("common"), UnitMarketType.EMPLOYER, UnitType.TANK, - faction, IUnitRating.DRAGOON_F, -2); + faction, IUnitRating.DRAGOON_F, 2); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.EMPLOYER, UnitType.CONV_FIGHTER, - faction, IUnitRating.DRAGOON_F, -2); + faction, IUnitRating.DRAGOON_F, 2); } // Mercenary Market if (!campaign.getFaction().isClan()) { faction = Factions.getInstance().getFaction("MERC"); - int modifier = -1; + int modifier = 1; if (campaign.getFaction().isMercenary()) { - modifier = 1; + modifier = -1; } addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.MERCENARY, UnitType.MEK, @@ -151,16 +151,16 @@ public void generateUnitOffers(final Campaign campaign) { if ((!campaign.getFaction().isClan()) && (faction != null) && (!faction.isClan())) { addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.FACTORY, UnitType.MEK, - faction, IUnitRating.DRAGOON_A, -2); + faction, IUnitRating.DRAGOON_A, 2); addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.FACTORY, UnitType.AEROSPACEFIGHTER, - faction, IUnitRating.DRAGOON_A, -2); + faction, IUnitRating.DRAGOON_A, 2); addOffers(campaign, getMarketItemCount("common"), UnitMarketType.FACTORY, UnitType.TANK, - faction, IUnitRating.DRAGOON_A, -2); + faction, IUnitRating.DRAGOON_A, 2); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.FACTORY, UnitType.CONV_FIGHTER, - faction, IUnitRating.DRAGOON_A, -2); + faction, IUnitRating.DRAGOON_A, 2); } } @@ -169,13 +169,13 @@ public void generateUnitOffers(final Campaign campaign) { // Clan Factory Market if ((faction.isClan()) && (campaign.getCurrentSystem().getFactionSet(campaign.getLocalDate()).contains(faction))) { addOffers(campaign, getMarketItemCount("very common"), UnitMarketType.FACTORY, UnitType.MEK, - faction, IUnitRating.DRAGOON_A, 4); + faction, IUnitRating.DRAGOON_A, -4); addOffers(campaign, getMarketItemCount("common"), UnitMarketType.FACTORY, UnitType.AEROSPACEFIGHTER, - faction, IUnitRating.DRAGOON_A, 4); + faction, IUnitRating.DRAGOON_A, -4); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.FACTORY, UnitType.TANK, - faction, IUnitRating.DRAGOON_A, 4); + faction, IUnitRating.DRAGOON_A, -4); } // Black Market @@ -184,16 +184,16 @@ public void generateUnitOffers(final Campaign campaign) { .getFactionSet(campaign.getLocalDate())); addOffers(campaign, getMarketItemCount("very rare"), UnitMarketType.BLACK_MARKET, UnitType.MEK, - faction, IUnitRating.DRAGOON_A, 4); + faction, IUnitRating.DRAGOON_A, -4); addOffers(campaign, getMarketItemCount("very rare"), UnitMarketType.BLACK_MARKET, UnitType.AEROSPACEFIGHTER, - faction, IUnitRating.DRAGOON_A, 4); + faction, IUnitRating.DRAGOON_A, -4); addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.BLACK_MARKET, UnitType.TANK, - faction, IUnitRating.DRAGOON_A, 4); + faction, IUnitRating.DRAGOON_A, -4); addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.BLACK_MARKET, UnitType.CONV_FIGHTER, - faction, IUnitRating.DRAGOON_A, 4); + faction, IUnitRating.DRAGOON_A, -4); } writeRefreshReport(campaign); From 78b26eb29377ba6be35ac9110c9e62ffe9ff5918 Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Thu, 20 Jun 2024 10:08:23 -0500 Subject: [PATCH 4/4] feat: Adjusted market item rarity and price mods in AtBMonthlyUnitMarket * Decreased modifier for very rare, rare, and uncommon item offers in black market * Changed item rarity for tank from uncommon to rare * Refactored getPricePercentage method in UnitMarketType, rearranged modifier operand for clarity --- .../campaign/market/enums/UnitMarketType.java | 15 ++++++++------- .../market/unitMarket/AtBMonthlyUnitMarket.java | 10 +++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/MekHQ/src/mekhq/campaign/market/enums/UnitMarketType.java b/MekHQ/src/mekhq/campaign/market/enums/UnitMarketType.java index a529ca5099..9cc648fd4c 100644 --- a/MekHQ/src/mekhq/campaign/market/enums/UnitMarketType.java +++ b/MekHQ/src/mekhq/campaign/market/enums/UnitMarketType.java @@ -117,32 +117,33 @@ public String toString() { */ public static int getPricePercentage(int modifier) { int roll = Compute.d6(2); - int value = 0; + int value; switch (roll) { case 2: - value = 3 + modifier; + value = modifier + 3; break; case 3: - value = 2 + modifier; + value = modifier + 2; break; case 4: case 5: - value = 1 + modifier; + value = modifier + 1; break; case 6: case 7: case 8: + value = modifier; break; case 9: case 10: - value = -1 + modifier; + value = modifier - 1; break; case 11: - value = -2 + modifier; + value = modifier - 2; break; case 12: - value = -3 + modifier; + value = modifier - 3; break; default: throw new IllegalStateException("Unexpected value in mekhq/campaign/market/unitMarket/AtBMonthlyUnitMarket.java/getPrice: " + roll); diff --git a/MekHQ/src/mekhq/campaign/market/unitMarket/AtBMonthlyUnitMarket.java b/MekHQ/src/mekhq/campaign/market/unitMarket/AtBMonthlyUnitMarket.java index 057aac33dd..23050ce4b2 100644 --- a/MekHQ/src/mekhq/campaign/market/unitMarket/AtBMonthlyUnitMarket.java +++ b/MekHQ/src/mekhq/campaign/market/unitMarket/AtBMonthlyUnitMarket.java @@ -184,16 +184,16 @@ public void generateUnitOffers(final Campaign campaign) { .getFactionSet(campaign.getLocalDate())); addOffers(campaign, getMarketItemCount("very rare"), UnitMarketType.BLACK_MARKET, UnitType.MEK, - faction, IUnitRating.DRAGOON_A, -4); + faction, IUnitRating.DRAGOON_A, -8); addOffers(campaign, getMarketItemCount("very rare"), UnitMarketType.BLACK_MARKET, UnitType.AEROSPACEFIGHTER, - faction, IUnitRating.DRAGOON_A, -4); + faction, IUnitRating.DRAGOON_A, -8); - addOffers(campaign, getMarketItemCount("uncommon"), UnitMarketType.BLACK_MARKET, UnitType.TANK, - faction, IUnitRating.DRAGOON_A, -4); + addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.BLACK_MARKET, UnitType.TANK, + faction, IUnitRating.DRAGOON_A, -8); addOffers(campaign, getMarketItemCount("rare"), UnitMarketType.BLACK_MARKET, UnitType.CONV_FIGHTER, - faction, IUnitRating.DRAGOON_A, -4); + faction, IUnitRating.DRAGOON_A, -8); } writeRefreshReport(campaign);