Merge pull request #1 from HerculesWS/master

Update from original

1 files changed, 36 insertions, 36 deletions

diff --git a/npc/guild/aldeg_cas01.txt b/npc/guild/aldeg_cas01.txt
index 0707d4725..82b09d608 100644
--- a/npc/guild/aldeg_cas01.txt
+++ b/npc/guild/aldeg_cas01.txt
@@ -14,9 +14,9 @@
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Neuschwanstein#1::OutsideFlagsA1	722,{
+-	script	Neuschwanstein#1::OutsideFlagsA1	GUILD_FLAG,{
 
-	set .@GID, GetCastleData("aldeg_cas01",1);
+	set .@GID, getcastledata("aldeg_cas01",1);
 
 	if (.@GID == 0) {
 		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
@@ -39,7 +39,7 @@
 		next;
 		if(select("Return to the guild castle.:Quit.") == 1) {
 			close2;
-			if (getcharid(2) == GetCastleData("aldeg_cas01",1)) {
+			if (getcharid(2) == getcastledata("aldeg_cas01",1)) {
 				warp "aldeg_cas01",218,170;
 				end;
 			}
@@ -51,68 +51,68 @@
 	mes " ";
 	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 	mes "we approve that this place is in";
-	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild.";
 	mes " ";
-	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
-	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+getguildmaster(.@GID)+"^000000";
 	mes "If there is anyone who objects to this,";
 	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastleA01:
-	FlagEmblem GetCastleData("aldeg_cas01",1);
+	flagemblem getcastledata("aldeg_cas01",1);
 	end;
 }
 
-alde_gld,61,87,6	duplicate(OutsideFlagsA1)	Neuschwanstein#1-2	722
-alde_gld,61,79,6	duplicate(OutsideFlagsA1)	Neuschwanstein#2	722
-alde_gld,45,87,8	duplicate(OutsideFlagsA1)	Neuschwanstein#3	722
-alde_gld,51,87,8	duplicate(OutsideFlagsA1)	Neuschwanstein#4	722
+alde_gld,61,87,6	duplicate(OutsideFlagsA1)	Neuschwanstein#1-2	GUILD_FLAG
+alde_gld,61,79,6	duplicate(OutsideFlagsA1)	Neuschwanstein#2	GUILD_FLAG
+alde_gld,45,87,8	duplicate(OutsideFlagsA1)	Neuschwanstein#3	GUILD_FLAG
+alde_gld,51,87,8	duplicate(OutsideFlagsA1)	Neuschwanstein#4	GUILD_FLAG
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Neuschwanstein#5::InsideFlagsA1	722,{
+-	script	Neuschwanstein#5::InsideFlagsA1	GUILD_FLAG,{
 	end;
 
 OnRecvCastleA01:
-	FlagEmblem GetCastleData("aldeg_cas01",1);
+	flagemblem getcastledata("aldeg_cas01",1);
 	end;
 }
 
-aldeg_cas01,30,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#5-2	722
-aldeg_cas01,30,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#6	722
-aldeg_cas01,37,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#7	722
-aldeg_cas01,37,246,4	duplicate(InsideFlagsA1)	Neuschwanstein#8	722
-aldeg_cas01,30,246,4	duplicate(InsideFlagsA1)	Neuschwanstein#9	722
-aldeg_cas01,95,80,2	duplicate(InsideFlagsA1)	Neuschwanstein#10	722
-aldeg_cas01,95,59,2	duplicate(InsideFlagsA1)	Neuschwanstein#11	722
-aldeg_cas01,62,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#12	722
-aldeg_cas01,66,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#13	722
-aldeg_cas01,70,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#14	722
-aldeg_cas01,74,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#15	722
-aldeg_cas01,62,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#16	722
-aldeg_cas01,66,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#17	722
-aldeg_cas01,70,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#18	722
-aldeg_cas01,74,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#19	722
-aldeg_cas01,74,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#20	722
-aldeg_cas01,203,150,4	duplicate(InsideFlagsA1)	Neuschwanstein#21	722
-aldeg_cas01,210,150,4	duplicate(InsideFlagsA1)	Neuschwanstein#22	722
+aldeg_cas01,30,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#5-2	GUILD_FLAG
+aldeg_cas01,30,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#6	GUILD_FLAG
+aldeg_cas01,37,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#7	GUILD_FLAG
+aldeg_cas01,37,246,4	duplicate(InsideFlagsA1)	Neuschwanstein#8	GUILD_FLAG
+aldeg_cas01,30,246,4	duplicate(InsideFlagsA1)	Neuschwanstein#9	GUILD_FLAG
+aldeg_cas01,95,80,2	duplicate(InsideFlagsA1)	Neuschwanstein#10	GUILD_FLAG
+aldeg_cas01,95,59,2	duplicate(InsideFlagsA1)	Neuschwanstein#11	GUILD_FLAG
+aldeg_cas01,62,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#12	GUILD_FLAG
+aldeg_cas01,66,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#13	GUILD_FLAG
+aldeg_cas01,70,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#14	GUILD_FLAG
+aldeg_cas01,74,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#15	GUILD_FLAG
+aldeg_cas01,62,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#16	GUILD_FLAG
+aldeg_cas01,66,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#17	GUILD_FLAG
+aldeg_cas01,70,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#18	GUILD_FLAG
+aldeg_cas01,74,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#19	GUILD_FLAG
+aldeg_cas01,74,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#20	GUILD_FLAG
+aldeg_cas01,203,150,4	duplicate(InsideFlagsA1)	Neuschwanstein#21	GUILD_FLAG
+aldeg_cas01,210,150,4	duplicate(InsideFlagsA1)	Neuschwanstein#22	GUILD_FLAG
 
 // Guild Flag (Town)
 //============================================================
-aldebaran,152,97,4	duplicate(InsideFlagsA1)	Neuschwanstein#23	722
+aldebaran,152,97,4	duplicate(InsideFlagsA1)	Neuschwanstein#23	GUILD_FLAG
 
 // Kafra Employee
 //============================================================
-aldeg_cas01,218,170,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas01	117
+aldeg_cas01,218,170,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas01	4_F_KAFRA1
 
 // Steward
 //============================================================
-aldeg_cas01,218,175,0	duplicate(cm)	Alfredo#aldeg_cas01	55
+aldeg_cas01,218,175,0	duplicate(cm)	Alfredo#aldeg_cas01	1_M_JOBTESTER
 
 // Treasure Room Exit
 //============================================================
-aldeg_cas01,123,223,0	script	#lever_A01	111,{
+aldeg_cas01,123,223,0	script	#lever_A01	HIDDEN_NPC,{
 
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
@@ -127,7 +127,7 @@ aldeg_cas01,123,223,0	script	#lever_A01	111,{
 
 // Guild Dungeon Switch
 //============================================================
-aldeg_cas01,211,181,0	duplicate(gdlever)	#aldeg_cas01	111
+aldeg_cas01,211,181,0	duplicate(gdlever)	#aldeg_cas01	HIDDEN_NPC
 
 // Guild Treasure Spawns
 //============================================================