mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-04 15:27:50 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix and unit-test Hakkapeliitta TransferMovement ability (#9539)

Browse Source
This commit is contained in:
SomeTroglodyte
2023-06-07 12:35:53 +02:00
committed by GitHub
parent 2994f7afa9
commit 936b9e34ef
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/com/unciv/logic/map/mapunit/UnitTurnManager.kt
View File

@ -140,16 +140,14 @@ class UnitTurnManager(val unit: MapUnit) {
unit.due = true
// Hakkapeliitta movement boost
if (unit.getTile().getUnits().count() > 1) {
// For every double-stacked tile, check if our cohabitant can boost our speed
for (tileUnit in unit.getTile().getUnits())
{
if (tileUnit == unit) continue
// For every double-stacked tile, check if our cohabitant can boost our speed
// (a test `count() > 1` is no optimization - two iterations of a sequence instead of one)
for (boostingUnit in unit.getTile().getUnits()) {
if (boostingUnit == unit) continue
if (tileUnit.getMatchingUniques(UniqueType.TransferMovement)
.any { tileUnit.matchesFilter(it.params[0]) } )
tileUnit.currentMovement = maxOf(tileUnit.getMaxMovement().toFloat(), tileUnit.getMaxMovement().toFloat())
}
if (boostingUnit.getMatchingUniques(UniqueType.TransferMovement)
.none { unit.matchesFilter(it.params[0]) } ) continue
unit.currentMovement = unit.currentMovement.coerceAtLeast(boostingUnit.getMaxMovement().toFloat())
}
// Wake sleeping units if there's an enemy in vision range:

25
tests/src/com/unciv/uniques/UnitUniquesTests.kt
View File

@ -1,6 +1,8 @@
package com.unciv.uniques
import com.badlogic.gdx.math.Vector2
import com.sun.source.tree.AssertTree
import com.unciv.logic.map.mapunit.UnitTurnManager
import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.translations.fillPlaceholders
import com.unciv.testing.GdxTestRunner
@ -10,6 +12,7 @@ import org.junit.Assert
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import kotlin.math.roundToInt
@RunWith(GdxTestRunner::class)
class UnitUniquesTests {
@ -42,6 +45,7 @@ class UnitUniquesTests {
Assert.assertNotNull("Great Person should have a gift action", giftAction)
}
@Test
fun CanConstructResourceRequiringImprovement() {
// Do this early so the uniqueObjects lazy is still un-triggered
@ -87,4 +91,25 @@ class UnitUniquesTests {
Assert.assertFalse("Great Engineer SHOULD be able to create a Manufactory modded to require Iron once Iron is available",
actionsWithIron.isEmpty())
}
@Test
fun `Check Hakkapeliitta TransferMovement ability`() {
val civ = game.addCiv(isPlayer = true)
val centerTile = game.getTile(Vector2.Zero)
// Hardcoded names mean test *must* run under G&K ruleset, not Vanilla, which the TestGame class ensures
val general = game.addUnit("Great General", civ, centerTile)
val boostingUnit = game.addUnit("Hakkapeliitta", civ, centerTile)
boostingUnit.baseUnit.promotions.forEach { boostingUnit.promotions.addPromotion(it, true) }
boostingUnit.updateUniques()
val baseMovement = general.baseUnit.movement
UnitTurnManager(general).startTurn()
val actualMovement = general.currentMovement.roundToInt()
val boosterMovement = boostingUnit.baseUnit.movement
Assert.assertEquals("Great General stacked with a Hakkapeliitta should have increased movement points.", boosterMovement, actualMovement)
// This effectively tests whether the G&K rules have not been tampered with, but won't hurt
Assert.assertNotEquals("Great General stacked with a Hakkapeliitta should NOT have its normal movement points.", baseMovement, actualMovement)
}
}