Fixed an off-by-one error that made cooking brawlers unobtainable
Reworked the ::npc admin command to take an optional amount argument. Usage: ::npc id [amount] [shouldWalk] Summoning points now no longer regenerate automatically Rewrote the ring of life Reverting a slayer ring to an enchanted gem no longer destroys the item if inventory is full The inauthentic mounted glory in a POH now respects teleblock Fixed revenents infinite healing Winkins' farm exit message is now split correctly Added egg spawn in front of the chicken shrine in Zanaris and added its authentic use handler to the shrine
This commit is contained in:
@@ -11,10 +11,11 @@ import content.data.EnchantedJewellery
|
||||
import core.game.interaction.InteractionListener
|
||||
import core.game.interaction.IntType
|
||||
import core.tools.START_DIALOGUE
|
||||
import org.rs09.consts.Items
|
||||
|
||||
/**
|
||||
* Listener for enchanted jewellery options
|
||||
* @author Ceikry & downthecrop
|
||||
* @author Ceikry, downthecrop, Player Name
|
||||
*/
|
||||
class EnchantedJewelleryListener : InteractionListener {
|
||||
|
||||
@@ -33,6 +34,10 @@ class EnchantedJewelleryListener : InteractionListener {
|
||||
private fun handle(player: Player, node: Node, isEquipped: Boolean) {
|
||||
player.pulseManager.clear(PulseType.STANDARD)
|
||||
val item = node.asItem()
|
||||
if (item.id == Items.RING_OF_LIFE_2570) {
|
||||
sendMessage(player, "You can't operate that.")
|
||||
return
|
||||
}
|
||||
val jewellery = EnchantedJewellery.idMap[item.id]
|
||||
if (jewellery != null) {
|
||||
if (jewellery.isLastItemIndex(jewellery.getItemIndex(item)) && !jewellery.isCrumble) {
|
||||
@@ -60,4 +65,4 @@ class EnchantedJewelleryListener : InteractionListener {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+6
-1
@@ -5,10 +5,12 @@ import core.api.teleport
|
||||
import core.game.interaction.IntType
|
||||
import core.game.interaction.InteractionListener
|
||||
import core.game.node.entity.player.Player
|
||||
import core.game.node.item.Item
|
||||
import core.game.system.task.Pulse
|
||||
import core.game.world.map.Location
|
||||
import core.game.world.update.flag.context.Animation
|
||||
import core.game.world.update.flag.context.Graphics
|
||||
import org.rs09.consts.Items
|
||||
import org.rs09.consts.Sounds
|
||||
import java.util.concurrent.Executors
|
||||
import java.util.concurrent.TimeUnit
|
||||
@@ -46,6 +48,9 @@ class MountedGlory : InteractionListener {
|
||||
}
|
||||
}
|
||||
private fun mountedGloryTeleport(player : Player, int : Int) {
|
||||
if (!player.zoneMonitor.teleport(1, Item(Items.AMULET_OF_GLORY_1704))) {
|
||||
return
|
||||
}
|
||||
Executors.newSingleThreadScheduledExecutor().schedule({
|
||||
player.pulseManager.run(object : Pulse() {
|
||||
var counter = 0
|
||||
@@ -63,4 +68,4 @@ class MountedGlory : InteractionListener {
|
||||
})
|
||||
}, 0, TimeUnit.SECONDS)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user