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

Random stuff (#342)

Browse Source 
- added poison arrows to usable arrows
- cleaned up some code
- changed ardougne tele to correct coords
- enabled pest control (although it needs a lot of work still)
- fixed some typos
- made beads drop a bit more often, so its more accurate like real rs
This commit is contained in:
Mr Extremez
2019-12-31 11:42:53 -06:00
committed by Daniel Ginovker
parent e8bfe7f88a
commit d1c2150c60
16 changed files with 78 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/com/rebotted/game/content/combat/CombatAssistant.java
+6 -3
View File
@@ -62,6 +62,9 @@ public class CombatAssistant {
NpcHandler.npcs[i].updateRequired = true;
}
if (CombatConstants.COMBAT_SOUNDS) {
if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
return;
}
c.getPacketSender().sendSound(CombatSounds.getNpcBlockSound(NpcHandler.npcs[c.oldNpcIndex].npcType), 100, 0);
}
NpcHandler.npcs[i].facePlayer(c.playerId);
@@ -152,7 +155,7 @@ public class CombatAssistant {
c.getPlayerAssistant().refreshSkill(4);
}
if (damage > 0) {
if (NpcHandler.npcs[i].npcType >= 3777 && NpcHandler.npcs[i].npcType <= 3780 || PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType)) {
if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
c.pcDamage += damage;
}
}
@@ -232,7 +235,7 @@ public class CombatAssistant {
c.getPlayerAssistant().refreshSkill(6);
if (damage > 0) {
if (NpcHandler.npcs[i].npcType >= 3777 && NpcHandler.npcs[i].npcType <= 3780 || PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType)) {
if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
c.pcDamage += damage;
}
}
@@ -353,7 +356,7 @@ public class CombatAssistant {
}
}
if (damage > 0) {
if (NpcHandler.npcs[i].npcType >= 3777 && NpcHandler.npcs[i].npcType <= 3780 || PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType)) {
if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
c.pcDamage += damage;
}
}