yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented blast furnace ore shop

Browse Source
This commit is contained in:
Ceikry
2023-02-12 01:08:34 +00:00
committed by Ryan
parent 69f950eb57
commit 39251fc75f
4 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/core/game/shops/Shop.kt
+5 -4
View File
@@ -37,7 +37,7 @@ class ShopListener(val player: Player) : ContainerListener
}
}
class Shop(val title: String, val stock: Array<ShopItem>, val general: Boolean = false, val currency: Int = Items.COINS_995, val highAlch: Boolean = false)
class Shop(val title: String, val stock: Array<ShopItem>, val general: Boolean = false, val currency: Int = Items.COINS_995, val highAlch: Boolean = false, val forceShared: Boolean = false)
{
val stockInstances = HashMap<Int, Container>()
val playerStock = if (general) generalPlayerStock else Container(40, ContainerType.SHOP)
@@ -45,7 +45,7 @@ class Shop(val title: String, val stock: Array<ShopItem>, val general: Boolean =
val restockRates = HashMap<Int,Int>()
init {
if(!getServerConfig().getBoolean(Shops.personalizedShops, false))
if(!getServerConfig().getBoolean(Shops.personalizedShops, false) || forceShared)
stockInstances[ServerConstants.SERVER_NAME.hashCode()] = generateStockContainer()
}
@@ -97,10 +97,10 @@ class Shop(val title: String, val stock: Array<ShopItem>, val general: Boolean =
public fun getContainer(player: Player) : Container
{
val container = if(getServerConfig().getBoolean(Shops.personalizedShops, false))
val container = if(getServerConfig().getBoolean(Shops.personalizedShops, false) && !forceShared)
stockInstances[player.details.uid] ?: generateStockContainer().also { stockInstances[player.details.uid] = it }
else
stockInstances[ServerConstants.SERVER_NAME.hashCode()]!!
stockInstances[ServerConstants.SERVER_NAME.hashCode()] ?: generateStockContainer().also { stockInstances[ServerConstants.SERVER_NAME.hashCode()] = it }
val listener = listenerInstances[player.details.uid]
@@ -135,6 +135,7 @@ class Shop(val title: String, val stock: Array<ShopItem>, val general: Boolean =
{
if(cont[i] == null) continue
if(stock.size < i + 1) break
if(stock[i].restockRate == 0) continue
if(GameWorld.ticks % stock[i].restockRate != 0) continue
if(cont[i].amount < stock[i].amount){
Server/src/main/core/game/shops/Shops.kt
+2 -1
View File
@@ -90,7 +90,8 @@ class Shops : StartupListener, TickListener, InteractionListener, InterfaceListe
val npcs = if(shopData["npcs"].toString().isNotBlank()) shopData["npcs"].toString().split(",").map { it.toInt() }.toIntArray() else intArrayOf()
val currency = shopData["currency"].toString().toInt()
val highAlch = shopData["high_alch"].toString() == "1"
shop = Shop(title, stock, general, currency, highAlch)
val forceShared = shopData.getOrDefault("force_shared", "false").toString().toBoolean()
shop = Shop(title, stock, general, currency, highAlch, forceShared)
npcs.map { shopsByNpc[it] = shop }
shopsById[id] = shop