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

Redemption Prayer/Fixes/Clues/Tidying up/Rares (#207)

Browse Source 
- closes #205
- closes #197
- closes #145

Does the followiwng
- Adds functional redemption prayer
- Fixes max stack deletion when trading
- Adds toggle for clue scrolls, currently set on disabled until someone gets the time to finish clue scrolls
- Cleans up a few minor things
- Removes a few bits of dead code
- Re enables rare detection
This commit is contained in:
Mr Extremez
2019-11-21 20:09:17 -06:00
committed by Daniel Ginovker
parent 4b3bb7ade7
commit 34f2665858
10 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/content/combat/CombatAssistant.java
+1 -9
View File
@@ -572,11 +572,6 @@ public class CombatAssistant {
resetPlayerAttack();
return;
}
if (NpcHandler.npcs[i].npcType == 134 || NpcHandler.npcs[i].npcType == 1267 || NpcHandler.npcs[i].npcType == 1265) {
if (Misc.random(350) == 0) {
AntiBotting.botCheckInterface(c);
}
}
if (NpcHandler.npcs[i].npcType == 757 && c.vampSlayer > 2) {
if (!c.getItemAssistant().playerHasItem(1549, 1) || !c.getItemAssistant().playerHasItem(2347, 1)) {
c.getActionSender().sendMessage("You need a stake and hammer to attack count draynor.");
@@ -598,9 +593,6 @@ public class CombatAssistant {
c.getActionSender().sendMessage("You can't attack a swarm!");
resetPlayerAttack();
return;
}
if (!c.goodDistance(c.getX(), c.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 1)) {
}
if (NpcHandler.npcs[i].underAttackBy > 0 && NpcHandler.npcs[i].underAttackBy != c.playerId && !NpcHandler.npcs[i].inMulti()) {
c.npcIndex = 0;
@@ -677,7 +669,7 @@ public class CombatAssistant {
if (!c.goodDistance(c.getX(), c.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 2) && RangeData.usingHally(c) && !c.usingRangeWeapon && !c.usingBow && !c.usingMagic
|| !c.goodDistance(c.getX(), c.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 4) && c.usingRangeWeapon && !c.usingBow && !c.usingMagic
|| !c.goodDistance(c.getX(), c.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 1)&& !c.usingRangeWeapon && !RangeData.usingHally(c) && !c.usingBow && !c.usingMagic
|| !c.goodDistance(c.getX(), c.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 1) && !c.usingRangeWeapon && !RangeData.usingHally(c) && !c.usingBow && !c.usingMagic
|| !c.goodDistance(c.getX(), c.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 8) && (c.usingBow || c.usingMagic)) {
return;
} else {