diff --git a/Server/src/main/content/minigame/barbassault/arena/scenery/ItemMachine.kt b/Server/src/main/content/minigame/barbassault/arena/scenery/ItemMachine.kt index f0d4237a0..e058486c0 100644 --- a/Server/src/main/content/minigame/barbassault/arena/scenery/ItemMachine.kt +++ b/Server/src/main/content/minigame/barbassault/arena/scenery/ItemMachine.kt @@ -29,7 +29,7 @@ class ItemMachine: InteractionListener { private val STOCK_UP_DEF = IntArray(10 * baseItems_DEF.size) { i -> baseItems_DEF[i % baseItems_DEF.size] } //Healer// private val ALL_HEALER_VAILS = intArrayOf(Items.HEALING_VIAL_10546,Items.HEALING_VIAL1_10545,Items.HEALING_VIAL2_10544,Items.HEALING_VIAL3_10543,Items.HEALING_VIAL4_10542) - private val TAKE_VAIL = Items.HEALING_VIAL4_10542 + private val TAKE_VAIL = Items.HEALING_VIAL_10546 private val TAKE_POIS_WORMS = Items.POISONED_WORMS_10540 private val TAKE_POIS_TOFU = Items.POISONED_TOFU_10539 private val TAKE_POIS_MEAT = Items.POISONED_MEAT_10541 @@ -66,14 +66,14 @@ class ItemMachine: InteractionListener { } //Healer// on(Scenery.HEALER_ITEM_MACHINE_20243, IntType.SCENERY, "Stock-up") { player, node -> - if (hasAnyVial(player)) { - sendMessage(player, "You can only carry one healing vial at a time.") - return@on true + var stockUp = STOCK_UP_HEAL + if (!hasAnyVial(player)) { + stockUp = intArrayOf(TAKE_VAIL) + STOCK_UP_HEAL } - handleAddItemMachine(player, node,10559, STOCK_UP_HEAL, 1,DispenserType.POISONED) + handleAddItemMachine(player, node,10559, stockUp, 1,DispenserType.POISONED) return@on true } - on(Scenery.HEALER_ITEM_MACHINE_20243, IntType.SCENERY, "Take-vail") { player, node -> + on(Scenery.HEALER_ITEM_MACHINE_20243, IntType.SCENERY, "Take-vial") { player, node -> if (hasAnyVial(player)) { sendMessage(player, "You can only carry one healing vial at a time.") return@on true @@ -96,6 +96,7 @@ class ItemMachine: InteractionListener { //Collector// on(Scenery.COLLECTOR_CONVERTER_21250, IntType.SCENERY, "Convert") { player, _ -> val bagLevel = BaHornSystem.HornHelper.getCollectorBag(player) + //todo get players collector level instead of bag level. if (!hasCape(player, 10557)) return@on true //Items.RED_EGG_10532