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

fix: new encumbrance limit was not applied AT ALL

Browse Source
This commit is contained in:
minjaesong
2024-02-01 16:17:58 +09:00
parent 55bb33b4ce
commit 6e1ad9f768
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/modulebasegame/SavegameMigrator.kt
View File

@@ -163,7 +163,7 @@ internal object SavegameMigrator {
} }
@AppliedVersion("0.3.99999") @AppliedVersion("0.4.0")
fun updatePlayerEncumbrance(actor: Actor) { fun updatePlayerEncumbrance(actor: Actor) {
if (actor is IngamePlayer && actor.actorValue.getAsInt("encumbrance") == 1000) { if (actor is IngamePlayer && actor.actorValue.getAsInt("encumbrance") == 1000) {
actor.actorValue.set("encumbrance", 50000) actor.actorValue.set("encumbrance", 50000)

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

@@ -25,6 +25,18 @@ class ActorInventory() : FixtureInventory() {
this.capacityMode = capacityMode this.capacityMode = capacityMode
} }
override var maxCapacity: Long = 0
get() = when (capacityMode) {
CAPACITY_MODE_COUNT -> field
CAPACITY_MODE_WEIGHT -> actor.actorValue.getAsInt(AVKey.ENCUMBRANCE)?.toLong() ?: field
CAPACITY_MODE_NO_ENCUMBER -> 0x7FFFFFFFFFFFFFFFL
else -> throw IllegalArgumentException()
}
set(value) {
if (capacityMode == CAPACITY_MODE_COUNT)
field = value
}
/** /**
* List of all equipped items (tools, armours, rings, necklaces, etc.) * List of all equipped items (tools, armours, rings, necklaces, etc.)
* *

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

@@ -18,8 +18,8 @@ import java.math.BigInteger
open class FixtureInventory() { open class FixtureInventory() {
var maxCapacity = 100L open var maxCapacity = 100L
var capacityMode = CAPACITY_MODE_COUNT open var capacityMode = CAPACITY_MODE_COUNT
constructor(maxCapacity: Long, capacityMode: Int) : this() { constructor(maxCapacity: Long, capacityMode: Int) : this() {
this.maxCapacity = maxCapacity this.maxCapacity = maxCapacity