diff options
author | Happy <markaizer@gmail.com> | 2014-08-21 04:50:46 +0800 |
---|---|---|
committer | Happy <markaizer@gmail.com> | 2014-08-21 04:50:46 +0800 |
commit | f52e1007fe08c67003c0bc4c78231904dd3fd5cc (patch) | |
tree | 99907d827264e501774e58ab4630e41fa7103c02 /npc/guild/payg_cas02.txt | |
parent | 2410110dece79b4598c12f1c953219f1d0d1904a (diff) | |
parent | 769b1d05aa5cfa8cddfe7d21b35d5c5e4da3bbd6 (diff) | |
download | hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.tar.gz hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.tar.bz2 hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.tar.xz hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.zip |
Merge pull request #1 from HerculesWS/master
Update from original
Diffstat (limited to 'npc/guild/payg_cas02.txt')
-rw-r--r-- | npc/guild/payg_cas02.txt | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/npc/guild/payg_cas02.txt b/npc/guild/payg_cas02.txt index 27e5fc4f0..cb7403c6a 100644 --- a/npc/guild/payg_cas02.txt +++ b/npc/guild/payg_cas02.txt @@ -17,9 +17,9 @@ // Guild Flags (Outside Castle) //============================================================ -- script Scarlet Palace#1::OutsideFlagsPA2 722,{ +- script Scarlet Palace#1::OutsideFlagsPA2 GUILD_FLAG,{ - set .@GID, GetCastleData("payg_cas02",1); + set .@GID, getcastledata("payg_cas02",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -42,7 +42,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("payg_cas02",1)) { + if (getcharid(2) == getcastledata("payg_cas02",1)) { warp "payg_cas02",278,251; end; } @@ -54,57 +54,57 @@ 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; OnRecvCastlePy02: - FlagEmblem GetCastleData("payg_cas02",1); + flagemblem getcastledata("payg_cas02",1); end; } -pay_gld,292,112,6 duplicate(OutsideFlagsPA2) Scarlet Palace#1-2 722 -pay_gld,292,120,6 duplicate(OutsideFlagsPA2) Scarlet Palace#2 722 -pay_gld,291,135,6 duplicate(OutsideFlagsPA2) Scarlet Palace#3 722 -pay_gld,271,163,0 duplicate(OutsideFlagsPA2) Scarlet Palace#4 722 +pay_gld,292,112,6 duplicate(OutsideFlagsPA2) Scarlet Palace#1-2 GUILD_FLAG +pay_gld,292,120,6 duplicate(OutsideFlagsPA2) Scarlet Palace#2 GUILD_FLAG +pay_gld,291,135,6 duplicate(OutsideFlagsPA2) Scarlet Palace#3 GUILD_FLAG +pay_gld,271,163,0 duplicate(OutsideFlagsPA2) Scarlet Palace#4 GUILD_FLAG // Guild Flags (Inside Castle) //============================================================ -- script Scarlet Palace#5::InsideFlagsPA2 722,{ +- script Scarlet Palace#5::InsideFlagsPA2 GUILD_FLAG,{ end; OnRecvCastlePy02: - FlagEmblem GetCastleData("payg_cas02",1); + flagemblem getcastledata("payg_cas02",1); end; } -payg_cas02,254,40,6 duplicate(InsideFlagsPA2) Scarlet Palace#5-2 722 -payg_cas02,254,48,6 duplicate(InsideFlagsPA2) Scarlet Palace#6 722 -payg_cas02,202,49,0 duplicate(InsideFlagsPA2) Scarlet Palace#7 722 -payg_cas02,209,49,0 duplicate(InsideFlagsPA2) Scarlet Palace#8 722 -payg_cas02,59,282,4 duplicate(InsideFlagsPA2) Scarlet Palace#9 722 -payg_cas02,70,282,4 duplicate(InsideFlagsPA2) Scarlet Palace#10 722 +payg_cas02,254,40,6 duplicate(InsideFlagsPA2) Scarlet Palace#5-2 GUILD_FLAG +payg_cas02,254,48,6 duplicate(InsideFlagsPA2) Scarlet Palace#6 GUILD_FLAG +payg_cas02,202,49,0 duplicate(InsideFlagsPA2) Scarlet Palace#7 GUILD_FLAG +payg_cas02,209,49,0 duplicate(InsideFlagsPA2) Scarlet Palace#8 GUILD_FLAG +payg_cas02,59,282,4 duplicate(InsideFlagsPA2) Scarlet Palace#9 GUILD_FLAG +payg_cas02,70,282,4 duplicate(InsideFlagsPA2) Scarlet Palace#10 GUILD_FLAG // Guild Flag (Town) //============================================================ -payon,97,322,4 duplicate(InsideFlagsPA2) Scarlet Palace#11 722 -payon,166,173,3 duplicate(InsideFlagsPA2) Scarlet Palace#12 722 +payon,97,322,4 duplicate(InsideFlagsPA2) Scarlet Palace#11 GUILD_FLAG +payon,166,173,3 duplicate(InsideFlagsPA2) Scarlet Palace#12 GUILD_FLAG // Kafra Employee //============================================================ -payg_cas02,22,275,5 duplicate(guildkafra) Kafra Staff#payg_cas02 117 +payg_cas02,22,275,5 duplicate(guildkafra) Kafra Staff#payg_cas02 4_F_KAFRA1 // Steward //============================================================ -payg_cas02,22,260,7 duplicate(cm) Cherieos#payg_cas02 55 +payg_cas02,22,260,7 duplicate(cm) Cherieos#payg_cas02 1_M_JOBTESTER // Treasure Room Exit //============================================================ -payg_cas02,149,149,0 script #lever_PA02 111,{ +payg_cas02,149,149,0 script #lever_PA02 HIDDEN_NPC,{ mes " "; mes "There's a small lever. Will you pull it?"; @@ -119,7 +119,7 @@ payg_cas02,149,149,0 script #lever_PA02 111,{ // Guild Dungeon Switch //============================================================ -payg_cas02,278,247,0 duplicate(gdlever) #payg_cas02 111 +payg_cas02,278,247,0 duplicate(gdlever) #payg_cas02 HIDDEN_NPC // Guild Treasure Spawns //============================================================ |