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/prtg_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/prtg_cas04.txt')
| -rw-r--r-- | npc/guild/prtg_cas04.txt | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/npc/guild/prtg_cas04.txt b/npc/guild/prtg_cas04.txt index d6bb7c15c..0c072bd66 100644 --- a/npc/guild/prtg_cas04.txt +++ b/npc/guild/prtg_cas04.txt @@ -16,7 +16,7 @@ // Guild Flags (Outside Castle) //============================================================ -- script Skoegul#1::OutsideFlagsPR4 722,{ +- script Skoegul#1::OutsideFlagsPR4 GUILD_FLAG,{ set .@GID, GetCastleData("prtg_cas04",1); @@ -66,14 +66,14 @@ OnRecvCastlePt04: end; } -prt_gld,120,243,6 duplicate(OutsideFlagsPR4) Skoegul#1-2 722 -prt_gld,120,236,6 duplicate(OutsideFlagsPR4) Skoegul#2 722 -prt_gld,122,243,6 duplicate(OutsideFlagsPR4) Skoegul#3 722 -prt_gld,122,236,6 duplicate(OutsideFlagsPR4) Skoegul#4 722 +prt_gld,120,243,6 duplicate(OutsideFlagsPR4) Skoegul#1-2 GUILD_FLAG +prt_gld,120,236,6 duplicate(OutsideFlagsPR4) Skoegul#2 GUILD_FLAG +prt_gld,122,243,6 duplicate(OutsideFlagsPR4) Skoegul#3 GUILD_FLAG +prt_gld,122,236,6 duplicate(OutsideFlagsPR4) Skoegul#4 GUILD_FLAG // Guild Flags (Inside Castle) //============================================================ -- script Skoegul#5::InsideFlagsPR4 722,{ +- script Skoegul#5::InsideFlagsPR4 GUILD_FLAG,{ end; OnRecvCastlePt04: @@ -81,32 +81,32 @@ OnRecvCastlePt04: end; } -prtg_cas04,82,29,4 duplicate(InsideFlagsPR4) Skoegul#5-2 722 -prtg_cas04,75,29,4 duplicate(InsideFlagsPR4) Skoegul#6 722 -prtg_cas04,75,27,4 duplicate(InsideFlagsPR4) Skoegul#7 722 -prtg_cas04,82,27,4 duplicate(InsideFlagsPR4) Skoegul#8 722 -prtg_cas04,59,29,4 duplicate(InsideFlagsPR4) Skoegul#9 722 -prtg_cas04,67,29,4 duplicate(InsideFlagsPR4) Skoegul#10 722 -prtg_cas04,258,25,4 duplicate(InsideFlagsPR4) Skoegul#11 722 -prtg_cas04,258,20,4 duplicate(InsideFlagsPR4) Skoegul#12 722 -prtg_cas04,263,20,4 duplicate(InsideFlagsPR4) Skoegul#13 722 -prtg_cas04,263,27,4 duplicate(InsideFlagsPR4) Skoegul#14 722 +prtg_cas04,82,29,4 duplicate(InsideFlagsPR4) Skoegul#5-2 GUILD_FLAG +prtg_cas04,75,29,4 duplicate(InsideFlagsPR4) Skoegul#6 GUILD_FLAG +prtg_cas04,75,27,4 duplicate(InsideFlagsPR4) Skoegul#7 GUILD_FLAG +prtg_cas04,82,27,4 duplicate(InsideFlagsPR4) Skoegul#8 GUILD_FLAG +prtg_cas04,59,29,4 duplicate(InsideFlagsPR4) Skoegul#9 GUILD_FLAG +prtg_cas04,67,29,4 duplicate(InsideFlagsPR4) Skoegul#10 GUILD_FLAG +prtg_cas04,258,25,4 duplicate(InsideFlagsPR4) Skoegul#11 GUILD_FLAG +prtg_cas04,258,20,4 duplicate(InsideFlagsPR4) Skoegul#12 GUILD_FLAG +prtg_cas04,263,20,4 duplicate(InsideFlagsPR4) Skoegul#13 GUILD_FLAG +prtg_cas04,263,27,4 duplicate(InsideFlagsPR4) Skoegul#14 GUILD_FLAG // Guild Flag (Town) //============================================================ -prontera,167,203,6 duplicate(InsideFlagsPR4) Skoegul#15 722 +prontera,167,203,6 duplicate(InsideFlagsPR4) Skoegul#15 GUILD_FLAG // Kafra Employee //============================================================ -prtg_cas04,258,247,4 duplicate(guildkafra) Kafra Staff#prtg_cas04 117 +prtg_cas04,258,247,4 duplicate(guildkafra) Kafra Staff#prtg_cas04 4_F_KAFRA1 // Steward //============================================================ -prtg_cas04,259,265,4 duplicate(cm) Van Dreth#prtg_cas04 55 +prtg_cas04,259,265,4 duplicate(cm) Van Dreth#prtg_cas04 1_M_JOBTESTER // Treasure Room Exit //============================================================ -prtg_cas04,275,160,0 script #Lever_PR04 111,{ +prtg_cas04,275,160,0 script #Lever_PR04 HIDDEN_NPC,{ mes " "; mes "There's a small lever. Will you pull it?"; @@ -121,7 +121,7 @@ prtg_cas04,275,160,0 script #Lever_PR04 111,{ // Guild Dungeon Switch //============================================================ -prtg_cas04,56,283,0 duplicate(gdlever) #prtg_cas04 111 +prtg_cas04,56,283,0 duplicate(gdlever) #prtg_cas04 HIDDEN_NPC // Guild Treasure Spawns //============================================================ |