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_cas01.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_cas01.txt')
| -rw-r--r-- | npc/guild/gefg_cas01.txt | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/npc/guild/gefg_cas01.txt b/npc/guild/gefg_cas01.txt index 527a1a9a6..a05b72b8f 100644 --- a/npc/guild/gefg_cas01.txt +++ b/npc/guild/gefg_cas01.txt @@ -14,7 +14,7 @@ // Guild Flag (Outside Castle) //============================================================ -- script Repherion#1::OutsideFlagsG1 722,{ +- script Repherion#1::OutsideFlagsG1 GUILD_FLAG,{ set .@GID, GetCastleData("gefg_cas01",1); @@ -64,14 +64,14 @@ OnRecvCastleG01: end; } -gef_fild13,148,51,5 duplicate(OutsideFlagsG1) Repherion#1-2 722 -gef_fild13,155,54,5 duplicate(OutsideFlagsG1) Repherion#2 722 -gef_fild13,212,79,6 duplicate(OutsideFlagsG1) Repherion#3 722 -gef_fild13,211,71,6 duplicate(OutsideFlagsG1) Repherion#4 722 +gef_fild13,148,51,5 duplicate(OutsideFlagsG1) Repherion#1-2 GUILD_FLAG +gef_fild13,155,54,5 duplicate(OutsideFlagsG1) Repherion#2 GUILD_FLAG +gef_fild13,212,79,6 duplicate(OutsideFlagsG1) Repherion#3 GUILD_FLAG +gef_fild13,211,71,6 duplicate(OutsideFlagsG1) Repherion#4 GUILD_FLAG // Guild Flag (Inside Castle) //============================================================ -- script Repherion#5::InsideFlagsG1 722,{ +- script Repherion#5::InsideFlagsG1 GUILD_FLAG,{ end; OnRecvCastleG01: @@ -79,28 +79,28 @@ OnRecvCastleG01: end; } -gefg_cas01,28,157,4 duplicate(InsideFlagsG1) Repherion#5-2 722 -gefg_cas01,22,156,5 duplicate(InsideFlagsG1) Repherion#6 722 -gefg_cas01,68,185,3 duplicate(InsideFlagsG1) Repherion#7 722 -gefg_cas01,17,171,5 duplicate(InsideFlagsG1) Repherion#8 722 -gefg_cas01,59,16,4 duplicate(InsideFlagsG1) Repherion#9 722 -gefg_cas01,64,16,4 duplicate(InsideFlagsG1) Repherion#10 722 +gefg_cas01,28,157,4 duplicate(InsideFlagsG1) Repherion#5-2 GUILD_FLAG +gefg_cas01,22,156,5 duplicate(InsideFlagsG1) Repherion#6 GUILD_FLAG +gefg_cas01,68,185,3 duplicate(InsideFlagsG1) Repherion#7 GUILD_FLAG +gefg_cas01,17,171,5 duplicate(InsideFlagsG1) Repherion#8 GUILD_FLAG +gefg_cas01,59,16,4 duplicate(InsideFlagsG1) Repherion#9 GUILD_FLAG +gefg_cas01,64,16,4 duplicate(InsideFlagsG1) Repherion#10 GUILD_FLAG // Guild Flag (Town) //============================================================ -geffen,109,123,2 duplicate(InsideFlagsG1) Repherion#11 722 +geffen,109,123,2 duplicate(InsideFlagsG1) Repherion#11 GUILD_FLAG // Kafra Employee //============================================================ -gefg_cas01,83,47,3 duplicate(guildkafra) Kafra Staff#gefg_cas01 117 +gefg_cas01,83,47,3 duplicate(guildkafra) Kafra Staff#gefg_cas01 4_F_KAFRA1 // Steward //============================================================ -gefg_cas01,40,48,5 duplicate(cm) Gnahcher#gefg_cas01 55 +gefg_cas01,40,48,5 duplicate(cm) Gnahcher#gefg_cas01 1_M_JOBTESTER // Treasure Room Exit //============================================================ -gefg_cas01,152,117,0 script #lever_G01 111,{ +gefg_cas01,152,117,0 script #lever_G01 HIDDEN_NPC,{ mes " "; mes "There's a small lever. Will you pull it?"; @@ -115,7 +115,7 @@ gefg_cas01,152,117,0 script #lever_G01 111,{ // Guild Dungeon Switch //============================================================ -gefg_cas01,78,84,0 duplicate(gdlever) #gefg_cas01 111 +gefg_cas01,78,84,0 duplicate(gdlever) #gefg_cas01 HIDDEN_NPC // Guild Treasure Spawns //============================================================ |