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

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/GameConstants.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class GameConstants {
public static double XP_RATE = 1;
public final static int SAVE_TIMER = 120; // save every 2 minute
public final static int SAVE_TIMER = 120; // save every x seconds
public final static int NPC_RANDOM_WALK_DISTANCE = 5;
2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java
+86 -86
View File
@@ -95,8 +95,8 @@ public class CombatAssistant {
if (Misc.random(4) == 1 && player.lastArrowUsed == 9242 && damage > 0) {
NpcHandler.npcs[i].gfx0(754);
damage = NpcHandler.npcs[i].HP / 5;
player.handleHitMask(player.playerLevel[3] / 10);
player.dealDamage(player.playerLevel[3] / 10);
player.handleHitMask(player.playerLevel[GameConstants.HITPOINTS] / 10);
player.dealDamage(player.playerLevel[GameConstants.HITPOINTS] / 10);
player.gfx0(754);
}
if (player.lastWeaponUsed == 11235 || player.bowSpecShot == 1) {
@@ -132,14 +132,14 @@ public class CombatAssistant {
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE / 2, 4);
player.getPlayerAssistant().addSkillXP(damage / 2, 1);
player.getPlayerAssistant().addSkillXP(damage / 3, 3);
player.getPlayerAssistant().refreshSkill(1);//defense
player.getPlayerAssistant().refreshSkill(3);//hp
player.getPlayerAssistant().refreshSkill(4);//range
player.getPlayerAssistant().refreshSkill(GameConstants.DEFENCE);//defense
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);//hp
player.getPlayerAssistant().refreshSkill(GameConstants.RANGED);//range
} else {
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE, 4);
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE /3, 3);
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(4);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
player.getPlayerAssistant().refreshSkill(GameConstants.RANGED);
}
if (damage > 0) {
if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
@@ -211,8 +211,8 @@ public class CombatAssistant {
if (MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1161 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1153 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1157 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1542 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1543 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1562) {
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MAGIC_EXP_RATE / 3, 3);
}
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(6);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
player.getPlayerAssistant().refreshSkill(GameConstants.MAGIC);
if (damage > 0) {
if (PestControl.npcIsPCMonster(NpcHandler.npcs[i].npcType) || PestControl.isPCPortal(NpcHandler.npcs[i].npcType)) {
player.pcDamage += damage;
@@ -237,12 +237,12 @@ public class CombatAssistant {
case 12911:
case 12929:
int heal = Misc.random(damage / 2);
if (player.playerLevel[3] + heal >= player.getPlayerAssistant().getLevelForXP(player.playerXP[3])) {
player.playerLevel[3] = player.getPlayerAssistant().getLevelForXP(player.playerXP[3]);
if (player.playerLevel[GameConstants.HITPOINTS] + heal >= player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.HITPOINTS])) {
player.playerLevel[GameConstants.HITPOINTS] = player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.HITPOINTS]);
} else {
player.playerLevel[3] += heal;
player.playerLevel[GameConstants.HITPOINTS] += heal;
}
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
break;
}
}
@@ -312,15 +312,15 @@ public class CombatAssistant {
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 2);
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 3);
player.getPlayerAssistant().refreshSkill(0);
player.getPlayerAssistant().refreshSkill(1);
player.getPlayerAssistant().refreshSkill(2);
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.DEFENCE);
player.getPlayerAssistant().refreshSkill(GameConstants.STRENGTH);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
} else {
if (NpcHandler.npcs[i].npcType != 2459 && NpcHandler.npcs[i].npcType != 2460 && NpcHandler.npcs[i].npcType != 2461 && NpcHandler.npcs[i].npcType != 2462) {
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE, player.fightMode);
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 3);
player.getPlayerAssistant().refreshSkill(player.fightMode);
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
}
}
if (damage > 0) {
@@ -329,11 +329,11 @@ public class CombatAssistant {
}
}
if (damage > 0 && guthansEffect) {
player.playerLevel[3] += damage;
if (player.playerLevel[3] > player.getLevelForXP(player.playerXP[3])) {
player.playerLevel[3] = player.getLevelForXP(player.playerXP[3]);
player.playerLevel[GameConstants.HITPOINTS] += damage;
if (player.playerLevel[GameConstants.HITPOINTS] > player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS])) {
player.playerLevel[GameConstants.HITPOINTS] = player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS]);
}
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
NpcHandler.npcs[i].gfx0(398);
}
NpcHandler.npcs[i].underAttack = true;
@@ -342,15 +342,15 @@ public class CombatAssistant {
switch (player.specEffect) {
case 4:
if (damage > 0) {
if (player.playerLevel[3] + damage > player.getLevelForXP(player.playerXP[3])) {
if (player.playerLevel[3] > player.getLevelForXP(player.playerXP[3])) {
if (player.playerLevel[GameConstants.HITPOINTS] + damage > player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS])) {
if (player.playerLevel[GameConstants.HITPOINTS] > player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS])) {
} else {
player.playerLevel[3] = player.getLevelForXP(player.playerXP[3]);
player.playerLevel[GameConstants.HITPOINTS] = player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS]);
}
} else {
player.playerLevel[3] += damage;
player.playerLevel[GameConstants.HITPOINTS] += damage;
}
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
}
break;
@@ -1108,7 +1108,7 @@ public class CombatAssistant {
public void playerDelayedHit(int i) {
if (PlayerHandler.players[i] != null) {
if (PlayerHandler.players[i].isDead || player.isDead || PlayerHandler.players[i].playerLevel[3] <= 0 || player.playerLevel[3] <= 0) {
if (PlayerHandler.players[i].isDead || player.isDead || PlayerHandler.players[i].playerLevel[GameConstants.HITPOINTS] <= 0 || player.playerLevel[GameConstants.HITPOINTS] <= 0) {
player.playerIndex = 0;
return;
}
@@ -1156,8 +1156,8 @@ public class CombatAssistant {
if (Misc.random(4) == 1 && player.lastArrowUsed == 9242 && damage > 0) {
PlayerHandler.players[i].gfx0(754);
damage = NpcHandler.npcs[i].HP / 5;
player.handleHitMask(player.playerLevel[3] / 10);
player.dealDamage(player.playerLevel[3] / 10);
player.handleHitMask(player.playerLevel[GameConstants.HITPOINTS] / 10);
player.dealDamage(player.playerLevel[GameConstants.HITPOINTS] / 10);
player.gfx0(754);
}
if (player.lastWeaponUsed == 11235 || player.bowSpecShot == 1) {
@@ -1185,11 +1185,11 @@ public class CombatAssistant {
damage2 = damage2 * 60 / 100;
}
}
if (PlayerHandler.players[i].playerLevel[3] - damage < 0) {
damage = PlayerHandler.players[i].playerLevel[3];
if (PlayerHandler.players[i].playerLevel[GameConstants.HITPOINTS] - damage < 0) {
damage = PlayerHandler.players[i].playerLevel[GameConstants.HITPOINTS];
}
if (PlayerHandler.players[i].playerLevel[3] - damage - damage2 < 0) {
damage2 = PlayerHandler.players[i].playerLevel[3] - damage;
if (PlayerHandler.players[i].playerLevel[GameConstants.HITPOINTS] - damage - damage2 < 0) {
damage2 = PlayerHandler.players[i].playerLevel[GameConstants.HITPOINTS] - damage;
}
if (damage < 0) {
damage = 0;
@@ -1207,14 +1207,14 @@ public class CombatAssistant {
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE / 3, 4);
player.getPlayerAssistant().addSkillXP(damage / 3, 1);
player.getPlayerAssistant().addSkillXP(damage / 3, 3);
player.getPlayerAssistant().refreshSkill(1);
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(4);
player.getPlayerAssistant().refreshSkill(GameConstants.DEFENCE);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
player.getPlayerAssistant().refreshSkill(GameConstants.RANGED);
} else {
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE, 4);
player.getPlayerAssistant().addSkillXP(damage / 3, 3);
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(4);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
player.getPlayerAssistant().refreshSkill(GameConstants.RANGED);
}
boolean dropArrows = true;
for (int noArrowId : RangeData.NO_ARROW_DROP) {
@@ -1240,7 +1240,7 @@ public class CombatAssistant {
PlayerHandler.players[i].handleHitMask(damage2);
}
o.getPlayerAssistant().refreshSkill(3);
o.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
PlayerHandler.players[i].updateRequired = true;
applySmite(i, damage);
if (damage2 != -1) {
@@ -1259,8 +1259,8 @@ public class CombatAssistant {
if (o.getPrayer().prayerActive[16] && System.currentTimeMillis() - o.protMageDelay > 1500) { // if prayer active reduce damage
damage = damage * 60 / 100;
}
if (PlayerHandler.players[i].playerLevel[3] - damage < 0) {
damage = PlayerHandler.players[i].playerLevel[3];
if (PlayerHandler.players[i].playerLevel[GameConstants.HITPOINTS] - damage < 0) {
damage = PlayerHandler.players[i].playerLevel[GameConstants.HITPOINTS];
}
if (damage > 0) {
applyRecoil(player, damage, i);
@@ -1269,8 +1269,8 @@ public class CombatAssistant {
if (MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1161 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1153 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1157 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1542 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1543 && MagicData.MAGIC_SPELLS[player.oldSpellId][0] != 1562) {
player.getPlayerAssistant().addSkillXP(MagicData.MAGIC_SPELLS[player.oldSpellId][7] + damage / 3, 3);
}
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(6);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
player.getPlayerAssistant().refreshSkill(GameConstants.MAGIC);
if (MagicSpells.getEndGfxHeight(player) == 100 && !player.magicFailed) { // end GFX
PlayerHandler.players[i].gfx100(MagicData.MAGIC_SPELLS[player.oldSpellId][5]);
@@ -1289,7 +1289,7 @@ public class CombatAssistant {
case 13011:
case 12999:
case 13023:
PlayerHandler.players[i].playerLevel[0] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[0]) * 10 / 100;
PlayerHandler.players[i].playerLevel[GameConstants.ATTACK] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[GameConstants.ATTACK]) * 10 / 100;
break;
}
}
@@ -1313,51 +1313,51 @@ public class CombatAssistant {
case 12911:
case 12929:
int heal = damage / 4;
if (player.playerLevel[3] + heal > player.getPlayerAssistant().getLevelForXP(player.playerXP[3])) {
player.playerLevel[3] = player.getPlayerAssistant().getLevelForXP(player.playerXP[3]);
if (player.playerLevel[GameConstants.HITPOINTS] + heal > player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.HITPOINTS])) {
player.playerLevel[GameConstants.HITPOINTS] = player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.HITPOINTS]);
} else {
player.playerLevel[3] += heal;
player.playerLevel[GameConstants.HITPOINTS] += heal;
}
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
break;
case 1153:
PlayerHandler.players[i].playerLevel[0] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[0]) * 5 / 100;
PlayerHandler.players[i].playerLevel[GameConstants.ATTACK] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[GameConstants.ATTACK]) * 5 / 100;
o.getPacketSender().sendMessage("Your attack level has been reduced!");
PlayerHandler.players[i].reduceSpellDelay[player.reduceSpellId] = System.currentTimeMillis();
o.getPlayerAssistant().refreshSkill(0);
break;
case 1157:
PlayerHandler.players[i].playerLevel[2] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[2]) * 5 / 100;
PlayerHandler.players[i].playerLevel[GameConstants.STRENGTH] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[GameConstants.STRENGTH]) * 5 / 100;
o.getPacketSender().sendMessage("Your strength level has been reduced!");
PlayerHandler.players[i].reduceSpellDelay[player.reduceSpellId] = System.currentTimeMillis();
o.getPlayerAssistant().refreshSkill(2);
o.getPlayerAssistant().refreshSkill(GameConstants.STRENGTH);
break;
case 1161:
PlayerHandler.players[i].playerLevel[1] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[1]) * 5 / 100;
PlayerHandler.players[i].playerLevel[GameConstants.DEFENCE] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[GameConstants.DEFENCE]) * 5 / 100;
o.getPacketSender().sendMessage("Your defence level has been reduced!");
PlayerHandler.players[i].reduceSpellDelay[player.reduceSpellId] = System.currentTimeMillis();
o.getPlayerAssistant().refreshSkill(1);
o.getPlayerAssistant().refreshSkill(GameConstants.DEFENCE);
break;
case 1542:
PlayerHandler.players[i].playerLevel[1] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[1]) * 10 / 100;
PlayerHandler.players[i].playerLevel[GameConstants.DEFENCE] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[GameConstants.DEFENCE]) * 10 / 100;
o.getPacketSender().sendMessage("Your defence level has been reduced!");
PlayerHandler.players[i].reduceSpellDelay[player.reduceSpellId] = System.currentTimeMillis();
o.getPlayerAssistant().refreshSkill(1);
o.getPlayerAssistant().refreshSkill(GameConstants.DEFENCE);
break;
case 1543:
PlayerHandler.players[i].playerLevel[2] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[2]) * 10 / 100;
PlayerHandler.players[i].playerLevel[GameConstants.STRENGTH] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[GameConstants.STRENGTH]) * 10 / 100;
o.getPacketSender().sendMessage("Your strength level has been reduced!");
PlayerHandler.players[i].reduceSpellDelay[player.reduceSpellId] = System.currentTimeMillis();
o.getPlayerAssistant().refreshSkill(2);
o.getPlayerAssistant().refreshSkill(GameConstants.STRENGTH);
break;
case 1562:
PlayerHandler.players[i].playerLevel[0] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[0]) * 10 / 100;
PlayerHandler.players[i].playerLevel[GameConstants.ATTACK] -= o.getPlayerAssistant().getLevelForXP(PlayerHandler.players[i].playerXP[GameConstants.ATTACK]) * 10 / 100;
o.getPacketSender().sendMessage("Your attack level has been reduced!");
PlayerHandler.players[i].reduceSpellDelay[player.reduceSpellId] = System.currentTimeMillis();
o.getPlayerAssistant().refreshSkill(0);
@@ -1378,7 +1378,7 @@ public class CombatAssistant {
}
applySmite(i, damage);
player.killedBy = PlayerHandler.players[i].playerId;
o.getPlayerAssistant().refreshSkill(3);
o.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
PlayerHandler.players[i].updateRequired = true;
player.usingMagic = false;
player.castingMagic = false;
@@ -1398,8 +1398,8 @@ public class CombatAssistant {
}
}
}
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(6);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
player.getPlayerAssistant().refreshSkill(GameConstants.MAGIC);
player.oldSpellId = 0;
}
}
@@ -1454,15 +1454,15 @@ public class CombatAssistant {
damage = damage * 60 / 100;
}
if (damage > 0 && guthansEffect) {
player.playerLevel[3] += damage;
if (player.playerLevel[3] > player.getLevelForXP(player.playerXP[3])) {
player.playerLevel[3] = player.getLevelForXP(player.playerXP[3]);
player.playerLevel[GameConstants.HITPOINTS] += damage;
if (player.playerLevel[GameConstants.HITPOINTS] > player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS])) {
player.playerLevel[GameConstants.HITPOINTS] = player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS]);
}
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
o.gfx0(398);
}
if (PlayerHandler.players[i].playerLevel[3] - damage < 0) {
damage = PlayerHandler.players[i].playerLevel[3];
if (PlayerHandler.players[i].playerLevel[GameConstants.HITPOINTS] - damage < 0) {
damage = PlayerHandler.players[i].playerLevel[GameConstants.HITPOINTS];
}
if (damage > 0) {
applyRecoil(player, damage, i);
@@ -1498,24 +1498,24 @@ public class CombatAssistant {
break;
case 3:
if (damage > 0) {
o.playerLevel[1] -= damage;
o.playerLevel[GameConstants.DEFENCE] -= damage;
o.getPacketSender().sendMessage("You feel weak.");
if (o.playerLevel[1] < 1) {
o.playerLevel[1] = 1;
if (o.playerLevel[GameConstants.DEFENCE] < 1) {
o.playerLevel[GameConstants.DEFENCE] = 1;
}
o.getPlayerAssistant().refreshSkill(1);
o.getPlayerAssistant().refreshSkill(GameConstants.DEFENCE);
}
break;
case 4:
if (damage > 0) {
if (player.playerLevel[3] + damage > player.getLevelForXP(player.playerXP[3])) {
if (player.playerLevel[3] < player.getLevelForXP(player.playerXP[3])) {
player.playerLevel[3] = player.getLevelForXP(player.playerXP[3]);
if (player.playerLevel[GameConstants.HITPOINTS] + damage > player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS])) {
if (player.playerLevel[GameConstants.HITPOINTS] < player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS])) {
player.playerLevel[GameConstants.HITPOINTS] = player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS]);
}
} else {
player.playerLevel[3] += damage;
player.playerLevel[GameConstants.HITPOINTS] += damage;
}
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
}
break;
}
@@ -1526,14 +1526,14 @@ public class CombatAssistant {
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE / 3, 2);
player.getPlayerAssistant().addSkillXP(damage / 3, 3);
player.getPlayerAssistant().refreshSkill(0);
player.getPlayerAssistant().refreshSkill(1);
player.getPlayerAssistant().refreshSkill(2);
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.DEFENCE);
player.getPlayerAssistant().refreshSkill(GameConstants.STRENGTH);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
} else {
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE, player.fightMode);
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.MELEE_EXP_RATE/3, 3);
player.getPlayerAssistant().refreshSkill(player.fightMode);
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
}
PlayerHandler.players[i].logoutDelay = System.currentTimeMillis();
PlayerHandler.players[i].underAttackBy = player.playerId;
@@ -1550,7 +1550,7 @@ public class CombatAssistant {
PlayerHandler.players[i].damageTaken[player.playerId] += damage;
player.totalPlayerDamageDealt += damage;
PlayerHandler.players[i].updateRequired = true;
o.getPlayerAssistant().refreshSkill(3);
o.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
break;
case 2:
@@ -1559,7 +1559,7 @@ public class CombatAssistant {
player.totalPlayerDamageDealt += damage;
PlayerHandler.players[i].updateRequired = true;
player.doubleHit = false;
o.getPlayerAssistant().refreshSkill(3);
o.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
break;
}
PlayerHandler.players[i].handleHitMask(damage);
@@ -1574,12 +1574,12 @@ public class CombatAssistant {
}
if (PlayerHandler.players[index] != null) {
Client c2 = (Client) PlayerHandler.players[index];
c2.playerLevel[5] -= damage / 4;
if (c2.playerLevel[5] <= 0) {
c2.playerLevel[5] = 0;
c2.playerLevel[GameConstants.PRAYER] -= damage / 4;
if (c2.playerLevel[GameConstants.PRAYER] <= 0) {
c2.playerLevel[GameConstants.PRAYER] = 0;
PrayerDrain.resetPrayers(c2);
}
c2.getPlayerAssistant().refreshSkill(5);
c2.getPlayerAssistant().refreshSkill(GameConstants.PRAYER);
}
}
2006Scape Server/src/main/java/com/rs2/game/content/combat/Specials.java
+7 -5
View File
@@ -1,6 +1,8 @@
package com.rs2.game.content.combat;
import java.util.HashMap;
import com.rs2.GameConstants;
import com.rs2.game.content.combat.range.RangeData;
import com.rs2.game.content.music.sound.CombatSounds;
import com.rs2.game.npcs.NpcHandler;
@@ -267,10 +269,10 @@ public class Specials {
if (o.getPrayer().prayerActive[18] && System.currentTimeMillis() - o.protMeleeDelay > 1500) {
damage *= .6;
}
if (o.playerLevel[3] - damage <= 0) {
damage = o.playerLevel[3];
if (o.playerLevel[GameConstants.HITPOINTS] - damage <= 0) {
damage = o.playerLevel[GameConstants.HITPOINTS];
}
if (o.playerLevel[3] > 0) {
if (o.playerLevel[GameConstants.HITPOINTS] > 0) {
o.handleHitMask(damage);
player.startAnimation(1667);
o.gfx100(337);
@@ -333,8 +335,8 @@ public class Specials {
player2.forcedChat("Raarrrrrgggggghhhhhhh!");
player2.startAnimation(1056);
player2.specAmount -= 5;
player2.playerLevel[2] = player2.getLevelForXP(player2.playerXP[2]) + player2.getLevelForXP(player2.playerXP[2]) * 15 / 100;
player2.getPlayerAssistant().refreshSkill(2);
player2.playerLevel[GameConstants.STRENGTH] = player2.getLevelForXP(player2.playerXP[GameConstants.STRENGTH]) + player2.getLevelForXP(player2.playerXP[GameConstants.STRENGTH]) * 15 / 100;
player2.getPlayerAssistant().refreshSkill(GameConstants.STRENGTH);
player2.getItemAssistant().updateSpecialBar();
} else {
player2.getPacketSender().sendMessage("You don't have the required special energy to use this attack.");
2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/CastRequirements.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.combat.magic;
import com.rs2.GameConstants;
import com.rs2.game.players.Player;
public class CastRequirements {
@@ -41,7 +42,7 @@ public class CastRequirements {
}
public static boolean hasRequiredLevel(Player c, int i) {
return c.playerLevel[6] >= i;
return c.playerLevel[GameConstants.MAGIC] >= i;
}
public static final int FIRE = 554,
2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/Enchanting.java
+4 -2
View File
@@ -2,6 +2,8 @@ package com.rs2.game.content.combat.magic;
import java.util.HashMap;
import java.util.Map;
import com.rs2.GameConstants;
import com.rs2.game.players.Player;
public class Enchanting {
@@ -196,14 +198,14 @@ public class Enchanting {
return;
}
if (c.playerLevel[c.playerMagic] >= enc.getLevelReq()) {
if (c.playerLevel[GameConstants.MAGIC] >= enc.getLevelReq()) {
if (c.getItemAssistant().playerHasItem(enc.getUnenchanted(), 1)) {
if(CastRequirements.hasRunes(c, getRequiredRunes(ens))){
if (getEnchantmentLevel(spellID) == enc.getELevel()) {
c.getItemAssistant().deleteItem(enc.getUnenchanted(), 1);
c.getItemAssistant().addItem(enc.getEnchanted(), 1);
c.getPlayerAssistant().addSkillXP(enc.getXp(),
c.playerMagic);
GameConstants.MAGIC);
CastRequirements.deleteRunes(c, getRequiredRunes(ens));
c.startAnimation(enc.getAnim());
c.gfx100(enc.getGFX());
2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicMaxHit.java
+9 -8
View File
@@ -1,13 +1,14 @@
package com.rs2.game.content.combat.magic;
import com.rs2.GameConstants;
import com.rs2.game.players.Player;
public class MagicMaxHit {
public static int mageAttackBonus(Player c) {
int magicBonus = c.playerLevel[6];
int magicBonus = c.playerLevel[GameConstants.MAGIC];
if (MagicData.fullVoidMage(c)) {
magicBonus += c.getLevelForXP(c.playerXP[6]) * 0.2;
magicBonus += c.getLevelForXP(c.playerXP[GameConstants.MAGIC]) * 0.2;
}
if (c.getPrayer().prayerActive[4]) {
magicBonus *= 1.05;
@@ -20,17 +21,17 @@ public class MagicMaxHit {
}
public static int mageDefenceBonus(Player c) {
int defenceBonus = c.playerLevel[1] / 2 + c.playerLevel[6] / 2;
int defenceBonus = c.playerLevel[GameConstants.DEFENCE] / 2 + c.playerLevel[GameConstants.MAGIC] / 2;
if (c.getPrayer().prayerActive[0]) {
defenceBonus += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.05;
defenceBonus += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.05;
} else if (c.getPrayer().prayerActive[3]) {
defenceBonus += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.1;
defenceBonus += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.1;
} else if (c.getPrayer().prayerActive[9]) {
defenceBonus += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.15;
defenceBonus += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.15;
} else if (c.getPrayer().prayerActive[18]) {
defenceBonus += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.2;
defenceBonus += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.2;
} else if (c.getPrayer().prayerActive[19]) {
defenceBonus += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.25;
defenceBonus += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.25;
}
return defenceBonus + c.playerBonus[8] + c.playerBonus[8] / 3;
}
2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicRequirements.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.combat.magic;
import com.rs2.GameConstants;
import com.rs2.game.items.ItemAssistant;
import com.rs2.game.players.Player;
import com.rs2.game.players.PlayerHandler;
@@ -101,7 +102,7 @@ public class MagicRequirements {
}
if (c.usingMagic && MagicTeleports.MAGIC_LEVEL_REQUIRED) { // check magic level
if (c.playerLevel[6] < MagicData.MAGIC_SPELLS[spell][1]) {
if (c.playerLevel[GameConstants.MAGIC] < MagicData.MAGIC_SPELLS[spell][1]) {
c.getPacketSender().sendMessage(
"You need to have a magic level of "
+ MagicData.MAGIC_SPELLS[spell][1]
2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicSpells.java
+13 -12
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.combat.magic;
import com.rs2.GameConstants;
import com.rs2.game.content.combat.CombatConstants;
import com.rs2.game.content.music.sound.SoundList;
import com.rs2.game.players.Client;
@@ -30,19 +31,19 @@ public class MagicSpells extends MagicData {
if (c2.getPrayer().prayerActive[12]) {
damage *= (int) .60;
}
if (c2.playerLevel[3] - damage < 0) {
damage = c2.playerLevel[3];
if (c2.playerLevel[GameConstants.HITPOINTS] - damage < 0) {
damage = c2.playerLevel[GameConstants.HITPOINTS];
}
c.getPlayerAssistant().addSkillXP(MagicData.MAGIC_SPELLS[c.oldSpellId][7] + damage * CombatConstants.MAGIC_EXP_RATE, 6);
c.getPlayerAssistant().addSkillXP(MagicData.MAGIC_SPELLS[c.oldSpellId][7] + damage / 3, 3);
// Server.playerHandler.players[playerId].setHitDiff(damage);
// Server.playerHandler.players[playerId].setHitUpdateRequired(true);
PlayerHandler.players[playerId].handleHitMask(damage);
// Server.playerHandler.players[playerId].playerLevel[3] -=
// Server.playerHandler.players[playerId].playerLevel[GameConstants.HITPOINTS] -=
// damage;
PlayerHandler.players[playerId].dealDamage(damage);
PlayerHandler.players[playerId].damageTaken[c.playerId] += damage;
c2.getPlayerAssistant().refreshSkill(3);
c2.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
c.totalPlayerDamageDealt += damage;
multiSpellEffect(c, playerId, damage);
} else {
@@ -62,21 +63,21 @@ public class MagicSpells extends MagicData {
- PlayerHandler.players[playerId].reduceStat > 35000) {
PlayerHandler.players[playerId].reduceStat = System
.currentTimeMillis();
PlayerHandler.players[playerId].playerLevel[0] -= PlayerHandler.players[playerId]
.getLevelForXP(PlayerHandler.players[playerId].playerXP[0]) * 10 / 100;
PlayerHandler.players[playerId].playerLevel[GameConstants.ATTACK] -= PlayerHandler.players[playerId]
.getLevelForXP(PlayerHandler.players[playerId].playerXP[GameConstants.ATTACK]) * 10 / 100;
}
break;
case 12919: // blood spells
case 12929:
int heal = damage / 4;
if (c.playerLevel[3] + heal >= c.getPlayerAssistant()
.getLevelForXP(c.playerXP[3])) {
c.playerLevel[3] = c.getPlayerAssistant().getLevelForXP(
c.playerXP[3]);
if (c.playerLevel[GameConstants.HITPOINTS] + heal >= c.getPlayerAssistant()
.getLevelForXP(c.playerXP[GameConstants.HITPOINTS])) {
c.playerLevel[GameConstants.HITPOINTS] = c.getPlayerAssistant().getLevelForXP(
c.playerXP[GameConstants.HITPOINTS]);
} else {
c.playerLevel[3] += heal;
c.playerLevel[GameConstants.HITPOINTS] += heal;
}
c.getPlayerAssistant().refreshSkill(3);
c.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
break;
case 12891:
case 12881:
2006Scape Server/src/main/java/com/rs2/game/content/combat/magic/MagicTeleports.java
+3 -2
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.combat.magic;
import com.rs2.GameConstants;
import com.rs2.game.content.randomevents.RandomEventHandler;
import com.rs2.game.players.Player;
@@ -28,7 +29,7 @@ public class MagicTeleports {
player.getPacketSender().sendMessage("You can't teleport above level 20 wilderness.");
return;
}
if (player.playerLevel[player.playerMagic] < teleport.getRequiredLevel()) {
if (player.playerLevel[GameConstants.MAGIC] < teleport.getRequiredLevel()) {
player.getPacketSender().sendMessage("You need a magic level of " + teleport.getRequiredLevel() + " to cast this spell.");
return;
}
@@ -39,6 +40,6 @@ public class MagicTeleports {
RandomEventHandler.addRandom(player);
CastRequirements.deleteRunes(player, teleport.getRequiredRunes());
player.getPlayerAssistant().startTeleport(teleport.getDestX(), teleport.getDestY(), teleport.getDestZ(), teleport.getType());
player.getPlayerAssistant().addSkillXP(teleport.getExperienceGained(), player.playerMagic);
player.getPlayerAssistant().addSkillXP(teleport.getExperienceGained(), GameConstants.MAGIC);
}
}
2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeData.java
+14 -13
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.combat.melee;
import com.rs2.GameConstants;
import com.rs2.game.content.combat.magic.MagicData;
import com.rs2.game.items.ItemAssistant;
import com.rs2.game.items.ItemConstants;
@@ -16,21 +17,21 @@ public class MeleeData {
}
public static int calculateMeleeAttack(Player c) {
int attackLevel = c.playerLevel[0];
int attackLevel = c.playerLevel[GameConstants.ATTACK];
// 2, 5, 11, 18, 19
if (c.getPrayer().prayerActive[2]) {
attackLevel += c.getLevelForXP(c.playerXP[c.playerAttack]) * 0.05;
attackLevel += c.getLevelForXP(c.playerXP[GameConstants.ATTACK]) * 0.05;
} else if (c.getPrayer().prayerActive[7]) {
attackLevel += c.getLevelForXP(c.playerXP[c.playerAttack]) * 0.1;
attackLevel += c.getLevelForXP(c.playerXP[GameConstants.ATTACK]) * 0.1;
} else if (c.getPrayer().prayerActive[15]) {
attackLevel += c.getLevelForXP(c.playerXP[c.playerAttack]) * 0.15;
attackLevel += c.getLevelForXP(c.playerXP[GameConstants.ATTACK]) * 0.15;
} else if (c.getPrayer().prayerActive[24]) {
attackLevel += c.getLevelForXP(c.playerXP[c.playerAttack]) * 0.15;
attackLevel += c.getLevelForXP(c.playerXP[GameConstants.ATTACK]) * 0.15;
} else if (c.getPrayer().prayerActive[25]) {
attackLevel += c.getLevelForXP(c.playerXP[c.playerAttack]) * 0.2;
attackLevel += c.getLevelForXP(c.playerXP[GameConstants.ATTACK]) * 0.2;
}
if (fullVoidMelee(c)) {
attackLevel += c.getLevelForXP(c.playerXP[c.playerAttack]) * 0.1;
attackLevel += c.getLevelForXP(c.playerXP[GameConstants.ATTACK]) * 0.1;
}
attackLevel *= c.specAccuracy;
// c.sendMessage("Attack: " + (attackLevel +
@@ -58,18 +59,18 @@ public class MeleeData {
}
public static int calculateMeleeDefence(Player c) {
int defenceLevel = c.playerLevel[1];
int defenceLevel = c.playerLevel[GameConstants.DEFENCE];
int i = c.playerBonus[bestMeleeDef(c)];
if (c.getPrayer().prayerActive[0]) {
defenceLevel += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.05;
defenceLevel += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.05;
} else if (c.getPrayer().prayerActive[5]) {
defenceLevel += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.1;
defenceLevel += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.1;
} else if (c.getPrayer().prayerActive[13]) {
defenceLevel += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.15;
defenceLevel += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.15;
} else if (c.getPrayer().prayerActive[24]) {
defenceLevel += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.2;
defenceLevel += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.2;
} else if (c.getPrayer().prayerActive[25]) {
defenceLevel += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.25;
defenceLevel += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.25;
}
return (int) (defenceLevel + defenceLevel * 0.15 + (i + i * 0.05));
}
2006Scape Server/src/main/java/com/rs2/game/content/combat/melee/MeleeMaxHit.java
+4 -3
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.combat.melee;
import com.rs2.GameConstants;
import com.rs2.game.players.Player;
public class MeleeMaxHit {
@@ -7,8 +8,8 @@ public class MeleeMaxHit {
public static int calculateMeleeMaxHit(Player c) {
double maxHit = 0;
int strBonus = c.playerBonus[10];
int strength = c.playerLevel[2];
int lvlForXP = c.getLevelForXP(c.playerXP[2]);
int strength = c.playerLevel[GameConstants.STRENGTH];
int lvlForXP = c.getLevelForXP(c.playerXP[GameConstants.STRENGTH]);
if (c.getPrayer().prayerActive[1]) {
strength += (int) (lvlForXP * .05);
} else if (c.getPrayer().prayerActive[6]) {
@@ -31,7 +32,7 @@ public class MeleeMaxHit {
&& c.playerEquipment[c.playerHat] == 4716
&& c.playerEquipment[c.playerChest] == 4720
&& c.playerEquipment[c.playerLegs] == 4722) {
maxHit += (c.getPlayerAssistant().getLevelForXP(c.playerXP[3]) - c.playerLevel[3]) / 2;
maxHit += (c.getPlayerAssistant().getLevelForXP(c.playerXP[GameConstants.HITPOINTS]) - c.playerLevel[GameConstants.HITPOINTS]) / 2;
}
if (c.specDamage > 1) {
maxHit = (int) (maxHit * c.specDamage);
2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java
+16 -16
View File
@@ -63,7 +63,7 @@ public class NpcCombat {
c.gfx0(NpcHandler.npcs[i].endGfx);
}
}
c.getPlayerAssistant().refreshSkill(3);
c.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
}
}
}
@@ -330,9 +330,9 @@ public class NpcCombat {
}
break;
case 134:
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(5);
c.getCombatAssistant().resetPlayerAttack();
}
@@ -575,8 +575,8 @@ public class NpcCombat {
damage = 0;
}
}
if (c.playerLevel[3] - damage < 0) {
damage = c.playerLevel[3];
if (c.playerLevel[GameConstants.HITPOINTS] - damage < 0) {
damage = c.playerLevel[GameConstants.HITPOINTS];
}
}
@@ -596,8 +596,8 @@ public class NpcCombat {
if (c.getPrayer().prayerActive[17]) { // protect from range
damage = 0;
}
if (c.playerLevel[3] - damage < 0) {
damage = c.playerLevel[3];
if (c.playerLevel[GameConstants.HITPOINTS] - damage < 0) {
damage = c.playerLevel[GameConstants.HITPOINTS];
}
}
@@ -621,8 +621,8 @@ public class NpcCombat {
damage = 0;
}
magicFailed = true;
if (c.playerLevel[3] - damage < 0) {
damage = c.playerLevel[3];
if (c.playerLevel[GameConstants.HITPOINTS] - damage < 0) {
damage = c.playerLevel[GameConstants.HITPOINTS];
}
if(NpcHandler.npcs[i].endGfx > 0 && (!magicFailed || FightCaves.isFightCaveNpc(i))) {
c.gfx100(NpcHandler.npcs[i].endGfx);
@@ -654,20 +654,20 @@ public class NpcCombat {
if (damage > 0) {
c.getCombatAssistant().applyRecoilNPC(c, damage, i);
}
if (c.playerLevel[3] - damage < 0) {
damage = c.playerLevel[3];
if (c.playerLevel[GameConstants.HITPOINTS] - damage < 0) {
damage = c.playerLevel[GameConstants.HITPOINTS];
}
int difference = c.playerLevel[3] - damage;
int difference = c.playerLevel[GameConstants.HITPOINTS] - damage;
if (c.getPlayerAssistant().savePlayer()) {
c.getPlayerAssistant().handleROL();
} else if (difference <= c.getLevelForXP(c.playerXP[3]) / 10 && difference > 0) {
} else if (difference <= c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS]) / 10 && difference > 0) {
c.appendRedemption();
} else {
NpcHandler.handleSpecialEffects(c, i, damage);
c.logoutDelay = System.currentTimeMillis(); // logout delay
c.handleHitMask(damage);
c.playerLevel[3] -= damage;
c.getPlayerAssistant().refreshSkill(3);
c.playerLevel[GameConstants.HITPOINTS] -= damage;
c.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
FightCaves.tzKihEffect(c, i, damage);
if (damage > 0)
{
2006Scape Server/src/main/java/com/rs2/game/content/combat/prayer/ActivatePrayers.java
+5 -4
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.combat.prayer;
import com.rs2.GameConstants;
import com.rs2.game.content.music.sound.SoundList;
import com.rs2.game.players.Player;
@@ -18,13 +19,13 @@ public class ActivatePrayers {
"Prayer has been disabled in this duel!");
return;
}
if (i == 24 && player.playerLevel[1] < 65) {
if (i == 24 && player.playerLevel[GameConstants.DEFENCE] < 65) {
player.getPacketSender().sendConfig(player.getPrayer().PRAYER_GLOW[i], 0);
player.getPacketSender().sendMessage(
"You may not use this prayer yet.");
return;
}
if (i == 25 && player.playerLevel[1] < 70) {
if (i == 25 && player.playerLevel[GameConstants.DEFENCE] < 70) {
player.getPacketSender().sendConfig(player.getPrayer().PRAYER_GLOW[i], 0);
player.getPacketSender().sendMessage(
"You may not use this prayer yet.");
@@ -36,8 +37,8 @@ public class ActivatePrayers {
int[] rangePrayer = { 3, 11, 19 };
int[] magePrayer = { 4, 12, 20 };
if (player.playerLevel[5] > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[5]) >= player
if (player.playerLevel[GameConstants.PRAYER] > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.PRAYER]) >= player
.getPrayer().PRAYER_LEVEL_REQUIRED[i]) {
boolean headIcon = false;
switch (i) {
2006Scape Server/src/main/java/com/rs2/game/content/combat/prayer/PrayerDrain.java
+5 -4
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.combat.prayer;
import com.rs2.GameConstants;
import com.rs2.game.players.Player;
public class PrayerDrain {
@@ -25,16 +26,16 @@ public class PrayerDrain {
}
public static void reducePrayerLevel(Player c) {
if (c.playerLevel[5] - 1 > 0) {
c.playerLevel[5] -= 1;
if (c.playerLevel[GameConstants.PRAYER] - 1 > 0) {
c.playerLevel[GameConstants.PRAYER] -= 1;
} else {
c.getPacketSender().sendMessage(
"You have run out of prayer points!");
c.playerLevel[5] = 0;
c.playerLevel[GameConstants.PRAYER] = 0;
resetPrayers(c);
c.getPrayer().prayerId = -1;
}
c.getPlayerAssistant().refreshSkill(5);
c.getPlayerAssistant().refreshSkill(GameConstants.PRAYER);
}
public static void resetPrayers(Player player) {
2006Scape Server/src/main/java/com/rs2/game/content/combat/range/DwarfCannon.java
+4 -3
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.combat.range;
import com.rs2.GameConstants;
import com.rs2.GameEngine;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
@@ -79,7 +80,7 @@ public class DwarfCannon {
player.getItemAssistant().deleteItem(2353, 1);
player.getItemAssistant().addItem(2, 4);
player.getPacketSender().sendMessage("You make some cannonballs.");
player.getPlayerAssistant().addSkillXP(26, player.playerSmithing);
player.getPlayerAssistant().addSkillXP(26, GameConstants.SMITHING);
player.getPacketSender().sendSound(352, 100, 0);
}
}
@@ -432,7 +433,7 @@ public class DwarfCannon {
target.hitUpdateRequired2 = true;
target.updateRequired = true;
myBalls -= 1;
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE, player.playerRanged);
player.getPlayerAssistant().addSkillXP(damage * CombatConstants.RANGE_EXP_RATE, GameConstants.RANGED);
}
}
@@ -503,7 +504,7 @@ public class DwarfCannon {
}
public boolean canAttackSlayer(int i){
return player.playerLevel[player.playerSlayer] >= player.getSlayer().getRequiredLevel(NpcHandler.npcs[i].npcType);
return player.playerLevel[GameConstants.SLAYER] >= player.getSlayer().getRequiredLevel(NpcHandler.npcs[i].npcType);
}
private void cannonProjectile(Npc n) {
2006Scape Server/src/main/java/com/rs2/game/content/combat/range/RangeMaxHit.java
+10 -9
View File
@@ -1,30 +1,31 @@
package com.rs2.game.content.combat.range;
import com.rs2.GameConstants;
import com.rs2.game.players.Player;
public class RangeMaxHit {
public static int calculateRangeDefence(Player c) {
int defenceLevel = c.playerLevel[1];
int defenceLevel = c.playerLevel[GameConstants.DEFENCE];
if (c.getPrayer().prayerActive[0]) {
defenceLevel += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.05;
defenceLevel += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.05;
} else if (c.getPrayer().prayerActive[5]) {
defenceLevel += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.1;
defenceLevel += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.1;
} else if (c.getPrayer().prayerActive[13]) {
defenceLevel += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.15;
defenceLevel += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.15;
} else if (c.getPrayer().prayerActive[24]) {
defenceLevel += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.2;
defenceLevel += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.2;
} else if (c.getPrayer().prayerActive[25]) {
defenceLevel += c.getLevelForXP(c.playerXP[c.playerDefence]) * 0.25;
defenceLevel += c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 0.25;
}
return defenceLevel + c.playerBonus[9] + c.playerBonus[9] / 2;
}
public static int calculateRangeAttack(Player c) {
int rangeLevel = c.playerLevel[4];
int rangeLevel = c.playerLevel[GameConstants.RANGED];
rangeLevel *= c.specAccuracy;
if (RangeData.fullVoidRange(c)) {
rangeLevel += c.getLevelForXP(c.playerXP[c.playerRanged]) * 0.1;
rangeLevel += c.getLevelForXP(c.playerXP[GameConstants.RANGED]) * 0.1;
}
if (c.getPrayer().prayerActive[3]) {
rangeLevel *= 1.05;
@@ -41,7 +42,7 @@ public class RangeMaxHit {
}
public static int rangeMaxHit(Player c) {
int rangeLevel = c.playerLevel[4];
int rangeLevel = c.playerLevel[GameConstants.RANGED];
int itemUsed = getRangeStr(c.usingBow ? c.lastArrowUsed : c.lastWeaponUsed);
double modifier = 1.00;
if (c.getPrayer().prayerActive[3]) {
2006Scape Server/src/main/java/com/rs2/game/content/consumables/Beverages.java
+30 -29
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.consumables;
import com.rs2.GameConstants;
import com.rs2.event.*;
import com.rs2.game.players.Player;
import com.rs2.util.Misc;
@@ -128,50 +129,50 @@ public class Beverages {
switch (id) {
case 1917:
case 7740://beer
double beerEffectStrength = c.getLevelForXP(c.playerXP[2]) * .04 + c.getLevelForXP(c.playerXP[2]);
double beerEffectAttack = c.getLevelForXP(c.playerXP[0]) * .07;
if (c.playerLevel[2] < beerEffectStrength) {
c.playerLevel[2] = (int) beerEffectStrength;
double beerEffectStrength = c.getLevelForXP(c.playerXP[GameConstants.STRENGTH]) * .04 + c.getLevelForXP(c.playerXP[GameConstants.STRENGTH]);
double beerEffectAttack = c.getLevelForXP(c.playerXP[GameConstants.ATTACK]) * .07;
if (c.playerLevel[GameConstants.STRENGTH] < beerEffectStrength) {
c.playerLevel[GameConstants.STRENGTH] = (int) beerEffectStrength;
}
if (c.playerLevel[0] > 0) {
c.playerLevel[0] -= beerEffectAttack;
if (c.playerLevel[GameConstants.ATTACK] > 0) {
c.playerLevel[GameConstants.ATTACK] -= beerEffectAttack;
}
if (c.playerLevel[0] <= 0) {
c.playerLevel[0] = 1;
if (c.playerLevel[GameConstants.ATTACK] <= 0) {
c.playerLevel[GameConstants.ATTACK] = 1;
}
c.getPlayerAssistant().refreshSkill(0);
c.getPlayerAssistant().refreshSkill(2);
c.getPlayerAssistant().refreshSkill(GameConstants.STRENGTH);
break;
case 1913: //dwarven stout
c.playerLevel[c.playerMining] = c.getPlayerAssistant().getLevelForXP(c.playerXP[c.playerMining]) + 1;
c.playerLevel[c.playerSmithing] = c.getPlayerAssistant().getLevelForXP(c.playerXP[c.playerSmithing]) + 1;
c.getPlayerAssistant().refreshSkill(c.playerMining);
c.getPlayerAssistant().refreshSkill(c.playerSmithing);
c.playerLevel[GameConstants.MINING] = c.getPlayerAssistant().getLevelForXP(c.playerXP[GameConstants.MINING]) + 1;
c.playerLevel[GameConstants.SMITHING] = c.getPlayerAssistant().getLevelForXP(c.playerXP[GameConstants.SMITHING]) + 1;
c.getPlayerAssistant().refreshSkill(GameConstants.MINING);
c.getPlayerAssistant().refreshSkill(GameConstants.SMITHING);
break;
case 1907://wizard's mind bomb
if (c.playerLevel[c.playerMagic] < 50) {
c.playerLevel[c.playerMagic] = c.getPlayerAssistant().getLevelForXP(c.playerXP[c.playerMagic]) + 2;
if (c.playerLevel[GameConstants.MAGIC] < 50) {
c.playerLevel[GameConstants.MAGIC] = c.getPlayerAssistant().getLevelForXP(c.playerXP[GameConstants.MAGIC]) + 2;
} else {
c.playerLevel[c.playerMagic] = c.getPlayerAssistant().getLevelForXP(c.playerXP[c.playerMagic]) + 3;
c.playerLevel[GameConstants.MAGIC] = c.getPlayerAssistant().getLevelForXP(c.playerXP[GameConstants.MAGIC]) + 3;
}
c.playerLevel[c.playerStrength] = c.getPlayerAssistant().getLevelForXP(c.playerXP[c.playerStrength]) - 3;
c.playerLevel[c.playerDefence] = c.getPlayerAssistant().getLevelForXP(c.playerXP[c.playerDefence]) - 3;
c.playerLevel[c.playerAttack] = c.getPlayerAssistant().getLevelForXP(c.playerXP[c.playerAttack]) - 4;
c.getPlayerAssistant().refreshSkill(c.playerDefence);
c.getPlayerAssistant().refreshSkill(c.playerMagic);
c.getPlayerAssistant().refreshSkill(c.playerAttack);
c.getPlayerAssistant().refreshSkill(c.playerStrength);
c.playerLevel[GameConstants.STRENGTH] = c.getPlayerAssistant().getLevelForXP(c.playerXP[GameConstants.STRENGTH]) - 3;
c.playerLevel[GameConstants.DEFENCE] = c.getPlayerAssistant().getLevelForXP(c.playerXP[GameConstants.DEFENCE]) - 3;
c.playerLevel[GameConstants.ATTACK] = c.getPlayerAssistant().getLevelForXP(c.playerXP[GameConstants.ATTACK]) - 4;
c.getPlayerAssistant().refreshSkill(GameConstants.DEFENCE);
c.getPlayerAssistant().refreshSkill(GameConstants.MAGIC);
c.getPlayerAssistant().refreshSkill(GameConstants.ATTACK);
c.getPlayerAssistant().refreshSkill(GameConstants.STRENGTH);
break;
case 1915://grog
c.playerLevel[2] = c.getPlayerAssistant().getLevelForXP(c.playerXP[2]) + 3;
if (c.playerLevel[0] > 0) {
c.playerLevel[0] = c.getPlayerAssistant().getLevelForXP(c.playerXP[0]) - 2;
c.playerLevel[GameConstants.STRENGTH] = c.getPlayerAssistant().getLevelForXP(c.playerXP[GameConstants.STRENGTH]) + 3;
if (c.playerLevel[GameConstants.ATTACK] > 0) {
c.playerLevel[GameConstants.ATTACK] = c.getPlayerAssistant().getLevelForXP(c.playerXP[GameConstants.ATTACK]) - 2;
}
if (c.playerLevel[0] <= 0) {
c.playerLevel[0] = 1;
if (c.playerLevel[GameConstants.ATTACK] <= 0) {
c.playerLevel[GameConstants.ATTACK] = 1;
}
c.getPlayerAssistant().refreshSkill(0);
c.getPlayerAssistant().refreshSkill(2);
c.getPlayerAssistant().refreshSkill(GameConstants.STRENGTH);
break;
}
}
2006Scape Server/src/main/java/com/rs2/game/content/consumables/Food.java
+26 -24
View File
@@ -1,6 +1,8 @@
package com.rs2.game.content.consumables;
import java.util.HashMap;
import com.rs2.GameConstants;
import com.rs2.game.content.music.sound.SoundList;
import com.rs2.game.items.impl.RareProtection;
import com.rs2.game.players.Player;
@@ -207,7 +209,7 @@ public class Food {
}
public static void eat(Player player, int id, int slot) {
if (player.isDead || player.playerLevel[3] <= 0) {
if (player.isDead || player.playerLevel[GameConstants.HITPOINTS] <= 0) {
return;
}
if (player.duelRule[6]) {
@@ -217,7 +219,7 @@ public class Food {
if (!RareProtection.eatDupedItem(player, id)) {
return;
}
if (System.currentTimeMillis() - player.foodDelay >= 1800 && player.playerLevel[3] > 0) {
if (System.currentTimeMillis() - player.foodDelay >= 1800 && player.playerLevel[GameConstants.HITPOINTS] > 0) {
player.getCombatAssistant().resetPlayerAttack();
player.attackTimer += 2;
player.startAnimation(829);
@@ -254,14 +256,14 @@ public class Food {
player.getPacketSender().sendSound(SoundList.DRINK, 100, 0);
}
player.foodDelay = System.currentTimeMillis();
if (player.playerLevel[3] < player.getLevelForXP(player.playerXP[3])) {
player.playerLevel[3] += f.getHeal();
if (player.playerLevel[GameConstants.HITPOINTS] < player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS])) {
player.playerLevel[GameConstants.HITPOINTS] += f.getHeal();
player.getPacketSender().sendMessage("It heals some health.");
if (player.playerLevel[3] > player.getLevelForXP(player.playerXP[3])) {
player.playerLevel[3] = player.getLevelForXP(player.playerXP[3]);
if (player.playerLevel[GameConstants.HITPOINTS] > player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS])) {
player.playerLevel[GameConstants.HITPOINTS] = player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS]);
}
}
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
}
}
@@ -272,33 +274,33 @@ public class Food {
player.forcedChat("Aaah, nothing like a nice cuppa tea!");
break;
case 1907:
if (player.playerLevel[6] < 50) {
player.playerLevel[6] = player.getPlayerAssistant().getLevelForXP(player.playerXP[6]) + 2;
if (player.playerLevel[GameConstants.MAGIC] < 50) {
player.playerLevel[GameConstants.MAGIC] = player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.MAGIC]) + 2;
} else {
player.playerLevel[6] = player.getPlayerAssistant().getLevelForXP(player.playerXP[6]) + 3;
player.playerLevel[GameConstants.MAGIC] = player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.MAGIC]) + 3;
}
if (player.playerLevel[2] < 4) {
player.playerLevel[2] = 1;
if (player.playerLevel[GameConstants.STRENGTH] < 4) {
player.playerLevel[GameConstants.STRENGTH] = 1;
}
if (player.playerLevel[0] < 5) {
player.playerLevel[0] = 1;
if (player.playerLevel[GameConstants.ATTACK] < 5) {
player.playerLevel[GameConstants.ATTACK] = 1;
} else {
player.playerLevel[0] = player.getPlayerAssistant().getLevelForXP(player.playerXP[0]) - 4;
player.playerLevel[GameConstants.ATTACK] = player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.ATTACK]) - 4;
}
if (player.playerLevel[1] < 4) {
player.playerLevel[1] = 1;
if (player.playerLevel[GameConstants.DEFENCE] < 4) {
player.playerLevel[GameConstants.DEFENCE] = 1;
} else {
player.playerLevel[1] = player.getPlayerAssistant().getLevelForXP(player.playerXP[1]) - 3;
player.playerLevel[GameConstants.DEFENCE] = player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.DEFENCE]) - 3;
}
if (player.playerLevel[2] < 4) {
player.playerLevel[2] = 1;
if (player.playerLevel[GameConstants.STRENGTH] < 4) {
player.playerLevel[GameConstants.STRENGTH] = 1;
} else {
player.playerLevel[2] = player.getPlayerAssistant().getLevelForXP(player.playerXP[2]) - 3;
player.playerLevel[GameConstants.STRENGTH] = player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.STRENGTH]) - 3;
}
player.getPlayerAssistant().refreshSkill(0);
player.getPlayerAssistant().refreshSkill(1);
player.getPlayerAssistant().refreshSkill(2);
player.getPlayerAssistant().refreshSkill(6);
player.getPlayerAssistant().refreshSkill(GameConstants.DEFENCE);
player.getPlayerAssistant().refreshSkill(GameConstants.STRENGTH);
player.getPlayerAssistant().refreshSkill(GameConstants.MAGIC);
break;
}
}
2006Scape Server/src/main/java/com/rs2/game/content/consumables/Kebabs.java
+23 -22
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.consumables;
import com.rs2.GameConstants;
import com.rs2.game.players.Player;
import com.rs2.util.Misc;
@@ -50,10 +51,10 @@ public class Kebabs {
} else if (Misc.random(100.0f) <= eff2) { // 61.24% heals 10% of HP
c.getPacketSender()
.sendMessage("It restores some life points.");
if (c.playerLevel[3] < c.getLevelForXP(c.playerXP[3])) {
c.playerLevel[3] += c.getLevelForXP(c.playerXP[3]) * 0.10;
if (c.playerLevel[3] > c.getLevelForXP(c.playerXP[3])) {
c.playerLevel[3] = c.getLevelForXP(c.playerXP[3]);
if (c.playerLevel[GameConstants.HITPOINTS] < c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS])) {
c.playerLevel[GameConstants.HITPOINTS] += c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS]) * 0.10;
if (c.playerLevel[GameConstants.HITPOINTS] > c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS])) {
c.playerLevel[GameConstants.HITPOINTS] = c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS]);
}
}
@@ -61,10 +62,10 @@ public class Kebabs {
} else if (Misc.random(100.0f) <= eff3) { // 21.12% + 10-20 HP
c.getPacketSender().sendMessage(
"That was a good kebab. You feel a lot better. ");
if (c.playerLevel[3] < c.getLevelForXP(c.playerXP[3])) {
c.playerLevel[3] += Misc.random(20);
if (c.playerLevel[3] > c.getLevelForXP(c.playerXP[3])) {
c.playerLevel[3] = c.getLevelForXP(c.playerXP[3]);
if (c.playerLevel[GameConstants.HITPOINTS] < c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS])) {
c.playerLevel[GameConstants.HITPOINTS] += Misc.random(20);
if (c.playerLevel[GameConstants.HITPOINTS] > c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS])) {
c.playerLevel[GameConstants.HITPOINTS] = c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS]);
}
}
@@ -73,16 +74,16 @@ public class Kebabs {
c.getPacketSender()
.sendMessage(
"Wow, that was an amazing kebab! You feel really invigorated.");
c.playerLevel[1] += 2 + Misc.random(1); // def
c.playerLevel[2] += 2 + Misc.random(1); // str
c.playerLevel[0] += 2 + Misc.random(1); // atk
c.getPlayerAssistant().refreshSkill(1);
c.getPlayerAssistant().refreshSkill(2);
c.getPlayerAssistant().refreshSkill(3);
if (c.playerLevel[3] < c.getLevelForXP(c.playerXP[3])) {
c.playerLevel[3] += Misc.random(30);
if (c.playerLevel[3] > c.getLevelForXP(c.playerXP[3])) {
c.playerLevel[3] = c.getLevelForXP(c.playerXP[3]);
c.playerLevel[GameConstants.DEFENCE] += 2 + Misc.random(1); // def
c.playerLevel[GameConstants.STRENGTH] += 2 + Misc.random(1); // str
c.playerLevel[GameConstants.ATTACK] += 2 + Misc.random(1); // atk
c.getPlayerAssistant().refreshSkill(GameConstants.DEFENCE);
c.getPlayerAssistant().refreshSkill(GameConstants.STRENGTH);
c.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
if (c.playerLevel[GameConstants.HITPOINTS] < c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS])) {
c.playerLevel[GameConstants.HITPOINTS] += Misc.random(30);
if (c.playerLevel[GameConstants.HITPOINTS] > c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS])) {
c.playerLevel[GameConstants.HITPOINTS] = c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS]);
}
}
@@ -104,8 +105,8 @@ public class Kebabs {
*/
public static void eat(Player player, int slot) {
if (System.currentTimeMillis() - player.foodDelay >= 1500
&& player.playerLevel[3] > 0) {
if (player.playerLevel[3] == player.getLevelForXP(player.playerXP[3])) { // If
&& player.playerLevel[GameConstants.HITPOINTS] > 0) {
if (player.playerLevel[GameConstants.HITPOINTS] == player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS])) { // If
// full
// health,
// does
@@ -119,7 +120,7 @@ public class Kebabs {
player.getItemAssistant().deleteItem(Kebab, slot, 1);
player.getPacketSender().sendSound(317, 100, 0);
player.foodDelay = System.currentTimeMillis();
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
return;
}
player.getCombatAssistant().resetPlayerAttack();
@@ -130,7 +131,7 @@ public class Kebabs {
player.getItemAssistant().deleteItem(Kebab, slot, 1);
player.getPacketSender().sendSound(317, 100, 0);
player.foodDelay = System.currentTimeMillis();
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
}
}
}
2006Scape Server/src/main/java/com/rs2/game/content/consumables/Potions.java
+26 -25
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.consumables;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -21,7 +22,7 @@ public class Potions {
"You may not drink potions in this duel.");
return;
}
if (c.isDead || c.playerLevel[3] <= 0) {
if (c.isDead || c.playerLevel[GameConstants.HITPOINTS] <= 0) {
return;
}
if (System.currentTimeMillis() - c.potDelay >= 1200) {
@@ -328,14 +329,14 @@ public class Potions {
// c.startAnimation(829);
c.playerItems[slot] = replaceItem + 1;
c.getItemAssistant().resetItems(3214);
c.playerLevel[5] += c.getLevelForXP(c.playerXP[5]) * .33;
c.playerLevel[GameConstants.PRAYER] += c.getLevelForXP(c.playerXP[GameConstants.PRAYER]) * .33;
if (rest) {
c.playerLevel[5] += 1;
c.playerLevel[GameConstants.PRAYER] += 1;
}
if (c.playerLevel[5] > c.getLevelForXP(c.playerXP[5])) {
c.playerLevel[5] = c.getLevelForXP(c.playerXP[5]);
if (c.playerLevel[GameConstants.PRAYER] > c.getLevelForXP(c.playerXP[GameConstants.PRAYER])) {
c.playerLevel[GameConstants.PRAYER] = c.getLevelForXP(c.playerXP[GameConstants.PRAYER]);
}
c.getPlayerAssistant().refreshSkill(5);
c.getPlayerAssistant().refreshSkill(GameConstants.PRAYER);
if (rest) {
restoreStats();
}
@@ -372,21 +373,21 @@ public class Potions {
c.getPacketSender().setSkillLevel(tD, c.playerLevel[tD],
c.playerXP[tD]);
}
c.playerLevel[0] += getBrewStat(0, .20);
if (c.playerLevel[0] > c.getLevelForXP(c.playerXP[0]) * 1.2 + 1) {
c.playerLevel[0] = (int) (c.getLevelForXP(c.playerXP[0]) * 1.2);
c.playerLevel[GameConstants.ATTACK] += getBrewStat(0, .20);
if (c.playerLevel[GameConstants.ATTACK] > c.getLevelForXP(c.playerXP[GameConstants.ATTACK]) * 1.2 + 1) {
c.playerLevel[GameConstants.ATTACK] = (int) (c.getLevelForXP(c.playerXP[GameConstants.ATTACK]) * 1.2);
}
c.playerLevel[2] += getBrewStat(2, .12);
if (c.playerLevel[2] > c.getLevelForXP(c.playerXP[2]) * 1.2 + 1) {
c.playerLevel[2] = (int) (c.getLevelForXP(c.playerXP[2]) * 1.2);
c.playerLevel[GameConstants.STRENGTH] += getBrewStat(2, .12);
if (c.playerLevel[GameConstants.STRENGTH] > c.getLevelForXP(c.playerXP[GameConstants.STRENGTH]) * 1.2 + 1) {
c.playerLevel[GameConstants.STRENGTH] = (int) (c.getLevelForXP(c.playerXP[GameConstants.STRENGTH]) * 1.2);
}
c.playerLevel[5] += getBrewStat(5, .10);
if (c.playerLevel[5] > c.getLevelForXP(c.playerXP[5]) * 1.2 + 1) {
c.playerLevel[5] = (int) (c.getLevelForXP(c.playerXP[5]) * 1.2);
c.playerLevel[GameConstants.PRAYER] += getBrewStat(5, .10);
if (c.playerLevel[GameConstants.PRAYER] > c.getLevelForXP(c.playerXP[GameConstants.PRAYER]) * 1.2 + 1) {
c.playerLevel[GameConstants.PRAYER] = (int) (c.getLevelForXP(c.playerXP[GameConstants.PRAYER]) * 1.2);
}
c.getPlayerAssistant().refreshSkill(0);
c.getPlayerAssistant().refreshSkill(2);
c.getPlayerAssistant().refreshSkill(5);
c.getPlayerAssistant().refreshSkill(GameConstants.STRENGTH);
c.getPlayerAssistant().refreshSkill(GameConstants.PRAYER);
c.hitUpdateRequired = true;
c.hitDiff = 9;
}
@@ -410,17 +411,17 @@ public class Potions {
c.getPacketSender().setSkillLevel(tD, c.playerLevel[tD],
c.playerXP[tD]);
}
c.playerLevel[1] += getBrewStat(1, .20);
if (c.playerLevel[1] > c.getLevelForXP(c.playerXP[1]) * 1.2 + 1) {
c.playerLevel[1] = (int) (c.getLevelForXP(c.playerXP[1]) * 1.2);
c.playerLevel[GameConstants.DEFENCE] += getBrewStat(1, .20);
if (c.playerLevel[GameConstants.DEFENCE] > c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 1.2 + 1) {
c.playerLevel[GameConstants.DEFENCE] = (int) (c.getLevelForXP(c.playerXP[GameConstants.DEFENCE]) * 1.2);
}
c.getPlayerAssistant().refreshSkill(1);
c.getPlayerAssistant().refreshSkill(GameConstants.DEFENCE);
c.playerLevel[3] += getBrewStat(3, .15);
if (c.playerLevel[3] > c.getLevelForXP(c.playerXP[3]) * 1.17 + 1) {
c.playerLevel[3] = (int) (c.getLevelForXP(c.playerXP[3]) * 1.17);
c.playerLevel[GameConstants.HITPOINTS] += getBrewStat(3, .15);
if (c.playerLevel[GameConstants.HITPOINTS] > c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS]) * 1.17 + 1) {
c.playerLevel[GameConstants.HITPOINTS] = (int) (c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS]) * 1.17);
}
c.getPlayerAssistant().refreshSkill(3);
c.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
}
public void enchanceStat(int skillID, boolean sup) {
2006Scape Server/src/main/java/com/rs2/game/content/guilds/Guilds.java
+7 -7
View File
@@ -131,35 +131,35 @@ public class Guilds {
}
break;
case 2641: // Prayer Guild
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[5]) < 31) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.PRAYER]) < 31) {
player.getDialogueHandler().sendStatement("You need 31 prayer to enter this guild!");
player.nextChat = 0;
return false;
}
break;
case 2712: // Cooking Guild
if (player.playerLevel[player.playerCooking] < 32 || player.playerEquipment[player.playerHat] != 1949) {
if (player.playerLevel[GameConstants.COOKING] < 32 || player.playerEquipment[player.playerHat] != 1949) {
player.getDialogueHandler().sendStatement("You need 32 cooking and a chefs hat to enter this guild!");
player.nextChat = 0;
return false;
}
break;
case 2647: // Crafting Guild
if (player.playerLevel[player.playerCrafting] < 40 || player.playerEquipment[player.playerChest] != 1757) {
if (player.playerLevel[GameConstants.CRAFTING] < 40 || player.playerEquipment[player.playerChest] != 1757) {
player.getDialogueHandler().sendStatement("You need 40 Crafting and a Brown Apron to enter this guild!");
player.nextChat = 0;
return false;
}
break;
case 2113: // Mining Guild
if (player.playerLevel[player.playerMining] < 60) {
if (player.playerLevel[GameConstants.MINING] < 60) {
player.getDialogueHandler().sendStatement("You need 60 Mining to enter this guild!");
player.nextChat = 0;
return false;
}
break;
case 2025: // Fishing Guild
if (player.playerLevel[player.playerFishing] < 68) {
if (player.playerLevel[GameConstants.FISHING] < 68) {
player.getDialogueHandler().sendStatement("You need 68 Fishing to enter this guild!");
player.nextChat = 0;
return false;
@@ -167,14 +167,14 @@ public class Guilds {
break;
case 1600:
case 1601: // Wizards Guild
if (player.playerLevel[player.playerMagic] < 66) {
if (player.playerLevel[GameConstants.MAGIC] < 66) {
player.getDialogueHandler().sendStatement("You need 66 Magic to enter this guild!");
player.nextChat = 0;
return false;
}
break;
case 2514:
if (player.playerLevel[player.playerRanged] < 40) { // Ranging Guild
if (player.playerLevel[GameConstants.RANGED] < 40) { // Ranging Guild
player.getDialogueHandler().sendStatement("You need 40 Range to enter this guild!");
player.nextChat = 0;
return false;
2006Scape Server/src/main/java/com/rs2/game/content/minigames/Dueling.java
+1 -1
View File
@@ -604,7 +604,7 @@ public class Dueling {
player.headIconPk = -1;
player.getPlayerAssistant().requestUpdates();
}
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
duelRewardInterface();
player.getPacketSender().showInterface(6733);
player.getPacketSender().sendMessage("You have won the duel!");
2006Scape Server/src/main/java/com/rs2/game/content/minigames/FightCaves.java
+4 -3
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.minigames;
import com.rs2.GameConstants;
import com.rs2.GameEngine;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
@@ -184,9 +185,9 @@ public class FightCaves {
public static void tzKihEffect(Client player, int i, int damage) {
if (NpcHandler.npcs[i].npcType == TZ_KIH) {
if (player != null) {
if (player.playerLevel[5] > 0) {
player.playerLevel[5] -= 1 + damage;
player.getPlayerAssistant().refreshSkill(5);
if (player.playerLevel[GameConstants.PRAYER] > 0) {
player.playerLevel[GameConstants.PRAYER] -= 1 + damage;
player.getPlayerAssistant().refreshSkill(GameConstants.PRAYER);
}
}
}
2006Scape Server/src/main/java/com/rs2/game/content/minigames/castlewars/CastleWars.java
+3 -1
View File
@@ -2,6 +2,8 @@ package com.rs2.game.content.minigames.castlewars;
import java.util.HashMap;
import java.util.Iterator;
import com.rs2.GameConstants;
import com.rs2.game.items.ItemAssistant;
import com.rs2.game.players.Player;
import com.rs2.util.Misc;
@@ -107,7 +109,7 @@ public class CastleWars {
&& teamPlayer.absX < COLLAPSE_ROCKS[cave][1]
&& teamPlayer.absY > COLLAPSE_ROCKS[cave][2]
&& teamPlayer.absY < COLLAPSE_ROCKS[cave][3]) {
int dmg = teamPlayer.playerLevel[3];
int dmg = teamPlayer.playerLevel[GameConstants.HITPOINTS];
teamPlayer.handleHitMask(dmg);
teamPlayer.dealDamage(99);// 99 damage?
}
2006Scape Server/src/main/java/com/rs2/game/content/minigames/trawler/Trawler.java
+18 -16
View File
@@ -2,6 +2,8 @@ package com.rs2.game.content.minigames.trawler;
import java.util.ArrayList;
import java.util.Random;
import com.rs2.GameConstants;
import com.rs2.GameEngine;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
@@ -483,7 +485,7 @@ public class Trawler extends GroupMinigame {
return;
}
p.startAnimation(net_interaction);
if (skillCheck(p.playerLevel[p.playerCrafting], 1, 0)) {
if (skillCheck(p.playerLevel[GameConstants.CRAFTING], 1, 0)) {
p.getItemAssistant().deleteItem(rope, 1);
net_ripped = false;
playerUpdates();
@@ -660,24 +662,24 @@ public class Trawler extends GroupMinigame {
public int chanceByLevel(Player p, int fish) {
switch (fish) {
case 381:
if (p.playerLevel[p.playerFishing] >= 81
&& p.playerLevel[p.playerFishing] < 90) {
if (p.playerLevel[GameConstants.FISHING] >= 81
&& p.playerLevel[GameConstants.FISHING] < 90) {
return 5;
} else if (p.playerLevel[p.playerFishing] >= 90
&& p.playerLevel[p.playerFishing] < 99) {
} else if (p.playerLevel[GameConstants.FISHING] >= 90
&& p.playerLevel[GameConstants.FISHING] < 99) {
return 9;
} else if (p.playerLevel[p.playerFishing] == 99) {
} else if (p.playerLevel[GameConstants.FISHING] == 99) {
return 13;
}
return 0;
case 395:
if (p.playerLevel[p.playerFishing] >= 79
&& p.playerLevel[p.playerFishing] < 85) {
if (p.playerLevel[GameConstants.FISHING] >= 79
&& p.playerLevel[GameConstants.FISHING] < 85) {
return 8;
} else if (p.playerLevel[p.playerFishing] >= 85
&& p.playerLevel[p.playerFishing] < 95) {
} else if (p.playerLevel[GameConstants.FISHING] >= 85
&& p.playerLevel[GameConstants.FISHING] < 95) {
return 13;
} else if (p.playerLevel[p.playerFishing] >= 95) {
} else if (p.playerLevel[GameConstants.FISHING] >= 95) {
return 17;
}
return 0;
@@ -780,31 +782,31 @@ public class Trawler extends GroupMinigame {
int xpToAdd = 0;
if (manta > 0) {
toReturn.add(new GameItem(389, manta));
if (p.playerLevel[p.playerFishing] >= 81) {
if (p.playerLevel[GameConstants.FISHING] >= 81) {
xpToAdd += (manta * 46);
}
}
if (turt > 0) {
toReturn.add(new GameItem(395, turt));
if (p.playerLevel[p.playerFishing] >= 79) {
if (p.playerLevel[GameConstants.FISHING] >= 79) {
xpToAdd += (manta * 38);
}
}
if (lobs > 0) {
toReturn.add(new GameItem(377, lobs));
if (p.playerLevel[p.playerFishing] >= 40) {
if (p.playerLevel[GameConstants.FISHING] >= 40) {
xpToAdd += (manta * 90);
}
}
if (swordFish > 0) {
toReturn.add(new GameItem(371, swordFish));
if (p.playerLevel[p.playerFishing] >= 50) {
if (p.playerLevel[GameConstants.FISHING] >= 50) {
xpToAdd += (manta * 100);
}
}
if (junk > 0)
toReturn.add(new GameItem(685, junk));
p.getPlayerAssistant().addSkillXP(xpToAdd, p.playerFishing);
p.getPlayerAssistant().addSkillXP(xpToAdd, GameConstants.FISHING);
return toReturn;
}
2006Scape Server/src/main/java/com/rs2/game/content/quests/QuestRewards.java
+10 -9
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.quests;
import com.rs2.GameConstants;
import com.rs2.game.players.Player;
/**
@@ -33,7 +34,7 @@ public class QuestRewards {
questReward(player, "Knight's Sword Quest", "1 Quest Point", "12,725 Smithing XP", "", "", "", "", 0);
QUEST_NAME = "The Knight's Sword";
player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7346);
player.getPlayerAssistant().addSkillXP(12725, player.playerSmithing);
player.getPlayerAssistant().addSkillXP(12725, GameConstants.SMITHING);
player.questPoints ++;
player.knightS = 9;
}
@@ -45,7 +46,7 @@ public class QuestRewards {
player.getItemAssistant().addOrDropItem(1897, 1);
player.getItemAssistant().addOrDropItem(2003, 1);
player.getItemAssistant().addOrDropItem(1560, 1);
player.getPlayerAssistant().addSkillXP(1525, player.playerCooking);
player.getPlayerAssistant().addSkillXP(1525, GameConstants.COOKING);
player.questPoints++;
player.gertCat = 7;
}
@@ -63,7 +64,7 @@ public class QuestRewards {
questReward(client, "Witch's Potion", "1 Quest Point", "325 Magic XP", "", "", "", "", 325);
QUEST_NAME = "Witch's Potion";
client.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7348);
client.getPlayerAssistant().addSkillXP(325, client.playerMagic);
client.getPlayerAssistant().addSkillXP(325, GameConstants.MAGIC);
client.questPoints++;
client.witchspot = 3;
}
@@ -80,7 +81,7 @@ public class QuestRewards {
questReward(client, "Restless Ghost", "1 Quest Point", "125 Prayer XP", "", "", "", "", 0);
QUEST_NAME = "Restless Ghost";
client.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7337);
client.getPlayerAssistant().addSkillXP(125, client.playerPrayer);
client.getPlayerAssistant().addSkillXP(125, GameConstants.PRAYER);
client.questPoints++;
client.restGhost = 5;
}
@@ -89,7 +90,7 @@ public class QuestRewards {
questReward(player, "Vampyre Slayer", "3 Quest Points", "4,825 Attack XP", "", "", "", "", 0);
QUEST_NAME = "Vampyre Slayer";
player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7347);
player.getPlayerAssistant().addSkillXP(4825, player.playerAttack);
player.getPlayerAssistant().addSkillXP(4825, GameConstants.ATTACK);
player.questPoints += 3;
player.vampSlayer = 5;
}
@@ -108,7 +109,7 @@ public class QuestRewards {
QUEST_NAME = "Sheep Shearer";
player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7344);
player.getItemAssistant().addOrDropItem(995, 60);
player.getPlayerAssistant().addSkillXP(150, player.playerCrafting);
player.getPlayerAssistant().addSkillXP(150, GameConstants.CRAFTING);
player.questPoints++;
player.sheepShear = 2;
}
@@ -118,7 +119,7 @@ public class QuestRewards {
QUEST_NAME = "Doric's Quest";
player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7336);
player.getItemAssistant().addOrDropItem(995, 180);
player.getPlayerAssistant().addSkillXP(1300, player.playerMining);
player.getPlayerAssistant().addSkillXP(1300, GameConstants.MINING);
player.questPoints++;
player.doricQuest = 3;
}
@@ -128,7 +129,7 @@ public class QuestRewards {
QUEST_NAME = "Imp Catcher";
player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7340);
player.getItemAssistant().addOrDropItem(1478, 1);
player.getPlayerAssistant().addSkillXP(875, player.playerMagic);
player.getPlayerAssistant().addSkillXP(875, GameConstants.MAGIC);
player.questPoints++;
player.impsC = 2;
}
@@ -138,7 +139,7 @@ public class QuestRewards {
QUEST_NAME = "Cook's Assistant";
player.getPacketSender().sendString("@gre@" + QUEST_NAME + "", 7333);
player.getItemAssistant().addOrDropItem(995, 500);
player.getPlayerAssistant().addSkillXP(300, player.playerCooking);
player.getPlayerAssistant().addSkillXP(300, GameConstants.COOKING);
player.questPoints++;
player.cookAss = 3;
}
2006Scape Server/src/main/java/com/rs2/game/content/randomevents/RiverTroll.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.randomevents;
import com.rs2.GameConstants;
import com.rs2.game.npcs.NpcHandler;
import com.rs2.game.players.Player;
import com.rs2.util.Misc;
@@ -17,7 +18,7 @@ public class RiverTroll {
for (int[] element : riverTroll) {
if (hasRiverTroll == false) {
if (client.combatLevel >= element[0] && client.combatLevel <= element[1] && hasRiverTroll == false) {
NpcHandler.spawnNpc(client, element[2], client.absX + Misc.random(1), client.absY + Misc.random(1), client.heightLevel, 0, element[3], element[4], client.playerLevel[client.playerAttack] * 2, client.playerLevel[client.playerDefence] * 2, true, false);
NpcHandler.spawnNpc(client, element[2], client.absX + Misc.random(1), client.absY + Misc.random(1), client.heightLevel, 0, element[3], element[4], client.playerLevel[GameConstants.ATTACK] * 2, client.playerLevel[GameConstants.DEFENCE] * 2, true, false);
client.randomActions = 0;
hasRiverTroll = true;
NpcHandler.npcs[element[2]].forceChat("Fishies be mine! Leave dem fishies!");
2006Scape Server/src/main/java/com/rs2/game/content/randomevents/Swarm.java
+3 -2
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.randomevents;
import com.rs2.GameConstants;
import com.rs2.game.npcs.NpcHandler;
import com.rs2.game.players.Client;
import com.rs2.game.players.Player;
@@ -14,9 +15,9 @@ public class Swarm {
private static int checkStats(Player c, boolean bot) {
if (bot) {
return c.getPlayerAssistant().getLevelForXP(c.playerXP[c.playerHitpoints]) * 3;
return c.getPlayerAssistant().getLevelForXP(c.playerXP[GameConstants.HITPOINTS]) * 3;
} else {
return c.getPlayerAssistant().getLevelForXP(c.playerXP[c.playerHitpoints]) * 2;
return c.getPlayerAssistant().getLevelForXP(c.playerXP[GameConstants.HITPOINTS]) * 2;
}
}
2006Scape Server/src/main/java/com/rs2/game/content/randomevents/TreeSpirit.java
+3 -2
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.randomevents;
import com.rs2.GameConstants;
import com.rs2.game.npcs.NpcHandler;
import com.rs2.game.players.Player;
import com.rs2.util.Misc;
@@ -13,7 +14,7 @@ public class TreeSpirit {
{ 91, 110, 442, 130, 5 }, { 111, 138, 443, 160, 7 }, };
private static int checkStats(Player p) {
return p.getPlayerAssistant().getLevelForXP(p.playerXP[p.playerHitpoints]) * 2;
return p.getPlayerAssistant().getLevelForXP(p.playerXP[GameConstants.HITPOINTS]) * 2;
}
public static void spawnTreeSpirit(Player p) {
@@ -22,7 +23,7 @@ public class TreeSpirit {
if (p.combatLevel >= element[0] && p.combatLevel <= element[1]) {
NpcHandler.spawnNpc(p, element[2], p.absX + Misc.random(1),
p.absY + Misc.random(1), p.heightLevel, 0, element[3],
element[4], checkStats(p), p.playerLevel[p.playerDefence] * 2, true,
element[4], checkStats(p), p.playerLevel[GameConstants.DEFENCE] * 2, true,
false);
NpcHandler.npcs[element[2]]
.forceChat("Leave these woods and never return!");
2006Scape Server/src/main/java/com/rs2/game/content/skills/SkillHandler.java
+7 -6
View File
@@ -2,6 +2,7 @@ package com.rs2.game.content.skills;
import java.util.Random;
import com.rs2.GameConstants;
import com.rs2.event.CycleEventHandler;
import com.rs2.game.content.skills.cooking.Cooking;
import com.rs2.game.content.skills.core.Fishing;
@@ -39,13 +40,13 @@ public class SkillHandler {
public static boolean isSkilling(Player player) {
if (player.playerSkilling[10] || player.playerStun || player.playerSkilling[12]
if (player.playerSkilling[GameConstants.FISHING] || player.playerStun || player.playerSkilling[GameConstants.CRAFTING]
|| player.playerIsFletching || player.isFletching || player.playerIsCooking
|| player.isMining || player.isWoodcutting || player.isSmithing
|| player.isSmelting || player.isSpinning || player.isPotionMaking
|| player.isPotCrafting || player.isFiremaking
|| player.playerSkilling[player.playerHerblore]
|| player.playerSkilling[13]) {
|| player.playerSkilling[GameConstants.HERBLORE]
|| player.playerSkilling[GameConstants.SMITHING]) {
return true;
}
return false;
@@ -63,7 +64,7 @@ public class SkillHandler {
player.isSmithing = false;
} else if (isSkilling[12]) {// crafting
isSkilling[12] = false;
} else if (player.isSmelting || player.playerSkilling[13]) {// smelting
} else if (player.isSmelting || player.playerSkilling[GameConstants.SMITHING]) {// smelting
Smelting.resetSmelting(player);
} else if (player.isCrafting) {
player.isCrafting = false;
@@ -82,7 +83,7 @@ public class SkillHandler {
public static void resetSkills(Player player) {// call when walking, dropping,
// picking up, leveling up
if (player.playerSkilling[10]) {// fishing
if (player.playerSkilling[GameConstants.FISHING]) {// fishing
Fishing.resetFishing(player);
} else if (player.isMining) {// mining
Mining.resetMining(player);
@@ -94,7 +95,7 @@ public class SkillHandler {
player.isSmithing = false;
} else if (isSkilling[12]) {// crafting
isSkilling[12] = false;
} else if (player.isSmelting || player.playerSkilling[13]) {// smelting
} else if (player.isSmelting || player.playerSkilling[GameConstants.SMITHING]) {// smelting
Smelting.resetSmelting(player);
} else if (player.isCrafting) {
player.isCrafting = false;
2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/Agility.java
+16 -15
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.agility;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -78,7 +79,7 @@ public class Agility {
if (player.stopPlayerPacket) {
return;
}
if (player.playerLevel[player.playerAgility] < 12) {
if (player.playerLevel[GameConstants.AGILITY] < 12) {
player.getDialogueHandler().sendStatement("You need 12 agility to use these stepping stones");
player.nextChat = 0;
return;
@@ -96,7 +97,7 @@ public class Agility {
@Override
public void stop() {
// c.getPlayerAssistant().addSkillXP(100, c.playerAgility);
// c.getPlayerAssistant().addSkillXP(100, GameConstants.AGILITY);
}
}, 1);
CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() {
@@ -121,7 +122,7 @@ public class Agility {
@Override
public void stop() {
// c.getPlayerAssistant().addSkillXP(300, c.playerAgility);
// c.getPlayerAssistant().addSkillXP(300, GameConstants.AGILITY);
setAnimationBack(player);
player.stopPlayerPacket = false;
}
@@ -499,7 +500,7 @@ public class Agility {
public void lapFinished() {
if (agilityProgress[5]) {
c.getPlayerAssistant().addSkillXP(lapBonus, c.playerAgility);
c.getPlayerAssistant().addSkillXP(lapBonus, GameConstants.AGILITY);
c.getPacketSender().sendMessage("You received some bonus experience for completing the track!");
resetAgilityProgress();
}
@@ -549,7 +550,7 @@ public class Agility {
moveY = 2851;
moveH = 1;
walk(1, 0, 2753, -1);
c.getPlayerAssistant().addSkillXP(14, c.playerAgility);
c.getPlayerAssistant().addSkillXP(14, GameConstants.AGILITY);
agilityTimer = 2;
}
@@ -558,7 +559,7 @@ public class Agility {
moveY = 2832;
moveH = 1;
walk(-1, 0, 2753, -1);
c.getPlayerAssistant().addSkillXP(14, c.playerAgility);
c.getPlayerAssistant().addSkillXP(14, GameConstants.AGILITY);
agilityTimer = 2;
}
@@ -567,7 +568,7 @@ public class Agility {
moveY = 2832;
moveH = 1;
walk(-1, 0, 2753, -1);
c.getPlayerAssistant().addSkillXP(14, c.playerAgility);
c.getPlayerAssistant().addSkillXP(14, GameConstants.AGILITY);
agilityTimer = 2;
}
@@ -576,7 +577,7 @@ public class Agility {
moveY = 2841;
moveH = 2;
walk(0, 1, 2753, -1);
c.getPlayerAssistant().addSkillXP(14, c.playerAgility);
c.getPlayerAssistant().addSkillXP(14, GameConstants.AGILITY);
agilityTimer = 2;
}
@@ -585,7 +586,7 @@ public class Agility {
moveY = 2849;
moveH = 2;
walk(0, 1, 2753, -1);
c.getPlayerAssistant().addSkillXP(14, c.playerAgility);
c.getPlayerAssistant().addSkillXP(14, GameConstants.AGILITY);
agilityTimer = 2;
}
@@ -594,7 +595,7 @@ public class Agility {
moveY = 2849;
moveH = 2;
walk(1, 0, 2753, -1);
c.getPlayerAssistant().addSkillXP(14, c.playerAgility);
c.getPlayerAssistant().addSkillXP(14, GameConstants.AGILITY);
agilityTimer = 2;
}
@@ -603,7 +604,7 @@ public class Agility {
moveY = 2836;
moveH = 2;
walk(0, -1, 2753, -1);
c.getPlayerAssistant().addSkillXP(14, c.playerAgility);
c.getPlayerAssistant().addSkillXP(14, GameConstants.AGILITY);
agilityTimer = 2;
}
@@ -612,7 +613,7 @@ public class Agility {
moveY = 2834;
moveH = 2;
walk(-1, 0, 2753, -1);
c.getPlayerAssistant().addSkillXP(14, c.playerAgility);
c.getPlayerAssistant().addSkillXP(14, GameConstants.AGILITY);
agilityTimer = 2;
}
@@ -621,7 +622,7 @@ public class Agility {
moveY = 2847;
moveH = 3;
walk(0, 1, 2753, -1);
c.getPlayerAssistant().addSkillXP(14, c.playerAgility);
c.getPlayerAssistant().addSkillXP(14, GameConstants.AGILITY);
agilityTimer = 2;
}
@@ -630,7 +631,7 @@ public class Agility {
moveY = 2840;
moveH = 3;
walk(0, -1, 2753, -1);
c.getPlayerAssistant().addSkillXP(14, c.playerAgility);
c.getPlayerAssistant().addSkillXP(14, GameConstants.AGILITY);
}
if (agilityTimer > 0) {
@@ -649,7 +650,7 @@ public class Agility {
}
public boolean checkLevel(int objectId) {
if (getLevelRequired(objectId) > c.playerLevel[c.playerAgility]) {
if (getLevelRequired(objectId) > c.playerLevel[GameConstants.AGILITY]) {
c.getPacketSender().sendMessage(
"You need atleast " + getLevelRequired(objectId)
+ " agility to do this.");
2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/AgilityShortcut.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.agility;
import com.rs2.GameConstants;
import com.rs2.game.players.Player;
/**
@@ -12,7 +13,7 @@ public class AgilityShortcut {
private static final int WALK = 1, MOVE = 2, AGILITY = 3;
private static void handleAgility(Player player, int x, int y, int levelReq, int anim, int walk, String message) {
if (player.playerLevel[player.playerAgility] < levelReq) {
if (player.playerLevel[GameConstants.AGILITY] < levelReq) {
player.getPacketSender().sendMessage("You need " + levelReq + " agility to use this shortcut.");
return;
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/ApeAtollAgility.java
+7 -6
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.agility;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -37,7 +38,7 @@ public class ApeAtollAgility {
c.getAgility().walk(-2, 0,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getAgility().resetAgilityProgress();
c.getAgility().agilityProgress[0] = true;
}
@@ -57,7 +58,7 @@ public class ApeAtollAgility {
"You managed to climb up the Tree.");
c.getAgility().climbUpTropicalTree(c.getX(), c.getY(), 2);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[0]) {
c.getAgility().agilityProgress[1] = true;
}
@@ -80,7 +81,7 @@ public class ApeAtollAgility {
c.getAgility().walk(-5, 0,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[1]) {
c.getAgility().agilityProgress[2] = true;
}
@@ -100,7 +101,7 @@ public class ApeAtollAgility {
c.getAgility().walk(-5, 0,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getPacketSender().sendMessage("You climb your way up");
if (c.getAgility().agilityProgress[2]) {
c.getAgility().agilityProgress[3] = true;
@@ -121,7 +122,7 @@ public class ApeAtollAgility {
c.getAgility().walk(1, 0,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[3]) {
c.getAgility().agilityProgress[4] = true;
}
@@ -160,7 +161,7 @@ public class ApeAtollAgility {
c.getAgility().tropicalTreeUpdate = 2;
c.getAgility().moveHeight = 0;
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId),
c.playerAgility);
GameConstants.AGILITY);
if (c.getAgility().agilityProgress[4]) {
c.getAgility().agilityProgress[5] = true;
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/BarbarianAgility.java
+9 -8
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.agility;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -28,7 +29,7 @@ public class BarbarianAgility {
c.getAgility().walk(0, -1,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getAgility().resetAgilityProgress();
c.getAgility().agilityProgress[0] = true;
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@@ -55,7 +56,7 @@ public class BarbarianAgility {
}
if (c.getAgility().hotSpot(2551, 3546)) {
c.getAgility().walk(-10, 0, c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[0]) {
c.getAgility().agilityProgress[1] = true;
}
@@ -71,7 +72,7 @@ public class BarbarianAgility {
if (c.absX == 2539 && c.absY > 3544 && c.absY < 3547) {
c.getAgility().climbUp(c.getX() - 1, c.getY(), 1);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId),
c.playerAgility);
GameConstants.AGILITY);
if (c.getAgility().agilityProgress[1]) {
c.getAgility().agilityProgress[2] = true;
}
@@ -89,7 +90,7 @@ public class BarbarianAgility {
c.getAgility().walk(-4, 0,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[2]) {
c.getAgility().agilityProgress[3] = true;
}
@@ -99,7 +100,7 @@ public class BarbarianAgility {
return true;
case BARBARIAN_LADDER_OBJECT:
if (c.playerLevel[c.playerAgility] < 35 && c.objectX != 2776
if (c.playerLevel[GameConstants.AGILITY] < 35 && c.objectX != 2776
&& c.objectY != 3121) {
c.getPacketSender().sendMessage(
"You need 35 agility to use this ladder.");
@@ -122,7 +123,7 @@ public class BarbarianAgility {
c.getAgility().walk(2, 0,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[4]) {
c.getAgility().agilityProgress[5] = true;
}
@@ -136,7 +137,7 @@ public class BarbarianAgility {
c.getAgility().walk(3, 0,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
} else if (c.absX == 2542 && c.absY == 3553) {
c.getAgility().walk(1, 0,
c.getAgility().getAnimation(objectId), -1);
@@ -145,7 +146,7 @@ public class BarbarianAgility {
c.getAgility().walk(2, 0,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
return true;
}
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/GnomeAgility.java
+11 -10
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.agility;
import com.rs2.GameConstants;
import com.rs2.game.players.Player;
public class GnomeAgility {
@@ -26,14 +27,14 @@ public class GnomeAgility {
} else if (c.absX == 2474 && c.absY > 3429 && c.absY < 3436) {
c.getPlayerAssistant().movePlayer(2474, 3429, 0);
}
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getAgility().resetAgilityProgress();
c.getAgility().agilityProgress[0] = true;
return true;
case NET1_OBJECT:
c.getAgility().climbUp(c.getX(), c.getY() - 2, 1);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[0]) {
c.getAgility().agilityProgress[1] = true;
}
@@ -41,7 +42,7 @@ public class GnomeAgility {
case TREE_OBJECT:
c.getAgility().climbUp(c.getX(), c.getY() - 3, 2);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[1]) {
c.getAgility().agilityProgress[2] = true;
}
@@ -57,7 +58,7 @@ public class GnomeAgility {
// cheat
c.getPlayerAssistant().movePlayer(2483, 3420, 2);
}
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[2]) {
c.getAgility().agilityProgress[3] = true;
}
@@ -65,7 +66,7 @@ public class GnomeAgility {
case TREE_BRANCH_OBJECT:
c.getAgility().climbDown(c.getX(), c.getY(), 0);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[3]) {
c.getAgility().agilityProgress[4] = true;
}
@@ -77,7 +78,7 @@ public class GnomeAgility {
}
if (c.getY() == 3425 && System.currentTimeMillis() - clickTimer > 1800) {
c.getAgility().climbUp(c.getX(), c.getY() + 2, 0);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
clickTimer = System.currentTimeMillis();
if (c.getAgility().agilityProgress[4]) {
c.getAgility().agilityProgress[5] = true;
@@ -89,12 +90,12 @@ public class GnomeAgility {
if (c.getAgility().hotSpot(2484, 3430)) {
c.getAgility().walk(0, 7, c.getAgility().getAnimation(objectId), 748);
if (c.getAgility().agilityProgress[5]) {
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getAgility().lapBonus = 1400 / 30;
c.getAgility().lapFinished();
} else {
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
}
c.getAgility().resetAgilityProgress();
} else if (c.absY > 3430 && c.absY < 3436 && System.currentTimeMillis() - clickTimer > 1800) {
@@ -107,12 +108,12 @@ public class GnomeAgility {
c.getAgility().walk(0, 7, c.getAgility().getAnimation(objectId), 748);
if (c.getAgility().agilityProgress[5]) {
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getAgility().lapBonus = 1400 / 30;
c.getAgility().lapFinished();
} else {
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
}
c.getAgility().resetAgilityProgress();
} else if (c.absY > 3430 && c.absY < 3436) {
2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/PyramidAgility.java
+18 -17
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.agility;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -44,7 +45,7 @@ public class PyramidAgility {
} else {
c.getAgility().climbUp(c.getX() + 3, c.getY() - 6, 0);
c.getAgility().agilityProgress[5] = true;
c.getAgility().lapBonus = 30 + c.playerLevel[c.playerAgility] * 8;
c.getAgility().lapBonus = 30 + c.playerLevel[GameConstants.AGILITY] * 8;
c.getAgility().lapFinished();
c.getPacketSender()
.sendMessage(
@@ -90,7 +91,7 @@ public class PyramidAgility {
c.getAgility().walk(0, 5,
c.getAgility().getAnimation(objectId), -1);
}
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
return true;
case PyramidAgility.PYRAMID_WALL_OBJECT:
@@ -102,21 +103,21 @@ public class PyramidAgility {
c.getAgility().walk(0, 2,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
}
if (c.getAgility().hotSpot(3371, 2834)
|| c.getAgility().hotSpot(3371, 2833)) {
c.getAgility().walk(-2, 0,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
}
if (c.getAgility().hotSpot(3359, 2838)
|| c.getAgility().hotSpot(3358, 2838)) {
c.getAgility().walk(0, 2,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
}
return true;
@@ -131,7 +132,7 @@ public class PyramidAgility {
c.getAgility().walk(1, 0,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
@@ -151,7 +152,7 @@ public class PyramidAgility {
if (c.getAgility().hotSpot(3372, 2832) || c.getAgility().hotSpot(3372, 2831)) {
c.getAgility().walk(-1, 0,
c.getAgility().getAnimation(1603), -1);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@Override
@@ -173,7 +174,7 @@ public class PyramidAgility {
c.getAgility().walk(-1, 0,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
@@ -194,7 +195,7 @@ public class PyramidAgility {
c.getAgility().walk(0, 5,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
@@ -215,7 +216,7 @@ public class PyramidAgility {
c.getAgility().walk(0, 3,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
@@ -237,7 +238,7 @@ public class PyramidAgility {
c.getAgility().walk(5, 0,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
@@ -258,7 +259,7 @@ public class PyramidAgility {
c.getAgility().walk(0, 0,
c.getAgility().getAnimation(10859), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
@@ -279,7 +280,7 @@ public class PyramidAgility {
c.getAgility().walk(0, 1,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
@@ -300,7 +301,7 @@ public class PyramidAgility {
c.getAgility().walk(0, -1,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
@@ -321,7 +322,7 @@ public class PyramidAgility {
c.getAgility().walk(0, -1,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
@@ -348,13 +349,13 @@ public class PyramidAgility {
c.getAgility().walk(0, -6,
c.getAgility().getAnimation(2295), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
}
if (c.getAgility().hotSpot(3370, 2835) || c.getAgility().hotSpot(3371, 2835)) {
c.getAgility().walk(-6, 0,
c.getAgility().getAnimation(2295), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
}
return true;
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/WerewolfAgility.java
+13 -12
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.agility;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -30,42 +31,42 @@ public class WerewolfAgility {
c.getAgility().walk(0, 2,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getAgility().resetAgilityProgress();
c.getAgility().agilityProgress[0] = true;
} else if (c.getAgility().hotSpot(3538, 9875)) {
c.getAgility().walk(0, 2,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getAgility().resetAgilityProgress();
c.getAgility().agilityProgress[0] = true;
} else if (c.getAgility().hotSpot(3538, 9876)) {
c.getAgility().walk(1, 2,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getAgility().resetAgilityProgress();
c.getAgility().agilityProgress[0] = true;
} else if (c.getAgility().hotSpot(3538, 9877)) {
c.getAgility().walk(2, 0,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getAgility().resetAgilityProgress();
c.getAgility().agilityProgress[0] = true;
} else if (c.getAgility().hotSpot(3540, 9877)) {
c.getAgility().walk(0, 2,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getAgility().resetAgilityProgress();
c.getAgility().agilityProgress[0] = true;
} else if (c.getAgility().hotSpot(3540, 9879)) {
c.getAgility().walk(0, 2,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getAgility().resetAgilityProgress();
c.getAgility().agilityProgress[0] = true;
}
@@ -81,7 +82,7 @@ public class WerewolfAgility {
c.getAgility().walk(0, 2,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[0]) {
c.getAgility().agilityProgress[1] = true;
}
@@ -112,7 +113,7 @@ public class WerewolfAgility {
c.getAgility().walk(0, 6,
c.getAgility().getAnimation(objectId), 748);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[1]) {
c.getAgility().agilityProgress[2] = true;
}
@@ -120,7 +121,7 @@ public class WerewolfAgility {
c.getAgility().walk(0, 6,
c.getAgility().getAnimation(objectId), 748);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[1]) {
c.getAgility().agilityProgress[2] = true;
}
@@ -128,7 +129,7 @@ public class WerewolfAgility {
c.getAgility().walk(0, 6,
c.getAgility().getAnimation(objectId), 748);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[1]) {
c.getAgility().agilityProgress[2] = true;
}
@@ -143,7 +144,7 @@ public class WerewolfAgility {
c.getAgility().walk(-3, 0,
c.getAgility().getAnimation(objectId), -1);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[2]) {
c.getAgility().agilityProgress[3] = true;
}
@@ -158,7 +159,7 @@ public class WerewolfAgility {
c.getAgility().getAnimation(
WerewolfAgility.WEREWOLF_SLING_OBJECT), 743);
c.getPlayerAssistant().addSkillXP(
c.getAgility().getXp(objectId), c.playerAgility);
c.getAgility().getXp(objectId), GameConstants.AGILITY);
if (c.getAgility().agilityProgress[3]) {
c.getAgility().agilityProgress[4] = true;
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/agility/WildernessAgility.java
+7 -6
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.agility;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -35,7 +36,7 @@ public class WildernessAgility {
} else if ((c.absX >= 3003 && c.absX <= 3005) && (c.absY > 3937 && c.absY < 3950)) {
c.getPlayerAssistant().movePlayer(3004, 3950, 0);
}
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getAgility().resetAgilityProgress();
c.getAgility().agilityProgress[0] = true;
return true;
@@ -49,7 +50,7 @@ public class WildernessAgility {
if (c.getAgility().agilityProgress[0]) {
c.getAgility().agilityProgress[1] = true;
}
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
@@ -78,7 +79,7 @@ public class WildernessAgility {
} else if (c.absX > 2996 && c.absX < 3002 && c.absY == 3960) {
c.getPlayerAssistant().movePlayer(2996, 3960, 0);
}
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getAgility().steppingStone = 6;
c.getAgility().steppingStoneTimer = 2;
c.getAgility().steppingStone--;
@@ -105,7 +106,7 @@ public class WildernessAgility {
if (c.getAgility().agilityProgress[3]) {
c.getAgility().agilityProgress[5] = true;
}
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
} else if (c.absX > 2994 && c.absX < 3002 && c.absY == 3945) {
c.getPlayerAssistant().movePlayer(2994, 3945, 0);
}
@@ -117,11 +118,11 @@ public class WildernessAgility {
}
c.getAgility().walk(0, -4, c.getAgility().getAnimation(objectId), -1);
if (c.getAgility().agilityProgress[5]) {
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
c.getAgility().lapBonus = 2400 / 30;
c.getAgility().lapFinished();
} else {
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), GameConstants.AGILITY);
}
return true;
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/Cooking.java
+5 -5
View File
@@ -124,7 +124,7 @@ public class Cooking extends SkillHandler {
}
public static void cookingAddon(Player c, int itemID1, int itemID2, int giveItem, int requiredLevel, int expGained) {
if (c.playerLevel[7] >= requiredLevel) {
if (c.playerLevel[GameConstants.COOKING] >= requiredLevel) {
if (c.getItemAssistant().playerHasItem(itemID1) && c.getItemAssistant().playerHasItem(itemID2)) {
c.getItemAssistant().deleteItem(itemID1, 1);
c.getItemAssistant().deleteItem(itemID2, 1);
@@ -151,7 +151,7 @@ public class Cooking extends SkillHandler {
public static boolean startCooking(Player c, int itemId, int objectId) {
CookingItems item = forId(itemId);
if (item != null) {
if (c.playerLevel[c.playerCooking] < item.getLevelReq()) {
if (c.playerLevel[GameConstants.COOKING] < item.getLevelReq()) {
c.getPacketSender().closeAllWindows();
c.getDialogueHandler().sendStatement("You need a Cooking level of " + item.getLevelReq() + " to cook this.");
c.nextChat = 0;
@@ -175,11 +175,11 @@ public class Cooking extends SkillHandler {
}
private static boolean getSuccess(Player c, int burnBonus, int levelReq, int stopBurn) {
if (c.playerLevel[c.playerCooking] >= stopBurn) {
if (c.playerLevel[GameConstants.COOKING] >= stopBurn) {
return true;
}
double burn_chance = 55.0 - burnBonus;
double cook_level = c.playerLevel[c.playerCooking];
double cook_level = c.playerLevel[GameConstants.COOKING];
double lev_needed = levelReq;
double burn_stop = stopBurn;
double multi_a = burn_stop - lev_needed;
@@ -231,7 +231,7 @@ public class Cooking extends SkillHandler {
if (GameConstants.SOUND) {
player.getPacketSender().sendSound(SoundList.COOK_ITEM, 100, 0);
}
player.getPlayerAssistant().addSkillXP(item.getXp(), player.playerCooking);
player.getPlayerAssistant().addSkillXP(item.getXp(), GameConstants.COOKING);
player.getItemAssistant().addItem(item.getCookedItem(), 1);
} else {
player.getPacketSender().sendMessage(
2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/CookingTutorialIsland.java
+27 -27
View File
@@ -33,22 +33,22 @@ public class CookingTutorialIsland extends SkillHandler {
if (!hasRequiredLevel(c, 7, levelRequired, "cooking", "cook this")) {
return;
}
int chance = c.playerLevel[7];
int chance = c.playerLevel[GameConstants.COOKING];
if (c.playerEquipment[c.playerHands] == 775) {
chance = c.playerLevel[7] + 8;
chance = c.playerLevel[GameConstants.COOKING] + 8;
}
if (chance <= 0) {
chance = Misc.random(5);
}
c.playerSkillProp[7][0] = itemID;
c.playerSkillProp[7][1] = xpRecieved;
c.playerSkillProp[7][2] = levelRequired;
c.playerSkillProp[7][3] = burntFish;
c.playerSkillProp[7][4] = cookedFish;
c.playerSkillProp[7][5] = object;
c.playerSkillProp[7][6] = chance;
c.playerSkillProp[GameConstants.COOKING][0] = itemID;
c.playerSkillProp[GameConstants.COOKING][1] = xpRecieved;
c.playerSkillProp[GameConstants.COOKING][2] = levelRequired;
c.playerSkillProp[GameConstants.COOKING][3] = burntFish;
c.playerSkillProp[GameConstants.COOKING][4] = cookedFish;
c.playerSkillProp[GameConstants.COOKING][5] = object;
c.playerSkillProp[GameConstants.COOKING][6] = chance;
c.stopPlayerSkill = false;
int item = c.getItemAssistant().getItemAmount(c.playerSkillProp[7][0]);
int item = c.getItemAssistant().getItemAmount(c.playerSkillProp[GameConstants.COOKING][0]);
if (item == 1) {
c.doAmount = 1;
cookTutFish(c);
@@ -58,7 +58,7 @@ public class CookingTutorialIsland extends SkillHandler {
}
public static void getAmount(Player player, int amount) {
int item = player.getItemAssistant().getItemAmount(player.playerSkillProp[7][0]);
int item = player.getItemAssistant().getItemAmount(player.playerSkillProp[GameConstants.COOKING][0]);
if (amount > item) {
amount = item;
}
@@ -67,10 +67,10 @@ public class CookingTutorialIsland extends SkillHandler {
}
public static void resetCooking(Player c) {
c.playerSkilling[7] = false;
c.playerSkilling[GameConstants.COOKING] = false;
c.stopPlayerSkill = false;
for (int i = 0; i < 6; i++) {
c.playerSkillProp[7][i] = -1;
c.playerSkillProp[GameConstants.COOKING][i] = -1;
}
}
@@ -82,18 +82,18 @@ public class CookingTutorialIsland extends SkillHandler {
}
private static void cookTutFish(final Player c) {
if (c.playerSkilling[7]) {
if (c.playerSkilling[GameConstants.COOKING]) {
return;
}
if (c.tutorialProgress == 6) {
c.playerSkilling[7] = true;
c.playerSkilling[GameConstants.COOKING] = true;
c.stopPlayerSkill = true;
c.getPacketSender().closeAllWindows();
if (c.playerSkillProp[7][5] > 0) {
// c.startAnimation(c.playerSkillProp[7][5] == 2732 ? 897 :
if (c.playerSkillProp[GameConstants.COOKING][5] > 0) {
// c.startAnimation(c.playerSkillProp[GameConstants.COOKING][5] == 2732 ? 897 :
// 896);
c.startAnimation(c.playerSkillProp[7][5] == 2732 ? 897
: c.playerSkillProp[7][5] == 12269 ? 897 : 896);
c.startAnimation(c.playerSkillProp[GameConstants.COOKING][5] == 2732 ? 897
: c.playerSkillProp[GameConstants.COOKING][5] == 12269 ? 897 : 896);
if (GameConstants.SOUND) {
c.getPacketSender().sendSound(SoundList.COOK_ITEM, 100,
0);
@@ -105,9 +105,9 @@ public class CookingTutorialIsland extends SkillHandler {
@Override
public void execute(CycleEventContainer container) {
c.getItemAssistant().deleteItem(
c.playerSkillProp[7][0],
c.playerSkillProp[GameConstants.COOKING][0],
c.getItemAssistant().getItemSlot(
c.playerSkillProp[7][0]), 1);
c.playerSkillProp[GameConstants.COOKING][0]), 1);
if (c.cookStage1 == 1) {
c.getPacketSender().chatbox(6180);
c.getDialogueHandler()
@@ -120,7 +120,7 @@ public class CookingTutorialIsland extends SkillHandler {
c.getPacketSender().chatbox(6179);
c.cookStage1 = 0;
c.getItemAssistant()
.addItem(c.playerSkillProp[7][3], 1);
.addItem(c.playerSkillProp[GameConstants.COOKING][3], 1);
} else {
c.getPacketSender().chatbox(6180);
c.getDialogueHandler()
@@ -134,14 +134,14 @@ public class CookingTutorialIsland extends SkillHandler {
c.getPacketSender().createArrow(3089, 3092,
c.getH(), 2);
c.getPlayerAssistant().addSkillXP(
c.playerSkillProp[7][1], 7);
c.playerSkillProp[GameConstants.COOKING][1], 7);
c.getItemAssistant()
.addItem(c.playerSkillProp[7][4], 1);
.addItem(c.playerSkillProp[GameConstants.COOKING][4], 1);
c.tutorialProgress = 7;
}
deleteTime(c);
if (!c.getItemAssistant().playerHasItem(
c.playerSkillProp[7][0], 1)
c.playerSkillProp[GameConstants.COOKING][0], 1)
|| c.doAmount <= 0) {
container.stop();
}
@@ -159,10 +159,10 @@ public class CookingTutorialIsland extends SkillHandler {
@Override
public void execute(CycleEventContainer container) {
if (c.playerSkillProp[7][5] > 0) {
if (c.playerSkillProp[GameConstants.COOKING][5] > 0) {
// c.getPacketSender().sendSound(357, 100, 1); //
// cook sound
c.startAnimation(c.playerSkillProp[7][5] == 2732 ? 897
c.startAnimation(c.playerSkillProp[GameConstants.COOKING][5] == 2732 ? 897
: 896);
}
if (!c.stopPlayerSkill) {
2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/DairyChurn.java
+3 -2
View File
@@ -2,6 +2,7 @@ package com.rs2.game.content.skills.cooking;
import java.util.HashMap;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -73,7 +74,7 @@ public class DairyChurn {
if (churnData == null || player.getStatedInterface() != "dairyChurn") {
return;
}
if (player.playerLevel[player.playerCooking] < churnData.getLevel()) {
if (player.playerLevel[GameConstants.COOKING] < churnData.getLevel()) {
player.getDialogueHandler().sendStatement("You need a cooking level of " + churnData.getLevel() + " to make this.");
return;
}
@@ -102,7 +103,7 @@ public class DairyChurn {
player.getItemAssistant().deleteItem(churnData.getUsed()[i], 1);
player.getItemAssistant().addItem(churnData.getResult(), 1);
player.getItemAssistant().addItem(1925, 1);
player.getPlayerAssistant().addSkillXP(churnData.getExperience(), player.playerCooking);
player.getPlayerAssistant().addSkillXP(churnData.getExperience(), GameConstants.COOKING);
}
@Override
2006Scape Server/src/main/java/com/rs2/game/content/skills/cooking/Potatoes.java
+4 -2
View File
@@ -2,6 +2,8 @@ package com.rs2.game.content.skills.cooking;
import java.util.HashMap;
import java.util.Map;
import com.rs2.GameConstants;
import com.rs2.game.content.randomevents.RandomEventHandler;
import com.rs2.game.content.skills.SkillHandler;
import com.rs2.game.players.Player;
@@ -96,12 +98,12 @@ public class Potatoes extends SkillHandler {
return false;
}
if (c.getItemAssistant().playerHasItem(potato.getIngredient(), 1)) {
if (c.playerLevel[c.playerCooking] >= potato.getReq()) {
if (c.playerLevel[GameConstants.COOKING] >= potato.getReq()) {
c.getItemAssistant().deleteItem(potato.getIngredient(), 1);
c.getItemAssistant().deleteItem(6703, 1);
c.getPacketSender().sendMessage("You put the topping on.");
c.getItemAssistant().addItem(potato.getNewPotatoID(), 1);
c.getPlayerAssistant().addSkillXP(potato.getXP(), c.playerCooking);
c.getPlayerAssistant().addSkillXP(potato.getXP(), GameConstants.COOKING);
RandomEventHandler.addRandom(c);
} else {
c.getPacketSender().sendMessage("You need a cooking level of " + potato.getReq() + " to make this potato.");
2006Scape Server/src/main/java/com/rs2/game/content/skills/core/Fishing.java
+83 -82
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.core;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -56,8 +57,8 @@ public class Fishing extends SkillHandler {
c.getPacketSender().sendMessage(c.disabled());
return;
}
if (c.playerSkillProp[10][4] > 0) {
c.playerSkilling[10] = false;
if (c.playerSkillProp[GameConstants.FISHING][4] > 0) {
c.playerSkilling[GameConstants.FISHING] = false;
return;
}
if (!noInventorySpace(c, "fishing")) {
@@ -66,7 +67,7 @@ public class Fishing extends SkillHandler {
resetFishing(c);
for (int i = 0; i < data.length; i++) {
if (npcId == data[i][0]) {
if (c.playerLevel[c.playerFishing] < data[i][1]) {
if (c.playerLevel[GameConstants.FISHING] < data[i][1]) {
c.getDialogueHandler().sendStatement(
"You need a fishing level of at least "
+ data[i][1]
@@ -86,24 +87,24 @@ public class Fishing extends SkillHandler {
return;
}
}
c.playerSkillProp[10][0] = data[i][6]; // ANIM
c.playerSkillProp[10][1] = data[i][4]; // FISH
c.playerSkillProp[10][2] = data[i][5]; // XP
c.playerSkillProp[10][3] = data[i][3]; // BAIT
c.playerSkillProp[10][4] = data[i][2]; // EQUIP
c.playerSkillProp[10][5] = data[i][7]; // sFish
c.playerSkillProp[10][6] = data[i][8]; // sLvl
c.playerSkillProp[10][7] = data[i][4]; // FISH
c.playerSkillProp[10][8] = data[i][9]; // sXP
c.playerSkillProp[10][9] = Misc.random(1) == 0 ? 7 : 5;
c.playerSkillProp[10][10] = data[i][0]; // INDEX
c.playerSkillProp[GameConstants.FISHING][0] = data[i][6]; // ANIM
c.playerSkillProp[GameConstants.FISHING][1] = data[i][4]; // FISH
c.playerSkillProp[GameConstants.FISHING][2] = data[i][5]; // XP
c.playerSkillProp[GameConstants.FISHING][3] = data[i][3]; // BAIT
c.playerSkillProp[GameConstants.FISHING][4] = data[i][2]; // EQUIP
c.playerSkillProp[GameConstants.FISHING][5] = data[i][7]; // sFish
c.playerSkillProp[GameConstants.FISHING][6] = data[i][8]; // sLvl
c.playerSkillProp[GameConstants.FISHING][7] = data[i][4]; // FISH
c.playerSkillProp[GameConstants.FISHING][8] = data[i][9]; // sXP
c.playerSkillProp[GameConstants.FISHING][9] = Misc.random(1) == 0 ? 7 : 5;
c.playerSkillProp[GameConstants.FISHING][10] = data[i][0]; // INDEX
if (c.playerSkilling[10]) {
if (c.playerSkilling[GameConstants.FISHING]) {
return;
}
c.playerSkilling[10] = true;
c.playerSkilling[GameConstants.FISHING] = true;
if (c.tutorialProgress == 6) { // if tutorial prog = 6
c.startAnimation(c.playerSkillProp[10][0]);
c.startAnimation(c.playerSkillProp[GameConstants.FISHING][0]);
c.stopPlayerSkill = true;
c.getPacketSender().drawHeadicon(0, 0, 0, 0); // deletes
// headicon
@@ -119,9 +120,9 @@ public class Fishing extends SkillHandler {
@Override
public void execute(CycleEventContainer container) {
if (c.playerSkillProp[10][5] > 0) {
if (c.playerLevel[c.playerFishing] >= c.playerSkillProp[10][6]) {
c.playerSkillProp[10][1] = c.playerSkillProp[10][Misc
if (c.playerSkillProp[GameConstants.FISHING][5] > 0) {
if (c.playerLevel[GameConstants.FISHING] >= c.playerSkillProp[GameConstants.FISHING][6]) {
c.playerSkillProp[GameConstants.FISHING][1] = c.playerSkillProp[GameConstants.FISHING][Misc
.random(1) == 0 ? 7 : 5];
}
}
@@ -129,12 +130,12 @@ public class Fishing extends SkillHandler {
if (!c.stopPlayerSkill) {
container.stop();
}
if (!c.playerSkilling[10]) {
if (!c.playerSkilling[GameConstants.FISHING]) {
container.stop();
}
if (c.playerSkillProp[10][1] > 0) {
c.startAnimation(c.playerSkillProp[10][0]);
if (c.playerSkillProp[GameConstants.FISHING][1] > 0) {
c.startAnimation(c.playerSkillProp[GameConstants.FISHING][0]);
}
}
@@ -150,20 +151,20 @@ public class Fishing extends SkillHandler {
@Override
public void execute(
CycleEventContainer container) {
if (c.playerSkillProp[10][5] > 0) {
if (c.playerLevel[c.playerFishing] >= c.playerSkillProp[10][6]) {
c.playerSkillProp[10][1] = c.playerSkillProp[10][Misc
if (c.playerSkillProp[GameConstants.FISHING][5] > 0) {
if (c.playerLevel[GameConstants.FISHING] >= c.playerSkillProp[GameConstants.FISHING][6]) {
c.playerSkillProp[GameConstants.FISHING][1] = c.playerSkillProp[GameConstants.FISHING][Misc
.random(1) == 0 ? 7 : 5];
}
}
if (c.playerSkillProp[10][2] > 0) {
if (c.playerSkillProp[GameConstants.FISHING][2] > 0) {
c.getPlayerAssistant().addSkillXP(
c.playerSkillProp[10][2],
c.playerFishing);
c.playerSkillProp[GameConstants.FISHING][2],
GameConstants.FISHING);
}
if (c.playerSkillProp[10][1] > 0) {
c.getItemAssistant().addItem(c.playerSkillProp[10][1], 1);
c.startAnimation(c.playerSkillProp[10][0]);
if (c.playerSkillProp[GameConstants.FISHING][1] > 0) {
c.getItemAssistant().addItem(c.playerSkillProp[GameConstants.FISHING][1], 1);
c.startAnimation(c.playerSkillProp[GameConstants.FISHING][0]);
c.getDialogueHandler().sendDialogues(3019, -1);
container.stop();
}
@@ -173,7 +174,7 @@ public class Fishing extends SkillHandler {
if (!c.stopPlayerSkill) {
container.stop();
}
if (!c.playerSkilling[10]) {
if (!c.playerSkilling[GameConstants.FISHING]) {
container.stop();
}
}
@@ -190,41 +191,41 @@ public class Fishing extends SkillHandler {
c.getPacketSender().sendMessage("" + messages(c));
// c.getPA().sendSound(379, 100, 1); // fishing
c.startAnimation(c.playerSkillProp[10][0]);
c.startAnimation(c.playerSkillProp[GameConstants.FISHING][0]);
c.stopPlayerSkill = true;
CycleEventHandler.getSingleton().addEvent(eventId, c,
new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
if (c.playerSkillProp[10][3] > 0) {
if (c.playerSkillProp[GameConstants.FISHING][3] > 0) {
if (!c.getItemAssistant().playerHasItem(
c.playerSkillProp[10][3])) {
c.playerSkillProp[GameConstants.FISHING][3])) {
c.getPacketSender()
.sendMessage(
"You don't have any "
+ ItemAssistant
.getItemName(c.playerSkillProp[10][3])
.getItemName(c.playerSkillProp[GameConstants.FISHING][3])
+ " left!");
c.getPacketSender()
.sendMessage(
"You need "
+ ItemAssistant
.getItemName(c.playerSkillProp[10][3])
.getItemName(c.playerSkillProp[GameConstants.FISHING][3])
+ " to fish here.");
resetFishing(c);
container.stop();
}
}
if (c.playerSkillProp[10][5] > 0) {
if (c.playerLevel[c.playerFishing] >= c.playerSkillProp[10][6]) {
c.playerSkillProp[10][1] = c.playerSkillProp[10][Misc
if (c.playerSkillProp[GameConstants.FISHING][5] > 0) {
if (c.playerLevel[GameConstants.FISHING] >= c.playerSkillProp[GameConstants.FISHING][6]) {
c.playerSkillProp[GameConstants.FISHING][1] = c.playerSkillProp[GameConstants.FISHING][Misc
.random(1) == 0 ? 7 : 5];
}
}
if (!hasFishingEquipment(c,
c.playerSkillProp[10][4])) {
c.playerSkillProp[GameConstants.FISHING][4])) {
resetFishing(c);
container.stop();
}
@@ -235,12 +236,12 @@ public class Fishing extends SkillHandler {
if (!c.stopPlayerSkill) {
container.stop();
}
if (!c.playerSkilling[10]) {
if (!c.playerSkilling[GameConstants.FISHING]) {
resetFishing(c);
container.stop();
}
if (c.playerSkillProp[10][1] > 0) {
c.startAnimation(c.playerSkillProp[10][0]);
if (c.playerSkillProp[GameConstants.FISHING][1] > 0) {
c.startAnimation(c.playerSkillProp[GameConstants.FISHING][0]);
// c.getPA().sendSound(379, 100, 1); //
// fishing
}
@@ -256,70 +257,70 @@ public class Fishing extends SkillHandler {
@Override
public void execute(CycleEventContainer container) {
if (c.playerSkillProp[10][5] > 0) {
if (c.playerLevel[c.playerFishing] >= c.playerSkillProp[10][6]) {
c.playerSkillProp[10][1] = c.playerSkillProp[10][Misc
if (c.playerSkillProp[GameConstants.FISHING][5] > 0) {
if (c.playerLevel[GameConstants.FISHING] >= c.playerSkillProp[GameConstants.FISHING][6]) {
c.playerSkillProp[GameConstants.FISHING][1] = c.playerSkillProp[GameConstants.FISHING][Misc
.random(1) == 0 ? 7 : 5];
}
}
if (c.playerSkillProp[10][1] > 0) {
if (c.playerSkillProp[GameConstants.FISHING][1] > 0) {
c.getPacketSender()
.sendMessage(
"You catch "
+ (c.playerSkillProp[10][1] == 321
|| c.playerSkillProp[10][1] == 317
|| c.playerSkillProp[10][1] == 7944 ? "some "
+ (c.playerSkillProp[GameConstants.FISHING][1] == 321
|| c.playerSkillProp[GameConstants.FISHING][1] == 317
|| c.playerSkillProp[GameConstants.FISHING][1] == 7944 ? "some "
: "a ")
+ ItemAssistant
.getItemName(
c.playerSkillProp[10][1])
c.playerSkillProp[GameConstants.FISHING][1])
.toLowerCase()
.replace(
"raw ",
"")
+ ".");
}
if (c.playerSkillProp[10][1] > 0 && c.randomEventsEnabled) {
if (c.playerSkillProp[GameConstants.FISHING][1] > 0 && c.randomEventsEnabled) {
randomEvents(c);
}
if (c.playerSkillProp[10][1] > 0) {
c.getItemAssistant().deleteItem(c.playerSkillProp[10][3], c.getItemAssistant().getItemSlot(c.playerSkillProp[10][3]), 1);
c.getItemAssistant().addItem(c.playerSkillProp[10][1], 1);
c.startAnimation(c.playerSkillProp[10][0]);
if (c.playerSkillProp[GameConstants.FISHING][1] > 0) {
c.getItemAssistant().deleteItem(c.playerSkillProp[GameConstants.FISHING][3], c.getItemAssistant().getItemSlot(c.playerSkillProp[GameConstants.FISHING][3]), 1);
c.getItemAssistant().addItem(c.playerSkillProp[GameConstants.FISHING][1], 1);
c.startAnimation(c.playerSkillProp[GameConstants.FISHING][0]);
}
if (c.playerSkillProp[10][5] > 0
&& c.playerLevel[c.playerFishing] >= c.playerSkillProp[10][6]) {
if (c.playerSkillProp[GameConstants.FISHING][5] > 0
&& c.playerLevel[GameConstants.FISHING] >= c.playerSkillProp[GameConstants.FISHING][6]) {
c.getPlayerAssistant().addSkillXP(
c.playerSkillProp[10][8],
c.playerFishing);
} else if (c.playerSkillProp[10][7] > 0) {
c.playerSkillProp[GameConstants.FISHING][8],
GameConstants.FISHING);
} else if (c.playerSkillProp[GameConstants.FISHING][7] > 0) {
c.getPlayerAssistant().addSkillXP(
c.playerSkillProp[10][2],
c.playerFishing);
c.playerSkillProp[GameConstants.FISHING][2],
GameConstants.FISHING);
}
if (c.playerSkillProp[10][3] > 0) {
if (c.playerSkillProp[GameConstants.FISHING][3] > 0) {
if (!c.getItemAssistant().playerHasItem(
c.playerSkillProp[10][3])) {
c.playerSkillProp[GameConstants.FISHING][3])) {
c.getDialogueHandler()
.sendStatement(
"You have run out of "
+ ItemAssistant
.getItemName(
c.playerSkillProp[10][3])
c.playerSkillProp[GameConstants.FISHING][3])
.toLowerCase()
.toLowerCase()
+ ".");
// c.getPacketDispatcher().sendMessage("You don't have any "+
// ItemAssistant.getItemName(c.playerSkillProp[10][3])
// ItemAssistant.getItemName(c.playerSkillProp[GameConstants.FISHING][3])
// +" left!");
// c.getPacketDispatcher().sendMessage("You need "+
// ItemAssistant.getItemName(c.playerSkillProp[10][3])
// ItemAssistant.getItemName(c.playerSkillProp[GameConstants.FISHING][3])
// +" to fish here.");
container.stop();
}
}
if (!hasFishingEquipment(c,
c.playerSkillProp[10][4])) {
c.playerSkillProp[GameConstants.FISHING][4])) {
resetFishing(c);
container.stop();
}
@@ -330,7 +331,7 @@ public class Fishing extends SkillHandler {
if (!c.stopPlayerSkill) {
container.stop();
}
if (!c.playerSkilling[10]) {
if (!c.playerSkilling[GameConstants.FISHING]) {
resetFishing(c);
container.stop();
}
@@ -371,32 +372,32 @@ public class Fishing extends SkillHandler {
public static void resetFishing(Player player) {
player.startAnimation(65535);
player.stopPlayerSkill = false;
player.playerSkilling[10] = false;
player.playerSkilling[GameConstants.FISHING] = false;
player.fishingWhirlPool = false;
stopEvents(player, eventId);
for (int i = 0; i < 11; i++) {
player.playerSkillProp[10][i] = -1;
player.playerSkillProp[GameConstants.FISHING][i] = -1;
}
}
public static String messages(Player c) {
if (c.playerSkillProp[10][10] == 1 || c.playerSkillProp[10][10] == 9) {
if (c.playerSkillProp[GameConstants.FISHING][10] == 1 || c.playerSkillProp[GameConstants.FISHING][10] == 9) {
// etc
return messages[0][0];
}
if (c.playerSkillProp[10][10] == 2 || c.playerSkillProp[10][10] == 3
|| c.playerSkillProp[10][10] == 4
|| c.playerSkillProp[10][10] == 5
|| c.playerSkillProp[10][10] == 6) {
if (c.playerSkillProp[GameConstants.FISHING][10] == 2 || c.playerSkillProp[GameConstants.FISHING][10] == 3
|| c.playerSkillProp[GameConstants.FISHING][10] == 4
|| c.playerSkillProp[GameConstants.FISHING][10] == 5
|| c.playerSkillProp[GameConstants.FISHING][10] == 6) {
return messages[1][0];
}
if (c.playerSkillProp[10][10] == 7 || c.playerSkillProp[10][10] == 10) {
if (c.playerSkillProp[GameConstants.FISHING][10] == 7 || c.playerSkillProp[GameConstants.FISHING][10] == 10) {
return messages[2][0];
}
if (c.playerSkillProp[10][10] == 8) {
if (c.playerSkillProp[GameConstants.FISHING][10] == 8) {
return messages[3][0];
}
@@ -404,7 +405,7 @@ public class Fishing extends SkillHandler {
}
private static int playerFishingLevel(Player c) {
return 10 - (int) Math.floor(c.playerLevel[c.playerFishing] / 10);
return 10 - (int) Math.floor(c.playerLevel[GameConstants.FISHING] / 10);
}
private final static int getTimer(Player c, int npcId) {
2006Scape Server/src/main/java/com/rs2/game/content/skills/core/Mining.java
+3 -2
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.core;
import com.rs2.GameConstants;
import com.rs2.event.*;
import com.rs2.game.items.ItemAssistant;
import com.rs2.game.objects.Object;
@@ -175,7 +176,7 @@ public class Mining {
CycleEventHandler.getSingleton().stopEvents(player, "miningEvent".hashCode());
if (player.isMining || player.miningRock)
return;
int miningLevel = player.playerLevel[player.playerMining];
int miningLevel = player.playerLevel[GameConstants.MINING];
rockData rock = rockData.getRock(objectID);
player.miningAxe = -1;
player.turnPlayerTo(objectX, objectY);
@@ -230,7 +231,7 @@ public class Mining {
if (player.isMining) {
if (!giveGem(player)) {
player.getItemAssistant().addItem(oreID, 1);
player.getPlayerAssistant().addSkillXP(rock.getXp(), player.playerMining);
player.getPlayerAssistant().addSkillXP(rock.getXp(), GameConstants.MINING);
player.getPacketSender().sendMessage("You manage to mine some " + ItemAssistant.getItemName(oreID).toLowerCase() + ".");
} else {
obtainGem(player);
2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/BattleStaffs.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.crafting;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -51,7 +52,7 @@ public class BattleStaffs {
if (player.isCrafting == true) {
return;
}
if (player.playerLevel[12] < b.getLevelReq()) {
if (player.playerLevel[GameConstants.CRAFTING] < b.getLevelReq()) {
player.getPacketSender().sendMessage("You need level " + b.getLevelReq() + " crafting to do that.");
return;
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/GemCutting.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.crafting;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -18,7 +19,7 @@ public class GemCutting extends CraftingData {
final int itemId = itemUsed == 1755 ? usedWith : itemUsed;
for (final cutGemData g : cutGemData.values()) {
if (itemId == g.getUncut()) {
if (player.playerLevel[12] < g.getLevel()) {
if (player.playerLevel[GameConstants.CRAFTING] < g.getLevel()) {
player.getPacketSender().sendMessage(
"You need a crafting level of " + g.getLevel()
+ " to cut this gem.");
2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/JewelryMaking.java
+4 -3
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.crafting;
import com.rs2.GameConstants;
import com.rs2.game.items.ItemAssistant;
import com.rs2.game.players.Player;
@@ -135,7 +136,7 @@ public class JewelryMaking {
if (!isRing && !isNeck && !isAmulet) {
return;
}
if (player.playerLevel[player.playerCrafting] >= lvl) {
if (player.playerLevel[GameConstants.CRAFTING] >= lvl) {
if (ItemAssistant.getItemName(itemAdd).toLowerCase().contains("gold")
&& !player.getItemAssistant().playerHasItem(GOLD_BAR, 1)
|| !player.getItemAssistant().playerHasItem(GOLD_BAR, 1)) {
@@ -156,8 +157,8 @@ public class JewelryMaking {
player.getItemAssistant().deleteItem(gem, 1);
player.getItemAssistant().deleteItem(GOLD_BAR, 1);
player.getItemAssistant().addItem(itemAdd, 1);
player.getPlayerAssistant().addSkillXP(xp, player.playerCrafting);
player.getPlayerAssistant().refreshSkill(player.playerCrafting);
player.getPlayerAssistant().addSkillXP(xp, GameConstants.CRAFTING);
player.getPlayerAssistant().refreshSkill(GameConstants.CRAFTING);
done++;
}
if (done == 1) {
2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/LeatherMaking.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.crafting;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -68,7 +69,7 @@ public class LeatherMaking extends CraftingData {
for (final leatherData l : leatherData.values()) {
if (buttonId == l.getButtonId(buttonId)) {
if (player.leatherType == l.getLeather()) {
if (player.playerLevel[12] < l.getLevel()) {
if (player.playerLevel[GameConstants.CRAFTING] < l.getLevel()) {
player.getPacketSender().sendMessage(
"You need a crafting level of " + l.getLevel()
+ " to make this.");
2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/Pottery.java
+13 -12
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.crafting;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -54,14 +55,14 @@ public class Pottery {
c.doAmount = amount;
c.isPotCrafting = true;
if (c.getItemAssistant().playerHasItem(softClay)
&& c.playerLevel[12] >= level && c.isPotCrafting) {
&& c.playerLevel[GameConstants.CRAFTING] >= level && c.isPotCrafting) {
c.startAnimation(unFire);
c.getItemAssistant().deleteItem(softClay, 1);
c.getItemAssistant().addItem(id, 1);
c.getPacketSender().sendMessage(
"You make the soft clay into a "
+ ItemAssistant.getItemName(id) + ".");
c.getPlayerAssistant().addSkillXP(xp, c.playerCrafting);
c.getPlayerAssistant().addSkillXP(xp, GameConstants.CRAFTING);
c.doAmount--;
}
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@@ -69,17 +70,17 @@ public class Pottery {
@Override
public void execute(CycleEventContainer container) {
if (c.getItemAssistant().playerHasItem(softClay)
&& c.playerLevel[12] >= level && !(c.doAmount <= 0)
&& c.playerLevel[GameConstants.CRAFTING] >= level && !(c.doAmount <= 0)
&& c.isPotCrafting) {
c.startAnimation(unFire);
c.getItemAssistant().deleteItem(softClay, 1);
c.getItemAssistant().addItem(id, 1);
c.getPacketSender().sendMessage("You make the soft clay into a " + ItemAssistant.getItemName(id) + ".");
c.getPlayerAssistant().addSkillXP(xp, c.playerCrafting);
c.getPlayerAssistant().addSkillXP(xp, GameConstants.CRAFTING);
c.doAmount--;
}
if (c.playerLevel[12] < level) {
if (c.playerLevel[GameConstants.CRAFTING] < level) {
container.stop();
c.getPacketSender().sendMessage("You need a crafting level of " + level + " to make this.");
}
@@ -113,22 +114,22 @@ public class Pottery {
player.doAmount = amount;
player.isPotCrafting = true;
if (player.getItemAssistant().playerHasItem(startId)
&& player.playerLevel[12] >= level && player.isPotCrafting) {
&& player.playerLevel[GameConstants.CRAFTING] >= level && player.isPotCrafting) {
player.getItemAssistant().deleteItem(startId, 1);
player.getItemAssistant().addItem(finishId, 1);
player.startAnimation(Fire);
player.getPacketSender().sendSound(469, 100, 0);
player.getPacketSender().sendMessage("You put a " + ItemAssistant.getItemName(startId) + " into the oven.");
player.getPacketSender().sendMessage("You retrieve the " + ItemAssistant.getItemName(finishId) + " from the oven.");
player.getPlayerAssistant().addSkillXP(xp, player.playerCrafting);
player.getPlayerAssistant().addSkillXP(xp, GameConstants.CRAFTING);
player.doAmount--;
}
if (player.playerLevel[12] < level) {
if (player.playerLevel[GameConstants.CRAFTING] < level) {
player.getPacketSender().sendMessage("You need a crafting level of " + level + " to make this.");
}
if (!player.getItemAssistant().playerHasItem(startId) && player.playerLevel[12] >= level) {
if (!player.getItemAssistant().playerHasItem(startId) && player.playerLevel[GameConstants.CRAFTING] >= level) {
player.getPacketSender().sendMessage("You need an " + ItemAssistant.getItemName(startId) + " to do this.");
}
@@ -136,20 +137,20 @@ public class Pottery {
@Override
public void execute(CycleEventContainer container) {
if (player.getItemAssistant().playerHasItem(startId) && player.playerLevel[12] >= level && player.isPotCrafting && !(player.doAmount <= 0)) {
if (player.getItemAssistant().playerHasItem(startId) && player.playerLevel[GameConstants.CRAFTING] >= level && player.isPotCrafting && !(player.doAmount <= 0)) {
player.getItemAssistant().deleteItem(startId, 1);
player.getItemAssistant().addItem(finishId, 1);
player.startAnimation(Fire);
player.getPacketSender().sendSound(469, 100, 0);
player.getPacketSender().sendMessage("You put a " + ItemAssistant.getItemName(startId) + " into the oven.");
player.getPacketSender().sendMessage("You retrieve the " + ItemAssistant.getItemName(finishId) + " from the oven.");
player.getPlayerAssistant().addSkillXP(xp, player.playerCrafting);
player.getPlayerAssistant().addSkillXP(xp, GameConstants.CRAFTING);
player.doAmount--;
}
if (player.isPotCrafting == false
|| !player.getItemAssistant().playerHasItem(startId)
|| player.playerLevel[12] < level) {
|| player.playerLevel[GameConstants.CRAFTING] < level) {
container.stop();
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/crafting/Spinning.java
+3 -2
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.crafting;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -42,14 +43,14 @@ public class Spinning extends CraftingData {
public void execute(CycleEventContainer container) {
if (player.isSpinning == true) {
if (player.getItemAssistant().playerHasItem(before)) {
if (player.playerLevel[player.playerCrafting] < level) {
if (player.playerLevel[GameConstants.CRAFTING] < level) {
player.getDialogueHandler().sendStatement("You need a crafting level of " + level + " to do this.");
return;
}
player.startAnimation(896);
player.getItemAssistant().deleteItem(before, 1);
player.getItemAssistant().addItem(after, 1);
player.getPlayerAssistant().addSkillXP(exp, player.playerCrafting);
player.getPlayerAssistant().addSkillXP(exp, GameConstants.CRAFTING);
player.getPacketSender().sendMessage("You spin the " + ItemAssistant.getItemName(before) + " into a " + ItemAssistant.getItemName(after) + ".");
player.doAmount--;
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/firemaking/Firemaking.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.firemaking;
import com.rs2.GameConstants;
import com.rs2.GameEngine;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
@@ -42,7 +43,7 @@ public class Firemaking {
for (final LogData l : LogData.values()) {
final int logId = usedWith == firemakingItems[i] ? itemUsed : usedWith;
if (logId == l.getLogId()) {
if (c.playerLevel[11] < l.getLevel()) {
if (c.playerLevel[GameConstants.FIREMAKING] < l.getLevel()) {
c.getPacketSender().sendMessage("You need a firemaking level of " + l.getLevel() + " to light " + ItemAssistant.getItemName(logId));
return;
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/ArrowMaking.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.fletching;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -82,7 +83,7 @@ public class ArrowMaking {
if (player.isWoodcutting) {
return false;
}
if (player.playerLevel[9] < arrowData.getLevel()) {
if (player.playerLevel[GameConstants.FLETCHING] < arrowData.getLevel()) {
player.getDialogueHandler().sendStatement(
"You need a fletching level of " + arrowData.getLevel()
+ " to do this");
2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/LogCutting.java
+10 -9
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.fletching;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -25,7 +26,7 @@ public class LogCutting {
public static void cutLog(final Player player, final int product, final int level, final double xp, int amount) {
player.doAmount = amount;
player.getPacketSender().closeAllWindows();
if (player.playerLevel[9] < level) {
if (player.playerLevel[GameConstants.FLETCHING] < level) {
player.getPacketSender().sendMessage("You need a fletching level of " + level + " to make this.");
return;
}
@@ -54,7 +55,7 @@ public class LogCutting {
player.getPacketSender().sendMessage("You carefully cut the " + ItemAssistant.getItemName(player.getFletching().log) + " into a " + ItemAssistant.getItemName(product) + ".");
}
player.getPlayerAssistant().addSkillXP(xp, player.playerFletching);
player.getPlayerAssistant().addSkillXP(xp, GameConstants.FLETCHING);
player.doAmount--;
player.getPacketSender().sendSound(CUT_SOUND, 100, 0);
}
@@ -296,13 +297,13 @@ public class LogCutting {
c.startAnimation(1248);
c.getItemAssistant().deleteItem(2859, amount);
c.getItemAssistant().addItem(2861, makeAmount);
c.getPlayerAssistant().addSkillXP(3 * amount, c.playerFletching);
c.getPlayerAssistant().addSkillXP(3 * amount, GameConstants.FLETCHING);
c.getPacketSender().sendMessage("You turn your " + ItemAssistant.getItemName(2859) + " into " + ItemAssistant.getItemName(2861) + ".");
}
}
public static void flightedArrow(Player c) {// to do
if (c.playerLevel[c.playerFletching] < 5) {
if (c.playerLevel[GameConstants.FLETCHING] < 5) {
c.getDialogueHandler().sendStatement("You need 5 fletching to fletch this.");
c.nextChat = 0;
return;
@@ -327,7 +328,7 @@ public class LogCutting {
}
public static void ogreArrow(Player c) {
if (c.playerLevel[c.playerFletching] < 5) {
if (c.playerLevel[GameConstants.FLETCHING] < 5) {
c.getDialogueHandler().sendStatement("You need 5 fletching to fletch this.");
c.nextChat = 0;
return;
@@ -342,21 +343,21 @@ public class LogCutting {
if (wolfBoneArrow == flightedArrow) {
c.startAnimation(1248);
c.getItemAssistant().addItem(2866, wolfBoneArrow);
c.getPlayerAssistant().addSkillXP(1 * wolfBoneArrow, c.playerFletching);
c.getPlayerAssistant().addSkillXP(1 * wolfBoneArrow, GameConstants.FLETCHING);
c.getItemAssistant().deleteItem(2861, wolfBoneArrow);
c.getItemAssistant().deleteItem(2865, wolfBoneArrow);
c.getPacketSender().sendMessage("You turn your " + ItemAssistant.getItemName(2865) + " (s) into " + ItemAssistant.getItemName(2866) + "(s).");
} else if (wolfBoneArrow > flightedArrow) {
c.startAnimation(1248);
c.getItemAssistant().addItem(2866, flightedArrow);
c.getPlayerAssistant().addSkillXP(1 * flightedArrow, c.playerFletching);
c.getPlayerAssistant().addSkillXP(1 * flightedArrow, GameConstants.FLETCHING);
c.getItemAssistant().deleteItem(2861, flightedArrow);
c.getItemAssistant().deleteItem(2865, flightedArrow);
c.getPacketSender().sendMessage("You turn your " + ItemAssistant.getItemName(2865) + " (s) into " + ItemAssistant.getItemName(2866) + "(s).");
} else if (wolfBoneArrow < flightedArrow) {
c.startAnimation(1248);
c.getItemAssistant().addItem(2866, wolfBoneArrow);
c.getPlayerAssistant().addSkillXP(1 * wolfBoneArrow, c.playerFletching);
c.getPlayerAssistant().addSkillXP(1 * wolfBoneArrow, GameConstants.FLETCHING);
c.getItemAssistant().deleteItem(2861, wolfBoneArrow);
c.getItemAssistant().deleteItem(2865, wolfBoneArrow);
c.getPacketSender().sendMessage("You turn your " + ItemAssistant.getItemName(2865) + " (s) into " + ItemAssistant.getItemName(2866) + "(s).");
@@ -376,7 +377,7 @@ public class LogCutting {
c.startAnimation(1248);
c.getItemAssistant().deleteItem(2862, amount);
c.getItemAssistant().addItem(2864, makeAmount);
c.getPlayerAssistant().addSkillXP(2 * amount, c.playerFletching);
c.getPlayerAssistant().addSkillXP(2 * amount, GameConstants.FLETCHING);
c.getPacketSender().sendMessage("You turn your " + ItemAssistant.getItemName(2862) + " (s) into " + ItemAssistant.getItemName(2864) + "(s).");
}
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/fletching/Stringing.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.fletching;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -73,7 +74,7 @@ public class Stringing {
if (loadData == null) {
return false;
}
if (player.playerLevel[9] < loadData.getLevel()) {
if (player.playerLevel[GameConstants.FLETCHING] < loadData.getLevel()) {
player.getDialogueHandler().sendStatement("You need a fletching level of " + loadData.getLevel() + " to do this");
return false;
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/herblore/GrindingAction.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.herblore;
import com.rs2.GameConstants;
import com.rs2.game.content.music.sound.SoundList;
import com.rs2.game.items.ItemAssistant;
import com.rs2.game.players.Player;
@@ -39,7 +40,7 @@ public class GrindingAction {
player.getItemAssistant().deleteItem(d.getId(), 1);
player.getItemAssistant().addItem(d.getEnd(), 1);
player.getPacketSender().sendMessage("You carefully grind the " + ItemAssistant.getItemName(d.getId()) + ".");
player.getPlayerAssistant().addSkillXP(1, player.playerHerblore);
player.getPlayerAssistant().addSkillXP(1, GameConstants.HERBLORE);
}
}
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/herblore/Herblore.java
+8 -7
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.herblore;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -27,7 +28,7 @@ public class Herblore extends SkillHandler {
final int itemSlot) {
for (int[] element : CLEAN_DATA) {
if (itemId == element[0]) {
if (c.playerLevel[15] < element[2]) {
if (c.playerLevel[GameConstants.HERBLORE] < element[2]) {
c.getPacketSender().sendMessage("You need a higher herblore level to clean this herb.");
return;
}
@@ -65,7 +66,7 @@ public class Herblore extends SkillHandler {
for (int[] element : POTION_DATA) {
if (useItem == element[0] && itemUsed == element[1]
|| useItem == element[1] && itemUsed == element[0]) {
if (c.playerLevel[c.playerHerblore] < element[3]) {
if (c.playerLevel[GameConstants.HERBLORE] < element[3]) {
c.getPacketSender().sendMessage("You need an herblore level of " + element[3] + " to mix this potion.");
return;
}
@@ -80,14 +81,14 @@ public class Herblore extends SkillHandler {
}
public static void makePotion(final Player c, int amount) {
if (c.playerSkilling[c.playerHerblore]) {
if (c.playerSkilling[GameConstants.HERBLORE]) {
return;
}
if (itemToDelete <= 0 || itemToDelete2 <= 0) {
return;
}
c.doAmount = amount;
c.playerSkilling[c.playerHerblore] = true;
c.playerSkilling[GameConstants.HERBLORE] = true;
c.getPacketSender().closeAllWindows();
c.startAnimation(ANIM);
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@@ -98,7 +99,7 @@ public class Herblore extends SkillHandler {
c.getItemAssistant().deleteItem(itemToDelete2, c.getItemAssistant().getItemSlot(itemToDelete2), 1);
c.getItemAssistant().addItem(itemToAdd, 1);
c.getPacketSender().sendMessage("You make a " + ItemAssistant.getItemName(itemToAdd).toLowerCase() + ".");
c.getPlayerAssistant().addSkillXP(potExp, c.playerHerblore);
c.getPlayerAssistant().addSkillXP(potExp, GameConstants.HERBLORE);
deleteTime(c);
if (!c.getItemAssistant().playerHasItem(itemToDelete2, 1) || !c.getItemAssistant().playerHasItem(itemToDelete, 1) || c.doAmount <= 0) {
container.stop();
@@ -118,7 +119,7 @@ public class Herblore extends SkillHandler {
@Override
public void execute(CycleEventContainer container) {
c.startAnimation(ANIM);
if (!c.playerSkilling[c.playerHerblore] || !c.isPotionMaking) {
if (!c.playerSkilling[GameConstants.HERBLORE] || !c.isPotionMaking) {
container.stop();
}
}
@@ -136,7 +137,7 @@ public class Herblore extends SkillHandler {
potExp = -1;
player.isGrinding = false;
player.isPotionMaking = false;
player.playerSkilling[player.playerHerblore] = false;
player.playerSkilling[GameConstants.HERBLORE] = false;
}
public static boolean isHerb(int item) {
2006Scape Server/src/main/java/com/rs2/game/content/skills/prayer/Ectofuntus.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.prayer;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -166,7 +167,7 @@ public class Ectofuntus {
public void execute(CycleEventContainer container) {
player.getItemAssistant().deleteItem(ectofuntus.getBonemealId(), 1);
player.startAnimation(WORSHIP);
player.getPlayerAssistant().addSkillXP(ectofuntus.getWorshipExperience(), player.playerPrayer);
player.getPlayerAssistant().addSkillXP(ectofuntus.getWorshipExperience(), GameConstants.PRAYER);
player.getPacketSender().sendMessage("You pray to the ectofuntus.");
container.stop();
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/runecrafting/Runecrafting.java
+7 -6
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.runecrafting;
import com.rs2.GameConstants;
import com.rs2.game.content.music.sound.SoundList;
import com.rs2.game.content.randomevents.RandomEventHandler;
import com.rs2.game.content.skills.SkillHandler;
@@ -154,7 +155,7 @@ public class Runecrafting {
c.getPacketSender().sendMessage("This skill is currently disabled.");
return false;
}
if (c.playerLevel[c.playerRunecrafting] >= ad.levelReq) {
if (c.playerLevel[GameConstants.RUNECRAFTING] >= ad.levelReq) {
getMultiSupport(obj);
c.startAnimation(791);
c.gfx100(186);
@@ -173,18 +174,18 @@ public class Runecrafting {
if (amount2 > 0 && amount > 0) {
c.getItemAssistant().deleteItem(7936, c.getItemAssistant().getItemAmount(7936));
c.getItemAssistant().addItem(ad.rewardedRune, amount * (getMultiplier(ad) <= 1 ? 1 : getMultiplier(ad)));
c.getPlayerAssistant().addSkillXP(ad.xp * amount, c.playerRunecrafting);
c.getPlayerAssistant().addSkillXP(ad.xp * amount, GameConstants.RUNECRAFTING);
c.getItemAssistant().deleteItem(1436, c.getItemAssistant().getItemAmount(1436));
c.getItemAssistant().addItem(ad.rewardedRune, amount2 * (getMultiplier(ad) <= 1 ? 1 : getMultiplier(ad)));
c.getPlayerAssistant().addSkillXP(ad.xp * amount2, c.playerRunecrafting);
c.getPlayerAssistant().addSkillXP(ad.xp * amount2, GameConstants.RUNECRAFTING);
} else if (amount > 0) {
c.getItemAssistant().deleteItem(7936, c.getItemAssistant().getItemAmount(7936));
c.getItemAssistant().addItem(ad.rewardedRune, amount * (getMultiplier(ad) <= 1 ? 1 : getMultiplier(ad)));
c.getPlayerAssistant().addSkillXP(ad.xp * amount, c.playerRunecrafting);
c.getPlayerAssistant().addSkillXP(ad.xp * amount, GameConstants.RUNECRAFTING);
} else if (amount2 > 0) {
c.getItemAssistant().deleteItem(1436, c.getItemAssistant().getItemAmount(1436));
c.getItemAssistant().addItem(ad.rewardedRune, amount2 * (getMultiplier(ad) <= 1 ? 1 : getMultiplier(ad)));
c.getPlayerAssistant().addSkillXP(ad.xp * amount2, c.playerRunecrafting);
c.getPlayerAssistant().addSkillXP(ad.xp * amount2, GameConstants.RUNECRAFTING);
} else {
c.getPacketSender().sendMessage("You don't have any essence left.");
}
@@ -195,7 +196,7 @@ public class Runecrafting {
int temp = 1;
for (int[] multiRune : ad.multiRunes) {
for (int j = 0; j < multiRune.length; j++) {
if (c.playerLevel[c.playerRunecrafting] >= multiRune[0]) {
if (c.playerLevel[GameConstants.RUNECRAFTING] >= multiRune[0]) {
temp++;
}
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/slayer/Slayer.java
+9 -7
View File
@@ -1,6 +1,8 @@
package com.rs2.game.content.skills.slayer;
import java.util.ArrayList;
import com.rs2.GameConstants;
import com.rs2.game.npcs.NpcHandler;
import com.rs2.game.players.Player;
import com.rs2.util.Misc;
@@ -163,7 +165,7 @@ public class Slayer {
}
public boolean canAttackNpc(int i) {
if (c.playerLevel[c.playerSlayer] < getRequiredLevel(NpcHandler.npcs[i].npcType)) {
if (c.playerLevel[GameConstants.SLAYER] < getRequiredLevel(NpcHandler.npcs[i].npcType)) {
c.getPacketSender().sendMessage("You need a slayer level of " + getRequiredLevel(NpcHandler.npcs[i].npcType) + " to attack this npc.");
c.getCombatAssistant().resetPlayerAttack();
return false;
@@ -182,27 +184,27 @@ public class Slayer {
}
for (Task slayerTask : Task.values()) {
if (slayerTask.getDifficulty() == EASY_TASK) {
if (c.playerLevel[18] >= slayerTask.getLevelReq()) {
if (c.playerLevel[GameConstants.SLAYER] >= slayerTask.getLevelReq()) {
easyTask.add(slayerTask.getNpcId());
}
continue;
} else if (slayerTask.getDifficulty() == VERY_EASY_TASK) {
if (c.playerLevel[18] >= slayerTask.getLevelReq()) {
if (c.playerLevel[GameConstants.SLAYER] >= slayerTask.getLevelReq()) {
veryEasyTask.add(slayerTask.getNpcId());
}
continue;
} else if (slayerTask.getDifficulty() == MEDIUM_TASK) {
if (c.playerLevel[18] >= slayerTask.getLevelReq()) {
if (c.playerLevel[GameConstants.SLAYER] >= slayerTask.getLevelReq()) {
mediumTask.add(slayerTask.getNpcId());
}
continue;
} else if (slayerTask.getDifficulty() == HARD_TASK) {
if (c.playerLevel[18] >= slayerTask.getLevelReq()) {
if (c.playerLevel[GameConstants.SLAYER] >= slayerTask.getLevelReq()) {
hardTask.add(slayerTask.getNpcId());
}
continue;
} else if (slayerTask.getDifficulty() == VERY_HARD_TASK) {
if (c.playerLevel[18] >= slayerTask.getLevelReq()) {
if (c.playerLevel[GameConstants.SLAYER] >= slayerTask.getLevelReq()) {
veryHardTask.add(slayerTask.getNpcId());
}
continue;
@@ -333,7 +335,7 @@ public class Slayer {
int taskLevel = getSlayerDifficulty(c);
for (Task slayerTask : Task.values()) {
if (slayerTask.getDifficulty() == taskLevel) {
if (c.playerLevel[18] >= slayerTask.getLevelReq()) {
if (c.playerLevel[GameConstants.SLAYER] >= slayerTask.getLevelReq()) {
resizeTable(taskLevel);
if (!c.needsNewTask) {
int task = getRandomTask(taskLevel);
2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/SilverCrafting.java
+4 -2
View File
@@ -1,6 +1,8 @@
package com.rs2.game.content.skills.smithing;
import java.util.HashMap;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -96,7 +98,7 @@ public class SilverCrafting {
player.getDialogueHandler().sendStatement("You need a silver bar to do this.");
return;
}
if (player.playerLevel[player.playerCrafting] < silverCraft.getLevel()) {
if (player.playerLevel[GameConstants.CRAFTING] < silverCraft.getLevel()) {
player.getDialogueHandler().sendStatement("You need a crafting level of " + silverCraft.getLevel() + " to make this.");
return;
}
@@ -129,7 +131,7 @@ public class SilverCrafting {
player.getItemAssistant().addItem(silverCraft.getResult(),
1);
player.getPlayerAssistant().addSkillXP(
silverCraft.getExperience(), player.playerCrafting);
silverCraft.getExperience(), GameConstants.CRAFTING);
amnt--;
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/Smelting.java
+35 -34
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.smithing;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -74,7 +75,7 @@ public class Smelting extends SkillHandler {
for (int i = 0; i < data.length; i++) {
if (bartype == data[i][0]) {
// Check player has the correct smithing level
if (c.playerLevel[c.playerSmithing] < data[i][1]) { // Smithing level
if (c.playerLevel[GameConstants.SMITHING] < data[i][1]) { // Smithing level
c.getDialogueHandler().sendStatement("You need a smithing level of at least "+ data[i][1] + " in order smelt this bar.");
return;
}
@@ -94,20 +95,20 @@ public class Smelting extends SkillHandler {
}
}
if (c.playerSkilling[13]) {
if (c.playerSkilling[GameConstants.SMITHING]) {
return;
}
c.playerSkilling[13] = true;
c.playerSkilling[GameConstants.SMITHING] = true;
c.stopPlayerSkill = true;
c.playerSkillProp[13][0] = data[i][0];// index
c.playerSkillProp[13][1] = data[i][1];// Level required
c.playerSkillProp[13][2] = data[i][2];// XP
c.playerSkillProp[13][3] = data[i][3];// primary item required
c.playerSkillProp[13][4] = data[i][4];// secondary item required
c.playerSkillProp[13][5] = data[i][5];// secondary item amount
c.playerSkillProp[13][6] = data[i][6];// output item
c.playerSkillProp[GameConstants.SMITHING][0] = data[i][0];// index
c.playerSkillProp[GameConstants.SMITHING][1] = data[i][1];// Level required
c.playerSkillProp[GameConstants.SMITHING][2] = data[i][2];// XP
c.playerSkillProp[GameConstants.SMITHING][3] = data[i][3];// primary item required
c.playerSkillProp[GameConstants.SMITHING][4] = data[i][4];// secondary item required
c.playerSkillProp[GameConstants.SMITHING][5] = data[i][5];// secondary item amount
c.playerSkillProp[GameConstants.SMITHING][6] = data[i][6];// output item
c.getPacketSender().closeAllWindows();
c.startAnimation(899);
@@ -118,36 +119,36 @@ public class Smelting extends SkillHandler {
public void execute(CycleEventContainer container) {
deleteTime(c);
// Remove primary item
c.getItemAssistant().deleteItem(c.playerSkillProp[13][3], 1);
c.getItemAssistant().deleteItem(c.playerSkillProp[GameConstants.SMITHING][3], 1);
// Check if required and remove secondary items
if (c.playerSkillProp[13][4] > 0 && c.playerSkillProp[13][5] > 0) {
c.getItemAssistant().deleteItem(c.playerSkillProp[13][4], c.playerSkillProp[13][5]);
if (c.playerSkillProp[GameConstants.SMITHING][4] > 0 && c.playerSkillProp[GameConstants.SMITHING][5] > 0) {
c.getItemAssistant().deleteItem(c.playerSkillProp[GameConstants.SMITHING][4], c.playerSkillProp[GameConstants.SMITHING][5]);
}
if (c.playerSkillProp[13][3] == IRON && c.playerSkillProp[13][4] == -1 && c.isSmelting) {
if (c.playerSkillProp[GameConstants.SMITHING][3] == IRON && c.playerSkillProp[GameConstants.SMITHING][4] == -1 && c.isSmelting) {
// Ring of forging
if (c.playerEquipment[c.playerRing] == 2568) {
c.getPacketSender().sendMessage("You receive an " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
c.getPlayerAssistant().addSkillXP(c.playerSkillProp[13][2], c.playerSmithing);
c.getPacketSender().sendMessage("You receive an " + ItemAssistant.getItemName(c.playerSkillProp[GameConstants.SMITHING][6]).toLowerCase() + ".");
c.getItemAssistant().addItem(c.playerSkillProp[GameConstants.SMITHING][6], 1);// item
c.getPlayerAssistant().addSkillXP(c.playerSkillProp[GameConstants.SMITHING][2], GameConstants.SMITHING);
} else {
if (Misc.random(100) >= 50) {
c.getPacketSender().sendMessage("You receive an " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
c.getPlayerAssistant().addSkillXP(c.playerSkillProp[13][2], c.playerSmithing);
c.getPacketSender().sendMessage("You receive an " + ItemAssistant.getItemName(c.playerSkillProp[GameConstants.SMITHING][6]).toLowerCase() + ".");
c.getItemAssistant().addItem(c.playerSkillProp[GameConstants.SMITHING][6], 1);// item
c.getPlayerAssistant().addSkillXP(c.playerSkillProp[GameConstants.SMITHING][2], GameConstants.SMITHING);
} else {
c.getPacketSender().sendMessage("You failed to smelt the iron bar.");
}
}
} else if (c.playerSkillProp[13][3] == GOLD && c.playerEquipment[c.playerHands] == 776 && c.isSmelting) {
c.getPacketSender().sendMessage("You receive a " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
c.getPlayerAssistant().addSkillXP(56.2, c.playerSmithing);
} else if (c.playerSkillProp[GameConstants.SMITHING][3] == GOLD && c.playerEquipment[c.playerHands] == 776 && c.isSmelting) {
c.getPacketSender().sendMessage("You receive a " + ItemAssistant.getItemName(c.playerSkillProp[GameConstants.SMITHING][6]).toLowerCase() + ".");
c.getItemAssistant().addItem(c.playerSkillProp[GameConstants.SMITHING][6], 1);// item
c.getPlayerAssistant().addSkillXP(56.2, GameConstants.SMITHING);
} else if (c.isSmelting){
c.getPacketSender().sendMessage("You receive a " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
c.getPlayerAssistant().addSkillXP(c.playerSkillProp[13][2], c.playerSmithing);
c.getPacketSender().sendMessage("You receive a " + ItemAssistant.getItemName(c.playerSkillProp[GameConstants.SMITHING][6]).toLowerCase() + ".");
c.getItemAssistant().addItem(c.playerSkillProp[GameConstants.SMITHING][6], 1);// item
c.getPlayerAssistant().addSkillXP(c.playerSkillProp[GameConstants.SMITHING][2], GameConstants.SMITHING);
}
////////////////////// CHECKING //////////////////////
@@ -155,7 +156,7 @@ public class Smelting extends SkillHandler {
resetSmelting(c);
container.stop();
}
if (!c.playerSkilling[13]) {
if (!c.playerSkilling[GameConstants.SMITHING]) {
resetSmelting(c);
container.stop();
}
@@ -163,13 +164,13 @@ public class Smelting extends SkillHandler {
resetSmelting(c);
container.stop();
}
if (!c.getItemAssistant().playerHasItem(c.playerSkillProp[13][3], 1)) {
if (!c.getItemAssistant().playerHasItem(c.playerSkillProp[GameConstants.SMITHING][3], 1)) {
c.getPacketSender().sendMessage("You don't have enough ores to continue smelting!");
resetSmelting(c);
container.stop();
}
if (c.playerSkillProp[13][4] > 0) {
if (!c.getItemAssistant().playerHasItem(c.playerSkillProp[13][4], c.playerSkillProp[13][5])) {
if (c.playerSkillProp[GameConstants.SMITHING][4] > 0) {
if (!c.getItemAssistant().playerHasItem(c.playerSkillProp[GameConstants.SMITHING][4], c.playerSkillProp[GameConstants.SMITHING][5])) {
c.getPacketSender().sendMessage("You don't have enough ores to continue smelting!");
resetSmelting(c);
container.stop();
@@ -188,7 +189,7 @@ public class Smelting extends SkillHandler {
@Override
public void execute(CycleEventContainer container) {
if (!c.playerSkilling[13]) {
if (!c.playerSkilling[GameConstants.SMITHING]) {
resetSmelting(c);
container.stop();
return;
@@ -326,11 +327,11 @@ public class Smelting extends SkillHandler {
* Resets Smelting
*/
public static void resetSmelting(Player player) {
player.playerSkilling[13] = false;
player.playerSkilling[GameConstants.SMITHING] = false;
player.stopPlayerSkill = false;
player.isSmelting = false;
for (int i = 0; i < 7; i++) {
player.playerSkillProp[13][i] = -1;
player.playerSkillProp[GameConstants.SMITHING][i] = -1;
}
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/Smithing.java
+3 -2
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.smithing;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -34,7 +35,7 @@ public class Smithing {
private void checkBar(Player player, int level, int amountToMake, int type) {
SmithingData item = SmithingData.forId(type);
if (item != null) {
if (player.playerLevel[player.playerSmithing] >= item.getLvl()) {
if (player.playerLevel[GameConstants.SMITHING] >= item.getLvl()) {
if (type == item.getId()) {
addItem = item.getId();
removeAmount = item.getAmount();
@@ -91,7 +92,7 @@ public class Smithing {
} else {
player.getItemAssistant().addItem(addItem, 1);
}
player.getPlayerAssistant().addSkillXP(XP, player.playerSmithing);
player.getPlayerAssistant().addSkillXP(XP, GameConstants.SMITHING);
player.doAmount--;
}
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/SmithingInterface.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.smithing;
import com.rs2.GameConstants;
import com.rs2.game.players.Player;
public class SmithingInterface {
@@ -666,7 +667,7 @@ public class SmithingInterface {
}
private String GetForlvl(int i, Player c) {
if (c.playerLevel[13] >= i) {
if (c.playerLevel[GameConstants.SMITHING] >= i) {
return "@whi@";
}
2006Scape Server/src/main/java/com/rs2/game/content/skills/smithing/Superheat.java
+7 -6
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.smithing;
import com.rs2.GameConstants;
import com.rs2.game.content.combat.magic.CastRequirements;
import com.rs2.game.content.music.sound.SoundList;
import com.rs2.game.items.ItemAssistant;
@@ -39,15 +40,15 @@ public class Superheat {
return false;
}
if (itemID == 444 && player.playerEquipment[player.playerHands] == 776) {
player.getPlayerAssistant().addSkillXP(56.2, player.playerSmithing);
player.getPlayerAssistant().addSkillXP(56.2, GameConstants.SMITHING);
} else {
player.getPlayerAssistant().addSkillXP(smelt[7], player.playerSmithing);
player.getPlayerAssistant().addSkillXP(smelt[7], GameConstants.SMITHING);
}
if (player.playerLevel[player.playerSmithing] < smelt[6]) {
if (player.playerLevel[GameConstants.SMITHING] < smelt[6]) {
player.getPacketSender().sendMessage("You need a smithing level of " + smelt[6] + " to superheat this ore.");
return false;
}
if (player.playerLevel[player.playerMagic] < 43) {
if (player.playerLevel[GameConstants.MAGIC] < 43) {
player.getPacketSender().sendMessage("You need a magic level of 43 to superheat this ore.");
return false;
}
@@ -55,12 +56,12 @@ public class Superheat {
player.getItemAssistant().deleteItem(smelt[2], smelt[3]);
CastRequirements.deleteRunes(player, new int[][]{{554, 4}, {561, 1}});
player.getItemAssistant().addItem(smelt[4], 1);
player.getPlayerAssistant().addSkillXP(53, player.playerMagic);
player.getPlayerAssistant().addSkillXP(53, GameConstants.MAGIC);
player.startAnimation(722);
player.gfx0(148);
player.getPacketSender().sendSound(SoundList.SUPERHEAT, 100, 0);
if (itemID != 444) {
player.getPlayerAssistant().addSkillXP(smelt[7], player.playerSmithing);
player.getPlayerAssistant().addSkillXP(smelt[7], GameConstants.SMITHING);
}
player.getPacketSender().sendFrame106(6);
return true;
2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/Pickpocket.java
+6 -5
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.thieving;
import com.rs2.GameConstants;
import com.rs2.GameEngine;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
@@ -238,13 +239,13 @@ public class Pickpocket extends SkillHandler {
}
for (final npcData n : npcData.values()) {
if (npcId == n.getNpc(npcId)) {
if (player.playerLevel[player.playerThieving] < n.getLevel()) {
if (player.playerLevel[GameConstants.THIEVING] < n.getLevel()) {
player.getDialogueHandler().sendStatement("You need a Thieving level of " + n.getLevel() + " to pickpocket the " + NpcHandler.getNpcListName(n.getNpc(npcId)).toLowerCase() + ".");
return;
}
player.getPacketSender().sendMessage("You attempt to pick the " + NpcHandler.getNpcListName(n.getNpc(npcId)).toLowerCase() + "'s pocket.");
player.startAnimation(881);
if (Misc.random(player.playerLevel[17] + 5) < Misc.random(n.getLevel())) {
if (Misc.random(player.playerLevel[GameConstants.THIEVING] + 5) < Misc.random(n.getLevel())) {
RandomEventHandler.addRandom(player);
CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() {
@Override
@@ -256,8 +257,8 @@ public class Pickpocket extends SkillHandler {
player.playerStun = true;
player.setHitDiff(n.getDamage());
player.setHitUpdateRequired(true);
player.playerLevel[3] -= n.getDamage();
player.getPlayerAssistant().refreshSkill(3);
player.playerLevel[GameConstants.HITPOINTS] -= n.getDamage();
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
player.gfx100(80);
player.startAnimation(404);
player.getPacketSender().sendSound(SoundList.STUNNED, 100, 0);
@@ -306,7 +307,7 @@ public class Pickpocket extends SkillHandler {
public void execute(CycleEventContainer container) {
player.getPacketSender().sendMessage(message2);
player.getPlayerAssistant().addSkillXP((int) n.getXp(),
player.playerThieving);
GameConstants.THIEVING);
int[] random = n.getPickPockets()[Misc.random(n.getPickPockets().length - 1)];
player.getItemAssistant().addItem(random[0], random[1] + (random.length > 2 ? Misc.random(random[2]) : 0));
container.stop();
2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/Stalls.java
+3 -3
View File
@@ -131,12 +131,12 @@ public class Stalls {
}
}
// Thieving level too low
if (p.playerLevel[p.playerThieving] < s.getLevel()) {
if (p.playerLevel[GameConstants.THIEVING] < s.getLevel()) {
p.getDialogueHandler().sendStatement("You must have a thieving level of " + s.getLevel() + " to steal from this stall.");
return;
}
// Failed, was caught red handed
if(Misc.random(4) == 1 && p.playerLevel[p.playerThieving] < 99) {
if(Misc.random(4) == 1 && p.playerLevel[GameConstants.THIEVING] < 99) {
failGuards(p);
return;
}
@@ -144,7 +144,7 @@ public class Stalls {
RandomEventHandler.addRandom(p);
int respawnTime = getRespawnTime(s.getObject());
GameEngine.objectHandler.createAnObject(p, 634, x, y, 0, getSpecialFace(p, s));
p.getPlayerAssistant().addSkillXP((int) s.getXp(), p.playerThieving);
p.getPlayerAssistant().addSkillXP((int) s.getXp(), GameConstants.THIEVING);
int[] random = s.getStalls()[Misc.random(s.getStalls().length-1)];
s.respawnTime = System.currentTimeMillis() + (respawnTime * GameConstants.CYCLE_TIME);
p.getPacketSender().sendMessage("You steal a " + ItemAssistant.getItemName(random[0]) + " from the stall.");
2006Scape Server/src/main/java/com/rs2/game/content/skills/thieving/ThieveOther.java
+5 -4
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.thieving;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -33,7 +34,7 @@ public class ThieveOther {
}
public static void stealFromChest(Player client, int level, int exp, int reward, int amount) {
if (client.playerLevel[client.playerThieving] < level) {
if (client.playerLevel[GameConstants.THIEVING] < level) {
client.getPacketSender().sendMessage("You need " + level + " thieving to thieve this chest.");
return;
}
@@ -42,7 +43,7 @@ public class ThieveOther {
return;
}
client.getItemAssistant().addItem(reward, amount);
client.getPlayerAssistant().addSkillXP(exp, client.playerThieving);
client.getPlayerAssistant().addSkillXP(exp, GameConstants.THIEVING);
client.getPacketSender().sendMessage("You steal " + ItemAssistant.getItemName(reward) + " from the chest.");
}
@@ -51,7 +52,7 @@ public class ThieveOther {
client.getPacketSender().sendMessage("You need a lock pick to do that.");
return;
}
if (client.playerLevel[client.playerThieving] < level) {
if (client.playerLevel[GameConstants.THIEVING] < level) {
client.getPacketSender().sendMessage("You need " + level + " thieving to thieve this chest.");
return;
}
@@ -75,7 +76,7 @@ public class ThieveOther {
}
client.getPlayerAssistant().movePlayer(x, y, client.heightLevel);
client.getPacketSender().sendMessage("You manage to pick the lock.");
client.getPlayerAssistant().addSkillXP(exp, client.playerThieving);
client.getPlayerAssistant().addSkillXP(exp, GameConstants.THIEVING);
container.stop();
}
@Override
2006Scape Server/src/main/java/com/rs2/game/content/skills/woodcutting/Woodcutting.java
+4 -3
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.skills.woodcutting;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -126,7 +127,7 @@ public class Woodcutting {
public static void handleCanoe(final Player player, final int objectId) {
Boolean gotAxe = false;
if (player.playerLevel[player.playerWoodcutting] < 12) {
if (player.playerLevel[GameConstants.WOODCUTTING] < 12) {
player.getPacketSender().sendMessage("You need a woodcutting level of at least 12 to use the canoe station.");
return;
}
@@ -147,7 +148,7 @@ public class Woodcutting {
int type = axes[0];
int level = axes[1];
int anim = axes[3];
if (player.playerLevel[player.playerWoodcutting] >= level && player.getItemAssistant().playerHasItem(type) || player.playerLevel[player.playerWoodcutting] >= level && player.playerEquipment[player.playerWeapon] == type) {
if (player.playerLevel[GameConstants.WOODCUTTING] >= level && player.getItemAssistant().playerHasItem(type) || player.playerLevel[GameConstants.WOODCUTTING] >= level && player.playerEquipment[player.playerWeapon] == type) {
player.turnPlayerTo(player.objectX, player.objectY);
player.startAnimation(anim);
CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() {
@@ -239,7 +240,7 @@ public class Woodcutting {
p.getPacketSender().sendMessage("This skill is currently disabled.");
return;
}
int wcLevel = p.playerLevel[8];
int wcLevel = p.playerLevel[GameConstants.WOODCUTTING];
p.woodcuttingAxe = -1;
treeData tree = treeData.getTree(objectId);
p.turnPlayerTo(x, y);
2006Scape Server/src/main/java/com/rs2/game/content/traveling/DesertCactus.java
+3 -2
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.traveling;
import com.rs2.GameConstants;
import com.rs2.GameEngine;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
@@ -64,7 +65,7 @@ public class DesertCactus {
int fail = Misc.random(2);
if (fail == 1) {
c.getPacketSender().sendMessage("You failed to cut the cactus.");
c.getPlayerAssistant().addSkillXP(1, c.playerWoodcutting);
c.getPlayerAssistant().addSkillXP(1, GameConstants.WOODCUTTING);
return;
}
c.startAnimation(CUTTING_ANIMATION);
@@ -74,7 +75,7 @@ public class DesertCactus {
if (c.getItemAssistant().playerHasItem(element[0])) {
c.getItemAssistant().deleteItem(element[0], c.getItemAssistant().getItemSlot(element[0]), 1);
c.getItemAssistant().addItem(element[1], 1);
c.getPlayerAssistant().addSkillXP(10, c.playerWoodcutting);
c.getPlayerAssistant().addSkillXP(10, GameConstants.WOODCUTTING);
}
}
}
2006Scape Server/src/main/java/com/rs2/game/content/traveling/DesertHeat.java
+5 -4
View File
@@ -1,5 +1,6 @@
package com.rs2.game.content.traveling;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -51,7 +52,7 @@ public class DesertHeat {
player.getPacketSender().sendMessage("You should get a waterskin for any traveling in the desert.");
player.handleHitMask(DAMAGE);
player.dealDamage(DAMAGE);
player.getPlayerAssistant().refreshSkill(player.playerHitpoints);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
}
private static int getClothes(Player player) {
@@ -78,7 +79,7 @@ public class DesertHeat {
public static void callHeat(final Player player) {
if (!Boundary.isIn(player, Boundary.DESERT)
|| player.playerLevel[player.playerHitpoints] < 0
|| player.playerLevel[GameConstants.HITPOINTS] <= 0
|| preventHeat(player)) {
return;
}
@@ -86,7 +87,7 @@ public class DesertHeat {
@Override
public void execute(CycleEventContainer container) {
if (!Boundary.isIn(player, Boundary.DESERT)
|| player.playerLevel[player.playerHitpoints] < 0
|| player.playerLevel[GameConstants.HITPOINTS] <= 0
|| player.disconnected
|| preventHeat(player)) {
container.stop();
@@ -98,7 +99,7 @@ public class DesertHeat {
doDamage(player);
}
container.stop();
} else if (player.playerLevel[player.playerHitpoints] < 0) {
} else if (player.playerLevel[GameConstants.HITPOINTS] <= 0) {
player.isDead = true;
container.stop();
}
2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java
+5 -4
View File
@@ -1,5 +1,6 @@
package com.rs2.game.dialogues;
import com.rs2.GameConstants;
import com.rs2.game.bots.Bot;
import com.rs2.game.bots.BotHandler;
import com.rs2.game.content.skills.crafting.JewelryMaking;
@@ -566,7 +567,7 @@ public class DialogueOptions {
player.getItemAssistant().addItem(1953, 1);
player.getItemAssistant().addItem(1925, 1);
player.getItemAssistant().addItem(1931, 1);
player.getPlayerAssistant().addSkillXP(1, player.playerCooking);
player.getPlayerAssistant().addSkillXP(1, GameConstants.COOKING);
player.nextChat = 0;
} else if (player.dialogueAction == 3205) {
player.getItemAssistant().deleteItem(1933, 1);
@@ -574,7 +575,7 @@ public class DialogueOptions {
player.getItemAssistant().addItem(1953, 1);
player.getItemAssistant().addItem(1925, 1);
player.getItemAssistant().addItem(1935, 1);
player.getPlayerAssistant().addSkillXP(1, player.playerCooking);
player.getPlayerAssistant().addSkillXP(1, GameConstants.COOKING);
player.nextChat = 0;
} else if (player.dialogueAction == 189) {
player.getDialogueHandler().sendDialogues(3210, player.npcType);
@@ -796,7 +797,7 @@ public class DialogueOptions {
player.getItemAssistant().addItem(2307, 1);
player.getItemAssistant().addItem(1925, 1);
player.getItemAssistant().addItem(1931, 1);
player.getPlayerAssistant().addSkillXP(1, player.playerCooking);
player.getPlayerAssistant().addSkillXP(1, GameConstants.COOKING);
player.nextChat = 0;
} else if (player.dialogueAction == 3205) {
player.getItemAssistant().deleteItem(1933, 1);
@@ -804,7 +805,7 @@ public class DialogueOptions {
player.getItemAssistant().addItem(1953, 1);
player.getItemAssistant().addItem(1925, 1);
player.getItemAssistant().addItem(1935, 1);
player.getPlayerAssistant().addSkillXP(1, player.playerCooking);
player.getPlayerAssistant().addSkillXP(1, GameConstants.COOKING);
player.nextChat = 0;
} else if (player.dialogueAction == 189) {
player.getDialogueHandler().sendDialogues(3212, player.npcType);
2006Scape Server/src/main/java/com/rs2/game/items/ItemAssistant.java
+8 -8
View File
@@ -1341,32 +1341,32 @@ public class ItemAssistant {
|| targetSlot == ItemConstants.HAT
|| targetSlot == ItemConstants.HANDS) {
if (player.defenceLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[1]) < player.defenceLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.DEFENCE]) < player.defenceLevelReq) {
player.getPacketSender().sendMessage("You need a defence level of " + player.defenceLevelReq + " to wear this item.");
canWearItem = false;
}
}
if (player.rangeLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[4]) < player.rangeLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.RANGED]) < player.rangeLevelReq) {
player.getPacketSender().sendMessage("You need a range level of " + player.rangeLevelReq + " to wear this item.");
canWearItem = false;
}
}
if (player.magicLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[6]) < player.magicLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.MAGIC]) < player.magicLevelReq) {
player.getPacketSender().sendMessage("You need a magic level of " + player.magicLevelReq + " to wear this item.");
canWearItem = false;
}
}
}
if (player.slayerLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[18]) < player.slayerLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.SLAYER]) < player.slayerLevelReq) {
player.getPacketSender().sendMessage("You need a slayer level of " + player.slayerLevelReq + " to wear this item.");
canWearItem = false;
}
}
if (player.agilityLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[16]) < player.agilityLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.AGILITY]) < player.agilityLevelReq) {
player.getPacketSender().sendMessage("You need a agility level of " + player.agilityLevelReq + " to wear this item.");
canWearItem = false;
}
@@ -1374,19 +1374,19 @@ public class ItemAssistant {
// Weapon
if (targetSlot == ItemConstants.WEAPON) {
if (player.attackLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[0]) < player.attackLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.ATTACK]) < player.attackLevelReq) {
player.getPacketSender().sendMessage("You need an attack level of " + player.attackLevelReq + " to wield this weapon.");
canWearItem = false;
}
}
if (player.rangeLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[4]) < player.rangeLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.RANGED]) < player.rangeLevelReq) {
player.getPacketSender().sendMessage("You need a range level of " + player.rangeLevelReq + " to wield this weapon.");
canWearItem = false;
}
}
if (player.magicLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[6]) < player.magicLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.MAGIC]) < player.magicLevelReq) {
player.getPacketSender().sendMessage("You need a magic level of " + player.magicLevelReq + " to wield this weapon.");
canWearItem = false;
}
2006Scape Server/src/main/java/com/rs2/game/items/UseItem.java
+13 -12
View File
@@ -1,5 +1,6 @@
package com.rs2.game.items;
import com.rs2.GameConstants;
import com.rs2.game.content.skills.cooking.Cooking;
import com.rs2.game.content.skills.crafting.BattleStaffs;
import com.rs2.game.content.skills.crafting.GemCutting;
@@ -177,19 +178,19 @@ public class UseItem {
LogCutting.wolfBoneArrow(player);
}
if (itemUsed == 771 && useWith == 946
&& player.playerLevel[player.playerCrafting] > 30) {
&& player.playerLevel[GameConstants.CRAFTING] > 30) {
player.getItemAssistant().deleteItem(771, 1);
player.getItemAssistant().addItem(772, 1);
} else if (player.playerLevel[player.playerCrafting] < 31 && itemUsed == 771
} else if (player.playerLevel[GameConstants.CRAFTING] < 31 && itemUsed == 771
&& useWith == 946) {
player.getPacketSender().sendMessage(
"You need 31 crafting to make this.");
}
if (itemUsed == 946 && useWith == 771
&& player.playerLevel[player.playerCrafting] > 30) {
&& player.playerLevel[GameConstants.CRAFTING] > 30) {
player.getItemAssistant().deleteItem(771, 1);
player.getItemAssistant().addItem(772, 1);
} else if (player.playerLevel[player.playerCrafting] < 31 && itemUsed == 946
} else if (player.playerLevel[GameConstants.CRAFTING] < 31 && itemUsed == 946
&& useWith == 771) {
player.getPacketSender().sendMessage(
"You need 31 crafting to make this.");
@@ -241,12 +242,12 @@ public class UseItem {
player.getItemAssistant().deleteItem(4548, 1);
}
if (itemUsed == 1095 && useWith == 2370 || itemUsed == 2370
&& useWith == 1095 && player.playerLevel[player.playerCrafting] > 43) {// chaps
&& useWith == 1095 && player.playerLevel[GameConstants.CRAFTING] > 43) {// chaps
player.getItemAssistant().deleteItem(2370, 1);
player.getItemAssistant().deleteItem(1095, 1);
player.getItemAssistant().addItem(1097, 1);
player.getPlayerAssistant().addSkillXP(42, player.playerCrafting);
} else if (itemUsed == 1095 && useWith == 2370 || itemUsed == 2370 && useWith == 1095 && player.playerLevel[player.playerCrafting] < 44) {
player.getPlayerAssistant().addSkillXP(42, GameConstants.CRAFTING);
} else if (itemUsed == 1095 && useWith == 2370 || itemUsed == 2370 && useWith == 1095 && player.playerLevel[GameConstants.CRAFTING] < 44) {
player.getPacketSender().sendMessage("You need 44 crafting to make this.");
}
if (itemUsed == 946 && useWith == 1963 || itemUsed == 1963 && useWith == 946) {
@@ -259,12 +260,12 @@ public class UseItem {
player.getItemAssistant().addItem(1975, 1);
player.getPacketSender().sendMessage("You slice your chocolate bar.");
}
if (itemUsed == 1129 && useWith == 2370 || itemUsed == 2370 && useWith == 1129 && player.playerLevel[player.playerCrafting] > 40) {// body
if (itemUsed == 1129 && useWith == 2370 || itemUsed == 2370 && useWith == 1129 && player.playerLevel[GameConstants.CRAFTING] > 40) {// body
player.getItemAssistant().deleteItem(2370, 1);
player.getItemAssistant().deleteItem(1129, 1);
player.getItemAssistant().addItem(1133, 1);
player.getPlayerAssistant().addSkillXP(40, player.playerCrafting);
} else if (itemUsed == 1129 && useWith == 2370 || itemUsed == 2370 && useWith == 1129 && player.playerLevel[player.playerCrafting] < 41) {
player.getPlayerAssistant().addSkillXP(40, GameConstants.CRAFTING);
} else if (itemUsed == 1129 && useWith == 2370 || itemUsed == 2370 && useWith == 1129 && player.playerLevel[GameConstants.CRAFTING] < 41) {
player.getPacketSender().sendMessage("You need 41 crafting to make this.");
}
if (itemUsed == 4593 && useWith == 4591 || useWith == 4591 && itemUsed == 4593) {
@@ -369,11 +370,11 @@ public class UseItem {
if (itemUsed == 1987 && useWith == 1937 || itemUsed == 1937
&& useWith == 1987) {
if (player.playerLevel[player.playerCooking] >= 35) {
if (player.playerLevel[GameConstants.COOKING] >= 35) {
player.getItemAssistant().addItem(1993, 1);
player.getItemAssistant().deleteItem(1937, 1);
player.getItemAssistant().deleteItem(1987, 1);
player.getPlayerAssistant().addSkillXP(200, player.playerCooking);
player.getPlayerAssistant().addSkillXP(200, GameConstants.COOKING);
} else {
player.getPacketSender().sendMessage(
"You need grapes and a jug of water to make wine.");
2006Scape Server/src/main/java/com/rs2/game/items/impl/Dye.java
+2 -1
View File
@@ -1,6 +1,7 @@
package com.rs2.game.items.impl;
import com.rs2.game.items.ItemData;
import com.rs2.GameConstants;
import com.rs2.game.items.ItemAssistant;
import com.rs2.game.players.Player;
@@ -68,7 +69,7 @@ public enum Dye {
player.getItemAssistant().deleteItem(itemUsed, 1);
player.getItemAssistant().deleteItem(useWith, 1);
player.getItemAssistant().addItem(cape.getReward(), 1);
player.getPlayerAssistant().addSkillXP(2.5, player.playerCrafting);
player.getPlayerAssistant().addSkillXP(2.5, GameConstants.CRAFTING);
}
}
}
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);
}
}
2006Scape Server/src/main/java/com/rs2/game/objects/ObjectsActions.java
+27 -27
View File
@@ -318,7 +318,7 @@ public class ObjectsActions {
//if (c.objectX == 2675 && c.objectY == 3170) {
//c.getDH().sendDialogues(79, 0);
//} else {
if (player.playerLevel[player.playerFishing] <= 50) {
if (player.playerLevel[GameConstants.FISHING] <= 50) {
player.getPacketSender().sendMessage("You need a fishing level of 50 or higher to play Fishing Trawler.");
return;
}
@@ -437,16 +437,16 @@ public class ObjectsActions {
case 2112:
if (player.absY == 9756
&& player.playerLevel[player.playerMining] >= 60) {
&& player.playerLevel[GameConstants.MINING] >= 60) {
player.getPlayerAssistant().movePlayer(3046, 9757, 0);
player.getPacketSender()
.sendMessage("You enter the guild.");
} else if (player.absY == 9757
&& player.playerLevel[player.playerMining] >= 60) {
&& player.playerLevel[GameConstants.MINING] >= 60) {
player.getPlayerAssistant().movePlayer(3046, 9756, 0);
player.getPacketSender()
.sendMessage("You enter the guild.");
} else if (player.playerLevel[player.playerMining] < 60) {
} else if (player.playerLevel[GameConstants.MINING] < 60) {
player.getPacketSender().sendMessage(
"You need 60 mining to enter this guild");
}
@@ -677,7 +677,7 @@ public class ObjectsActions {
break;
case 10596:
if (player.playerLevel[player.playerSlayer] < 72) {
if (player.playerLevel[GameConstants.SLAYER] < 72) {
player.getPacketSender().sendMessage(
"You need 72 slayer to enter.");
return;
@@ -761,7 +761,7 @@ public class ObjectsActions {
player.getItemAssistant().deleteItem(4255, 1);
player.getItemAssistant().addItem(1925, 1);
player.getItemAssistant().addItem(1931, 1);
player.getPlayerAssistant().addSkillXP(18, player.playerPrayer);
player.getPlayerAssistant().addSkillXP(18, GameConstants.PRAYER);
}
else
{
@@ -801,14 +801,14 @@ public class ObjectsActions {
case 2634:
if (player.absX == 2837
&& player.playerLevel[player.playerMining] >= 50) {
&& player.playerLevel[GameConstants.MINING] >= 50) {
player.getPlayerAssistant().movePlayer(player.absX + 3,
player.absY, 0);
} else if (player.absX == 2840
&& player.playerLevel[player.playerMining] >= 50) {
&& player.playerLevel[GameConstants.MINING] >= 50) {
player.getPlayerAssistant().movePlayer(player.absX - 3,
player.absY, 0);
} else if (player.playerLevel[player.playerMining] < 50) {
} else if (player.playerLevel[GameConstants.MINING] < 50) {
player.getDialogueHandler().sendStatement("You need 50 mining to pass to this rock slide.");
player.nextChat = 0;
return;
@@ -1415,7 +1415,7 @@ public class ObjectsActions {
break;
case 9295:
if (player.playerLevel[player.playerAgility] < 51) {
if (player.playerLevel[GameConstants.AGILITY] < 51) {
player.getPacketSender().sendMessage(
"You need 51 agility to use this shortcut.");
return;
@@ -1527,7 +1527,7 @@ public class ObjectsActions {
break;
case 2287:
if (player.playerLevel[16] < 35) {
if (player.playerLevel[GameConstants.AGILITY] < 35) {
player.getPacketSender().sendMessage(
"You need 35 agility to enter here!");
return;
@@ -1679,21 +1679,21 @@ public class ObjectsActions {
case 2320:
long clickTimer = 0;
if (player.absY <= 9963 && player.playerLevel[player.playerAgility] > 14 && System.currentTimeMillis() - clickTimer > 2000) {
if (player.absY <= 9963 && player.playerLevel[GameConstants.AGILITY] > 14 && System.currentTimeMillis() - clickTimer > 2000) {
player.getPlayerAssistant().movePlayer(3120, 9970, 0);
player.startAnimation(744);
player.turnPlayerTo(player.objectX, player.objectY);
player.getPacketSender().sendMessage("You swing on the monkey bars.");
player.getPlayerAssistant().addSkillXP(25, player.playerAgility);
player.getPlayerAssistant().addSkillXP(25, GameConstants.AGILITY);
clickTimer = System.currentTimeMillis();
} else if (player.absY <= 9970 && player.playerLevel[player.playerAgility] > 14 && System.currentTimeMillis() - clickTimer > 2000) {
} else if (player.absY <= 9970 && player.playerLevel[GameConstants.AGILITY] > 14 && System.currentTimeMillis() - clickTimer > 2000) {
player.getPlayerAssistant().movePlayer(3120, 9963, 0);
player.startAnimation(744);
player.turnPlayerTo(player.objectX, player.objectY);
player.getPacketSender().sendMessage("You swing on the monkey bars.");
player.getPlayerAssistant().addSkillXP(25, player.playerAgility);
player.getPlayerAssistant().addSkillXP(25, GameConstants.AGILITY);
clickTimer = System.currentTimeMillis();
} else if (player.playerLevel[player.playerAgility] < 15) {
} else if (player.playerLevel[GameConstants.AGILITY] < 15) {
player.getPacketSender().sendMessage("You need 15 agility to use these monkey bars.");
} else {
player.getPacketSender().sendMessage("You can't do the monkey bars here.");
@@ -1904,7 +1904,7 @@ public class ObjectsActions {
player.getItemAssistant().addItem(2130, 1);
player.getItemAssistant().deleteItem(1927, 1);
player.getPlayerAssistant()
.addSkillXP(18, player.playerCooking);
.addSkillXP(18, GameConstants.COOKING);
} else {
player.getPacketSender().sendMessage(
"You need a bucket of milk to do this.");
@@ -2553,14 +2553,14 @@ public class ObjectsActions {
case 10638:
case 411:
case 412:
if (player.playerLevel[5] < player.getPlayerAssistant()
.getLevelForXP(player.playerXP[5])) {
if (player.playerLevel[GameConstants.PRAYER] < player.getPlayerAssistant()
.getLevelForXP(player.playerXP[GameConstants.PRAYER])) {
player.startAnimation(645);
player.playerLevel[5] = player.getPlayerAssistant()
.getLevelForXP(player.playerXP[5]);
player.playerLevel[GameConstants.PRAYER] = player.getPlayerAssistant()
.getLevelForXP(player.playerXP[GameConstants.PRAYER]);
player.getPacketSender().sendMessage(
"You recharge your prayer points.");
player.getPlayerAssistant().refreshSkill(5);
player.getPlayerAssistant().refreshSkill(GameConstants.PRAYER);
} else {
player.getPacketSender().sendMessage(
"You already have full prayer points.");
@@ -2573,14 +2573,14 @@ public class ObjectsActions {
"You can't use this in the wilderness.");
return;
}
if (player.playerLevel[5] < player.getPlayerAssistant()
.getLevelForXP(player.playerXP[5])) {
if (player.playerLevel[GameConstants.PRAYER] < player.getPlayerAssistant()
.getLevelForXP(player.playerXP[GameConstants.PRAYER])) {
player.startAnimation(645);
player.playerLevel[5] = player.getPlayerAssistant()
.getLevelForXP(player.playerXP[5]) + 2;
player.playerLevel[GameConstants.PRAYER] = player.getPlayerAssistant()
.getLevelForXP(player.playerXP[GameConstants.PRAYER]) + 2;
player.getPacketSender().sendMessage(
"You recharge your prayer points.");
player.getPlayerAssistant().refreshSkill(5);
player.getPlayerAssistant().refreshSkill(GameConstants.PRAYER);
} else {
player.getPacketSender().sendMessage(
"You already have full prayer points.");
2006Scape Server/src/main/java/com/rs2/game/objects/impl/Climbing.java
+13 -12
View File
@@ -1,5 +1,6 @@
package com.rs2.game.objects.impl;
import com.rs2.GameConstants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -369,10 +370,10 @@ public class Climbing {
break;
case 2408:
if (client.playerLevel[5] > 0) {
client.playerLevel[5] = 0;
if (client.playerLevel[GameConstants.PRAYER] > 0) {
client.playerLevel[GameConstants.PRAYER] = 0;
}
client.getPlayerAssistant().refreshSkill(5);
client.getPlayerAssistant().refreshSkill(GameConstants.PRAYER);
client.getPacketSender().sendMessage(
"Your prayer is drained as you enter the dungeon.");
client.getPlayerAssistant().movePlayer(2823, 9771, 0);
@@ -442,7 +443,7 @@ public class Climbing {
} else if (client.objectX == 3258 && client.objectY == 3487) {
client.getPlayerAssistant().movePlayer(3257, 3487, 1);
client.resetWalkingQueue();
} else if (client.objectX == 3144 && client.objectY == 3447 && client.playerLevel[client.playerCooking] > 31 && client.playerEquipment[client.playerHat] == 1949) {
} else if (client.objectX == 3144 && client.objectY == 3447 && client.playerLevel[GameConstants.COOKING] > 31 && client.playerEquipment[client.playerHat] == 1949) {
client.getPlayerAssistant().movePlayer(3143, 3448, 1);
client.resetWalkingQueue();
} else if (client.objectX == 3010 && client.objectY == 3515) {
@@ -574,7 +575,7 @@ public class Climbing {
"You go down the trapdoor.");
client.startAnimation(827);
client.getPlayerAssistant().addSkillXP(.5,
client.playerThieving);
GameConstants.THIEVING);
client.getPacketSender().closeAllWindows();
} else if (!client.getItemAssistant().playerHasItem(1523, 1)
&& Misc.random(5) < 2) {
@@ -583,7 +584,7 @@ public class Climbing {
"You go down the trapdoor.");
client.startAnimation(827);
client.getPlayerAssistant().addSkillXP(.5,
client.playerThieving);
GameConstants.THIEVING);
client.getPacketSender().closeAllWindows();
client.resetWalkingQueue();
} else if (client.getItemAssistant().playerHasItem(1523, 1)
@@ -593,9 +594,9 @@ public class Climbing {
client.getPacketSender()
.sendMessage(
"Your thieving has been drained, your fingers feel numb.");
client.playerLevel[17] = client.getPlayerAssistant()
.getLevelForXP(client.playerXP[17]) - 1;
client.getPlayerAssistant().refreshSkill(17);
client.playerLevel[GameConstants.THIEVING] = client.getPlayerAssistant()
.getLevelForXP(client.playerXP[GameConstants.THIEVING]) - 1;
client.getPlayerAssistant().refreshSkill(GameConstants.THIEVING);
client.getItemAssistant().deleteItem(1523, 1);
} else if (!client.getItemAssistant().playerHasItem(1523, 1)
&& Misc.random(5) > 2) {
@@ -604,9 +605,9 @@ public class Climbing {
client.getPacketSender()
.sendMessage(
"Your thieving has been drained, your fingers feel numb.");
client.playerLevel[17] = client.getPlayerAssistant()
.getLevelForXP(client.playerXP[17]) - 1;
client.getPlayerAssistant().refreshSkill(17);
client.playerLevel[GameConstants.THIEVING] = client.getPlayerAssistant()
.getLevelForXP(client.playerXP[GameConstants.THIEVING]) - 1;
client.getPlayerAssistant().refreshSkill(GameConstants.THIEVING);
}
break;
2006Scape Server/src/main/java/com/rs2/game/objects/impl/OtherObjects.java
+3 -2
View File
@@ -1,5 +1,6 @@
package com.rs2.game.objects.impl;
import com.rs2.GameConstants;
import com.rs2.GameEngine;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
@@ -199,7 +200,7 @@ public class OtherObjects {
player.updateRequired = true;
player.poisonMask = 2;
player.dealDamage(nettlesDamage);
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
player.getPacketSender().sendMessage("You have been stung by the nettles.");
player.stopPlayer(false);
}
@@ -218,7 +219,7 @@ public class OtherObjects {
} else if (random == 9) {
player.handleHitMask(damage);
player.dealDamage(damage);
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
container.stop();
} else {
player.getPacketSender().sendMessage("You find nothing of interest.");
2006Scape Server/src/main/java/com/rs2/game/players/Player.java
+26 -47
View File
@@ -1873,28 +1873,6 @@ public abstract class Player {
public int playerRing = 12;
public int playerArrows = 13;
public int playerAttack = 0;
public int playerDefence = 1;
public int playerStrength = 2;
public int playerHitpoints = 3;
public int playerRanged = 4;
public int playerPrayer = 5;
public int playerMagic = 6;
public int playerCooking = 7;
public int playerWoodcutting = 8;
public int playerFletching = 9;
public int playerFishing = 10;
public int playerFiremaking = 11;
public int playerCrafting = 12;
public int playerSmithing = 13;
public int playerMining = 14;
public int playerHerblore = 15;
public int playerAgility = 16;
public int playerThieving = 17;
public int playerSlayer = 18;
public int playerFarming = 19;
public int playerRunecrafting = 20;
public int[] playerEquipment = new int[14];
public int[] playerEquipmentN = new int[14];
public int[] playerLevel = new int[25];
@@ -2530,13 +2508,13 @@ public abstract class Player {
if (isBot) {
return 0;
}
int j = getLevelForXP(playerXP[playerAttack]);
int k = getLevelForXP(playerXP[playerDefence]);
int l = getLevelForXP(playerXP[playerStrength]);
int i1 = getLevelForXP(playerXP[playerHitpoints]);
int j1 = getLevelForXP(playerXP[playerPrayer]);
int k1 = getLevelForXP(playerXP[playerRanged]);
int l1 = getLevelForXP(playerXP[playerMagic]);
int j = getLevelForXP(playerXP[GameConstants.ATTACK]);
int k = getLevelForXP(playerXP[GameConstants.DEFENCE]);
int l = getLevelForXP(playerXP[GameConstants.STRENGTH]);
int i1 = getLevelForXP(playerXP[GameConstants.HITPOINTS]);
int j1 = getLevelForXP(playerXP[GameConstants.PRAYER]);
int k1 = getLevelForXP(playerXP[GameConstants.RANGED]);
int l1 = getLevelForXP(playerXP[GameConstants.MAGIC]);
int combatLevel = (int) ((k + i1 + Math.floor(j1 / 2)) * 0.25D) + 1;
double d = (j + l) * 0.32500000000000001D;
double d1 = Math.floor(k1 * 1.5D) * 0.32500000000000001D;
@@ -2702,12 +2680,12 @@ public abstract class Player {
} else {
str.writeByteA(0); // 0: red hitting - 1: blue hitting
}
if (playerLevel[3] <= 0) {
playerLevel[3] = 0;
if (playerLevel[GameConstants.HITPOINTS] <= 0) {
playerLevel[GameConstants.HITPOINTS] = 0;
isDead = true;
}
str.writeByteC(playerLevel[3]); // Their current hp, for HP bar
str.writeByte(getLevelForXP(playerXP[3]));
str.writeByteC(playerLevel[GameConstants.HITPOINTS]); // Their current hp, for HP bar
str.writeByte(getLevelForXP(playerXP[GameConstants.HITPOINTS]));
}
protected void appendHitUpdate2(Stream str) {
@@ -2720,12 +2698,12 @@ public abstract class Player {
} else {
str.writeByteS(0); // 0: red hitting - 1: blue hitting
}
if (playerLevel[3] <= 0) {
playerLevel[3] = 0;
if (playerLevel[GameConstants.HITPOINTS] <= 0) {
playerLevel[GameConstants.HITPOINTS] = 0;
isDead = true;
}
str.writeByte(playerLevel[3]); // Their current hp, for HP bar
str.writeByteC(getLevelForXP(playerXP[3])); // Their max hp, for HP
str.writeByte(playerLevel[GameConstants.HITPOINTS]); // Their current hp, for HP bar
str.writeByteC(getLevelForXP(playerXP[GameConstants.HITPOINTS])); // Their max hp, for HP
}
public void appendPlayerUpdateBlock(Stream str) {
@@ -3105,9 +3083,9 @@ public abstract class Player {
public void dealDamage(int damage) {
if (teleTimer <= 0) {
playerLevel[3] -= damage;
int difference = playerLevel[3] - damage;
if (difference <= getLevelForXP(playerXP[3]) / 10 && difference > 0)
playerLevel[GameConstants.HITPOINTS] -= damage;
int difference = playerLevel[GameConstants.HITPOINTS] - damage;
if (difference <= getLevelForXP(playerXP[GameConstants.HITPOINTS]) / 10 && difference > 0)
appendRedemption();
getPlayerAssistant().handleROL();
} else {
@@ -3118,20 +3096,21 @@ public abstract class Player {
hitUpdateRequired2 = false;
}
}
getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
}
public void appendRedemption() {
Client c = (Client) PlayerHandler.players[playerId];
if (c.getPrayer().prayerActive[22]) {
int added = c.playerLevel[3] += (int)(c.getLevelForXP(c.playerXP[5]) * .25);
if (added > c.getLevelForXP(c.playerXP[3])) {
c.playerLevel[3] = c.getLevelForXP(c.playerXP[3]);
int added = c.playerLevel[GameConstants.HITPOINTS] += (int)(c.getLevelForXP(c.playerXP[GameConstants.PRAYER]) * .25);
if (added > c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS])) {
c.playerLevel[GameConstants.HITPOINTS] = c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS]);
} else {
c.playerLevel[3] += (int)(getLevelForXP(c.playerXP[5]) * .25);
c.playerLevel[GameConstants.HITPOINTS] += (int)(getLevelForXP(c.playerXP[GameConstants.PRAYER]) * .25);
}
c.playerLevel[5] = 0;
c.getPlayerAssistant().refreshSkill(3);
c.getPlayerAssistant().refreshSkill(5);
c.playerLevel[GameConstants.PRAYER] = 0;
c.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
c.getPlayerAssistant().refreshSkill(GameConstants.PRAYER);
c.gfx0(436);
PrayerDrain.resetPrayers(c);
}
2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java
+15 -15
View File
@@ -41,7 +41,7 @@ public class PlayerAssistant {
}
public boolean savePlayer() {
return (player.wildLevel < 20 && player.playerEquipment[ItemConstants.RING] == 2570 && player.playerLevel[3] > 0 && player.playerLevel[3] <= player.getLevelForXP(player.playerXP[3]) / 10 && player.underAttackBy > 0);
return (player.wildLevel < 20 && player.playerEquipment[ItemConstants.RING] == 2570 && player.playerLevel[GameConstants.HITPOINTS] > 0 && player.playerLevel[GameConstants.HITPOINTS] <= player.getLevelForXP(player.playerXP[GameConstants.HITPOINTS]) / 10 && player.underAttackBy > 0);
}
public void handleROL() {
@@ -98,11 +98,11 @@ public class PlayerAssistant {
player.getPacketSender().sendString("Welcome to " + GameConstants.SERVER_NAME + "\\n", 15257);
int currentDay = player.getLastLogin() - player.lastLoginDate;
if (player.playerLevel[15] < 3) {
if (player.playerLevel[GameConstants.HERBLORE] < 3) {
player.playerLevel[15] = 3;
player.playerXP[15] = 175;
player.getPlayerAssistant().refreshSkill(15);
player.playerLevel[GameConstants.HERBLORE] = 3;
player.playerXP[GameConstants.HERBLORE] = 175;
player.getPlayerAssistant().refreshSkill(GameConstants.HERBLORE);
}
if (player.lastLoginDate <= 0) {
player.getPacketSender().sendString("This is your first time logging in!", 15258);
@@ -178,31 +178,31 @@ public class PlayerAssistant {
int xpToAdd = 0;
if (manta > 0) {
toReturn.add(new GameItem(389, manta));
if (player.playerLevel[player.playerFishing] >= 81) {
if (player.playerLevel[GameConstants.FISHING] >= 81) {
xpToAdd += (manta * 46);
}
}
if (turt > 0) {
toReturn.add(new GameItem(395, turt));
if (player.playerLevel[player.playerFishing] >= 79) {
if (player.playerLevel[GameConstants.FISHING] >= 79) {
xpToAdd += (manta * 38);
}
}
if (lobs > 0) {
toReturn.add(new GameItem(377, lobs));
if (player.playerLevel[player.playerFishing] >= 40) {
if (player.playerLevel[GameConstants.FISHING] >= 40) {
xpToAdd += (manta * 90);
}
}
if (swordFish > 0) {
toReturn.add(new GameItem(371, swordFish));
if (player.playerLevel[player.playerFishing] >= 50) {
if (player.playerLevel[GameConstants.FISHING] >= 50) {
xpToAdd += (manta * 100);
}
}
if (junk > 0)
toReturn.add(new GameItem(685, junk));
player.getPlayerAssistant().addSkillXP(xpToAdd, player.playerFishing);
player.getPlayerAssistant().addSkillXP(xpToAdd, GameConstants.FISHING);
return toReturn;
}
@@ -402,7 +402,7 @@ public class PlayerAssistant {
public int raiseTimer() {
// calculations from https://oldschool.runescape.wiki/w/Energy
double seconds = 60 / (8 + Math.floor(player.playerLevel[player.playerAgility] / 6));
double seconds = 60 / (8 + Math.floor(player.playerLevel[GameConstants.AGILITY] / 6));
return (int) Math.floor(seconds * 1000);
}
@@ -1392,8 +1392,8 @@ public class PlayerAssistant {
player.clickedVamp = false;
} else if (player.isWoodcutting) {
player.isWoodcutting = false;
} else if (player.playerSkilling[10]) {
player.playerSkilling[10] = false;
} else if (player.playerSkilling[GameConstants.FISHING]) {
player.playerSkilling[GameConstants.FISHING] = false;
} else if(player.clickedTree) {
player.clickedTree = false;
}
@@ -1614,7 +1614,7 @@ public class PlayerAssistant {
if (player.freezeTimer > 0) {
return;
}
if (player.isDead || player.playerLevel[3] <= 0) {
if (player.isDead || player.playerLevel[GameConstants.HITPOINTS] <= 0) {
return;
}
@@ -1970,7 +1970,7 @@ public class PlayerAssistant {
player.getPacketSender().sendString("" + player.playerXP[skill] + "", data.get().getFrame6());
player.getPacketSender().sendString("" + getXPForLevel(getLevelForXP(player.playerXP[skill]) + 1) + "", data.get().getFrame7());
if (skill == 5) {
player.getPacketSender().sendString("" + player.playerLevel[5] + "/" + getLevelForXP(player.playerXP[5]) + "", 687);// Prayer
player.getPacketSender().sendString("" + player.playerLevel[GameConstants.PRAYER] + "/" + getLevelForXP(player.playerXP[GameConstants.PRAYER]) + "", 687);// Prayer
}
}
2006Scape Server/src/main/java/com/rs2/net/PacketSender.java
+4 -4
View File
@@ -85,12 +85,12 @@ public class PacketSender {
if (player.questPoints > QuestAssistant.MAXIMUM_QUESTPOINTS || player.playerRights > 2) {
player.questPoints = QuestAssistant.MAXIMUM_QUESTPOINTS;// check for abusers
}
if (player.playerHitpoints < 0) {
if (GameConstants.HITPOINTS < 0) {
player.isDead = true;
}
if (player.playerLevel[player.playerHitpoints] > 99) {
player.playerLevel[player.playerHitpoints] = 99;// check for abusers
player.getPlayerAssistant().refreshSkill(3);
if (player.playerLevel[GameConstants.HITPOINTS] > 99) {
player.playerLevel[GameConstants.HITPOINTS] = 99;// check for abusers
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
}
if (player.tutorialProgress > 0 && player.tutorialProgress < 36 && GameConstants.TUTORIAL_ISLAND) {
player.getPacketSender().sendMessage("@blu@Continue the tutorial from the last step you were on.@bla@");
2006Scape Server/src/main/java/com/rs2/net/packets/impl/Bank10.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.net.packets.impl;
import com.rs2.GameConstants;
import com.rs2.game.content.random.PartyRoom;
import com.rs2.game.content.skills.crafting.JewelryMaking;
import com.rs2.game.players.Player;
@@ -86,7 +87,7 @@ public class Bank10 implements PacketType {
case 1121:
case 1122:
case 1123:
player.getSmithing().readInput(player, player.playerLevel[player.playerSmithing], removeId, 10);
player.getSmithing().readInput(player, player.playerLevel[GameConstants.SMITHING], removeId, 10);
break;
}
2006Scape Server/src/main/java/com/rs2/net/packets/impl/Bank5.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.net.packets.impl;
import com.rs2.GameConstants;
import com.rs2.game.content.random.PartyRoom;
import com.rs2.game.content.skills.crafting.JewelryMaking;
import com.rs2.game.players.Player;
@@ -88,7 +89,7 @@ public class Bank5 implements PacketType {
case 1121:
case 1122:
case 1123:
player.getSmithing().readInput(player, player.playerLevel[player.playerSmithing], removeId, 5);
player.getSmithing().readInput(player, player.playerLevel[GameConstants.SMITHING], removeId, 5);
break;
}
}
2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickingButtons.java
+5 -4
View File
@@ -1,5 +1,6 @@
package com.rs2.net.packets.impl;
import com.rs2.GameConstants;
import com.rs2.game.content.combat.CombatConstants;
import com.rs2.game.content.combat.Specials;
import com.rs2.game.content.combat.magic.*;
@@ -125,7 +126,7 @@ public class ClickingButtons implements PacketType {
"You can't do this in trade!");
return;
}
if (player.playerLevel[6] < 15) {
if (player.playerLevel[GameConstants.MAGIC] < 15) {
player.getPacketSender().sendString(
"You need a magic level of @blu@15 @bla@to cast bones to bananas",
357);
@@ -149,7 +150,7 @@ public class ClickingButtons implements PacketType {
player.getItemAssistant().deleteItem(557, 2);
player.getItemAssistant().deleteItem(555, 2);
player.getPlayerAssistant().addSkillXP(40, 6);
player.getPlayerAssistant().refreshSkill(6);
player.getPlayerAssistant().refreshSkill(GameConstants.MAGIC);
player.startAnimation(722);
player.gfx100(141);
player.getPacketSender().sendFrame106(6);
@@ -169,7 +170,7 @@ public class ClickingButtons implements PacketType {
"You can't do this in trade!");
return;
}
if (player.playerLevel[6] < 60) {
if (player.playerLevel[GameConstants.MAGIC] < 60) {
player.getPacketSender().sendString("You need a magic level of @blu@60 @blu@ to cast bones to peaches.", 357);
player.getPacketSender().sendChatInterface(356);
return;
@@ -193,7 +194,7 @@ public class ClickingButtons implements PacketType {
player.getItemAssistant().deleteItem(557, 4);
player.getItemAssistant().deleteItem(555, 4);
player.getPlayerAssistant().addSkillXP(40, 6);
player.getPlayerAssistant().refreshSkill(6);
player.getPlayerAssistant().refreshSkill(GameConstants.MAGIC);
player.startAnimation(722);
player.gfx100(311);
player.getPacketSender().sendFrame106(6);
2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java
+3 -3
View File
@@ -171,7 +171,7 @@ public class Commands implements PacketType {
break;
case "prayer":
player.getPacketSender().sendMessage(String.format("Prayer points: %d", player.playerLevel[5]));
player.getPacketSender().sendMessage(String.format("Prayer points: %d", player.playerLevel[GameConstants.PRAYER]));
break;
case "snow":
Calendar date = new GregorianCalendar();
@@ -683,11 +683,11 @@ public class Commands implements PacketType {
break;
case "hp":
player.getPacketSender().sendMessage("You attributed yourself 999,999 hitpoints.");
player.playerLevel[3] = 999999;
player.playerLevel[GameConstants.HITPOINTS] = 999999;
break;
case "pray":
player.getPacketSender().sendMessage("You attributed yourself 999,999 prayer points.");
player.playerLevel[5] = 999999;
player.playerLevel[GameConstants.PRAYER] = 999999;
break;
case "setlevel":
case "level":
2006Scape Server/src/main/java/com/rs2/net/packets/impl/DropItem.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class DropItem implements PacketType {
player.getItemAssistant().deleteItem(itemId, slot, player.playerItemsN[slot]);
player.handleHitMask(explosiveHit);
player.dealDamage(explosiveHit);
player.getPlayerAssistant().refreshSkill(3);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
player.forcedText = "Ow! That really hurt!";
player.forcedChatUpdateRequired = true;
player.updateRequired = true;
2006Scape Server/src/main/java/com/rs2/net/packets/impl/ItemOnObject.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.net.packets.impl;
import com.rs2.GameConstants;
import com.rs2.game.content.combat.range.DwarfCannon;
import com.rs2.game.content.skills.cooking.Cooking;
import com.rs2.game.content.skills.cooking.CookingTutorialIsland;
@@ -149,7 +150,7 @@ public class ItemOnObject implements PacketType {
player.startAnimation(883);
player.getItemAssistant().addItem(2130, 1);
player.getItemAssistant().deleteItem(1927, 1);
player.getPlayerAssistant().addSkillXP(18, player.playerCooking);
player.getPlayerAssistant().addSkillXP(18, GameConstants.COOKING);
} else {
player.getPacketSender().sendMessage("You need a bucket of milk to do this.");
}
2006Scape Server/src/main/java/com/rs2/net/packets/impl/MagicOnFloorItems.java
+3 -2
View File
@@ -1,5 +1,6 @@
package com.rs2.net.packets.impl;
import com.rs2.GameConstants;
import com.rs2.GameEngine;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
@@ -56,7 +57,7 @@ public class MagicOnFloorItems implements PacketType {
MagicData.MAGIC_SPELLS[51][4], 50, 10, 0, 50);
player.getPlayerAssistant().addSkillXP(
MagicData.MAGIC_SPELLS[51][7], 6);
player.getPlayerAssistant().refreshSkill(6);
player.getPlayerAssistant().refreshSkill(GameConstants.MAGIC);
player.stopMovement();
CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() {
@Override
@@ -107,7 +108,7 @@ public class MagicOnFloorItems implements PacketType {
offX, offY, 50, 70, MagicData.MAGIC_SPELLS[51][4], 50, 10,
0, 50);
player.getPlayerAssistant().addSkillXP(MagicData.MAGIC_SPELLS[51][7], 6);
player.getPlayerAssistant().refreshSkill(6);
player.getPlayerAssistant().refreshSkill(GameConstants.MAGIC);
player.stopMovement();
}
}
2006Scape Server/src/main/java/com/rs2/net/packets/impl/RemoveItem.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.rs2.net.packets.impl;
import com.rs2.GameConstants;
import com.rs2.game.content.random.PartyRoom;
import com.rs2.game.content.skills.crafting.JewelryMaking;
import com.rs2.game.items.Weight;
@@ -89,7 +90,7 @@ public class RemoveItem implements PacketType {
case 1121:
case 1122:
case 1123:
player.getSmithing().readInput(player, player.playerLevel[player.playerSmithing], removeId, 1);
player.getSmithing().readInput(player, player.playerLevel[GameConstants.SMITHING], removeId, 1);
break;
}
2006Scape Server/src/main/java/com/rs2/net/packets/impl/Walking.java
+3 -2
View File
@@ -1,5 +1,6 @@
package com.rs2.net.packets.impl;
import com.rs2.GameConstants;
import com.rs2.game.content.skills.SkillHandler;
import com.rs2.game.content.skills.cooking.Cooking;
import com.rs2.game.content.skills.core.Fishing;
@@ -36,13 +37,13 @@ public class Walking implements PacketType {
if (player.isTeleporting) {
player.isTeleporting = false;
}
if (player.playerSkilling[10]) {// fishing
if (player.playerSkilling[GameConstants.FISHING]) {// fishing
Fishing.resetFishing(player);
}
if (player.playerIsCooking) {// cooking
Cooking.setCooking(player, false);
}
if (player.playerSkilling[13]) {// smelting
if (player.playerSkilling[GameConstants.SMITHING]) {// smelting
Smelting.resetSmelting(player);
}
if (player.playerStun) {