2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-07 08:39:07 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Quick patch (#316)

Browse Source 
- Fixed npc drops/anims
- Fixed some combat sounds that were not working
- Made Kalphite Queen a multi area
This commit is contained in:
Mr Extremez
2019-12-23 11:23:04 -06:00
committed by Daniel Ginovker
parent bc4320ee68
commit 32bbf1e003
5 changed files with 31 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/com/rebotted/game/content/combat/CombatAssistant.java
+2 -4
View File
@@ -61,7 +61,7 @@ public class CombatAssistant {
NpcHandler.npcs[i].animUpdateRequired = true; NpcHandler.npcs[i].animUpdateRequired = true;
NpcHandler.npcs[i].updateRequired = true; NpcHandler.npcs[i].updateRequired = true;
} }
if (CombatConstants.COMBAT_SOUNDS && NpcHandler.npcs[i].npcType < 3177 && NpcHandler.npcs[i].npcType > 3180) { if (CombatConstants.COMBAT_SOUNDS) {
c.getPacketSender().sendSound(CombatSounds.getNpcBlockSound(NpcHandler.npcs[c.oldNpcIndex].npcType), 100, 0); c.getPacketSender().sendSound(CombatSounds.getNpcBlockSound(NpcHandler.npcs[c.oldNpcIndex].npcType), 100, 0);
} }
NpcHandler.npcs[i].facePlayer(c.playerId); NpcHandler.npcs[i].facePlayer(c.playerId);
@@ -644,9 +644,7 @@ public class CombatAssistant {
return; return;
} }
if (c.usingRangeWeapon || c.usingBow if (c.usingRangeWeapon || c.usingBow
&& CombatConstants.COMBAT_SOUNDS && CombatConstants.COMBAT_SOUNDS) {
&& NpcHandler.npcs[i].npcType < 3177
&& NpcHandler.npcs[i].npcType > 3180) {
c.getPacketSender().sendSound(SoundList.SHOOT_ARROW, c.getPacketSender().sendSound(SoundList.SHOOT_ARROW,
100, 0); 100, 0);
} }
2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcCombat.java
+1 -3
View File
@@ -241,9 +241,7 @@ public class NpcCombat {
c.singleCombatDelay2 = System.currentTimeMillis(); c.singleCombatDelay2 = System.currentTimeMillis();
NpcHandler.npcs[i].oldIndex = c.playerId; NpcHandler.npcs[i].oldIndex = c.playerId;
NpcData.startAnimation(NpcEmotes.getAttackEmote(i), i); NpcData.startAnimation(NpcEmotes.getAttackEmote(i), i);
if (CombatConstants.COMBAT_SOUNDS if (CombatConstants.COMBAT_SOUNDS) {
&& NpcHandler.npcs[i].npcType < 3177
&& NpcHandler.npcs[i].npcType > 3180) {
c.getPacketSender() c.getPacketSender()
.sendSound( .sendSound(
CombatSounds CombatSounds
2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcEmotes.java
+8 -26
View File
@@ -165,30 +165,7 @@ public enum NpcEmotes {
return -1; return -1;
} }
// public static int getDeadEmote(Player player, int i) { public static int getDeadEmote(Player player, int i) {
// for (NpcEmotes e : NpcEmotes.values()) {
// for (int f = 0; f < e.getNpcId().length; f++) {
// if (NpcHandler.npcs[i].npcType == e.getNpcId()[f]) {
// return e.getDead();
// } else {
// switch (NpcHandler.npcs[i].npcType) {
// case 2745:
// return 2654;
// case 1158:
// GameEngine.npcHandler.spawnSecondForm(player, i);
// return 6242;
// case 1160:
// GameEngine.npcHandler.spawnFirstForm(player, i);
// return 6233;
// }
// }
// }
// }
// return 2304;
// }
//
//}
public static int getDeadEmote(int i) {
for (NpcEmotes e : NpcEmotes.values()) { for (NpcEmotes e : NpcEmotes.values()) {
for (int f = 0; f < e.getNpcId().length; f++) { for (int f = 0; f < e.getNpcId().length; f++) {
if (NpcHandler.npcs[i].npcType == e.getNpcId()[f]) { if (NpcHandler.npcs[i].npcType == e.getNpcId()[f]) {
@@ -197,11 +174,16 @@ public static int getDeadEmote(int i) {
switch (NpcHandler.npcs[i].npcType) { switch (NpcHandler.npcs[i].npcType) {
case 2745: case 2745:
return 2654; return 2654;
case 1158:
GameEngine.npcHandler.spawnSecondForm(player, i);
return 6242;
case 1160:
GameEngine.npcHandler.spawnFirstForm(player, i);
return 6233;
} }
} }
} }
} }
return 2304; return 2304;
} }
} }
2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java
+4 -15
View File
@@ -647,27 +647,16 @@ public class NpcHandler {
} }
if (npcs[i].isDead) { if (npcs[i].isDead) {
if (npcs[i].actionTimer == 0 && npcs[i].applyDead == false if (npcs[i].actionTimer == 0 && npcs[i].applyDead == false && npcs[i].needRespawn == false) {
&& npcs[i].needRespawn == false) {
npcs[i].updateRequired = true; npcs[i].updateRequired = true;
npcs[i].facePlayer(0); npcs[i].facePlayer(0);
if (npcs[i].killedBy <= 0) if (npcs[i].killedBy <= 0)
npcs[i].killedBy = NpcData.getNpcKillerId(i); npcs[i].killedBy = NpcData.getNpcKillerId(i);
npcs[i].animNumber = NpcEmotes.getDeadEmote(i); // dead
// emote
Player c = (Client) PlayerHandler.players[npcs[i].killedBy]; Player c = (Client) PlayerHandler.players[npcs[i].killedBy];
if (c != null) { if (c != null) {
// if (npcs[i].killedBy <= 0) npcs[i].animNumber = NpcEmotes.getDeadEmote(c, i); // dead emote
// npcs[i].killedBy = NpcData.getNpcKillerId(i); if (CombatConstants.COMBAT_SOUNDS) {
// npcs[i].animNumber = NpcEmotes.getDeadEmote(c, i); // dead emote c.getPacketSender().sendSound(CombatSounds.getNpcDeathSounds(npcs[i].npcType), 100, 0);
if (CombatConstants.COMBAT_SOUNDS
&& NpcHandler.npcs[i].npcType < 3177
&& NpcHandler.npcs[i].npcType > 3180) {
c.getPacketSender()
.sendSound(
CombatSounds
.getNpcDeathSounds(npcs[i].npcType),
100, 0);
} }
} }
npcs[i].animUpdateRequired = true; npcs[i].animUpdateRequired = true;
2006Redone Server/src/com/rebotted/game/players/Player.java
+9 -1
View File
@@ -1706,7 +1706,15 @@ public abstract class Player {
|| absX >= 2371 && absX <= 2422 && absY >= 5062 && absY <= 5117 || absX >= 2371 && absX <= 2422 && absY >= 5062 && absY <= 5117
|| absX >= 2896 && absX <= 2927 && absY >= 3595 && absY <= 3630 || absX >= 2896 && absX <= 2927 && absY >= 3595 && absY <= 3630
|| absX >= 2892 && absX <= 2932 && absY >= 4435 && absY <= 4464 || absX >= 2892 && absX <= 2932 && absY >= 4435 && absY <= 4464
|| absX >= 2256 && absX <= 2287 && absY >= 4680 && absY <= 4711) { || absX >= 2256 && absX <= 2287 && absY >= 4680 && absY <= 4711
|| inKqArea()) {
return true;
}
return false;
}
public boolean inKqArea() {
if (absX >= 3467 && absX <= 3506 && absY >= 9477 && absY <= 9513) {
return true; return true;
} }
return false; return false;