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

inventory console command is working again

Browse Source
This commit is contained in:
minjaesong
2021-09-26 17:04:28 +09:00
parent 2c12d43274
commit f4a4030260
1 changed files with 66 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
src/net/torvald/terrarum/modulebasegame/console/Inventory.kt
View File

@@ -7,6 +7,8 @@ import net.torvald.terrarum.console.EchoError
import net.torvald.terrarum.gameitem.ItemID import net.torvald.terrarum.gameitem.ItemID
import net.torvald.terrarum.itemproperties.ItemCodex import net.torvald.terrarum.itemproperties.ItemCodex
import net.torvald.terrarum.* import net.torvald.terrarum.*
import net.torvald.terrarum.Terrarum.PLAYER_REF_ID
import net.torvald.terrarum.gameactors.ActorID
import net.torvald.terrarum.modulebasegame.gameactors.Pocketed import net.torvald.terrarum.modulebasegame.gameactors.Pocketed
/** /**
@@ -14,66 +16,92 @@ import net.torvald.terrarum.modulebasegame.gameactors.Pocketed
*/ */
internal object Inventory : ConsoleCommand { internal object Inventory : ConsoleCommand {
private var target: Pocketed? = null private var targetID: ActorID = PLAYER_REF_ID
override fun execute(args: Array<String>) { override fun execute(args: Array<String>) {
if (args.size == 1) { if (args.size == 1) {
printUsage() printUsage()
} }
else { else {
when (args[1]) { val actor = getActor()
"list" -> listInventory() if (actor != null) {
"add" -> if (args.size > 3) addItem(args[2], args[3].toInt()) when (args[1]) {
else addItem(args[2]) "list" -> listInventory(actor)
"target" -> setTarget(args[2].toInt()) "add" -> if (args.size > 3) addItem(actor, args[2], args[3].toInt()) else addItem(actor, args[2])
"equip" -> equipItem(args[2]) "remove" -> if (args.size > 3) removeItem(actor, args[2], args[3].toInt()) else removeItem(actor, args[2])
else -> printUsage() "target" -> targetID = if (args[2].lowercase() == "player") PLAYER_REF_ID else args[2].toInt()
} "equip" -> equipItem(actor, args[2])
} "unequip"-> unequipItem(actor, args[2])
} else -> printUsage()
private fun listInventory() {
if (target != null) {
if (target!!.inventory.getTotalUniqueCount() == 0) {
Echo("(inventory empty)")
}
else {
target!!.inventory.forEach { val (item, amount) = it
if (amount == 0) {
EchoError("Unexpected zero-amounted item: ID $item")
}
Echo("ID $item${if (amount > 1) " ($amount)" else ""}")
} }
} }
else {
Echo("Actor $targetID is not Pocketed or does not exists")
}
} }
} }
private fun setTarget(actorRefId: Int = Terrarum.PLAYER_REF_ID) { private fun getActor() = Terrarum.ingame?.getActorByID(targetID) as? Pocketed
val actor = INGAME.getActorByID(actorRefId)
if (actor !is Pocketed) { private fun listInventory(actor: Pocketed) {
EchoError("Cannot edit inventory of incompatible actor: $actor") if (actor.inventory.getTotalUniqueCount() == 0) {
Echo("(inventory empty)")
} }
else { else {
target = actor actor.inventory.forEach { val (item, amount) = it
if (amount == 0) {
EchoError("Unexpected zero-amounted item: ID $item")
}
Echo("${ccW}ID $ccY$item${if (amount > 1) "$ccW ($ccG$amount$ccW)" else ""}")
}
} }
} }
private fun addItem(refId: ItemID, amount: Int = 1) { private fun addItem(actor: Pocketed, refId: ItemID, amount: Int = 1) {
if (target != null) { val item = ItemCodex[refId]
target!!.addItem(ItemCodex[refId]!!, amount) if (item != null) {
actor.addItem(item, amount)
Echo("${ccW}Added$ccG $amount$ccY $refId$ccW to $ccO$targetID")
} }
else EchoError("No such item: $refId")
} }
private fun equipItem(refId: ItemID) { private fun removeItem(actor: Pocketed, refId: ItemID, amount: Int = 1) {
if (target != null) { val item = ItemCodex[refId]
val item = ItemCodex[refId]!! if (item != null) {
target!!.equipItem(item) actor.removeItem(item, amount)
Echo("${ccW}Removed$ccG $amount$ccY $refId$ccW from $ccO$targetID")
} }
else EchoError("No such item: $refId")
}
private fun equipItem(actor: Pocketed, refId: ItemID) {
val item = ItemCodex[refId]
if (item != null) {
actor.equipItem(item)
Echo("${ccW}Equipped$ccY $refId$ccW to $ccO$targetID")
}
else EchoError("No such item: $refId")
}
private fun unequipItem(actor: Pocketed, refId: ItemID) {
val item = ItemCodex[refId]
if (item != null) {
actor.unequipItem(item)
Echo("${ccW}Stripped$ccY $refId$ccW out of $ccO$targetID")
}
else EchoError("No such item: $refId")
} }
override fun printUsage() { override fun printUsage() {
Echo("Usage: inventory command arguments") Echo("${ccW}Usage:$ccY inventory$ccG [command]")
Echo("Available commands:") Echo("${ccW}Available commands:")
Echo("list | assign slot | add itemid [amount] | target [actorid] | equip itemid") Echo("$ccY target$ccG [actorid|“player”]")
Echo("$ccY add$ccG [itemid] [amount]")
Echo("$ccY remove$ccG [itemid] [amount]")
Echo("$ccY equip$ccG [itemid]")
Echo("$ccY unequip$ccG [itemid]")
Echo("$ccY list")
Echo("Currently targeted: $ccO$targetID")
} }
} }