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/bossnia.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/bossnia.txt')
| -rw-r--r-- | npc/events/bossnia.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/npc/events/bossnia.txt b/npc/events/bossnia.txt index 7211ebaa1..70f4fc21c 100644 --- a/npc/events/bossnia.txt +++ b/npc/events/bossnia.txt @@ -14,7 +14,7 @@ // Entrance NPCs //============================================================ -prontera,132,125,4 script Bossnia Staff#1 908,{ +prontera,132,125,4 script Bossnia Staff#1 4_M_PHILMAN,{ mes "[Riss]"; mes "Hello?"; mes "I found some beautiful places"; @@ -81,11 +81,11 @@ prontera,132,125,4 script Bossnia Staff#1 908,{ mes "Come back when you have at least 5,000 zeny."; close; } -geffen,124,169,4 duplicate(Bossnia Staff#1) Bossnia Staff#2 908 -payon,165,150,4 duplicate(Bossnia Staff#1) Bossnia Staff#3 908 -morocc,142,100,4 duplicate(Bossnia Staff#1) Bossnia Staff#4 908 -lighthalzen,203,140,4 duplicate(Bossnia Staff#1) Bossnia Staff#5 908 -rachel,132,144,4 duplicate(Bossnia Staff#1) Bossnia Staff#6 908 +geffen,124,169,4 duplicate(Bossnia Staff#1) Bossnia Staff#2 4_M_PHILMAN +payon,165,150,4 duplicate(Bossnia Staff#1) Bossnia Staff#3 4_M_PHILMAN +morocc,142,100,4 duplicate(Bossnia Staff#1) Bossnia Staff#4 4_M_PHILMAN +lighthalzen,203,140,4 duplicate(Bossnia Staff#1) Bossnia Staff#5 4_M_PHILMAN +rachel,132,144,4 duplicate(Bossnia Staff#1) Bossnia Staff#6 4_M_PHILMAN // Warp Portals //============================================================ |