Random stuff (#342)

- added poison arrows to usable arrows
- cleaned up some code
- changed ardougne tele to correct coords
- enabled pest control (although it needs a lot of work still)
- fixed some typos
- made beads drop a bit more often, so its more accurate like real rs
This commit is contained in:
Mr Extremez
2019-12-31 11:42:53 -06:00
committed by Daniel Ginovker
parent e8bfe7f88a
commit d1c2150c60
16 changed files with 78 additions and 140 deletions
@@ -4,7 +4,6 @@ import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import com.rebotted.GameConstants;
import com.rebotted.GameEngine;
import com.rebotted.event.CycleEvent;
@@ -650,12 +649,14 @@ public class NpcHandler {
if (npcs[i].actionTimer == 0 && npcs[i].applyDead == false && npcs[i].needRespawn == false) {
npcs[i].updateRequired = true;
npcs[i].facePlayer(0);
if (npcs[i].killedBy <= 0)
npcs[i].killedBy = NpcData.getNpcKillerId(i);
npcs[i].killedBy = NpcData.getNpcKillerId(i);
Player c = (Client) PlayerHandler.players[npcs[i].killedBy];
if (c != null) {
npcs[i].animNumber = NpcEmotes.getDeadEmote(c, i); // dead emote
if (CombatConstants.COMBAT_SOUNDS) {
if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
return;
}
c.getPacketSender().sendSound(CombatSounds.getNpcDeathSounds(npcs[i].npcType), 100, 0);
}
}
@@ -2012,10 +2012,10 @@ public class NPCDrops extends NPCDropsHandler {
public static final ItemDrop[] imp = {
new ItemDrop(i("ashes"), 1, ALWAYS),
new ItemDrop(i("red bead"), 1, UNCOMMON),
new ItemDrop(i("yellow bead"), 1, UNCOMMON),
new ItemDrop(i("black bead"), 1, UNCOMMON),
new ItemDrop(i("white bead"), 1, UNCOMMON),
new ItemDrop(i("red bead"), 1, COMMON),
new ItemDrop(i("yellow bead"), 1, COMMON),
new ItemDrop(i("black bead"), 1, COMMON),
new ItemDrop(i("white bead"), 1, COMMON),
new ItemDrop(i("tinderbox"), 1, UNCOMMON),
new ItemDrop(i("ball of wool"), 1, COMMON),
new ItemDrop(i("hammer"), 1, COMMON),