diff --git a/modules/core/src/main/kotlin/com/waicool20/wai2k/script/modules/combat/CombatModule.kt b/modules/core/src/main/kotlin/com/waicool20/wai2k/script/modules/combat/CombatModule.kt index 03f5a21ae..269d327d9 100644 --- a/modules/core/src/main/kotlin/com/waicool20/wai2k/script/modules/combat/CombatModule.kt +++ b/modules/core/src/main/kotlin/com/waicool20/wai2k/script/modules/combat/CombatModule.kt @@ -84,9 +84,6 @@ class CombatModule(navigator: Navigator) : ScriptModule(navigator) { return } } - // Cancel further execution if any of the dolls needed to repair but were not able to - wasCancelled = gameState.echelons.any { it.needsRepairs() } - if (wasCancelled) return navigator.navigateTo(LocationId.COMBAT) val map = map as CombatMap.StoryMap @@ -227,10 +224,6 @@ class CombatModule(navigator: Navigator) : ScriptModule(navigator) { updateEchelonRepairStatus(1) - val echelon1Members = gameState.echelons[0].members.map { it.name } - wasCancelled = - profile.combat.draggers.none { TDoll.lookup(config, it.id)?.name in echelon1Members } - // Sometimes update echelon repair status reads the old dolls name because old doll is still // on screen briefly after the switch if (scriptStats.sortiesDone >= 1 && gameState.echelons[0].members[slot - 1].name != tdoll.name) {