Updated Actions for Spirit Tree and Leprechaun (#435)

- Leprechaun spawns at tree w/ sfx and quest conditions
- Tree Spirit spawns at tree w/ sfx and quest conditions
This commit is contained in:
JohnsonMichaels123
2020-12-14 12:33:38 -08:00
committed by GitHub
parent 252171c209
commit 59b9dbf460
@@ -137,19 +137,47 @@ public class ClickObject implements PacketType {
Woodcutting.startWoodcutting(player, player.objectId, player.objectX, player.objectY, player.clickObjectType); Woodcutting.startWoodcutting(player, player.objectId, player.objectX, player.objectY, player.clickObjectType);
} }
switch (player.objectId) { switch (player.objectId) {
case 1292: case 1292: //lostCity 1
if (player.spiritTree == false && player.clickedTree) { if (player.spiritTree == false && player.clickedTree && player.lostCity < 2)
player.getPacketSender().sendMessage("You have already spawned a tree spirit."); {
player.getPacketSender().sendMessage("Nothing interesting happens.");
return;
}
if (player.spiritTree == false && player.clickedTree && player.lostCity == 2) {
player.getPacketSender().sendMessage("You're too busy fighting the tree spirit!'");
return; return;
} }
if (player.spiritTree == false && player.clickedTree == false) { if (player.spiritTree == false && player.clickedTree == false) {
player.getPacketSender().sendMessage("You attempt to chop the tree, and a tree spirit appears."); player.getPacketSender().sendMessage("You attempt to chop the tree, and a tree spirit appears !");
NpcHandler.spawnNpc(player, 655, player.getX(), player.getY(), 0, 0, 225, 20, 80, 80, true, false); player.getPacketSender().sendSound(300, 100, 1);
NpcHandler.spawnNpc(player, 655, player.getX(), player.getY(), 0, 0, 225, 20, 80, 80, true, true);
player.clickedTree = true; player.clickedTree = true;
} else if (player.spiritTree) { } else if (player.spiritTree && player.lostCity >= 2) {
Woodcutting.startWoodcutting(player, player.objectId, player.objectX, player.objectY, player.clickObjectType); Woodcutting.startWoodcutting(player, player.objectId, player.objectX, player.objectY, player.clickObjectType);
} }
break; break;
case 2409://lostCity 2
if (player.lostCity != 1)
{
player.getPacketSender().sendMessage("Nothing interesting happens.");
return;
}
else if (player.lostCity == 1 && player.leprechaunSpawned == false) {
player.getPacketSender().sendMessage("A leprechaun falls out of the tree!");
player.getPacketSender().sendSound(300, 100, 1);
NpcHandler.spawnNpc(player, 654, player.getX(), player.getY(), 0, 1, 1, 0, 0, 0, false, true);
player.leprechaunSpawned = true;
return;
}
else if (player.lostCity == 1 && player.leprechaunSpawned == true) {
player.getPacketSender().sendMessage("The leprechaun is already out of the tree!");
return;
}
else if (player.lostCity >= 2 && player.leprechaunSpawned == false) {
player.getPacketSender().sendMessage("The leprechaun doesn't appear to be there anymore.");
return;
}
break;
case 1294: case 1294:
case 1293: case 1293: