curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-13 12:04:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

exportmap cmd reworked

Browse Source
This commit is contained in:
minjaesong
2023-10-30 16:43:34 +09:00
parent 6df348bf86
commit 4244a2c395
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/torvald/terrarum/gameworld/GameWorld.kt
View File

@@ -597,8 +597,8 @@ open class GameWorld(
layerOres.unsafeSetTile(x, y, tileNameToNumberMap[ore]!!, placement)
}
fun terrainIterator(): Iterator<ItemID> {
return object : Iterator<ItemID> {
fun terrainIterator(): Iterator<List<ItemID>> {
return object : Iterator<List<ItemID>> {
private var iteratorCount = 0
@@ -606,13 +606,13 @@ open class GameWorld(
return iteratorCount < width * height
}
override fun next(): ItemID {
override fun next(): List<ItemID> {
val y = iteratorCount / width
val x = iteratorCount % width
// advance counter
iteratorCount += 1
return getTileFromTerrain(x, y)
return listOf(getTileFromTerrain(x, y), getTileFromWall(x, y), getTileFromOre(x, y).item)
}
}