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

Merge pull request #106 from RedSparr0w/champions-guild

Browse Source 
fixup champions guild
This commit is contained in:
Josh Shippam
2019-10-25 15:17:41 +01:00
committed by GitHub
parent 3743ebf4da 441ca60292
commit 551e785b94
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/content/guilds/Guilds.java
+3 -2
View File
@@ -115,8 +115,9 @@ public class Guilds {
public static boolean checkRequirments(Client c, int objectId) {
switch (objectId) {
case 1805: // Champions Guild
if (c.questPoints < QuestAssistant.MAXIMUM_QUESTPOINTS) {
c.getDialogueHandler().sendStatement("You need " + QuestAssistant.MAXIMUM_QUESTPOINTS + " quest points to enter this guild!");
int requiredQP = Math.min(32, QuestAssistant.MAXIMUM_QUESTPOINTS);
if (c.questPoints < requiredQP) {
c.getDialogueHandler().sendStatement("You need " + requiredQP + " quest points to enter this guild!");
c.nextChat = 0;
return false;
}
2006Redone Server/src/redone/game/npcs/NpcActions.java
+6 -5
View File
@@ -90,12 +90,12 @@ public class NpcActions {
case 537:
case 536:
if (c.questPoints >= QuestAssistant.MAXIMUM_QUESTPOINTS) {
int requiredQP = Math.min(32, QuestAssistant.MAXIMUM_QUESTPOINTS);
if (c.questPoints >= requiredQP) {
c.getDialogueHandler().sendDialogues(1373, npcType);
} else {
c.getActionSender().sendMessage(
"You need " + QuestAssistant.MAXIMUM_QUESTPOINTS
+ " quest points to open this shop.");
"You need " + requiredQP + " quest points to open this shop.");
}
break;
@@ -1005,11 +1005,12 @@ public class NpcActions {
case 537:
case 536:
if (c.questPoints >= QuestAssistant.MAXIMUM_QUESTPOINTS) {
int requiredQP = Math.min(32, QuestAssistant.MAXIMUM_QUESTPOINTS);
if (c.questPoints >= requiredQP) {
c.getShopAssistant().openShop(npcType);
} else {
c.getActionSender().sendMessage(
"You need 19 quest points to open this shop.");
"You need " + requiredQP + " quest points to open this shop.");
}
break;
2006Redone Server/src/redone/game/objects/impl/Climbing.java
+7 -8
View File
@@ -42,6 +42,7 @@ public class Climbing {
}
public static void processClimbing(Client client) {
int chapionsGuildRequiredQP = Math.min(32, QuestAssistant.MAXIMUM_QUESTPOINTS);
switch (client.objectId) {
case 9584:
if (client.objectX == 2932 && client.objectY == 3282) {
@@ -134,13 +135,12 @@ public class Climbing {
} else if (client.absY == 3445) {
client.getPlayerAssistant().movePlayer(3260, 3449, 1);
} else if (client.absY == 3358
&& client.questPoints >= QuestAssistant.MAXIMUM_QUESTPOINTS) {
&& client.questPoints >= chapionsGuildRequiredQP) {
client.getPlayerAssistant().movePlayer(client.absX, 3354, 1);
} else if (client.absY == 3358
&& client.questPoints < QuestAssistant.MAXIMUM_QUESTPOINTS) {
&& client.questPoints < chapionsGuildRequiredQP) {
client.getActionSender().sendMessage(
"You need " + QuestAssistant.MAXIMUM_QUESTPOINTS
+ " quest points to use these stairs.");
"You need " + chapionsGuildRequiredQP + " quest points to use these stairs.");
} else if (client.absX == 3180) {
client.getPlayerAssistant().movePlayer(3176, client.absY, 1);
} else if (client.absX == 3159) {
@@ -160,13 +160,12 @@ public class Climbing {
if (client.absX == 3102) {
client.getPlayerAssistant().movePlayer(3098, 3266, 0);
} else if (client.absY == 3354
&& client.questPoints >= QuestAssistant.MAXIMUM_QUESTPOINTS) {
&& client.questPoints >= chapionsGuildRequiredQP) {
client.getPlayerAssistant().movePlayer(client.absX, 3358, 0);
} else if (client.absY == 3358
&& client.questPoints < QuestAssistant.MAXIMUM_QUESTPOINTS) {
&& client.questPoints < chapionsGuildRequiredQP) {
client.getActionSender().sendMessage(
"You need " + QuestAssistant.MAXIMUM_QUESTPOINTS
+ " quest points to use these stairs");
"You need " + chapionsGuildRequiredQP + " quest points to use these stairs");
} else if (client.absY == 3449) {
client.getPlayerAssistant().movePlayer(3259, 3445, 0);
} else if (client.absX == 3155) {
2006Redone Server/src/redone/game/players/Client.java
+1 -2
View File
@@ -633,8 +633,7 @@ public class Client extends Player {
AntiBotting.botCheckInterface(this);
}
if (questPoints > QuestAssistant.MAXIMUM_QUESTPOINTS || playerRights > 2) {
questPoints = QuestAssistant.MAXIMUM_QUESTPOINTS;// check for
// abusers
questPoints = QuestAssistant.MAXIMUM_QUESTPOINTS;// check for abusers
}
if (playerHitpoints < 0) {
isDead = true;