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

Fixup being able to kill monsters without correct slayer level (#220)

Browse Source 
* Cannon only fire at npcs on same height level.

* Cannon cannot kill monsters if you do not have the slayer level
This commit is contained in:
Danial
2019-11-29 18:04:53 +13:00
committed by Daniel Ginovker
parent 680a0c2ee0
commit d4b16a25aa
1 changed files with 57 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java
+57 -50
View File
@@ -404,56 +404,59 @@ public class DwarfCannon {
private Npc targetNpc() {
for (int i = 0; i < NpcHandler.MAX_NPCS; i++) {
if (NpcHandler.npcs[i] == null) {
continue;
}
Npc npc = NpcHandler.npcs[i];
int myX = player.cannonX;
int myY = player.cannonY;
int theirX = npc.absX;
int theirY = npc.absY;
if (!npc.isDead && !npc.isDead && npc.HP != 0 && npc.npcType != 1266 && npc.npcType != 1268 && inDistance(theirX, theirY)) {
switch (rotation) {
case 1:
if (theirY > myY && theirX >= myX - 1 && theirX <= myX + 1) {
return npc;
}
break;
case 2:
if (theirX >= myX + 1 && theirY >= myY + 1) {
return npc;
}
break;
case 3:
if (theirX > myX && theirY >= myY - 1 && theirY <= myY + 1) {
return npc;
}
break;
case 4:
if (theirY <= myY - 1 && theirX >= myX + 1) {
return npc;
}
break;
case 5:
if (theirY < myY && theirX >= myX - 1 && theirX <= myX + 1) {
return npc;
}
break;
case 6:
if (theirX <= myX - 1 && theirY <= myY - 1) {
return npc;
}
break;
case 7:
if (theirX < myX && theirY >= myY - 1 && theirY <= myY + 1) {
return npc;
}
break;
case 8:
if (theirX <= myX - 1 && theirY >= myY + 1) {
return npc;
}
break;
Npc npc = NpcHandler.npcs[i];
if (npc == null || npc.heightLevel != player.heightLevel || !canAttackSlayer(i)) {
continue;
}
int myX = player.cannonX;
int myY = player.cannonY;
int theirX = npc.absX;
int theirY = npc.absY;
if (!npc.isDead && !npc.isDead && npc.HP != 0 && npc.npcType != 1266 && npc.npcType != 1268 && inDistance(theirX, theirY)) {
switch (rotation) {
case 1:
if (theirY > myY && theirX >= myX - 1 && theirX <= myX + 1) {
return npc;
}
break;
case 2:
if (theirX >= myX + 1 && theirY >= myY + 1) {
return npc;
}
break;
case 3:
if (theirX > myX && theirY >= myY - 1 && theirY <= myY + 1) {
return npc;
}
break;
case 4:
if (theirY <= myY - 1 && theirX >= myX + 1) {
return npc;
}
break;
case 5:
if (theirY < myY && theirX >= myX - 1 && theirX <= myX + 1) {
return npc;
}
break;
case 6:
if (theirX <= myX - 1 && theirY <= myY - 1) {
return npc;
}
break;
case 7:
if (theirX < myX && theirY >= myY - 1 && theirY <= myY + 1) {
return npc;
}
break;
case 8:
if (theirX <= myX - 1 && theirY >= myY + 1) {
return npc;
}
break;
}
}
}
@@ -463,6 +466,10 @@ public class DwarfCannon {
public boolean inDistance(int npcX, int npcY) {
return (npcX >= player.cannonX - maxDistance && npcX <= player.cannonX + maxDistance && npcY >= player.cannonY - maxDistance && npcY <= player.cannonY + maxDistance);
}
public boolean canAttackSlayer(int i){
return player.playerLevel[player.playerSlayer] >= player.getSlayer().getRequiredLevel(NpcHandler.npcs[i].npcType);
}
private void cannonProjectile(Npc n) {
int oX = player.cannonX+getShootXPos();