2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-03 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/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) {