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

Improved POH lecterns

Browse Source 
More authentic animations
More authentic tick timing
Fixed off-by-one that resulted in spurious full inventory errors
Made lecterns take rune-providing staves into account
Made the buttons light up based on the lectern tier
Converted TeleTabInterface from a Plugin to a Listener
This commit is contained in:
Avi Weinstock
2022-07-08 10:30:26 +00:00
committed by Ryan
parent 07576f8c75
commit e837904351
1 changed files with 70 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt
+69 -46
View File
@@ -1,5 +1,6 @@
package rs09.game.node.entity.skill.construction.decoration.study package rs09.game.node.entity.skill.construction.decoration.study
import api.*
import core.cache.def.impl.SceneryDefinition import core.cache.def.impl.SceneryDefinition
import core.game.component.Component import core.game.component.Component
import core.game.component.ComponentDefinition import core.game.component.ComponentDefinition
@@ -11,6 +12,7 @@ import core.game.node.entity.player.Player
import core.game.node.entity.player.link.diary.DiaryType import core.game.node.entity.player.link.diary.DiaryType
import core.game.node.entity.skill.Skills import core.game.node.entity.skill.Skills
import core.game.node.entity.skill.construction.Decoration import core.game.node.entity.skill.construction.Decoration
import core.game.node.entity.skill.magic.MagicStaff
import core.game.node.item.Item import core.game.node.item.Item
import core.game.system.task.Pulse import core.game.system.task.Pulse
import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Animation
@@ -18,6 +20,7 @@ import core.plugin.Initializable
import core.plugin.Plugin import core.plugin.Plugin
import rs09.game.world.GameWorld import rs09.game.world.GameWorld
import rs09.plugin.ClassScanner.definePlugin import rs09.plugin.ClassScanner.definePlugin
import rs09.game.interaction.InterfaceListener
/** /**
* Handles the lectern * Handles the lectern
@@ -90,6 +93,10 @@ class LecternPlugin : OptionHandler() {
return false return false
} }
for (item in requiredItems) { for (item in requiredItems) {
val staff = MagicStaff.forId(item.id)
if (staff != null && player.equipment.containsAtLeastOneItem(staff.staves)) {
continue;
}
if (!player.inventory.containsItem(item)) { if (!player.inventory.containsItem(item)) {
//TODO staffs //TODO staffs
player.sendMessage("You don't have enough materials.") player.sendMessage("You don't have enough materials.")
@@ -120,7 +127,6 @@ class LecternPlugin : OptionHandler() {
for (i in 13642..13648) { for (i in 13642..13648) {
SceneryDefinition.forId(i).handlers["option:study"] = this SceneryDefinition.forId(i).handlers["option:study"] = this
} }
definePlugin(TeleTabInterface())
return this return this
} }
@@ -131,17 +137,12 @@ class LecternPlugin : OptionHandler() {
var counter = 0 var counter = 0
override fun pulse(): Boolean { override fun pulse(): Boolean {
when(counter++){ when(counter++){
0 -> player.animator.animate(Animation(3649)).also { player.lock() } 0 -> player.animator.animate(Animation(1894)).also { player.lock() }
8 -> player.interfaceManager.open(Component(400)).also { player.unlock(); return true } 1 -> player.interfaceManager.open(Component(400)).also { player.unlock(); return true }
} }
return false return false
} }
}) })
/*var bits = 0 We dumb so we comment it out haha code go brrrrr
for (t in TeleTabButton.values()) {
if (t.canMake(player)) bits = bits or (1 shl t.buttonId)
}
player.configManager[2005] = bits*/
return true return true
} }
@@ -149,45 +150,67 @@ class LecternPlugin : OptionHandler() {
* TeleTabInterface * TeleTabInterface
* @author Ceikry * @author Ceikry
*/ */
private class TeleTabInterface : ComponentPlugin() { class TeleTabInterface : InterfaceListener {
@Throws(Throwable::class) val decorationVarps = hashMapOf(
override fun newInstance(arg: Any?): Plugin<Any>? { Decoration.OAK_LECTERN to Pair(0, 0),
ComponentDefinition.put(400, this) Decoration.EAGLE_LECTERN to Pair(1, 0),
return this Decoration.DEMON_LECTERN to Pair(0, 1),
} Decoration.TEAK_EAGLE_LECTERN to Pair(2, 0),
Decoration.TEAK_DEMON_LECTERN to Pair(0, 2),
override fun handle(player: Player, component: Component, opcode: Int, button: Int, slot: Int, itemId: Int): Boolean { Decoration.MAHOGANY_EAGLE_LECTERN to Pair(3, 0),
val ttb = TeleTabButton.forId(button) Decoration.MAHOGANY_DEMON_LECTERN to Pair(0, 3),
if (ttb != null && ttb.canMake(player)) { )
player.interfaceManager.close() override fun defineInterfaceListeners() {
player.pulseManager.run(object : Pulse(1) { onOpen(400) { player, component ->
override fun pulse(): Boolean { val id = player.getAttribute("ttb:objectid", 0)
if (!ttb.canMake(player)) { val deco = Decoration.forObjectId(id)
return true val values = decorationVarps[deco] ?: Pair(0, 0)
} player.varpManager.get(261).setVarbit(0, values.first).send(player)
if (player.inventory.freeSlots() == 0) { player.varpManager.get(262).setVarbit(0, values.second).send(player)
player.sendMessage("You don't have enough space in your inventory to make this.") return@onOpen true
return true }
} on(400) { player, _, _, buttonID, _, _ ->
if (player.inventory.remove(*ttb.requiredItems.toTypedArray())) { val ttb = TeleTabButton.forId(buttonID)
player.inventory.add(ttb.tabItem) if (ttb != null && ttb.canMake(player)) {
player.skills.addExperience(Skills.MAGIC, ttb.xp / 2.toDouble(), true) player.interfaceManager.close()
//TODO Add correct lectern animation. var requiredItemsCountingStaves = ttb.requiredItems.filter({ item ->
player.animate(Animation(4460)) val staff = MagicStaff.forId(item.id);
////////////////////////////// !(staff != null && player.equipment.containsAtLeastOneItem(staff.staves))
super.setDelay(9) }).toTypedArray()
if (ttb == TeleTabButton.VARROCK player.pulseManager.run(object : Pulse(1) {
&& (player.getAttribute("ttb:objectid", 0) == Decoration.MAHOGANY_EAGLE_LECTERN.objectId var counter = 0
|| player.getAttribute("ttb:objectid", 0) == Decoration.MAHOGANY_DEMON_LECTERN.objectId)) { override fun pulse(): Boolean {
player.achievementDiaryManager.finishTask(player, DiaryType.VARROCK, 2, 8) when(counter++) {
} 0 -> {
} if (!ttb.canMake(player)) {
return false return true
} }
}) //TODO Add correct lectern animation (should look like raising arms progressively higher 3 times).
player.animate(Animation(782))
}
2 -> {
if (player.inventory.remove(*requiredItemsCountingStaves)) {
// Should never drop, since soft clay was successfully removed
addItemOrDrop(player, ttb.tabItem.id)
player.skills.addExperience(Skills.MAGIC, ttb.xp / 2.toDouble(), true)
if (ttb == TeleTabButton.VARROCK
&& (player.getAttribute("ttb:objectid", 0) == Decoration.MAHOGANY_EAGLE_LECTERN.objectId
|| player.getAttribute("ttb:objectid", 0) == Decoration.MAHOGANY_DEMON_LECTERN.objectId)) {
player.achievementDiaryManager.finishTask(player, DiaryType.VARROCK, 2, 8)
}
} else {
return true
}
}
}
counter %= 6
return false
}
})
}
player.animate(Animation(-1))
return@on true
} }
player.animate(Animation(-1))
return true
} }
} }