diff --git a/core/src/com/unciv/logic/battle/BattleUnitCapture.kt b/core/src/com/unciv/logic/battle/BattleUnitCapture.kt index 3017077f6d..ebbfd464b8 100644 --- a/core/src/com/unciv/logic/battle/BattleUnitCapture.kt +++ b/core/src/com/unciv/logic/battle/BattleUnitCapture.kt @@ -183,7 +183,7 @@ object BattleUnitCapture { capturedUnit.updateVisibleTiles() } - private fun captureOrConvertToWorker(capturedUnit: MapUnit, capturingCiv: Civilization){ + fun captureOrConvertToWorker(capturedUnit: MapUnit, capturingCiv: Civilization){ // Captured settlers are converted to workers unless captured by barbarians (so they can be returned later). if (capturedUnit.hasUnique(UniqueType.FoundCity) && !capturingCiv.isBarbarian()) { capturedUnit.destroy() diff --git a/core/src/com/unciv/logic/map/mapunit/MapUnit.kt b/core/src/com/unciv/logic/map/mapunit/MapUnit.kt index 06845bd920..8fe5f6a907 100644 --- a/core/src/com/unciv/logic/map/mapunit/MapUnit.kt +++ b/core/src/com/unciv/logic/map/mapunit/MapUnit.kt @@ -4,7 +4,7 @@ import com.badlogic.gdx.math.Vector2 import com.unciv.Constants import com.unciv.logic.IsPartOfGameInfoSerialization import com.unciv.logic.automation.unit.UnitAutomation -import com.unciv.logic.battle.Battle +import com.unciv.logic.battle.BattleUnitCapture import com.unciv.logic.battle.MapUnitCombatant import com.unciv.logic.city.City import com.unciv.logic.civilization.Civilization @@ -635,7 +635,7 @@ class MapUnit : IsPartOfGameInfoSerialization { val unguardedCivilian = tile.getUnguardedCivilian(this) // Capture Enemy Civilian Unit if you move on top of it if (isMilitary() && unguardedCivilian != null && civ.isAtWarWith(unguardedCivilian.civ)) { - Battle.captureCivilianUnit(MapUnitCombatant(this), MapUnitCombatant(tile.civilianUnit!!)) + BattleUnitCapture.captureCivilianUnit(MapUnitCombatant(this), MapUnitCombatant(tile.civilianUnit!!)) } val promotionUniques = tile.neighbors diff --git a/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt b/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt index e0740e062d..b608cd591e 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt @@ -5,14 +5,13 @@ import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.Constants import com.unciv.UncivGame -import com.unciv.logic.battle.Battle +import com.unciv.logic.battle.BattleUnitCapture import com.unciv.logic.city.City import com.unciv.logic.civilization.AlertType import com.unciv.logic.civilization.Civilization import com.unciv.logic.civilization.CivilopediaAction import com.unciv.logic.civilization.DiplomacyAction import com.unciv.logic.civilization.LocationAction -import com.unciv.logic.civilization.NotificationAction import com.unciv.logic.civilization.NotificationCategory import com.unciv.logic.civilization.NotificationIcon import com.unciv.logic.civilization.PopupAlert @@ -324,7 +323,7 @@ class AlertPopup( } addCloseButton(Constants.no, KeyboardBinding.Cancel) { // Take it for ourselves - Battle.captureOrConvertToWorker(capturedUnit, captor) + BattleUnitCapture.captureOrConvertToWorker(capturedUnit, captor) } }