AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 14:24:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Probably solved a bug where brushes would cause non-ruleset terrains for mods without grassland

Browse Source
This commit is contained in:
yairm210 2021-11-11 23:56:29 +02:00
parent 4ce8704969
commit 8aa99c03e2
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -27,14 +27,10 @@ object Battle {
fun moveAndAttack(attacker: ICombatant, attackableTile: AttackableTile) { fun moveAndAttack(attacker: ICombatant, attackableTile: AttackableTile) {
if (attacker is MapUnitCombatant) { if (attacker is MapUnitCombatant) {
attacker.unit.movement.moveToTile(attackableTile.tileToAttackFrom) attacker.unit.movement.moveToTile(attackableTile.tileToAttackFrom)
/** You might ask: When can this possibly happen? /**
* We always receive an AttackableTile, which means that it was returned from getAttackableTiles!
* And getAttackableTiles should ensure that we return only units that are in the range of movement!
*
* The answer is: when crossing a HIDDEN TILE.
* When calculating movement distance, we assume that a hidden tile is 1 movement point, * When calculating movement distance, we assume that a hidden tile is 1 movement point,
* which can lead to EXCEEDINGLY RARE edge cases where you think * which can lead to EXCEEDINGLY RARE edge cases where you think
* that you can attack a tile by passing through a hidden tile, * that you can attack a tile by passing through a HIDDEN TILE,
* but the hidden tile is actually IMPASSIBLE so you stop halfway! * but the hidden tile is actually IMPASSIBLE so you stop halfway!
*/ */
if (attacker.getTile() != attackableTile.tileToAttackFrom) return if (attacker.getTile() != attackableTile.tileToAttackFrom) return

10
core/src/com/unciv/ui/mapeditor/MapEditorOptionsTable.kt
View File

@ -299,12 +299,14 @@ class MapEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(CameraS
tileInfo.ruleset = mapEditorScreen.ruleset tileInfo.ruleset = mapEditorScreen.ruleset
val terrain = resource.terrainsCanBeFoundOn.first { ruleset.terrains.containsKey(it) } val terrain = resource.terrainsCanBeFoundOn.first { ruleset.terrains.containsKey(it) }
val terrainObject = ruleset.terrains[terrain]!! val terrainObject = ruleset.terrains[terrain]!!
if (terrainObject.type == TerrainType.TerrainFeature) {
if (terrainObject.type != TerrainType.TerrainFeature) tileInfo.baseTerrain = terrain
else {
tileInfo.baseTerrain = tileInfo.baseTerrain =
if (terrainObject.occursOn.isNotEmpty()) terrainObject.occursOn.first() if (terrainObject.occursOn.isNotEmpty()) terrainObject.occursOn.first()
else "Grassland" else ruleset.terrains.values.first { it.type == TerrainType.Land }.name
tileInfo.terrainFeatures.add(terrain) tileInfo.terrainFeatures.add(terrain)
} else tileInfo.baseTerrain = terrain }
tileInfo.resource = resource.name tileInfo.resource = resource.name
tileInfo.setTerrainTransients() tileInfo.setTerrainTransients()