* Rather large update to the WoE scripts.

- Eliminated unofficial map-broadcasts (opening treasures/guardian death.)
- Fixed several errors in guardian spawning (script-wise.)
- Treasure spawning itself is done weird... What exactly is the last paramater for anyway? Near as I can see it's ALWAYS 1. Why is it used? what does it do? Why is it undocumented? Mysteries and more!
- Updated dialog and restructured several NPCs.
* Created a unique function for novice WoE as the new manager does not support it.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11633 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 25 insertions, 18 deletions

diff --git a/npc/guild/gldfunc_dunsw.txt b/npc/guild/gldfunc_dunsw.txt
index c1fdc8e74..89c55ec45 100644
--- a/npc/guild/gldfunc_dunsw.txt
+++ b/npc/guild/gldfunc_dunsw.txt
@@ -4,9 +4,9 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
-//= eAthena 0.1+; RO Episode 4+
+//= eAthena SVN; RO Episode 4+
 //===== Description: =========================================
 //= Switch that warps guild members to guild dungeon.
 //==========================================
@@ -22,26 +22,33 @@
 //	Some not competent people try to change gld_dun -> gld_dun0
 //	IT is wrong, because we already supple "02","03",etc as suffix.
 //	[Lupus]
+//= 1.4 Updated script dialog and structure. [L0ne_W0lf]
 //============================================================
 
 //==================================================
 function	script	F_GldDunSw	{
+	set .@GID, GetCastleData(getarg(0),1);
+	if (.@GID == 0) {
+		mes "[ Echoing Voice ]";
+		mes " ' The one who can overcome an ordeal and show true bravery... will find the way... ' ";
+		close;
+	}
+	else {
+		mes "[ Echoing Voice ]";
+		mes " ' Only the one who can show true bravery can take this test. '";
+		next;
+		mes " ";
+		mes "There's a small lever. Will you pull it?";
+		next;
 
-	mes "[ Mysterious Voice ]";
-	mes " ' Only brave warriors may lead the guild base.. '";
-	next;
-	mes "(There is little switch over here....... Would you like to pull the switch?)";
-	next;
-	menu "Yes",-,"No",M_No;
-
-		set @GID, GetCastleData(getarg(0),1);
-		if (@GID == 0 || getcharid(2) != @GID) goto L_NotGLead;
-		warp "gld_dun"+getarg(1),getarg(2),getarg(3);
-		end;
-
-		L_NotGLead:
-			mes "[ Mysterious Voice ]";
-			mes " ' ..... it seems that you are not brave enough...... ' ";
-	M_No:
+		if (select("Pull.:Do not.") == 1) {
+			if (getcharid(2) == .@GID) {
+				warp "gld_dun"+getarg(1),getarg(2),getarg(3);
+				end;
+			}
+			mes " ";
+			mes " Nothing happened.";
+		}
 		return;
+	}
 }