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

Update server skill magic numbers (#502)

Browse Source
This commit is contained in:
Danial
2021-09-24 00:34:58 +12:00
committed by GitHub
parent 06b509c4d0
commit d30e833dd8
91 changed files with 856 additions and 794 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/src/main/java/com/rs2/game/npcs/NpcActions.java
+9 -8
View File
@@ -1,5 +1,6 @@
package com.rs2.game.npcs;
import com.rs2.GameConstants;
import com.rs2.game.content.quests.QuestAssistant;
import com.rs2.game.content.skills.core.Fishing;
import com.rs2.game.content.skills.crafting.Tanning;
@@ -234,10 +235,10 @@ public class NpcActions {
break;
case 2270:
if (player.playerLevel[player.playerThieving] > 98) {
if (player.playerLevel[GameConstants.THIEVING] > 98) {
player.getShopAssistant().openShop(118);
} else if (player.playerLevel[player.playerThieving] > 49
&& player.playerLevel[player.playerAgility] > 49) {
} else if (player.playerLevel[GameConstants.THIEVING] > 49
&& player.playerLevel[GameConstants.AGILITY] > 49) {
player.getShopAssistant().openShop(118);
} else {
player.getPacketSender().sendMessage(
@@ -588,7 +589,7 @@ public class NpcActions {
break;
case 780:
if (player.playerLevel[10] < 4) {
if (player.playerLevel[GameConstants.FISHING] < 4) {
player.getDialogueHandler().sendStatement(
"You don't have the requirements to do this quest.");
return;
@@ -1130,10 +1131,10 @@ public class NpcActions {
break;
case 2270:
if (player.playerLevel[player.playerThieving] > 98) {
if (player.playerLevel[GameConstants.THIEVING] > 98) {
player.getShopAssistant().openShop(118);
} else if (player.playerLevel[player.playerThieving] > 49
&& player.playerLevel[player.playerAgility] > 49) {
} else if (player.playerLevel[GameConstants.THIEVING] > 49
&& player.playerLevel[GameConstants.AGILITY] > 49) {
player.getShopAssistant().openShop(118);
} else {
player.getPacketSender().sendMessage(
@@ -1257,7 +1258,7 @@ public class NpcActions {
break;
case 2258:
if (player.playerLevel[20] < 35) {
if (player.playerLevel[GameConstants.RUNECRAFTING] < 35) {
player.getPacketSender().sendMessage("You need a Runecrafting level of 35 to enter the Abyss.");
return;
}
2006Scape Server/src/main/java/com/rs2/game/npcs/NpcHandler.java
+5 -5
View File
@@ -787,8 +787,8 @@ public class NpcHandler {
}
if (npcs[i].npcType > 3726 && npcs[i].npcType < 3732) {
int damage = 10 + Misc.random(10);
player.playerLevel[player.playerHitpoints] = player.getPlayerAssistant().getLevelForXP(player.playerXP[player.playerHitpoints]) - damage;
player.getPlayerAssistant().refreshSkill(player.playerHitpoints);
player.playerLevel[GameConstants.HITPOINTS] = player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.HITPOINTS]) - damage;
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
player.handleHitMask(damage);
}
if (npcs[i].npcType == 655) {
@@ -1390,9 +1390,9 @@ public class NpcHandler {
|| npcs[i].npcType == 1160) {
if (damage > 0) {
if (c != null) {
if (c.playerLevel[5] > 0) {
c.playerLevel[5]--;
c.getPlayerAssistant().refreshSkill(5);
if (c.playerLevel[GameConstants.PRAYER] > 0) {
c.playerLevel[GameConstants.PRAYER]--;
c.getPlayerAssistant().refreshSkill(GameConstants.PRAYER);
c.getPlayerAssistant().appendPoison(12);
}
}