From 04f474ed6d96200d0f0f0f72c72fa66999595fdf Mon Sep 17 00:00:00 2001 From: RedSparr0w Date: Fri, 25 Oct 2019 17:36:38 +1300 Subject: [PATCH] fixup champions guild --- .../src/redone/game/content/guilds/Guilds.java | 4 ++-- .../src/redone/game/npcs/NpcActions.java | 7 +++---- .../src/redone/game/objects/impl/Climbing.java | 14 ++++++-------- .../src/redone/game/players/Client.java | 3 +-- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/2006Redone Server/src/redone/game/content/guilds/Guilds.java b/2006Redone Server/src/redone/game/content/guilds/Guilds.java index 5789db46..71aadc41 100644 --- a/2006Redone Server/src/redone/game/content/guilds/Guilds.java +++ b/2006Redone Server/src/redone/game/content/guilds/Guilds.java @@ -115,8 +115,8 @@ 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!"); + if (c.questPoints < 19) { + c.getDialogueHandler().sendStatement("You need 19 quest points to enter this guild!"); c.nextChat = 0; return false; } diff --git a/2006Redone Server/src/redone/game/npcs/NpcActions.java b/2006Redone Server/src/redone/game/npcs/NpcActions.java index f1b85597..55d1ead1 100644 --- a/2006Redone Server/src/redone/game/npcs/NpcActions.java +++ b/2006Redone Server/src/redone/game/npcs/NpcActions.java @@ -90,12 +90,11 @@ public class NpcActions { case 537: case 536: - if (c.questPoints >= QuestAssistant.MAXIMUM_QUESTPOINTS) { + if (c.questPoints >= 19) { c.getDialogueHandler().sendDialogues(1373, npcType); } else { c.getActionSender().sendMessage( - "You need " + QuestAssistant.MAXIMUM_QUESTPOINTS - + " quest points to open this shop."); + "You need 19 quest points to open this shop."); } break; @@ -1005,7 +1004,7 @@ public class NpcActions { case 537: case 536: - if (c.questPoints >= QuestAssistant.MAXIMUM_QUESTPOINTS) { + if (c.questPoints >= 19) { c.getShopAssistant().openShop(npcType); } else { c.getActionSender().sendMessage( diff --git a/2006Redone Server/src/redone/game/objects/impl/Climbing.java b/2006Redone Server/src/redone/game/objects/impl/Climbing.java index f6b36a55..fdc1b165 100644 --- a/2006Redone Server/src/redone/game/objects/impl/Climbing.java +++ b/2006Redone Server/src/redone/game/objects/impl/Climbing.java @@ -134,13 +134,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 >= 19) { client.getPlayerAssistant().movePlayer(client.absX, 3354, 1); } else if (client.absY == 3358 - && client.questPoints < QuestAssistant.MAXIMUM_QUESTPOINTS) { + && client.questPoints < 19) { client.getActionSender().sendMessage( - "You need " + QuestAssistant.MAXIMUM_QUESTPOINTS - + " quest points to use these stairs."); + "You need 19 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 +159,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 >= 19) { client.getPlayerAssistant().movePlayer(client.absX, 3358, 0); } else if (client.absY == 3358 - && client.questPoints < QuestAssistant.MAXIMUM_QUESTPOINTS) { + && client.questPoints < 19) { client.getActionSender().sendMessage( - "You need " + QuestAssistant.MAXIMUM_QUESTPOINTS - + " quest points to use these stairs"); + "You need 19 quest points to use these stairs"); } else if (client.absY == 3449) { client.getPlayerAssistant().movePlayer(3259, 3445, 0); } else if (client.absX == 3155) { diff --git a/2006Redone Server/src/redone/game/players/Client.java b/2006Redone Server/src/redone/game/players/Client.java index 7bb94942..6feb622e 100644 --- a/2006Redone Server/src/redone/game/players/Client.java +++ b/2006Redone Server/src/redone/game/players/Client.java @@ -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;