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

replacing water/lava tiles with one fluid marker

Browse Source 
actual fluid not implemented
This commit is contained in:
Minjae Song
2018-12-12 20:32:13 +09:00
parent 6e4cea28e7
commit 95245c8945
9 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,8 +42,7 @@ internal object ExportMap : ConsoleCommand {
colorTable.put(Block.RAW_TOPAZ, Col4096(0xC70))
colorTable.put(Block.RAW_AMETHYST, Col4096(0x70C))
colorTable.put(Block.WATER, Col4096(0x038))
colorTable.put(Block.LAVA, Col4096(0xF50))
colorTable.put(Block.FLUID_MARKER, Col4096(0x038))
colorTable.put(Block.SAND, Col4096(0xDDB))
colorTable.put(Block.SAND_WHITE, Col4096(0xFFD))

8
src/net/torvald/terrarum/modulebasegame/worldgenerator/WorldGenerator.kt
View File

@@ -833,7 +833,7 @@ object WorldGenerator {
/* Flood */
private fun floodBottomLava() {
println("[mapgenerator] Flooding with lava...")
/*println("[mapgenerator] Flooding with lava...")
LoadScreen.addMessage("Flooding with lava...")
for (i in HEIGHT * 14 / 15..HEIGHT - 1) {
for (j in 0..WIDTH - 1) {
@@ -841,7 +841,7 @@ object WorldGenerator {
world.setTileTerrain(j, i, Block.LAVA)
}
}
}
}*/
}
/* Plant */
@@ -921,11 +921,11 @@ object WorldGenerator {
if (ix < OCEAN_WIDTH) {
if (worldOceanPosition == TYPE_OCEAN_LEFT) {
for (y in getTerrainHeightFromHeightMap(OCEAN_WIDTH)..getTerrainHeightFromHeightMap(ix) - 1) {
world.setTileTerrain(ix, y, Block.WATER)
//world.setTileTerrain(ix, y, Block.WATER)
}
} else if (worldOceanPosition == TYPE_OCEAN_RIGHT) {
for (y in getTerrainHeightFromHeightMap(world.width - 1 - OCEAN_WIDTH)..getTerrainHeightFromHeightMap(world.width - 1 - ix) - 1) {
world.setTileTerrain(world.width - 1 - ix, y, Block.WATER)
//world.setTileTerrain(world.width - 1 - ix, y, Block.WATER)
}
}
}