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

working savegame migrator

Browse Source
This commit is contained in:
minjaesong
2023-09-29 21:26:24 +09:00
parent 2041631462
commit 908a6ed953
5 changed files with 123 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/net/torvald/terrarum/modulebasegame/gameactors/ActorInventory.kt
View File

@@ -122,10 +122,11 @@ class ActorInventory() : FixtureInventory() {
}
}
override fun clear() {
super.clear()
override fun clear(): List<InventoryPair> {
val r = super.clear()
itemEquipped.fill(null)
quickSlot.fill(null)
return r
}
}

80
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureInventory.kt
View File

@@ -29,6 +29,45 @@ open class FixtureInventory() {
val CAPACITY_MODE_NO_ENCUMBER = 0
val CAPACITY_MODE_COUNT = 1
val CAPACITY_MODE_WEIGHT = 2
private fun filterItem0(item: GameItem): GameItem {
return if (item.originalID.isBlock()) {
val drop = BlockCodex[item.originalID].drop.ifBlank { item.originalID }
ItemCodex[drop] ?: throw NullPointerException("Item: ${item.originalID}, drop: ${BlockCodex[item.originalID].drop}")
}
else if (item.originalID.isWall()) {
val blockID = item.originalID.substringAfter('@')
val drop = BlockCodex[blockID].drop.ifBlank { blockID }
ItemCodex["wall@$drop"] ?: throw NullPointerException("Item: ${item.originalID}, drop: ${BlockCodex[item.originalID].drop}")
}
else {
item
}
}
fun filterItem(item0: GameItem?): GameItem? {
if (item0 == null) return null
var item = item0
var recursionCount = 0
var breakNow = false
var item1: GameItem
while (!breakNow) {
if (recursionCount > 16) throw IllegalStateException("Item filter recursion is too deep, check the filtering code")
item1 = filterItem0(item!!)
if (item1 == item) {
breakNow = true
}
item = item1
recursionCount++
}
return item
}
}
/**
@@ -40,19 +79,6 @@ open class FixtureInventory() {
fun isEmpty() = totalCount == 0L
fun isNotEmpty() = totalCount > 0
private fun filterItem(item: GameItem): GameItem {
return if (item.originalID.isBlock()) {
ItemCodex[BlockCodex[item.originalID].drop]!!
}
else if (item.originalID.isWall()) {
val blockID = item.originalID.substringAfter('@')
ItemCodex["wall@${BlockCodex[blockID].drop}"]!!
}
else {
item
}
}
open fun add(itemID: ItemID, count: Long = 1) {
if (ItemCodex[itemID] == null)
throw NullPointerException("Item not found: $itemID")
@@ -61,23 +87,7 @@ open class FixtureInventory() {
}
open fun add(item0: GameItem, count: Long = 1L) {
var item = item0
var recursionCount = 0
var breakNow = false
var item1: GameItem
while (!breakNow) {
if (recursionCount > 16) throw IllegalStateException("Item filter recursion is too deep, check the filtering code")
item1 = filterItem(item)
if (item1 == item) {
breakNow = true
}
item = item1
recursionCount++
}
val item = filterItem(item0)!!
// println("[ActorInventory] add-by-elem $item, $count")
@@ -166,6 +176,12 @@ open class FixtureInventory() {
updateEncumbrance()
}
open fun clear(): List<InventoryPair> {
val r = itemList.cloneToList()
itemList.clear()
return r
}
/**
* HashMap<GameItem, Amounts>
@@ -285,10 +301,6 @@ open class FixtureInventory() {
return -(low + 1) // key not found
}
open fun clear() {
itemList.clear()
}
fun updateEncumbrance() {
totalWeight0 = itemList.sumOf { ItemCodex[it.itm]!!.mass * it.qty }
totalCount0 = itemList.sumOf { it.qty }