mirror of
https://github.com/yairm210/Unciv.git
synced 2025-01-27 16:10:55 +07:00
chore: Modernized VisibilityTest
This commit is contained in:
Yair Morgenstern
parent
06377feaeb
commit
537ebdcbdd
@ -2,14 +2,9 @@
|
||||
package com.unciv.logic.map
|
||||
|
||||
import com.badlogic.gdx.math.Vector2
|
||||
import com.unciv.logic.GameInfo
|
||||
import com.unciv.logic.civilization.Civilization
|
||||
import com.unciv.logic.map.mapunit.MapUnit
|
||||
import com.unciv.logic.map.tile.Tile
|
||||
import com.unciv.models.ruleset.Ruleset
|
||||
import com.unciv.models.ruleset.RulesetCache
|
||||
import com.unciv.models.ruleset.nation.Nation
|
||||
import com.unciv.testing.GdxTestRunner
|
||||
import com.unciv.uniques.TestGame
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
@ -17,106 +12,81 @@ import org.junit.runner.RunWith
|
||||
@RunWith(GdxTestRunner::class)
|
||||
class VisibilityTests {
|
||||
|
||||
private var civInfo = Civilization()
|
||||
private var enemyCivInfo = Civilization()
|
||||
private var ruleSet = Ruleset()
|
||||
private var unit = MapUnit()
|
||||
private var enemyUnit = MapUnit()
|
||||
val tileMap = TileMap()
|
||||
val testGame = TestGame()
|
||||
|
||||
@Before
|
||||
fun initTheWorld() {
|
||||
RulesetCache.loadRulesets(noMods = true)
|
||||
ruleSet = RulesetCache.getVanillaRuleset()
|
||||
civInfo.gameInfo = GameInfo()
|
||||
civInfo.gameInfo.ruleset = ruleSet
|
||||
civInfo.nation = Nation().apply { name = "My nation" }
|
||||
civInfo.gameInfo.civilizations.add(civInfo)
|
||||
civInfo.gameInfo.civilizations.add(enemyCivInfo)
|
||||
|
||||
unit.civ = civInfo
|
||||
unit.owner = civInfo.civName
|
||||
|
||||
enemyUnit.civ = enemyCivInfo
|
||||
enemyUnit.owner = enemyCivInfo.civName
|
||||
|
||||
tileMap.ruleset = ruleSet
|
||||
testGame.makeHexagonalMap(5)
|
||||
}
|
||||
|
||||
fun addTile(terrainName: String, position:Vector2) = addTile(listOf(terrainName), position)
|
||||
|
||||
fun addTile(terrainNames: List<String>, position:Vector2): Tile {
|
||||
val tile = Tile()
|
||||
tile.position = position
|
||||
fun setTile(terrainName: String, position:Vector2) = setTile(listOf(terrainName), position)
|
||||
//
|
||||
fun setTile(terrainNames: List<String>, position:Vector2): Tile {
|
||||
val tile = testGame.getTile(position)
|
||||
tile.baseTerrain = terrainNames.first()
|
||||
tile.ruleset = ruleSet
|
||||
tile.setTerrainTransients()
|
||||
tile.setTerrainFeatures(terrainNames.subList(1,terrainNames.size))
|
||||
tile.tileMap = tileMap
|
||||
tileMap.tileList.add(tile)
|
||||
tileMap.tileMatrix.clear()
|
||||
tileMap.setTransients()
|
||||
tile.setTransients()
|
||||
return tile
|
||||
}
|
||||
|
||||
@Test
|
||||
fun canSeeNearbyForest() {
|
||||
val grassland = addTile("Grassland", Vector2(0f,0f))
|
||||
val forest = addTile(listOf("Grassland", "Forest"), Vector2(1f, 0f))
|
||||
val grassland = setTile("Grassland", Vector2(0f,0f))
|
||||
val forest = setTile(listOf("Grassland", "Forest"), Vector2(1f, 0f))
|
||||
val viewableTiles = grassland.getViewableTilesList(1)
|
||||
assert(viewableTiles.contains(forest))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun canSeeForestOverPlains() {
|
||||
val grassland = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile("Plains", Vector2(1f,0f))
|
||||
val forest = addTile(listOf("Grassland", "Forest"), Vector2(2f, 0f))
|
||||
val grassland = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile("Plains", Vector2(1f,0f))
|
||||
val forest = setTile(listOf("Grassland", "Forest"), Vector2(2f, 0f))
|
||||
val viewableTiles = grassland.getViewableTilesList(2)
|
||||
assert(viewableTiles.contains(forest))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun cannotSeePlainsOverForest() {
|
||||
val grassland = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile(listOf("Grassland", "Forest"), Vector2(1f, 0f))
|
||||
val plains = addTile("Plains", Vector2(2f,0f))
|
||||
val grassland = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile(listOf("Grassland", "Forest"), Vector2(1f, 0f))
|
||||
val plains = setTile("Plains", Vector2(2f,0f))
|
||||
val viewableTiles = grassland.getViewableTilesList(2)
|
||||
assert(!viewableTiles.contains(plains))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun cannotSeeForestOverForest() {
|
||||
val grassland = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile(listOf("Grassland", "Forest"), Vector2(1f, 0f))
|
||||
val plains = addTile(listOf("Plains", "Forest"), Vector2(2f,0f))
|
||||
val grassland = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile(listOf("Grassland", "Forest"), Vector2(1f, 0f))
|
||||
val plains = setTile(listOf("Plains", "Forest"), Vector2(2f,0f))
|
||||
val viewableTiles = grassland.getViewableTilesList(2)
|
||||
assert(!viewableTiles.contains(plains))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun canSeeHillOverPlains() {
|
||||
val grassland = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile("Plains", Vector2(1f,0f))
|
||||
val hill = addTile(listOf("Grassland", "Hill"), Vector2(2f, 0f))
|
||||
val grassland = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile("Plains", Vector2(1f,0f))
|
||||
val hill = setTile(listOf("Grassland", "Hill"), Vector2(2f, 0f))
|
||||
val viewableTiles = grassland.getViewableTilesList(2)
|
||||
assert(viewableTiles.contains(hill))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun cannotSeePlainsOverHill() {
|
||||
val grassland = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile(listOf("Grassland", "Hill"), Vector2(1f, 0f))
|
||||
val plains = addTile("Plains", Vector2(2f,0f))
|
||||
val grassland = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile(listOf("Grassland", "Hill"), Vector2(1f, 0f))
|
||||
val plains = setTile("Plains", Vector2(2f,0f))
|
||||
val viewableTiles = grassland.getViewableTilesList(2)
|
||||
assert(!viewableTiles.contains(plains))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun cannotSeeHillOverHill() {
|
||||
val grassland = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile(listOf("Grassland", "Hill"), Vector2(1f,0f))
|
||||
val hill = addTile(listOf("Grassland", "Hill"), Vector2(2f, 0f))
|
||||
val grassland = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile(listOf("Grassland", "Hill"), Vector2(1f,0f))
|
||||
val hill = setTile(listOf("Grassland", "Hill"), Vector2(2f, 0f))
|
||||
val viewableTiles = grassland.getViewableTilesList(2)
|
||||
assert(!viewableTiles.contains(hill))
|
||||
}
|
||||
@ -124,46 +94,46 @@ class VisibilityTests {
|
||||
|
||||
@Test
|
||||
fun cannotSeeHillOverForest() {
|
||||
val grassland = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile(listOf("Grassland", "Forest"), Vector2(1f,0f))
|
||||
val hill = addTile(listOf("Grassland", "Hill"), Vector2(2f, 0f))
|
||||
val grassland = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile(listOf("Grassland", "Forest"), Vector2(1f,0f))
|
||||
val hill = setTile(listOf("Grassland", "Hill"), Vector2(2f, 0f))
|
||||
val viewableTiles = grassland.getViewableTilesList(2)
|
||||
assert(!viewableTiles.contains(hill))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun cannotSeeForestOverHill() {
|
||||
val grassland = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile(listOf("Grassland", "Hill"), Vector2(1f,0f))
|
||||
val hill = addTile(listOf("Grassland", "Forest"), Vector2(2f, 0f))
|
||||
val grassland = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile(listOf("Grassland", "Hill"), Vector2(1f,0f))
|
||||
val hill = setTile(listOf("Grassland", "Forest"), Vector2(2f, 0f))
|
||||
val viewableTiles = grassland.getViewableTilesList(2)
|
||||
assert(!viewableTiles.contains(hill))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun canSeeHillForestOverHill() {
|
||||
val grassland = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile(listOf("Grassland", "Forest"), Vector2(1f,0f))
|
||||
val hill = addTile(listOf("Grassland", "Hill", "Forest"), Vector2(2f, 0f))
|
||||
val grassland = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile(listOf("Grassland", "Forest"), Vector2(1f,0f))
|
||||
val hill = setTile(listOf("Grassland", "Hill", "Forest"), Vector2(2f, 0f))
|
||||
val viewableTiles = grassland.getViewableTilesList(2)
|
||||
assert(viewableTiles.contains(hill))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun canSeeMountainOverHill() {
|
||||
val grassland = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile(listOf("Grassland", "Hill"), Vector2(1f,0f))
|
||||
val hill = addTile(listOf("Mountain"), Vector2(2f, 0f))
|
||||
val grassland = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile(listOf("Grassland", "Hill"), Vector2(1f,0f))
|
||||
val hill = setTile(listOf("Mountain"), Vector2(2f, 0f))
|
||||
val viewableTiles = grassland.getViewableTilesList(2)
|
||||
assert(viewableTiles.contains(hill))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun cannotSeeMountainOverHillForest() {
|
||||
val grassland = addTile(listOf("Grassland", "Hill"), Vector2(0f,0f))
|
||||
addTile(listOf("Grassland", "Hill"), Vector2(0f,0f))
|
||||
addTile(listOf("Grassland", "Hill", "Forest"), Vector2(1f,0f))
|
||||
val mountain = addTile(listOf("Mountain"), Vector2(2f, 0f))
|
||||
val grassland = setTile(listOf("Grassland", "Hill"), Vector2(0f,0f))
|
||||
setTile(listOf("Grassland", "Hill"), Vector2(0f,0f))
|
||||
setTile(listOf("Grassland", "Hill", "Forest"), Vector2(1f,0f))
|
||||
val mountain = setTile(listOf("Mountain"), Vector2(2f, 0f))
|
||||
val viewableTiles = grassland.getViewableTilesList(4)
|
||||
assert(!viewableTiles.contains(mountain))
|
||||
}
|
||||
@ -171,10 +141,10 @@ class VisibilityTests {
|
||||
|
||||
@Test
|
||||
fun cannotSee3TilesAwayPlain() {
|
||||
val source = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile("Grassland", Vector2(1f,0f))
|
||||
addTile("Grassland", Vector2(2f,0f))
|
||||
val beyondSight = addTile("Grassland", Vector2(3f,0f))
|
||||
val source = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile("Grassland", Vector2(1f,0f))
|
||||
setTile("Grassland", Vector2(2f,0f))
|
||||
val beyondSight = setTile("Grassland", Vector2(3f,0f))
|
||||
|
||||
val viewableTiles = source.getViewableTilesList(2)
|
||||
assert(!viewableTiles.contains(beyondSight))
|
||||
@ -182,10 +152,10 @@ class VisibilityTests {
|
||||
|
||||
@Test
|
||||
fun canSeeElevation3Tiles() {
|
||||
val source = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile("Grassland", Vector2(1f,0f))
|
||||
addTile("Grassland", Vector2(2f,0f))
|
||||
val beyondSight = addTile(listOf("Grassland", "Hill"), Vector2(3f,0f))
|
||||
val source = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile("Grassland", Vector2(1f,0f))
|
||||
setTile("Grassland", Vector2(2f,0f))
|
||||
val beyondSight = setTile(listOf("Grassland", "Hill"), Vector2(3f,0f))
|
||||
|
||||
val viewableTiles = source.getViewableTilesList(2)
|
||||
assert(viewableTiles.contains(beyondSight))
|
||||
@ -193,10 +163,10 @@ class VisibilityTests {
|
||||
|
||||
@Test
|
||||
fun canSeeElevation3TilesEvenWithInvisibleIntermediate() {
|
||||
val source = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile(listOf("Grassland", "Hill"), Vector2(1f,0f))
|
||||
val intermediate = addTile(listOf("Grassland", "Hill"), Vector2(2f,0f))
|
||||
val beyondSight = addTile(listOf("Grassland", "Hill", "Forest"), Vector2(3f,0f))
|
||||
val source = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile(listOf("Grassland", "Hill"), Vector2(1f,0f))
|
||||
val intermediate = setTile(listOf("Grassland", "Hill"), Vector2(2f,0f))
|
||||
val beyondSight = setTile(listOf("Grassland", "Hill", "Forest"), Vector2(3f,0f))
|
||||
|
||||
val viewableTiles = source.getViewableTilesList(2)
|
||||
assert(viewableTiles.contains(beyondSight))
|
||||
@ -205,10 +175,10 @@ class VisibilityTests {
|
||||
|
||||
@Test
|
||||
fun cannotSeeHiddenElevation3Tiles() {
|
||||
val source = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile("Grassland", Vector2(1f,0f))
|
||||
addTile(listOf("Grassland", "Forest"), Vector2(2f,0f))
|
||||
val beyondSight = addTile(listOf("Grassland", "Hill"), Vector2(3f,0f))
|
||||
val source = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile("Grassland", Vector2(1f,0f))
|
||||
setTile(listOf("Grassland", "Forest"), Vector2(2f,0f))
|
||||
val beyondSight = setTile(listOf("Grassland", "Hill"), Vector2(3f,0f))
|
||||
|
||||
val viewableTiles = source.getViewableTilesList(2)
|
||||
assert(!viewableTiles.contains(beyondSight))
|
||||
@ -216,23 +186,23 @@ class VisibilityTests {
|
||||
|
||||
@Test
|
||||
fun canSeeButNotAttackHillForestOverHill() {
|
||||
val grassland = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile(listOf("Grassland", "Hill"), Vector2(1f,0f))
|
||||
val hillForest = addTile(listOf("Grassland", "Hill", "Forest"), Vector2(2f, 0f))
|
||||
val grassland = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile(listOf("Grassland", "Hill"), Vector2(1f,0f))
|
||||
val hillForest = setTile(listOf("Grassland", "Hill", "Forest"), Vector2(2f, 0f))
|
||||
val viewableTiles = grassland.getViewableTilesList(2)
|
||||
assert(viewableTiles.contains(hillForest))
|
||||
val attackableTiles = tileMap.getViewableTiles(grassland.position, 2, true)
|
||||
val attackableTiles = testGame.tileMap.getViewableTiles(grassland.position, 2, true)
|
||||
assert(!attackableTiles.contains(hillForest))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun canSeeAndAttackMountainOverHill() {
|
||||
val grassland = addTile("Grassland", Vector2(0f,0f))
|
||||
addTile(listOf("Grassland", "Hill"), Vector2(1f,0f))
|
||||
val mountain = addTile(listOf("Mountain"), Vector2(2f, 0f))
|
||||
val grassland = setTile("Grassland", Vector2(0f,0f))
|
||||
setTile(listOf("Grassland", "Hill"), Vector2(1f,0f))
|
||||
val mountain = setTile(listOf("Mountain"), Vector2(2f, 0f))
|
||||
val viewableTiles = grassland.getViewableTilesList(2)
|
||||
assert(viewableTiles.contains(mountain))
|
||||
val attackableTiles = tileMap.getViewableTiles(grassland.position, 2, true)
|
||||
val attackableTiles = testGame.tileMap.getViewableTiles(grassland.position, 2, true)
|
||||
assert(attackableTiles.contains(mountain))
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user