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/god_se_festival.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/god_se_festival.txt')
| -rw-r--r-- | npc/events/god_se_festival.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt index 3b8e12bf7..c56563c86 100644 --- a/npc/events/god_se_festival.txt +++ b/npc/events/god_se_festival.txt @@ -14,7 +14,7 @@ //============================================================ // Original name: "Festival Manager#god_se_fes00" -yuno,1,1,0 script Festival Manager#gq_fes0 891,{ +yuno,1,1,0 script Festival Manager#gq_fes0 4_F_HUGIRL,{ callfunc "F_GM_NPC"; mes "[Festival Manager]"; mes "I am the festival NPC manager for the God SE quest."; @@ -44,7 +44,7 @@ yuno,1,1,0 script Festival Manager#gq_fes0 891,{ } } -yuno,118,192,5 script Rmimi Ravies#gq_fes01 891,{ +yuno,118,192,5 script Rmimi Ravies#gq_fes01 4_F_HUGIRL,{ set .@GID, getcharid(2); if (countitem(7840) > 0) { mes "[Rmimi Ravies]"; @@ -392,7 +392,7 @@ OnTimer3900000: // Original name: "Festival Manager#god_se_fes02" -rachel,1,1,0 script Festival Manager#gq_fes2 891,{ +rachel,1,1,0 script Festival Manager#gq_fes2 4_F_HUGIRL,{ callfunc "F_GM_NPC"; mes "[Festival Manager]"; mes "I am the festival NPC manager for the God SE quest."; @@ -422,7 +422,7 @@ rachel,1,1,0 script Festival Manager#gq_fes2 891,{ } } -rachel,132,117,3 script Rhehe Ravies#gq_fes03 891,{ +rachel,132,117,3 script Rhehe Ravies#gq_fes03 4_F_HUGIRL,{ set .@GID, getcharid(2); if (countitem(7840) > 0) { mes "[Rhehe Ravies]"; |