Skip to content

Commit 4cd940c

Browse files
committed
Fix issue with enabling Blitzer's Best Kegs inducements.
Also improve error reporting for future problems with inducements
1 parent fbad4b6 commit 4cd940c

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

modules/jervis-engine/src/commonMain/kotlin/com/jervisffb/engine/rules/bb2025/BB2025Inducements.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ val DEFAULT_INDUCEMENTS_BB2025 = mapOf<InducementType, Inducement<*>>(
1919
InducementType.TEMP_AGENCY_CHEERLEADER to SimpleInducement(InducementType.TEMP_AGENCY_CHEERLEADER, "Temp Agency Cheerleaders", 5, 5_000, true),
2020
InducementType.TEAM_MASCOT to SimpleInducement(InducementType.TEAM_MASCOT, "Team Mascot", 1, 25_000, true),
2121
InducementType.WEATHER_MAGE to SimpleInducement(InducementType.WEATHER_MAGE, "Weather Mage", 1, 25_000, true),
22-
InducementType.BLITZERS_BEST_KEGS to SimpleInducement(InducementType.BLOODWEISER_KEG, "Blitzer's Best Kegs", 2, 50_000, true),
22+
InducementType.BLITZERS_BEST_KEGS to SimpleInducement(InducementType.BLITZERS_BEST_KEGS, "Blitzer's Best Kegs", 2, 50_000, true),
2323
InducementType.BRIBE to SimpleInducement(InducementType.BRIBE, "Bribe", 3, 100_000, true), // 0.5x price and 2x amount for Bribery and Corruption
2424
InducementType.EXTRA_TEAM_TRAINING to SimpleInducement(InducementType.EXTRA_TEAM_TRAINING, "Extra Team Training", 8, 100_000, true),
2525
InducementType.MORTUARY_ASSISTANT to SimpleInducement(InducementType.MORTUARY_ASSISTANT, "Mortuary Assistant", 1, 100_000, true, requirements = listOf(TeamSpecialRule.MASTERS_OF_UNDEATH)),

modules/jervis-ui/src/commonMain/kotlin/com/jervisffb/ui/menu/components/setup/InducementsSetupComponentModel.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class InducementsSetupComponentModel(initialRulesBuilder: RulesParameterBuilder,
5050
}
5151

5252
fun updateInducementEnabled(category: String, type: InducementType, enabled: Boolean) {
53-
val inducementsInCategory = inducements[category]!!
53+
val inducementsInCategory = inducements[category] ?: error("Inducements for $category not found")
5454
updateEnabled(inducementsInCategory, type, enabled)
5555

5656
// Expanded Mercenaries replace the standard rules and vice versa.
@@ -77,7 +77,10 @@ class InducementsSetupComponentModel(initialRulesBuilder: RulesParameterBuilder,
7777
) {
7878
inducements.indexOfFirst { it.type == type }.let { index ->
7979
if (index >= 0) {
80-
builders!![type]!!.enabled = enabled
80+
val inducementBuilders = builders ?: error("Missing Inducement Builders")
81+
inducementBuilders[type]?.let {
82+
it.enabled = enabled
83+
} ?: error("Builder for $type was not found")
8184
inducements[index] = inducements[index].copy(enabled = enabled)
8285
}
8386
}

0 commit comments

Comments
 (0)