2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-09 16:45:44 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fixed the price of spirit shards and pouches

Browse source
This commit is contained in:
dam 2025-11-28 14:37:26 +02:00 • committed by Ryan
parent 0bf2f7d0ec
commit 07e48d91a8
2 changed files with 44 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Server/src/main/core/game/shops/Shop.kt
View file

@ -167,7 +167,12 @@ class Shop(val title: String, val stock: Array<ShopItem>, val general: Boolean =
Items.TOKKUL_6529 -> item.definition.getConfiguration(ItemConfigParser.TOKKUL_PRICE, 1) Items.TOKKUL_6529 -> item.definition.getConfiguration(ItemConfigParser.TOKKUL_PRICE, 1)
Items.ARCHERY_TICKET_1464 -> item.definition.getConfiguration(ItemConfigParser.ARCHERY_TICKET_PRICE, 1) Items.ARCHERY_TICKET_1464 -> item.definition.getConfiguration(ItemConfigParser.ARCHERY_TICKET_PRICE, 1)
Items.CASTLE_WARS_TICKET_4067 -> item.definition.getConfiguration(ItemConfigParser.CASTLE_WARS_TICKET_PRICE, 1) Items.CASTLE_WARS_TICKET_4067 -> item.definition.getConfiguration(ItemConfigParser.CASTLE_WARS_TICKET_PRICE, 1)
else -> getGPCost(Item(item.id, 1), if (isMainStock) stock[item.slot].amount else playerStock[slot].amount, if (isMainStock) item.amount else playerStock[slot].amount) else -> {
val fixedPrice = fixedPriceItems[item.id]
fixedPrice ?: getGPCost(Item(item.id, 1),
if (isMainStock) stock[item.slot].amount else playerStock[slot].amount,
if (isMainStock) item.amount else playerStock[slot].amount)
}
} }
return Item(currency, price) return Item(currency, price)
@ -210,12 +215,15 @@ class Shop(val title: String, val stock: Array<ShopItem>, val general: Boolean =
} }
} }
val price = when(currency) val price = when (currency) {
{ // selling items authentically return 10x less tokkul (floored/truncated) than the item's shop price
Items.TOKKUL_6529 -> (item.definition.getConfiguration(ItemConfigParser.TOKKUL_PRICE, 1) / 10.0).toInt() // selling items authentically return 10x less tokkul (floored/truncated) than the item's shop price Items.TOKKUL_6529 -> (item.definition.getConfiguration(ItemConfigParser.TOKKUL_PRICE, 1) / 10.0).toInt()
Items.ARCHERY_TICKET_1464 -> item.definition.getConfiguration(ItemConfigParser.ARCHERY_TICKET_PRICE, 1) Items.ARCHERY_TICKET_1464 -> item.definition.getConfiguration(ItemConfigParser.ARCHERY_TICKET_PRICE, 1)
Items.CASTLE_WARS_TICKET_4067 -> item.definition.getConfiguration(ItemConfigParser.CASTLE_WARS_TICKET_PRICE, 1) Items.CASTLE_WARS_TICKET_4067 -> item.definition.getConfiguration(ItemConfigParser.CASTLE_WARS_TICKET_PRICE, 1)
else -> getGPSell(Item(shopItemId, 1), stockAmt, currentAmt) else -> {
val fixedPrice = fixedPriceItems[shopItemId]
fixedPrice ?: getGPSell(Item(shopItemId, 1), stockAmt, currentAmt)
}
} }
if(!general && stockAmt == 0 && shopSlot == -1) if(!general && stockAmt == 0 && shopSlot == -1)
@ -293,10 +301,17 @@ class Shop(val title: String, val stock: Array<ShopItem>, val general: Boolean =
if(cost.id == -1) sendMessage(player, "This shop cannot sell that item.").also { return TransactionStatus.Failure("Shop cannot sell this item") } if(cost.id == -1) sendMessage(player, "This shop cannot sell that item.").also { return TransactionStatus.Failure("Shop cannot sell this item") }
if(currency == Items.COINS_995){ if(currency == Items.COINS_995){
val fixedPrice = fixedPriceItems[item.id]
if (fixedPrice != null) {
// Fixed price items: simple multiplication
cost.amount = fixedPrice * item.amount
} else {
// Dynamic pricing: calculate cost for each item as stock depletes
var amt = item.amount var amt = item.amount
var inStockAmt = inStock.amount var inStockAmt = inStock.amount
while(amt-- > 1) while(amt-- > 1)
cost.amount += getGPCost(Item(item.id, 1), if (isMainStock) stock[slot].amount else playerStock[slot].amount, --inStockAmt) cost.amount += getGPCost(Item(item.id, 1), if (isMainStock) stock[slot].amount else playerStock[slot].amount, --inStockAmt)
}
} else { } else {
cost.amount = cost.amount * item.amount cost.amount = cost.amount * item.amount
} }
@ -379,7 +394,10 @@ class Shop(val title: String, val stock: Array<ShopItem>, val general: Boolean =
return TransactionStatus.Failure("Attempt to sell to full shop.") return TransactionStatus.Failure("Attempt to sell to full shop.")
} }
if(currency == Items.COINS_995 && item.amount > 1){ val fixedPrice = fixedPriceItems[id]
if (fixedPrice != null) {
profit.amount = fixedPrice * item.amount
} else if(currency == Items.COINS_995 && item.amount > 1){
var amt = item.amount var amt = item.amount
var inStockAmt = container!![shopSlot]?.amount ?: playerStock.getAmount(id) var inStockAmt = container!![shopSlot]?.amount ?: playerStock.getAmount(id)
while(amt-- > 1) while(amt-- > 1)
@ -450,6 +468,12 @@ class Shop(val title: String, val stock: Array<ShopItem>, val general: Boolean =
//General stores globally share player stock (weird quirk, right?) //General stores globally share player stock (weird quirk, right?)
val generalPlayerStock = Container(40, ContainerType.SHOP) val generalPlayerStock = Container(40, ContainerType.SHOP)
val listenerInstances = HashMap<Int, ShopListener>() val listenerInstances = HashMap<Int, ShopListener>()
// Items with fixed prices that don't fluctuate based on stock (both buy & sell price)
val fixedPriceItems = mapOf(
Items.SPIRIT_SHARDS_12183 to 25,
Items.POUCH_12155 to 1
)
} }
sealed class TransactionStatus { sealed class TransactionStatus {

3
Server/src/main/core/game/shops/Shops.kt
View file

@ -68,7 +68,8 @@ class Shops : StartupListener, TickListener, InteractionListener, InterfaceListe
return@map return@map
}} }}
} else { } else {
items.add(ShopItem(item, amount.toInt(), tokens.getOrNull(2)?.toIntOrNull() ?: 100)) val restockRate = tokens.getOrNull(2)?.toIntOrNull() ?: 100
items.add(ShopItem(item, amount.toInt(), restockRate))
idsInStock[item] = true idsInStock[item] = true
} }
} catch (e: Exception) { } catch (e: Exception) {