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/gefg_cas03.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/gefg_cas03.txt')
| -rw-r--r-- | npc/guild/gefg_cas03.txt | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/npc/guild/gefg_cas03.txt b/npc/guild/gefg_cas03.txt index b46ed18c7..60e3c46fd 100644 --- a/npc/guild/gefg_cas03.txt +++ b/npc/guild/gefg_cas03.txt @@ -14,7 +14,7 @@ // Guild Flag (Outside Castle) //============================================================ -- script Yesnelph#1::OutsideFlagsG3 722,{ +- script Yesnelph#1::OutsideFlagsG3 GUILD_FLAG,{ set .@GID, GetCastleData("gefg_cas03",1); @@ -64,16 +64,16 @@ OnRecvCastleG03: end; } -gef_fild13,78,182,4 duplicate(OutsideFlagsG3) Yesnelph#1-2 722 -gef_fild13,87,182,4 duplicate(OutsideFlagsG3) Yesnelph#2 722 -gef_fild13,73,295,7 duplicate(OutsideFlagsG3) Yesnelph#3 722 -gef_fild13,113,274,7 duplicate(OutsideFlagsG3) Yesnelph#4 722 -gef_fild13,144,235,6 duplicate(OutsideFlagsG3) Yesnelph#5 722 -gef_fild13,144,244,6 duplicate(OutsideFlagsG3) Yesnelph#6 722 +gef_fild13,78,182,4 duplicate(OutsideFlagsG3) Yesnelph#1-2 GUILD_FLAG +gef_fild13,87,182,4 duplicate(OutsideFlagsG3) Yesnelph#2 GUILD_FLAG +gef_fild13,73,295,7 duplicate(OutsideFlagsG3) Yesnelph#3 GUILD_FLAG +gef_fild13,113,274,7 duplicate(OutsideFlagsG3) Yesnelph#4 GUILD_FLAG +gef_fild13,144,235,6 duplicate(OutsideFlagsG3) Yesnelph#5 GUILD_FLAG +gef_fild13,144,244,6 duplicate(OutsideFlagsG3) Yesnelph#6 GUILD_FLAG // Guild Flag (Inside Castle) //============================================================ -- script Yesnelph#7::InsideFlagsG3 722,{ +- script Yesnelph#7::InsideFlagsG3 GUILD_FLAG,{ end; OnRecvCastleG03: @@ -81,30 +81,30 @@ OnRecvCastleG03: end; } -gefg_cas03,122,220,6 duplicate(InsideFlagsG3) Yesnelph#7-2 722 -gefg_cas03,122,229,6 duplicate(InsideFlagsG3) Yesnelph#8 722 -gefg_cas03,91,257,7 duplicate(InsideFlagsG3) Yesnelph#9 722 -gefg_cas03,52,276,7 duplicate(InsideFlagsG3) Yesnelph#10 722 -gefg_cas03,56,164,4 duplicate(InsideFlagsG3) Yesnelph#11 722 -gefg_cas03,65,164,4 duplicate(InsideFlagsG3) Yesnelph#12 722 -gefg_cas03,37,214,1 duplicate(InsideFlagsG3) Yesnelph#13 722 -gefg_cas03,34,208,1 duplicate(InsideFlagsG3) Yesnelph#14 722 +gefg_cas03,122,220,6 duplicate(InsideFlagsG3) Yesnelph#7-2 GUILD_FLAG +gefg_cas03,122,229,6 duplicate(InsideFlagsG3) Yesnelph#8 GUILD_FLAG +gefg_cas03,91,257,7 duplicate(InsideFlagsG3) Yesnelph#9 GUILD_FLAG +gefg_cas03,52,276,7 duplicate(InsideFlagsG3) Yesnelph#10 GUILD_FLAG +gefg_cas03,56,164,4 duplicate(InsideFlagsG3) Yesnelph#11 GUILD_FLAG +gefg_cas03,65,164,4 duplicate(InsideFlagsG3) Yesnelph#12 GUILD_FLAG +gefg_cas03,37,214,1 duplicate(InsideFlagsG3) Yesnelph#13 GUILD_FLAG +gefg_cas03,34,208,1 duplicate(InsideFlagsG3) Yesnelph#14 GUILD_FLAG // Guild Flag (Town) //============================================================ -geffen,120,132,8 duplicate(InsideFlagsG3) Yesnelph#15 722 +geffen,120,132,8 duplicate(InsideFlagsG3) Yesnelph#15 GUILD_FLAG // Kafra Employee //============================================================ -gefg_cas03,116,89,5 duplicate(guildkafra) Kafra Staff#gefg_cas03 117 +gefg_cas03,116,89,5 duplicate(guildkafra) Kafra Staff#gefg_cas03 4_F_KAFRA1 // Steward //============================================================ -gefg_cas03,106,23,5 duplicate(cm) Jyang#gefg_cas03 55 +gefg_cas03,106,23,5 duplicate(cm) Jyang#gefg_cas03 1_M_JOBTESTER // Treasure Room Exit //============================================================ -gefg_cas03,275,289,0 script #lever_G03 111,{ +gefg_cas03,275,289,0 script #lever_G03 HIDDEN_NPC,{ mes " "; mes "There's a small lever. Will you pull it?"; @@ -119,7 +119,7 @@ gefg_cas03,275,289,0 script #lever_G03 111,{ // Guild Dungeon Switch //============================================================ -gefg_cas03,221,43,0 duplicate(gdlever) #gefg_cas03 111 +gefg_cas03,221,43,0 duplicate(gdlever) #gefg_cas03 HIDDEN_NPC // Guild Treasure Spawns //============================================================ |