Merge branch 'more-tds-fixes' into 'master'

Increase tds aggro range and add proper music for the Ancient Guthix Temple.

See merge request 2009scape/2009scape!253
This commit is contained in:
Ceikry
2021-09-11 01:52:05 +00:00
4 changed files with 30 additions and 3 deletions
+12
View File
@@ -2278,5 +2278,17 @@
"name": "Volcanic Vikings", "name": "Volcanic Vikings",
"indexId": "440", "indexId": "440",
"borders": "{2304,3785,2635,3818}" "borders": "{2304,3785,2635,3818}"
},
{
"id": "584",
"name": "Temple Desecrated",
"indexId": "628",
"borders": "{2580,5763,2620,5700}"
},
{
"id": "589",
"name": "The Sound of Guthix",
"indexId": "626",
"borders": "{2500,5766,2620,5810}"
} }
] ]
@@ -25,6 +25,11 @@ public enum BossKillCounter {
JAD(new int[] { 2745 }, "Tz-Tok Jad", 14828), JAD(new int[] { 2745 }, "Tz-Tok Jad", 14828),
KALPHITE_QUEEN(new int[] { 1160 }, "Kalphite Queen", 14650), KALPHITE_QUEEN(new int[] { 1160 }, "Kalphite Queen", 14650),
CORPOREAL_BEAST(new int[] { 8133 }, "Corporeal Beast", 14653), 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),
CALLISTO(new int[] { 8610 }, "Callisto", 14658), CALLISTO(new int[] { 8610 }, "Callisto", 14658),
SCORPIA(new int[] { 8611 }, "Scorpia", 14661), SCORPIA(new int[] { 8611 }, "Scorpia", 14661),
VENENATIS(new int[] { 8612 }, "Venenatis", 14657), VENENATIS(new int[] { 8612 }, "Venenatis", 14657),
@@ -169,4 +174,4 @@ public enum BossKillCounter {
player.getPacketDispatch().sendMessage("Your Barrows chest count is: <col=ff0000>" + player.getSavedData().getGlobalData().getBarrowsLoots() + "</col>."); player.getPacketDispatch().sendMessage("Your Barrows chest count is: <col=ff0000>" + player.getSavedData().getGlobalData().getBarrowsLoots() + "</col>.");
} }
} }
@@ -2,6 +2,7 @@ package core.game.node.entity.npc.bosses;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import core.game.content.global.BossKillCounter;
import core.game.node.entity.Entity; import core.game.node.entity.Entity;
import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.BattleState;
import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.combat.CombatStyle;
@@ -63,6 +64,14 @@ public class TormentedDemonNPC extends AbstractNPC {
*/ */
private final int[] damageLog = new int[3]; private final int[] damageLog = new int[3];
@Override
public void init() {
super.init();
getAggressiveHandler().setChanceRatio(10);
getAggressiveHandler().setRadius(64);
getAggressiveHandler().setAllowTolerance(false);
}
/** /**
* Constructs a new {@Code TormentedDemonNPC} {@Code Object} * Constructs a new {@Code TormentedDemonNPC} {@Code Object}
*/ */
@@ -162,6 +171,7 @@ public class TormentedDemonNPC extends AbstractNPC {
super.finalizeDeath(killer); super.finalizeDeath(killer);
reTransform(); reTransform();
fireShield = true; fireShield = true;
BossKillCounter.addtoKillcount((Player) killer, this.getId());
} }
@Override @Override
@@ -57,7 +57,7 @@ class StatsCommandSet : CommandSet(Command.Privilege.STANDARD) {
//Boss KC //Boss KC
82 -> sendLine(player, "KBD KC: ${globalData.bossCounters.get(BossKillCounter.KING_BLACK_DRAGON.ordinal)}",i) 82 -> sendLine(player, "KBD KC: ${globalData.bossCounters.get(BossKillCounter.KING_BLACK_DRAGON.ordinal)}",i)
83 -> sendLine(player, "Bork KC: ${globalData.bossCounters.get(BossKillCounter.BORK.ordinal)}",i) 83 -> sendLine(player, "TDs KC: ${globalData.bossCounters.get(BossKillCounter.TORMENTED_DEMONS.ordinal)}",i)
84 -> sendLine(player, "Supreme KC: ${globalData.bossCounters.get(BossKillCounter.DAGANNOTH_SUPREME.ordinal)}",i) 84 -> sendLine(player, "Supreme KC: ${globalData.bossCounters.get(BossKillCounter.DAGANNOTH_SUPREME.ordinal)}",i)
85 -> sendLine(player, "Rex KC: ${globalData.bossCounters.get(BossKillCounter.DAGANNOTH_REX.ordinal)}",i) 85 -> sendLine(player, "Rex KC: ${globalData.bossCounters.get(BossKillCounter.DAGANNOTH_REX.ordinal)}",i)
86 -> sendLine(player, "Prime KC: ${globalData.bossCounters.get(BossKillCounter.DAGANNOTH_PRIME.ordinal)}",i) 86 -> sendLine(player, "Prime KC: ${globalData.bossCounters.get(BossKillCounter.DAGANNOTH_PRIME.ordinal)}",i)
@@ -88,4 +88,4 @@ class StatsCommandSet : CommandSet(Command.Privilege.STANDARD) {
player.packetDispatch.sendInterfaceConfig(26,66,true) player.packetDispatch.sendInterfaceConfig(26,66,true)
player.packetDispatch.sendString(other.username + "'s Stats",26,101) player.packetDispatch.sendString(other.username + "'s Stats",26,101)
} }
} }