curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-08 12:51:51 +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)
}
}

21
src/net/torvald/terrarum/modulebasegame/console/ExportMap.kt
View File

@@ -1,12 +1,16 @@
package net.torvald.terrarum.modulebasegame.console
import com.badlogic.gdx.graphics.Color
import net.torvald.gdx.graphics.Cvec
import net.torvald.terrarum.App
import net.torvald.terrarum.BlockCodex
import net.torvald.terrarum.INGAME
import net.torvald.terrarum.blockproperties.Block
import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo
import net.torvald.terrarum.console.EchoError
import net.torvald.terrarum.utils.RasterWriter
import net.torvald.terrarum.worlddrawer.CreateTileAtlas.Companion.WALL_OVERLAY_COLOUR
import net.torvald.terrarum.worlddrawer.toRGBA
import java.io.File
import java.io.IOException
@@ -20,6 +24,14 @@ internal object ExportMap : ConsoleCommand {
// private var mapDataPointer = 0
private val oreColourMap = hashMapOf(
Block.AIR to Cvec(0),
"ores@basegame:1" to Cvec(0x00e9c8ff),
"ores@basegame:2" to Cvec(0xff9a5dff.toInt()),
"ores@basegame:3" to Cvec(0x383314ff),
)
private val WALL_OVERLAY = Cvec(0.35f, 0.35f, 0.35f, 1f)
override fun execute(args: Array<String>) {
val world = (INGAME.world)
@@ -31,8 +43,13 @@ internal object ExportMap : ConsoleCommand {
var mapData = ByteArray(world.width * world.height * 3)
var mapDataPointer = 0
for (tile in world.terrainIterator()) {
val colArray = App.tileMaker.terrainTileColourMap.get(tile)!!.toByteArray()
for ((terr, wall, ore) in world.terrainIterator()) {
val colOre = (oreColourMap.get(ore) ?: throw NullPointerException("nullore $ore")).toByteArray()
val colFore = (App.tileMaker.terrainTileColourMap.get(terr) ?: throw NullPointerException("nullterr $terr")).toByteArray()
val colWall = (App.tileMaker.terrainTileColourMap.get(wall) ?: throw NullPointerException("nullwall $wall")).cpy().mul(WALL_OVERLAY).toByteArray()
val colArray = if (ore != Block.AIR) colOre else if (BlockCodex[terr].isSolid) colFore else colWall
for (i in 0..2) {
mapData[mapDataPointer + i] = colArray[i]