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/aldeg_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/aldeg_cas01.txt')
| -rw-r--r-- | npc/guild/aldeg_cas01.txt | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/npc/guild/aldeg_cas01.txt b/npc/guild/aldeg_cas01.txt index 0707d4725..537dce7a4 100644 --- a/npc/guild/aldeg_cas01.txt +++ b/npc/guild/aldeg_cas01.txt @@ -14,7 +14,7 @@ // Guild Flags (Outside Castle) //============================================================ -- script Neuschwanstein#1::OutsideFlagsA1 722,{ +- script Neuschwanstein#1::OutsideFlagsA1 GUILD_FLAG,{ set .@GID, GetCastleData("aldeg_cas01",1); @@ -64,14 +64,14 @@ OnRecvCastleA01: end; } -alde_gld,61,87,6 duplicate(OutsideFlagsA1) Neuschwanstein#1-2 722 -alde_gld,61,79,6 duplicate(OutsideFlagsA1) Neuschwanstein#2 722 -alde_gld,45,87,8 duplicate(OutsideFlagsA1) Neuschwanstein#3 722 -alde_gld,51,87,8 duplicate(OutsideFlagsA1) Neuschwanstein#4 722 +alde_gld,61,87,6 duplicate(OutsideFlagsA1) Neuschwanstein#1-2 GUILD_FLAG +alde_gld,61,79,6 duplicate(OutsideFlagsA1) Neuschwanstein#2 GUILD_FLAG +alde_gld,45,87,8 duplicate(OutsideFlagsA1) Neuschwanstein#3 GUILD_FLAG +alde_gld,51,87,8 duplicate(OutsideFlagsA1) Neuschwanstein#4 GUILD_FLAG // Guild Flags (Inside Castle) //============================================================ -- script Neuschwanstein#5::InsideFlagsA1 722,{ +- script Neuschwanstein#5::InsideFlagsA1 GUILD_FLAG,{ end; OnRecvCastleA01: @@ -79,40 +79,40 @@ OnRecvCastleA01: end; } -aldeg_cas01,30,248,4 duplicate(InsideFlagsA1) Neuschwanstein#5-2 722 -aldeg_cas01,30,248,4 duplicate(InsideFlagsA1) Neuschwanstein#6 722 -aldeg_cas01,37,248,4 duplicate(InsideFlagsA1) Neuschwanstein#7 722 -aldeg_cas01,37,246,4 duplicate(InsideFlagsA1) Neuschwanstein#8 722 -aldeg_cas01,30,246,4 duplicate(InsideFlagsA1) Neuschwanstein#9 722 -aldeg_cas01,95,80,2 duplicate(InsideFlagsA1) Neuschwanstein#10 722 -aldeg_cas01,95,59,2 duplicate(InsideFlagsA1) Neuschwanstein#11 722 -aldeg_cas01,62,75,2 duplicate(InsideFlagsA1) Neuschwanstein#12 722 -aldeg_cas01,66,75,2 duplicate(InsideFlagsA1) Neuschwanstein#13 722 -aldeg_cas01,70,75,2 duplicate(InsideFlagsA1) Neuschwanstein#14 722 -aldeg_cas01,74,75,2 duplicate(InsideFlagsA1) Neuschwanstein#15 722 -aldeg_cas01,62,64,2 duplicate(InsideFlagsA1) Neuschwanstein#16 722 -aldeg_cas01,66,64,2 duplicate(InsideFlagsA1) Neuschwanstein#17 722 -aldeg_cas01,70,64,2 duplicate(InsideFlagsA1) Neuschwanstein#18 722 -aldeg_cas01,74,64,2 duplicate(InsideFlagsA1) Neuschwanstein#19 722 -aldeg_cas01,74,64,2 duplicate(InsideFlagsA1) Neuschwanstein#20 722 -aldeg_cas01,203,150,4 duplicate(InsideFlagsA1) Neuschwanstein#21 722 -aldeg_cas01,210,150,4 duplicate(InsideFlagsA1) Neuschwanstein#22 722 +aldeg_cas01,30,248,4 duplicate(InsideFlagsA1) Neuschwanstein#5-2 GUILD_FLAG +aldeg_cas01,30,248,4 duplicate(InsideFlagsA1) Neuschwanstein#6 GUILD_FLAG +aldeg_cas01,37,248,4 duplicate(InsideFlagsA1) Neuschwanstein#7 GUILD_FLAG +aldeg_cas01,37,246,4 duplicate(InsideFlagsA1) Neuschwanstein#8 GUILD_FLAG +aldeg_cas01,30,246,4 duplicate(InsideFlagsA1) Neuschwanstein#9 GUILD_FLAG +aldeg_cas01,95,80,2 duplicate(InsideFlagsA1) Neuschwanstein#10 GUILD_FLAG +aldeg_cas01,95,59,2 duplicate(InsideFlagsA1) Neuschwanstein#11 GUILD_FLAG +aldeg_cas01,62,75,2 duplicate(InsideFlagsA1) Neuschwanstein#12 GUILD_FLAG +aldeg_cas01,66,75,2 duplicate(InsideFlagsA1) Neuschwanstein#13 GUILD_FLAG +aldeg_cas01,70,75,2 duplicate(InsideFlagsA1) Neuschwanstein#14 GUILD_FLAG +aldeg_cas01,74,75,2 duplicate(InsideFlagsA1) Neuschwanstein#15 GUILD_FLAG +aldeg_cas01,62,64,2 duplicate(InsideFlagsA1) Neuschwanstein#16 GUILD_FLAG +aldeg_cas01,66,64,2 duplicate(InsideFlagsA1) Neuschwanstein#17 GUILD_FLAG +aldeg_cas01,70,64,2 duplicate(InsideFlagsA1) Neuschwanstein#18 GUILD_FLAG +aldeg_cas01,74,64,2 duplicate(InsideFlagsA1) Neuschwanstein#19 GUILD_FLAG +aldeg_cas01,74,64,2 duplicate(InsideFlagsA1) Neuschwanstein#20 GUILD_FLAG +aldeg_cas01,203,150,4 duplicate(InsideFlagsA1) Neuschwanstein#21 GUILD_FLAG +aldeg_cas01,210,150,4 duplicate(InsideFlagsA1) Neuschwanstein#22 GUILD_FLAG // Guild Flag (Town) //============================================================ -aldebaran,152,97,4 duplicate(InsideFlagsA1) Neuschwanstein#23 722 +aldebaran,152,97,4 duplicate(InsideFlagsA1) Neuschwanstein#23 GUILD_FLAG // Kafra Employee //============================================================ -aldeg_cas01,218,170,0 duplicate(guildkafra) Kafra Staff#aldeg_cas01 117 +aldeg_cas01,218,170,0 duplicate(guildkafra) Kafra Staff#aldeg_cas01 4_F_KAFRA1 // Steward //============================================================ -aldeg_cas01,218,175,0 duplicate(cm) Alfredo#aldeg_cas01 55 +aldeg_cas01,218,175,0 duplicate(cm) Alfredo#aldeg_cas01 1_M_JOBTESTER // Treasure Room Exit //============================================================ -aldeg_cas01,123,223,0 script #lever_A01 111,{ +aldeg_cas01,123,223,0 script #lever_A01 HIDDEN_NPC,{ mes " "; mes "There's a small lever. Will you pull it?"; @@ -127,7 +127,7 @@ aldeg_cas01,123,223,0 script #lever_A01 111,{ // Guild Dungeon Switch //============================================================ -aldeg_cas01,211,181,0 duplicate(gdlever) #aldeg_cas01 111 +aldeg_cas01,211,181,0 duplicate(gdlever) #aldeg_cas01 HIDDEN_NPC // Guild Treasure Spawns //============================================================ |