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

vt: new filesystem using tevd

Browse Source
This commit is contained in:
Song Minjae
2017-04-07 19:12:27 +09:00
parent 35ca5762fd
commit 1a3c9d7f65
14 changed files with 2227 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/net/torvald/terrarum/gameactors/ActorInventory.kt
View File

@@ -121,29 +121,17 @@ class ActorInventory() {
return capacityMode
}
fun getTotalWeight(): Double {
var weight = 0.0
itemList.forEach { weight += it.item.mass * it.amount }
return weight
}
fun getTotalWeight(): Double = itemList.map { it.item.mass * it.amount }.sum()
/**
* Real amount
*/
fun getTotalCount(): Int {
var count = 0
itemList.forEach { count += it.amount }
return count
}
fun getTotalCount(): Int = itemList.map { it.amount }.sum()
/**
* Unique amount, multiple items are calculated as one
*/
fun getTotalUniqueCount(): Int {
return itemList.size
}
fun getTotalUniqueCount(): Int = itemList.size
/**
* Check whether the itemList contains too many items

14
src/net/torvald/terrarum/gameactors/DecodeTapestry.kt
View File

@@ -111,19 +111,15 @@ object DecodeTapestry {
val FORMAT_64 = 2
operator fun invoke(fileObj: File): TapestryObject {
fun magicMismatch(magic: ByteArray): Boolean {
MAGIC.forEachIndexed { i, byte ->
if (byte != magic[i])
return true
}
return false
fun magicMismatch(magic: ByteArray, array: ByteArray): Boolean {
return !Arrays.equals(array.sliceArray(0..magic.lastIndex), magic)
}
val file = fileObj.readBytes()
val magic = file.copyOfRange(0, 4)
if (magicMismatch(magic))
if (magicMismatch(MAGIC, magic))
throw RuntimeException("Invalid file -- type mismatch: expected header " +
"${MAGIC[0]} ${MAGIC[1]} ${MAGIC[2]} ${MAGIC[3]}; got " +
"${magic[0]} ${magic[1]} ${magic[2]} ${magic[3]}")
@@ -156,8 +152,8 @@ object DecodeTapestry {
val artName = kotlin.text.String(artNameBytes.toByteArray(), charset = Charset.forName("UTF-8"))
val authorName = kotlin.text.String(authorNameBytes.toByteArray(), charset = Charset.forName("UTF-8"))
val artName = String(artNameBytes.toByteArray(), charset = Charset.forName("UTF-8"))
val authorName = String(authorNameBytes.toByteArray(), charset = Charset.forName("UTF-8"))
val imageDataSize = file.size - readCounter
val height = imageDataSize / width