mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-11 11:28:03 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix broken links from capture reorg

Browse Source
This commit is contained in:
Yair Morgenstern 2023-10-04 21:39:58 +03:00
parent 510fd7927a
commit 4e8b454284
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/battle/BattleUnitCapture.kt
View File

@ -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()

4
core/src/com/unciv/logic/map/mapunit/MapUnit.kt
View File

@ -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

5
core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt
View File

@ -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)
}
}