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

fixed a bug where colourmap won't interpolate properly. BUG: fadeout/fadein is somewhat glitched, UIQuickBar does not fade-in/out instead it just (dis)appears with no effect

Browse Source 
Former-commit-id: 029f504b7e2e4d85676ec8b36b27dcbed5e5db47
Former-commit-id: 0b56ca1e8976bfc5e7ea8d665e6ed6496a52de85
This commit is contained in:
Song Minjae
2016-07-27 00:20:36 +09:00
parent 00dd5e99bb
commit ee647652d2
36 changed files with 368 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/net/torvald/serialise/WriteGameMapData.kt
View File

@@ -35,7 +35,7 @@ object WriteGameMapData {
// write binary
Files.write(tempPath, MAGIC)
Files.write(tempPath, byteArrayOf(GameWorld.BITS))
Files.write(tempPath, byteArrayOf(GameWorld.SIZEOF))
Files.write(tempPath, byteArrayOf(GameWorld.LAYERS))
Files.write(tempPath, byteArrayOf(BYTE_NULL))
Files.write(tempPath, byteArrayOf(BYTE_NULL))
@@ -44,15 +44,15 @@ object WriteGameMapData {
Files.write(tempPath, toByteArray(map.spawnX))
Files.write(tempPath, toByteArray(map.spawnY))
map.layerTerrain.forEach(
{b -> Files.write(tempPath, byteArrayOf(b))})
{ b -> Files.write(tempPath, byteArrayOf(b)) })
map.layerWall.forEach(
{b -> Files.write(tempPath, byteArrayOf(b))})
{ b -> Files.write(tempPath, byteArrayOf(b)) })
map.terrainDamage.forEach(
{b -> Files.write(tempPath, byteArrayOf(b))})
{ b -> Files.write(tempPath, byteArrayOf(b)) })
map.wallDamage.forEach(
{b -> Files.write(tempPath, byteArrayOf(b))})
{ b -> Files.write(tempPath, byteArrayOf(b)) })
map.layerWire.forEach(
{b -> Files.write(tempPath, byteArrayOf(b))})
{ b -> Files.write(tempPath, byteArrayOf(b)) })
// replace savemeta with tempfile
try {

6
src/net/torvald/serialise/WriteMeta.kt
View File

@@ -3,6 +3,8 @@ package net.torvald.serialise
import net.torvald.terrarum.mapgenerator.MapGenerator
import net.torvald.terrarum.mapgenerator.RoguelikeRandomiser
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.itemproperties.ItemPropCodex
import net.torvald.terrarum.itemproperties.MaterialPropCodex
import net.torvald.terrarum.tileproperties.TilePropCodex
import org.apache.commons.codec.digest.DigestUtils
import java.io.FileInputStream
@@ -43,8 +45,8 @@ object WriteMeta {
// define files to get hash
val fileArray: Array<File> = arrayOf(
File(TilePropCodex.CSV_PATH)
//, File(ItemPropCodex.CSV_PATH)
//, File(MaterialPropCodex.CSV_PATH)
, File(ItemPropCodex.CSV_PATH)
, File(MaterialPropCodex.CSV_PATH)
//,
)