inventory: add support for incrementing/decrementing item quantities

game-server/src/main/kotlin/work/fking/pangya/game/GameServer.kt

@@ -83,7 +83,7 @@ class GameServer(
         player.currentRoom?.removePlayer(player)
         player.currentChannel?.removePlayer(player)
         players.remove(player)
-        LOGGER.debug("{} disconnected", player.nickname)
+        LOGGER.info("{} disconnected", player.nickname)
     }
 
     fun start() {

game-server/src/main/kotlin/work/fking/pangya/game/persistence/InventoryRepository.kt

@@ -11,6 +11,7 @@ import java.util.concurrent.atomic.AtomicInteger
 interface InventoryRepository {
     fun load(txCtx: TransactionalContext, playerUid: Int): Inventory
     fun saveItem(txCtx: TransactionalContext, playerUid: Int, item: Item): Item
+    fun deleteItem(txCtx: TransactionalContext, playerUid: Int, item: Item)
 }
 
 class InMemoryInventoryRepository : InventoryRepository {
@@ -33,6 +34,10 @@ class InMemoryInventoryRepository : InventoryRepository {
         findInventory(playerUid).add(persistedItem)
         return persistedItem
     }
+
+    override fun deleteItem(txCtx: TransactionalContext, playerUid: Int, item: Item) {
+        findInventory(playerUid).remove(item)
+    }
 }
 
 class JooqInventoryRepository : InventoryRepository {
@@ -73,4 +78,9 @@ class JooqInventoryRepository : InventoryRepository {
             uid = uid!!
         )
     }
+
+    override fun deleteItem(txCtx: TransactionalContext, playerUid: Int, item: Item) {
+        txCtx.jooq().deleteFrom(PLAYER_INVENTORY_ITEM)
+            .where(PLAYER_INVENTORY_ITEM.UID.eq(item.uid))
+    }
 }

game-server/src/main/kotlin/work/fking/pangya/game/player/Inventory.kt

@@ -1,10 +1,50 @@
 package work.fking.pangya.game.player
 
 import work.fking.pangya.game.model.IffContainer
+import java.lang.Math.addExact
+import kotlin.math.max
 
 class Inventory(override val entries: MutableList<Item> = ArrayList()) : IffContainer<Item> {
 
     fun add(item: Item) {
         entries.add(item)
     }
+
+    fun incrementByUid(uid: Int, amount: Int): Item {
+        val item = findByUid(uid) ?: throw IllegalArgumentException("no such item with uid = $uid")
+        decrement(item, amount)
+        return item
+    }
+
+    fun incrementByIffId(iffId: Int, amount: Int): Item {
+        val item = findByIffId(iffId) ?: throw IllegalArgumentException("no such item with iffId = $iffId")
+        decrement(item, amount)
+        return item
+    }
+
+    private fun increment(item: Item, amount: Int) {
+        require(amount > 0) { "amount must be positive" }
+        item.quantity = addExact(item.quantity, amount)
+    }
+
+    fun decrementByUid(uid: Int, amount: Int): Item {
+        val item = findByUid(uid) ?: throw IllegalArgumentException("no such item with uid = $uid")
+        decrement(item, amount)
+        return item
+    }
+
+    fun decrementByIffId(iffId: Int, amount: Int): Item {
+        val item = findByIffId(iffId) ?: throw IllegalArgumentException("no such item with iffId = $iffId")
+        decrement(item, amount)
+        return item
+    }
+
+    private fun decrement(item: Item, amount: Int) {
+        require(amount > 0) { "amount must be positive" }
+        item.quantity = max(item.quantity - amount, 0)
+
+        if (item.quantity == 0) {
+            entries.remove(item)
+        }
+    }
 }

game-server/src/main/kotlin/work/fking/pangya/game/player/Item.kt

@@ -7,14 +7,14 @@ import work.fking.pangya.game.model.IFF_TYPE_NOEQUIP_ITEM
 import work.fking.pangya.game.model.IffObject
 import work.fking.pangya.game.model.iffTypeFromId
 
-data class Item(
+class Item(
     override val uid: Int = -1,
     override val iffId: Int,
-    val quantity: Int = 0,
+    var quantity: Int = 0,
     val stats: IntArray = IntArray(5)
 ) : IffObject {
 
-    private fun quantifiable(): Boolean {
+    fun quantifiable(): Boolean {
         return when (iffTypeFromId(iffId)) {
             IFF_TYPE_EQUIPITEM_ITEM, IFF_TYPE_NOEQUIP_ITEM, IFF_TYPE_BALL -> true
             else -> false
@@ -37,6 +37,15 @@ data class Item(
         }
     }
 
+    fun copy(uid: Int): Item {
+        return Item(
+            uid = uid,
+            iffId = iffId,
+            quantity = quantity,
+            stats = stats
+        )
+    }
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (javaClass != other?.javaClass) return false

login-server/src/main/kotlin/work/fking/pangya/login/LoginServer.kt

@@ -55,7 +55,7 @@ class LoginServer(
     }
 
     private fun onPlayerDisconnect(player: Player) {
-        LOGGER.debug("{} disconnected", player.username)
+        LOGGER.info("{} disconnected", player.username)
         sessionClient.unregisterSession(player)
     }