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

Rewrote boss kill counter

Browse Source 
Removed inauthentic slayer tasks and boss pets
This commit is contained in:
Bishop
2026-07-03 09:08:16 +00:00
committed by Ryan
parent 97f78b9058
commit 09d9d1ec55
15 changed files with 86 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/content/data/BossKillCounter.java
-172
View File
@@ -1,172 +0,0 @@
package content.data;
import core.game.node.entity.player.Player;
/**
* The BossKillcounter keeps track of the amount of bosses the player has slain.
* addtoKillcount(player, npcId) should be added in the finalizeDeath() method of the combat handler for the boss.
* @author Splinter
*/
public enum BossKillCounter {
/* ORDINAL BOUND */
KING_BLACK_DRAGON(new int[] { 50 }, "King Black Dragon", 14649),
BORK(new int[] { 7133, 7134 }, "Bork", -1),
DAGANNOTH_SUPREME(new int[] { 2881 }, "Dagannoth Supreme", 14639),
DAGANNOTH_PRIME(new int[] { 2882 }, "Dagannoth Prime", 14640),
DAGANNOTH_REX(new int[] { 2883 }, "Dagannoth Rex", 14641),
CHAOS_ELEMENTAL(new int[] { 3200 }, "Chaos Elemental", 14638),
GIANT_MOLE(new int[] { 3340 }, "Giant Mole", 14642),
SARADOMIN(new int[] { 6247 }, "Commander Zilyana", 14647),
ZAMORAK(new int[] { 6203 }, "K'ril Tsutsaroth", 14648),
BANDOS(new int[] { 6260 }, "General Graardor", 14646),
ARMADYL(new int[] { 6222 }, "Kree'arra", 14645),
JAD(new int[] { 2745 }, "Tz-Tok Jad", 14828),
KALPHITE_QUEEN(new int[] { 1160 }, "Kalphite Queen", 14650),
CORPOREAL_BEAST(new int[] { 8133 }, "Corporeal Beast", 14653),
TORMENTED_DEMONS(new int[] {
8349, 8350, 8351, 8352, 8353, 8354,
8355, 8356, 8357, 8358, 8359, 8360,
8361, 8362, 8363, 8364, 8365, 8366,
}, "Tormented demon", -1),
;
/**
* The npcs that can increase the killcounter
*/
private final int[] npc;
/**
* The name of the NPC, to be displayed as a sendMessage
*/
private final String name;
/**
* The item ID of the pet relating to the boss.
*/
private final int petId;
/**
* Constructs a new {@code BossKillCounter} {@code Object}.
* @param npc the npc.
* @param name the npc's string name
*/
BossKillCounter(final int[] npc, final String name, final int petId) {
this.npc = npc;
this.name = name;
this.petId = petId;
}
/**
* Gets the npc.
* @return The npc.
*/
public int[] getNpc() {
return npc;
}
/**
* Gets the NPC's name
* @return their name
*/
public String getName() {
return name;
}
/**
* Gets the petId
* @return The petId
*/
public int getPetId() {
return petId;
}
/**
* Gets the type for the npc.
* @param npc the npc.
* @return the BossKillcounter
*/
public static BossKillCounter forNPC(final int npc) {
for (BossKillCounter kc : BossKillCounter.values()) {
for (int i : kc.getNpc()) {
if (npc == i) {
return kc;
}
}
}
return null;
}
/**
* Adds to the player's killcount for that particular boss.
* @param killer The player who killed the npc
* @param npcid the ID of the npc that just died
*/
public static void addtoKillcount(Player killer, int npcid) {
if (killer == null) {
return;
}
BossKillCounter boss = BossKillCounter.forNPC(npcid);
if (boss == null) {
return;
}
killer.getSavedData().getGlobalData().getBossCounters()[boss.ordinal()]++;
killer.getPacketDispatch().sendMessage("Your " + boss.getName() + " killcount is now: <col=ff0000>" + killer.getSavedData().getGlobalData().getBossCounters()[boss.ordinal()] + "</col>.");
// addBossPet(killer, npcid, boss);
}
// /**
// * Gives the player the pet if they killed a certain boss.
// * The chance by default is 1/5000. This rate lowers to 1/2200 if the <GlobalEvents> for Boss Pets is active.
// * Note: Not all bosses have pet versions of themselves.
// */
// private static void addBossPet(Player killer, int npcid, BossKillCounter boss){
// if(boss.getPetId() == -1){ //The boss does not have a pet version.
// return;
// }
// int number = 5000;
// if (npcid == 2745) {
// number = 200;
// if (killer.getSlayer().getTask() == Tasks.JAD) {
// number = 100;
// }
// } else if (npcid == 3200) {
// number = 300;
// }
// int rand = number;
// if(rand == 10){
// for (int i = 0; i < killer.getFamiliarManager().getInsuredPets().size(); i++) {
// if (killer.getFamiliarManager().getInsuredPets().get(i).getBabyItemId() == boss.getPetId()) {
// return;
// }
// }
// if(killer.getFamiliarManager().hasFamiliar() && killer.getInventory().freeSlots() < 1){
// return;
// }
// if(!killer.getFamiliarManager().hasFamiliar()){
// killer.getFamiliarManager().summon(new Item(boss.getPetId()), true);
// killer.sendNotificationMessage("You have a funny feeling like you're being followed.");
// } else if (killer.getInventory().freeSlots() > 0){
// killer.getInventory().add(new Item(boss.getPetId(), 1));
// killer.sendNotificationMessage("You feel something weird sneaking into your backpack.");
// }
// Repository.sendNews(killer.getUsername()+" now commands a miniature "+(boss.equals(CORPOREAL_BEAST) ? "Dark core" : boss.getName())+"!");
// }
// }
/**
* Increments the player's Barrows chest counter.
* @param player the player
*/
public static void addtoBarrowsCount(Player player) {
if (player == null) {
return;
}
player.getSavedData().getGlobalData().setBarrowsLoots(player.getSavedData().getGlobalData().getBarrowsLoots() + 1);
player.getPacketDispatch().sendMessage("Your Barrows chest count is: <col=ff0000>" + player.getSavedData().getGlobalData().getBarrowsLoots() + "</col>.");
}
}
Server/src/main/content/data/BossKillCounter.kt
+72
View File
@@ -0,0 +1,72 @@
package content.data
import core.api.sendMessage
import core.game.node.entity.player.Player
import org.rs09.consts.NPCs
/**
* Enumerates the bosses that have their kill counts tracked in a player's statistics (::stats).
* addToBossKillCount(player, npcId) should be added in the finalizeDeath() method of the combat handler for the boss.
* ORDINAL BOUND
* @author Bishop
*/
enum class BossKillCounter(val bossId: IntArray, val bossName: String) {
KING_BLACK_DRAGON(intArrayOf(NPCs.KING_BLACK_DRAGON_50), "King Black Dragon"),
BORK(intArrayOf(NPCs.BORK_7133, NPCs.BORK_7134), "Bork"),
DAGANNOTH_SUPREME(intArrayOf(NPCs.DAGANNOTH_SUPREME_2881), "Dagannoth Supreme"),
DAGANNOTH_PRIME(intArrayOf(NPCs.DAGANNOTH_PRIME_2882), "Dagannoth Prime"),
DAGANNOTH_REX(intArrayOf(NPCs.DAGANNOTH_REX_2883), "Dagannoth Rex"),
CHAOS_ELEMENTAL(intArrayOf(NPCs.CHAOS_ELEMENTAL_3200), "Chaos Elemental"),
GIANT_MOLE(intArrayOf(NPCs.GIANT_MOLE_3340), "Giant Mole"),
SARADOMIN(intArrayOf(NPCs.COMMANDER_ZILYANA_6247), "Commander Zilyana"),
ZAMORAK(intArrayOf(NPCs.KRIL_TSUTSAROTH_6203), "K'ril Tsutsaroth"),
BANDOS(intArrayOf(NPCs.GENERAL_GRAARDOR_6260), "General Graardor"),
ARMADYL(intArrayOf(NPCs.KREEARRA_6222), "Kree'arra"),
JAD(intArrayOf(NPCs.TZTOK_JAD_2745), "Tz-Tok Jad"),
KALPHITE_QUEEN(intArrayOf(NPCs.KALPHITE_QUEEN_1160), "Kalphite Queen"),
CORPOREAL_BEAST(intArrayOf(NPCs.CORPOREAL_BEAST_8133), "Corporeal Beast"),
TORMENTED_DEMONS(
intArrayOf(
NPCs.TORMENTED_DEMON_8349, NPCs.TORMENTED_DEMON_8350, NPCs.TORMENTED_DEMON_8351,
NPCs.TORMENTED_DEMON_8352, NPCs.TORMENTED_DEMON_8353, NPCs.TORMENTED_DEMON_8354,
NPCs.TORMENTED_DEMON_8355, NPCs.TORMENTED_DEMON_8356, NPCs.TORMENTED_DEMON_8357,
NPCs.TORMENTED_DEMON_8358, NPCs.TORMENTED_DEMON_8359, NPCs.TORMENTED_DEMON_8360,
NPCs.TORMENTED_DEMON_8361, NPCs.TORMENTED_DEMON_8362, NPCs.TORMENTED_DEMON_8363,
NPCs.TORMENTED_DEMON_8364, NPCs.TORMENTED_DEMON_8365, NPCs.TORMENTED_DEMON_8366),
"Tormented demon"
),
PENANCE_QUEEN(intArrayOf(NPCs.PENANCE_QUEEN_5247), "Penance Queen");
companion object {
private fun forBossId(npc: Int): BossKillCounter? {
for (kc in values()) {
for (i in kc.bossId) {
if (npc == i) {
return kc
}
}
}
return null
}
@JvmStatic
fun addToBossKillCount(killer: Player?, bossId: Int) {
if (killer == null) {
return
}
val boss: BossKillCounter = forBossId(bossId) ?: return
killer.getSavedData().globalData.bossCounters[boss.ordinal]++
sendMessage(killer, "Your ${boss.bossName} killcount is now: <col=ff0000>${killer.getSavedData().globalData.bossCounters[boss.ordinal]}</col>.")
}
fun addToBarrowsChestCount(player: Player?) {
if (player == null) {
return
}
player.getSavedData().globalData.barrowsLoots++
sendMessage(player, "Your Barrows chest count is: <col=ff0000>${player.getSavedData().globalData.barrowsLoots}</col>.")
}
}
}
Server/src/main/content/global/handlers/item/EnchantedGemListener.kt
+1 -7
View File
@@ -2,7 +2,6 @@ package content.global.handlers.item
import content.global.skill.slayer.SlayerUtils
import core.api.*
import content.global.skill.slayer.Tasks
import org.rs09.consts.Items
import core.game.dialogue.DialogueFile
import core.game.dialogue.IfTopic
@@ -39,12 +38,7 @@ class EnchantedGemDialogue() : DialogueFile() {
if(!hasSlayerTask(player!!)) {
npcl(core.game.dialogue.FacialExpression.HALF_THINKING, "You need something new to hunt. Come and see me when you can and I'll give you a new task.").also { stage = 1 }
} else {
if(getSlayerTask(player!!) == Tasks.JAD) {
npcl(core.game.dialogue.FacialExpression.FRIENDLY, "You're currently assigned to kill TzTok-Jad!")
} else {
npcl(core.game.dialogue.FacialExpression.FRIENDLY, "You're currently assigned to kill ${SlayerUtils.pluralise(
getSlayerTaskName(player!!))}; only ${getSlayerTaskKillsRemaining(player!!)} more to go.")
}
npcl(core.game.dialogue.FacialExpression.FRIENDLY, "You're currently assigned to kill ${SlayerUtils.pluralise(getSlayerTaskName(player!!))}; only ${getSlayerTaskKillsRemaining(player!!)} more to go.")
setVarp(player!!, 2502, getSlayerTaskFlags(player!!) shr 4)
stage = 1
}
Server/src/main/content/global/skill/slayer/Tasks.java
-12
View File
@@ -21,7 +21,6 @@ public enum Tasks {
ABERRANT_SPECTRES(65, new int[] { 1604, 1605, 1606, 1607, 7801, 7802, 7803, 7804 }, new String[] { "Aberrant Spectres are fetid, vile ghosts. The very", "smell of them will paralyse and harm you. A nose peg", "will help ignore their stink." }, 60, true, false),
ABYSSAL_DEMONS(85, new int[] { 1615 }, new String[] { "Abyssal Demons are nasty creatures to fight. They", "aren't really part of this realm, and are able to", "move very quickly to trap their prey."}, 85, false, false),
ANKOU(40, new int[] { 4381, 4382, 4383 }, new String[] { "Ankou are undead skeletal ghosts. They'll fight you", "up close but make sure to take advantage out of their", "limited defence." }, 1, true, false),
AVIANSIES(60, new int[] { 6245, 6243, 6235, 6232, 6244, 6246, 6233, 6241, 6238, 6237, 6240, 6242, 6239, 6234 }, new String[] { "Aviansies are bird-like creatures found in the icy", "dungeons of the north. Melee weapons can't reach them,", "so use Magic or Ranged attacks." }, 1, false, false),
BANSHEE(20, new int[] { 1612 }, new String[] { "Banshees use a piercing scream to shock their enemies.", "You'll need some earmuffs to protect yourself from them." }, 15, true, false),
BASILISKS(40, new int[] { 1616, 1617 }, new String[] { "Basilisks, like Cockatrice, have a gaze which will", "paralyse and harm their prey. You'll need a Mirror", "Shield to protect you." }, 40, false, false),
BATS(5, new int[] { 412, 78, 3711 }, new String[] { "Bats are rarely found on the ground, so you'll have", "to fight them while they're airborne, which won't be", "easy for melee." }, 1, false, false),
@@ -107,12 +106,10 @@ public enum Tasks {
SPIRTUAL_WARRIORS(60, new int[] { 6219, 6229, 6255, 6277, }, new String[] { "Spiritual warriors can be found in the icy caverns near", "Trollheim, supporting the cause of their chosen god." }, 68, Quests.DEATH_PLATEAU),
STEEL_DRAGONS( 85,new int[] { 1592, 3590 }, new String[] { "Steel dragons are dangerous and metallic, with steel", "scales that are far thicker than normal steel armour. As", "you are an accomplished slayer, I am sure you'll be", "able to deal with them easily."}, 1, false, true),
SUQAHS (65, new int[] { 4527, 4528, 4529, 4530, 4531, 4532, 4533 }, new String[] { "Suqahs can only be found on the mystical Lunar Isle.", "They are capable of melee and magic attacks and often", "drop hide, teeth and herbs!" }, 1, Quests.LUNAR_DIPLOMACY),
// No access to Lair of Tarn Razorlor but this should be added as a task when there is access
TERROR_DOGS(1, new int[] { 5417, 5418 }, new String[] { "Terror dogs are the personal pets of Tarn Razorlor.", "Wherever you find him, you will find them. They are", "bad-tempered and generally unfriendly." }, 40, Quests.HAUNTED_MINE),
TROLLS(60, new int[] { 72, 3584, 1098, 1096, 1097, 1095, 1101, 1105, 1102, 1103, 1104, 1130, 1131, 1132, 1133, 1134, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1138, 1560, 1561, 1562, 1563, 1564, 1565, 1566, 1935, 1936, 1937, 1938, 1939, 1940, 1941, 1942, 3840, 3841, 3842, 3843, 3845, 1933, 1934, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 391, 392, 393, 394, 395, 396}, new String[] { "Trolls regenerate damage quickly but are still", "vulnerable to poisons, they usually use crushing", "weapons." }, 1, false, false),
TUROTHS(60, new int[] { 1622, 1611, 1623, 1626, 1627, 1628, 1629, 1630, 7800}, new String[] { "Turoth are large vicious creatures with thick hides.", "You'll need a Leaf-Tipped Spear Sword or Battle-axe,", "Broad Arrows, or a Magic Dart to harm them." }, 55, false, false),
VAMPIRES(35, new int[] { 1220, 1223, 1225, 6214 }, new String[] { "Vampires are extremely powerful beings. They feed on", "the blood of the living so watch out you don't", "get bitten." }, 1, false, false),
// Waiting for the wall beast movement bug to be fixed before adding this as a task
WALL_BEASTS(1, new int[] { 7823 }, new String[] { "Wall Beasts are really much larger creatures but", "you'll only see their arms. You'll want something", "sharp on your head to stop them grabbing you." }, 35, false, false ),
// No way to get to Poison Swamp Cave
// If a grapple is implemented from W Castle Wars to E Posion Swamps
@@ -124,15 +121,6 @@ public enum Tasks {
WEREWOLVES(60, new int[] { 6006, 6007, 6008, 6009, 6010, 6011, 6012, 6013, 6014, 6015, 6016, 6017, 6018, 6019, 6020, 6021, 6022, 6023, 6024, 6025, 6212, 6213, 6607, 6609, 6614, 6617, 6625, 6632, 6644, 6663, 6675, 6686, 6701, 6712, 6724, 6728, }, new String[] { "Werewolves are feral creatures, they are strong and", "tough with sharp claws and teeth." }, 1, false, false),
WOLVES(20, new int[] { 95, 96, 97, 141, 142, 143, 839, 1198, 1330, 1558, 1559, 1951, 1952, 1953, 1954, 1955, 1956, 4413, 4414, 6046, 6047, 6048, 6049, 6050, 6051, 6052, 6829, 6830, 7005 }, new String[] { "Wolves are pack animals, so you'll always find them", "in groups. Watch out for their bite, it can be nasty." }, 1, false, false),
ZOMBIES(10, new int[] { 73, 74, 75, 76, 2060, 2714, 2863, 2866, 2869, 2878, 3622, 4392, 4393, 4394, 5293, 5294, 5295, 5296, 5297, 5298, 5299, 5300, 5301, 5302, 5303, 5304, 5305, 5306, 5307, 5308, 5309, 5310, 5311, 5312, 5313, 5314, 5315, 5316, 5317, 5318, 5319, 5320, 5321, 5322, 5323, 5324, 5325, 5326, 5327, 5328, 5329, 5330, 5331, 5375, 5376, 5377, 5378, 5379, 5380, 5393, 5394, 5395, 5396, 5397, 5398, 5399, 5400, 5401, 5402, 5403, 5404, 5405, 5406, 5407, 5408, 5409, 5410, 6099, 6100, 6131, 8149, 8150, 8151, 8152, 8153, 8159, 8160, 8161, 8162, 8163, 8164, 2044, 2045, 2046, 2047, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 7641, 1465, 1466, 1467, 2837, 2838, 2839, 2840, 2841, 2842, 5629, 5630, 5631, 5632, 5633, 5634, 5635, 5636, 5637, 5638, 5639, 5640, 5641, 5642, 5643, 5644, 5645, 5646, 5647, 5648, 5649, 5650, 5651, 5652, 5653, 5654, 5655, 5656, 5657, 5658, 5659, 5660, 5661, 5662, 5663, 5664, 5665, 2843, 2844, 2845, 2846, 2847, 2848}, new String[] { "Zombies are undead so magic is your best bet against", "them, there is even a spell specially for", "fighting the undead." }, 1, true, false),
// Bosses need to be handled differently/have a source. They should probably be removed from here
JAD(90, new int[] { }, new String[] { "You must complete the entire fight cave, including", "TzTok-Jad. Beware, only those skilled in combat should", "attempt this and death will reset your task." }, 1, false, false),
CHAOS_ELEMENTAL(90, new int[] { 3200 }, new String[] { "The Chaos Elemental roams the deepest Wilderness. It", "can teleport you and make you unequip items randomly." }, 1, false, false),
GIANT_MOLE(75, new int[] { 3340 }, new String[] { "Dig on the mole-hills in Falador Park to enter the", "mole cave, and bring a lantern he can't extinguish." }, 1, false, false),
KING_BLACK_DRAGON(75, new int[] { 50 }, new String[] { "The King Black Dragon's cave is reached by pulling a", "lever in the Wilderness. An anti-fire shield is", "strongly recommended." }, 1, false, true),
COMMANDER_ZILYANA(90, new int[] { 6247 }, new String[] { "Commander Zilyana is in the God Wars Dungeon.", "She frequently uses magic attacks." }, 1, false, false),
GENERAL_GRARDOOR(90, new int[] { 6260 }, new String[] { "General Graardor is in the God Wars Dungeon.", "He uses melee and ranged attacks." }, 1, false, false),
KRIL_TSUTSAROTH(90, new int[] { 6203 }, new String[] { "K'ril Tsutsaroth is in the God Wars Dungeon.", "He's poisonous and he can hit through prayers." }, 1, false, false),
KREE_ARRA(90, new int[] { 6222 }, new String[] { "Kree'arra roosts in the God Wars Dungeon.", "Melee attacks don't work on flying creatures,", "and you'll need a grappling hook to get in." }, 1, false, false),
;
static final HashMap<Integer, Tasks> taskMap = new HashMap<>();
Server/src/main/content/minigame/barrows/RewardChest.kt
+1 -1
View File
@@ -78,7 +78,7 @@ object RewardChest {
InterfaceContainer.generateItems(player, rewards.toTypedArray(), arrayOf("Examine"), 364, 4, 3, 4)
player.interfaceManager.open(Component(Components.TRAIL_REWARD_364))
BossKillCounter.addtoBarrowsCount(player)
BossKillCounter.addToBarrowsChestCount(player)
for (item in rewards) {
announceIfRare(player, item)
if (!player.inventory.add(item)) {
Server/src/main/content/region/asgarnia/falador/handlers/GiantMoleNPC.java
+1 -1
View File
@@ -299,7 +299,7 @@ public final class GiantMoleNPC extends AbstractNPC {
super.finalizeDeath(killer);
if (killer instanceof Player) {
Player player = killer.asPlayer();
BossKillCounter.addtoKillcount(player, this.getId());
BossKillCounter.addToBossKillCount(player, this.getId());
}
}
Server/src/main/content/region/asgarnia/trollheim/handlers/gwd/GodwarsBossNPC.java
+1 -1
View File
@@ -231,7 +231,7 @@ public final class GodwarsBossNPC extends AbstractNPC {
public void finalizeDeath(Entity killer) {
super.finalizeDeath(killer);
if (getId() == 6222 || getId() == 6260 || getId() == 6247 || getId() == 6203) {
BossKillCounter.addtoKillcount((Player) killer, this.getId());
BossKillCounter.addToBossKillCount((Player) killer, this.getId());
}
if (minions == null) {
return;
Server/src/main/content/region/desert/handlers/KalphiteQueenNPC.java
+2 -2
View File
@@ -97,10 +97,10 @@ public final class KalphiteQueenNPC extends AbstractNPC {
removeAttribute("disable:drop");
super.finalizeDeath(killer);
reTransform();
BossKillCounter.addtoKillcount((Player) killer, 1160);
BossKillCounter.addToBossKillCount((Player) killer, 1160);
return;
}
BossKillCounter.addtoKillcount((Player) killer, this.getId());
BossKillCounter.addToBossKillCount((Player) killer, this.getId());
setAttribute("disable:drop", true);
super.finalizeDeath(killer);
super.setRespawnTick(-1);
Server/src/main/content/region/fremennik/waterbirth/handlers/DagannothKingNPC.java
+1 -1
View File
@@ -97,7 +97,7 @@ public final class DagannothKingNPC extends AbstractNPC {
public void finalizeDeath(Entity killer) {
super.finalizeDeath(killer);
if (getId() == 2881 || getId() == 2882 || getId() == 2883) {
BossKillCounter.addtoKillcount((Player) killer, this.getId());
BossKillCounter.addToBossKillCount((Player) killer, this.getId());
}
}
Server/src/main/content/region/karamja/tzhaar/handlers/TzhaarFightCavesPlugin.java
+2 -9
View File
@@ -1,6 +1,5 @@
package content.region.karamja.tzhaar.handlers;
import content.global.skill.slayer.SlayerManager;
import core.game.event.NPCKillEvent;
import core.game.activity.ActivityPlugin;
import content.data.BossKillCounter;
@@ -10,8 +9,6 @@ import core.game.node.entity.Entity;
import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.diary.DiaryType;
import core.game.node.entity.skill.Skills;
import content.global.skill.slayer.Tasks;
import core.game.node.item.GroundItemManager;
import core.game.node.item.Item;
import core.game.node.scenery.Scenery;
@@ -23,6 +20,7 @@ import core.plugin.Initializable;
import core.tools.RandomFunction;
import core.game.world.GameWorld;
import core.game.world.repository.Repository;
import org.rs09.consts.NPCs;
import java.util.ArrayList;
import java.util.List;
@@ -167,12 +165,7 @@ public final class TzhaarFightCavesPlugin extends ActivityPlugin {
}
player.getPacketDispatch().sendMessage("You were victorious!");
if (!practice) {
BossKillCounter.addtoKillcount(player, 2745);
if (SlayerManager.getInstance(player).getTask() == Tasks.JAD) {
player.getSkills().addExperience(Skills.SLAYER, 25000);
SlayerManager.getInstance(player).clear();
player.sendMessage("You receive 25,000 slayer experience for defeating TzTok-Jad.");
}
BossKillCounter.addToBossKillCount(player, NPCs.TZTOK_JAD_2745);
player.getDialogueInterpreter().sendDialogues(2617, null, "You even defeated TzTok-Jad, I am most impressed!", "Please accept this gift as a reward.");
Repository.sendNews(player.getUsername() + " has been victorious in defeating TzTok-Jad for a firecape!");
} else {
Server/src/main/content/region/misthalin/lumbridge/handlers/TormentedDemonNPC.java
+1 -1
View File
@@ -184,7 +184,7 @@ public class TormentedDemonNPC extends AbstractNPC {
super.finalizeDeath(killer);
reTransform();
fireShield = true;
BossKillCounter.addtoKillcount((Player) killer, this.getId());
BossKillCounter.addToBossKillCount((Player) killer, this.getId());
}
@Override
Server/src/main/content/region/wilderness/handlers/BorkNPC.java
+1 -1
View File
@@ -118,7 +118,7 @@ public class BorkNPC extends AbstractNPC {
@Override
public void finalizeDeath(Entity killer){
super.finalizeDeath(killer);
BossKillCounter.addtoKillcount((Player) killer, this.getId());
BossKillCounter.addToBossKillCount((Player) killer, this.getId());
}
@Override
Server/src/main/content/region/wilderness/handlers/ChaosElementalNPC.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class ChaosElementalNPC extends AbstractNPC {
@Override
public void finalizeDeath(Entity killer) {
super.finalizeDeath(killer);
BossKillCounter.addtoKillcount((Player) killer, this.getId());
BossKillCounter.addToBossKillCount((Player) killer, this.getId());
}
/**
Server/src/main/content/region/wilderness/handlers/CorporealBeastNPC.java
+1 -1
View File
@@ -91,7 +91,7 @@ public final class CorporealBeastNPC extends NPCBehavior {
@Override
public void onDeathFinished(NPC self, Entity killer) {
BossKillCounter.addtoKillcount((Player) killer, NPCs.CORPOREAL_BEAST_8133);
BossKillCounter.addToBossKillCount((Player) killer, NPCs.CORPOREAL_BEAST_8133);
if (darkEnergyCore != null) {
darkEnergyCore.clear();
darkEnergyCore = null;
Server/src/main/content/region/wilderness/handlers/KingBlackDragonNPC.java
+1 -1
View File
@@ -49,7 +49,7 @@ public final class KingBlackDragonNPC extends AbstractNPC {
@Override
public void finalizeDeath(Entity killer) {
super.finalizeDeath(killer);
BossKillCounter.addtoKillcount((Player) killer, this.getId());
BossKillCounter.addToBossKillCount((Player) killer, this.getId());
}
/**