diff options
| author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
| commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
| tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/guild/payg_cas04.txt | |
| parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
| parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
| download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/guild/payg_cas04.txt')
| -rw-r--r-- | npc/guild/payg_cas04.txt | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/npc/guild/payg_cas04.txt b/npc/guild/payg_cas04.txt index 4f584e368..53c327081 100644 --- a/npc/guild/payg_cas04.txt +++ b/npc/guild/payg_cas04.txt @@ -17,7 +17,7 @@ // Guild Flags (Outside Castle) //============================================================ -- script Sacred Altar#1::OutsideFlagsPA4 722,{ +- script Sacred Altar#1::OutsideFlagsPA4 GUILD_FLAG,{ set .@GID, GetCastleData("payg_cas04",1); @@ -67,14 +67,14 @@ OnRecvCastlePy04: end; } -pay_gld,137,160,0 duplicate(OutsideFlagsPA4) Sacred Altar#1-2 722 -pay_gld,143,160,0 duplicate(OutsideFlagsPA4) Sacred Altar#2 722 -pay_gld,133,151,2 duplicate(OutsideFlagsPA4) Sacred Altar#3 722 -pay_gld,153,166,1 duplicate(OutsideFlagsPA4) Sacred Altar#4 722 +pay_gld,137,160,0 duplicate(OutsideFlagsPA4) Sacred Altar#1-2 GUILD_FLAG +pay_gld,143,160,0 duplicate(OutsideFlagsPA4) Sacred Altar#2 GUILD_FLAG +pay_gld,133,151,2 duplicate(OutsideFlagsPA4) Sacred Altar#3 GUILD_FLAG +pay_gld,153,166,1 duplicate(OutsideFlagsPA4) Sacred Altar#4 GUILD_FLAG // Guild Flags (Inside Castle) //============================================================ -- script Sacred Altar#5::InsideFlagsPA4 722,{ +- script Sacred Altar#5::InsideFlagsPA4 GUILD_FLAG,{ end; OnRecvCastlePy04: @@ -82,29 +82,29 @@ OnRecvCastlePy04: end; } -payg_cas04,255,259,0 duplicate(InsideFlagsPA4) Sacred Altar#5-2 722 -payg_cas04,248,259,0 duplicate(InsideFlagsPA4) Sacred Altar#6 722 -payg_cas04,248,168,6 duplicate(InsideFlagsPA4) Sacred Altar#7 722 -payg_cas04,248,160,6 duplicate(InsideFlagsPA4) Sacred Altar#8 722 -payg_cas04,232,181,4 duplicate(InsideFlagsPA4) Sacred Altar#9 722 -payg_cas04,239,181,4 duplicate(InsideFlagsPA4) Sacred Altar#10 722 +payg_cas04,255,259,0 duplicate(InsideFlagsPA4) Sacred Altar#5-2 GUILD_FLAG +payg_cas04,248,259,0 duplicate(InsideFlagsPA4) Sacred Altar#6 GUILD_FLAG +payg_cas04,248,168,6 duplicate(InsideFlagsPA4) Sacred Altar#7 GUILD_FLAG +payg_cas04,248,160,6 duplicate(InsideFlagsPA4) Sacred Altar#8 GUILD_FLAG +payg_cas04,232,181,4 duplicate(InsideFlagsPA4) Sacred Altar#9 GUILD_FLAG +payg_cas04,239,181,4 duplicate(InsideFlagsPA4) Sacred Altar#10 GUILD_FLAG // Guild Flag (Town) //============================================================ -payon,118,322,4 duplicate(InsideFlagsPA4) Sacred Altar#11 722 -payon,166,165,3 duplicate(InsideFlagsPA4) Sacred Altar#12 722 +payon,118,322,4 duplicate(InsideFlagsPA4) Sacred Altar#11 GUILD_FLAG +payon,166,165,3 duplicate(InsideFlagsPA4) Sacred Altar#12 GUILD_FLAG // Kafra Employee //============================================================ -payg_cas04,40,235,1 duplicate(guildkafra) Kafra Staff#payg_cas04 117 +payg_cas04,40,235,1 duplicate(guildkafra) Kafra Staff#payg_cas04 4_F_KAFRA1 // Steward //============================================================ -payg_cas04,38,284,3 duplicate(cm) DJ#payg_cas04 55 +payg_cas04,38,284,3 duplicate(cm) DJ#payg_cas04 1_M_JOBTESTER // Treasure Room Exit //============================================================ -payg_cas04,151,47,0 script #lever_PA04 111,{ +payg_cas04,151,47,0 script #lever_PA04 HIDDEN_NPC,{ mes " "; mes "There's a small lever. Will you pull it?"; @@ -119,7 +119,7 @@ payg_cas04,151,47,0 script #lever_PA04 111,{ // Guild Dungeon Switch //============================================================ -payg_cas04,52,48,0 duplicate(gdlever) #payg_cas04 111 +payg_cas04,52,48,0 duplicate(gdlever) #payg_cas04 HIDDEN_NPC // Guild Treasure Spawns //============================================================ |