From a2f7a6de3d877163593521e82774eb8a3710ab9a Mon Sep 17 00:00:00 2001 From: Lupus Date: Mon, 13 Nov 2006 13:50:05 +0000 Subject: [PATCH] Fix for guild manager recognizing git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9205 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 2 ++ npc/guild/gldfunc_manager.txt | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 82984f4f34..a43f111c3e 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -33,6 +33,8 @@ KarLaeda Date Added ====== +11/13 + * Fix for guild manager recognizing [KarLaeda] 11/12 * According to recent info you can re-install Guardians during WoE [Lupus] 11/11 diff --git a/npc/guild/gldfunc_manager.txt b/npc/guild/gldfunc_manager.txt index bc1b3143d9..bd45344b65 100644 --- a/npc/guild/gldfunc_manager.txt +++ b/npc/guild/gldfunc_manager.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= jAthena - kalen (1.0) & eAthena Team //===== Current Version: ===================================== -//= 1.6 +//= 1.6a //===== Compatible With: ===================================== //= eAthena 0.1+; RO Episode 4+ //===== Description: ========================================= @@ -28,6 +28,7 @@ //= 1.41 Fixed possible Economy investment overflow with Emsolute Develop learnt [Lupus] //= 1.5 Official Novice Castles Menu (u can't invest / hire guardians) [Lupus] //= 1.6 According to recent info u can re-install Guardians during WoE [Lupus] +//= 1.6a Fix for guild manager recognizing [KarLaeda] //============================================================ @@ -41,13 +42,13 @@ function script F_GldManager { mes "I am waiting for my master. Brave adventurer, follow your destiny!"; return 0; } - if (getcharid(2) == @GID){ - mes "You're not ^5533FF" + getguildmaster(@GID) + "^000000! I am here to follow ^5533FF" + getguildmaster(@GID) + "^000000's command only"; + if (getcharid(2) != @GID){ + mes "I am here to follow ^5533FF" + getguildmaster(@GID) + "^000000's command! Hey! Your not even a part of the guild!!"; + mes "Where are the guardians? Destroy these intruders!"; return 0; } if (strcharinfo(0) != getguildmaster(@GID)){ - mes "I am here to follow ^5533FF" + getguildmaster(@GID) + "^000000's command! Hey! Your not even a part of the guild!!"; - mes "Where are the guardians? Destroy these intruders!"; + mes "You're not ^5533FF" + getguildmaster(@GID) + "^000000! I am here to follow ^5533FF" + getguildmaster(@GID) + "^000000's command only"; return 0; }