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/events/nguild/nguild_dunsw.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/events/nguild/nguild_dunsw.txt')
| -rw-r--r-- | npc/events/nguild/nguild_dunsw.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/events/nguild/nguild_dunsw.txt b/npc/events/nguild/nguild_dunsw.txt index 7f191290b..2fd6b7594 100644 --- a/npc/events/nguild/nguild_dunsw.txt +++ b/npc/events/nguild/nguild_dunsw.txt @@ -41,25 +41,25 @@ function script F_GldDunSw { } // Castle 1 =============================================== -nguild_alde,212,181,0 script Switch#DunN01 111,{ +nguild_alde,212,181,0 script Switch#DunN01 HIDDEN_NPC,{ callfunc "F_GldDunSw","nguild_alde","02",32,122; close; } // Castle 2 =============================================== -nguild_gef,78,84,0 script Switch#DunN02 111,{ +nguild_gef,78,84,0 script Switch#DunN02 HIDDEN_NPC,{ callfunc "F_GldDunSw","nguild_gef","04",39,258; close; } // Castle 3 =============================================== -nguild_pay,101,25,0 script Switch#DunN03 111,{ +nguild_pay,101,25,0 script Switch#DunN03 HIDDEN_NPC,{ callfunc "F_GldDunSw","nguild_pay","01",186,165; close; } // Castle 4 =============================================== -nguild_prt,94,200,0 script Switch#DunN04 111,{ +nguild_prt,94,200,0 script Switch#DunN04 HIDDEN_NPC,{ callfunc "F_GldDunSw","nguild_prt","03",28,251; close; } |