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/quests/mrsmile.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/quests/mrsmile.txt')
| -rw-r--r-- | npc/quests/mrsmile.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/npc/quests/mrsmile.txt b/npc/quests/mrsmile.txt index 4baf22093..065dc5f89 100644 --- a/npc/quests/mrsmile.txt +++ b/npc/quests/mrsmile.txt @@ -12,7 +12,7 @@ //= 1.4a Fixed a little Typo error in duplicates. (bugreport:749) [Samuray22] //============================================================ -- script Smile Assistance::SmileHelper 92,{ +- script Smile Assistance::SmileHelper 4_F_03,{ mes "[Smile Girl]"; mes "Hi ~ Hi ~"; mes "This is Smile Assistance."; @@ -93,12 +93,12 @@ } // Additional Smile Assistance staff -alberta,113,53,4 duplicate(SmileHelper) Smile Assistance#alb 92 -aldebaran,136,135,4 duplicate(SmileHelper) Smile Assistance#alde 92 -geffen,119,107,4 duplicate(SmileHelper) Smile Assistance#gef 92 -moc_ruins,59,154,3 duplicate(SmileHelper) Smile Assistance#moc 92 -payon,186,104,5 duplicate(SmileHelper) Smile Assistance#pay 92 -prontera,157,187,4 duplicate(SmileHelper) Smile Assistance#prt 92 +alberta,113,53,4 duplicate(SmileHelper) Smile Assistance#alb 4_F_03 +aldebaran,136,135,4 duplicate(SmileHelper) Smile Assistance#alde 4_F_03 +geffen,119,107,4 duplicate(SmileHelper) Smile Assistance#gef 4_F_03 +moc_ruins,59,154,3 duplicate(SmileHelper) Smile Assistance#moc 4_F_03 +payon,186,104,5 duplicate(SmileHelper) Smile Assistance#pay 4_F_03 +prontera,157,187,4 duplicate(SmileHelper) Smile Assistance#prt 4_F_03 //============================================================ // Old changelog |