From 03cebbdd42ca4018ca5e4dd6f710983be5a9f95a Mon Sep 17 00:00:00 2001 From: SimonCeder <63475501+SimonCeder@users.noreply.github.com> Date: Thu, 28 Oct 2021 21:31:20 +0200 Subject: [PATCH] Fix for broken saves in #5573 (#5587) * no new camps in 4 tiles for 15 turns after cleared * can't spawn land units on water or vice versa, unit choice * UniqueType.MustSetUp * sometroglodyte's fixes --- core/src/com/unciv/logic/BarbarianManager.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/BarbarianManager.kt b/core/src/com/unciv/logic/BarbarianManager.kt index 8e7d00db27..dfd798be39 100644 --- a/core/src/com/unciv/logic/BarbarianManager.kt +++ b/core/src/com/unciv/logic/BarbarianManager.kt @@ -167,7 +167,8 @@ class BarbarianManager { } } -class Encampment (val position: Vector2) { +class Encampment() { + val position = Vector2() var countdown = 0 var spawnedUnits = -1 var destroyed = false // destroyed encampments haunt the vicinity for 15 turns preventing new spawns @@ -175,6 +176,11 @@ class Encampment (val position: Vector2) { @Transient lateinit var gameInfo: GameInfo + constructor(position: Vector2): this() { + this.position.x = position.x + this.position.y = position.y + } + fun clone(): Encampment { val toReturn = Encampment(position) toReturn.countdown = countdown