Made the Sheep Shearer wool collected count persist between logins
Reorganised, expanded, and corrected the Sheep Shearer quest dialogue
This commit is contained in:
zsrv
Ryan
@@ -0,0 +1,119 @@
|
||||
package content.global.handlers.npc
|
||||
|
||||
import content.region.misthalin.lumbridge.quest.sheepshearer.SheepShearer.Companion.ATTR_IS_PENGUIN_SHEEP_SHEARED
|
||||
import core.api.*
|
||||
import core.game.interaction.IntType
|
||||
import core.game.interaction.InteractionListener
|
||||
import core.game.node.entity.combat.DeathTask
|
||||
import core.game.node.entity.npc.NPC
|
||||
import core.game.node.entity.npc.NPCBehavior
|
||||
import core.game.node.entity.player.link.audio.Audio
|
||||
import core.game.system.task.Pulse
|
||||
import core.game.world.GameWorld
|
||||
import core.game.world.update.flag.context.Animation
|
||||
import core.tools.RandomFunction
|
||||
import org.rs09.consts.Items
|
||||
import org.rs09.consts.NPCs
|
||||
import org.rs09.consts.Sounds
|
||||
|
||||
private val sheepIds = intArrayOf(
|
||||
NPCs.SHEEP_42,
|
||||
NPCs.SHEEP_43,
|
||||
NPCs.GOLDEN_SHEEP_1271,
|
||||
NPCs.GOLDEN_SHEEP_1272,
|
||||
NPCs.SHEEP_1529,
|
||||
NPCs.SHEEP_1762,
|
||||
NPCs.SHEEP_1763,
|
||||
NPCs.SHEEP_1764,
|
||||
NPCs.SHEEP_1765,
|
||||
NPCs.SICK_LOOKING_SHEEP_1_2377,
|
||||
NPCs.SICK_LOOKING_SHEEP_2_2378,
|
||||
NPCs.SICK_LOOKING_SHEEP_3_2379,
|
||||
NPCs.SICK_LOOKING_SHEEP_4_2380,
|
||||
NPCs.SHEEP_3310,
|
||||
NPCs.SHEEP_3311,
|
||||
NPCs.SHEEP_3579,
|
||||
NPCs.SHEEP_5148,
|
||||
NPCs.SHEEP_5149,
|
||||
NPCs.SHEEP_5150,
|
||||
NPCs.SHEEP_5151,
|
||||
NPCs.SHEEP_5152,
|
||||
NPCs.SHEEP_5153,
|
||||
NPCs.SHEEP_5154,
|
||||
NPCs.SHEEP_5155,
|
||||
NPCs.SHEEP_5156,
|
||||
NPCs.SHEEP_5157,
|
||||
NPCs.SHEEP_5158,
|
||||
NPCs.SHEEP_5159,
|
||||
NPCs.SHEEP_5160,
|
||||
NPCs.SHEEP_5161,
|
||||
NPCs.SHEEP_5162,
|
||||
NPCs.SHEEP_5163,
|
||||
NPCs.SHEEP_5164,
|
||||
NPCs.SHEEP_5165,
|
||||
NPCs.GOLDEN_SHEEP_5172,
|
||||
NPCs.GOLDEN_SHEEP_5173
|
||||
)
|
||||
|
||||
class SheepBehavior : NPCBehavior(*sheepIds), InteractionListener {
|
||||
override fun tick(self: NPC): Boolean {
|
||||
if (self.properties.combatPulse.isAttacking || DeathTask.isDead(self)) {
|
||||
return true
|
||||
}
|
||||
if (RandomFunction.random(35) == 5) {
|
||||
sendChat(self, "Baa!")
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
override fun defineListeners() {
|
||||
on(IntType.NPC, "shear") { player, node ->
|
||||
val sheep = node as NPC
|
||||
if (sheep.id == NPCs.SHEEP_3579) {
|
||||
if (player.questRepository.getQuest("Sheep Shearer").isStarted(player)) {
|
||||
setAttribute(player, ATTR_IS_PENGUIN_SHEEP_SHEARED, true)
|
||||
}
|
||||
animate(player, Animation(893))
|
||||
playAudio(player, Audio(Sounds.PENGUINSHEEP_ESCAPE_686), false)
|
||||
sendMessage(player, "The... whatever it is... manages to get away from you!")
|
||||
animate(sheep, Animation(3570))
|
||||
sheep.moveStep()
|
||||
return@on true
|
||||
}
|
||||
if (!inInventory(player, Items.SHEARS_1735)) {
|
||||
sendMessage(player, "You need shears to shear a sheep.")
|
||||
return@on true
|
||||
}
|
||||
if (hasOption(sheep, "attack")) {
|
||||
sendMessage(player, "That one looks a little too violent to shear...")
|
||||
return@on true
|
||||
}
|
||||
if (freeSlots(player) == 0) {
|
||||
sendMessage(player, "You don't have enough space in your inventory to carry any wool you would shear.")
|
||||
return@on true
|
||||
}
|
||||
lock(sheep, 3)
|
||||
stopWalk(sheep)
|
||||
animate(player, Animation(893))
|
||||
val random = RandomFunction.random(1, 5)
|
||||
if (random != 4) {
|
||||
sheep.locks.lockMovement(2)
|
||||
sheep.transform(NPCs.SHEEP_5153)
|
||||
playAudio(player, Audio(Sounds.SHEAR_SHEEP_761), false)
|
||||
sendMessage(player, "You get some wool.")
|
||||
addItem(player, Items.WOOL_1737) // 5160
|
||||
GameWorld.Pulser.submit(object : Pulse(80, sheep) {
|
||||
override fun pulse(): Boolean {
|
||||
sheep.reTransform()
|
||||
return true
|
||||
}
|
||||
})
|
||||
} else {
|
||||
sendMessage(player, "The sheep manages to get away from you!")
|
||||
sheep.moveStep()
|
||||
}
|
||||
return@on true
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
package content.global.handlers.npc;
|
||||
|
||||
import core.game.node.entity.combat.DeathTask;
|
||||
import core.game.node.entity.npc.AbstractNPC;
|
||||
import core.game.world.map.Location;
|
||||
import core.plugin.Initializable;
|
||||
import core.tools.RandomFunction;
|
||||
|
||||
/**
|
||||
* Handles the sheep npc's.
|
||||
* @author 'Vexia
|
||||
*/
|
||||
@Initializable
|
||||
public class SheepNPC extends AbstractNPC {
|
||||
|
||||
/**
|
||||
* The NPC ids of NPCs using this plugin.
|
||||
*/
|
||||
private static final int[] ID = { 42, 43, 1271, 1272, 1529, 1762, 1763, 1764, 1765, 2377, 2378, 2379, 2380, 3310, 3311, 3579, 5148, 5149, 5150, 5151, 5152, 5153, 5154, 5155, 5156, 5157, 5158, 5159, 5160, 5161, 5162, 5163, 5164, 5165, 5172, 5173 };
|
||||
|
||||
/**
|
||||
* Constructs a new {@code AlKharidWarriorPlugin} {@code Object}.
|
||||
*/
|
||||
public SheepNPC() {
|
||||
super(0, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs a new {@code AlKharidWarriorPlugin} {@code Object}.
|
||||
* @param id The NPC id.
|
||||
* @param location The location.
|
||||
*/
|
||||
private SheepNPC(int id, Location location) {
|
||||
super(id, location);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractNPC construct(int id, Location location, Object... objects) {
|
||||
return new SheepNPC(id, location);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tick() {
|
||||
if (getProperties().getCombatPulse().isAttacking() || DeathTask.isDead(this)) {
|
||||
super.tick();
|
||||
return;
|
||||
}
|
||||
if (RandomFunction.random(35) == 5) {
|
||||
sendChat("Baa!");
|
||||
}
|
||||
super.tick();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int[] getIds() {
|
||||
return ID;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user