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/re/quests/quests_morocc.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/re/quests/quests_morocc.txt')
| -rw-r--r-- | npc/re/quests/quests_morocc.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/npc/re/quests/quests_morocc.txt b/npc/re/quests/quests_morocc.txt index b1eb02a35..5c062bdf4 100644 --- a/npc/re/quests/quests_morocc.txt +++ b/npc/re/quests/quests_morocc.txt @@ -37,19 +37,19 @@ end; } } -moc_fild07,380,202,1 duplicate(Continental Guard#man) Continental Guard#man1 852 -moc_fild11,189,360,6 duplicate(Continental Guard#man) Continental Guard#man2 852 -prt_fild10,263,23,1 duplicate(Continental Guard#man) Continental Guard#man3 852 -prt_fild09,95,19,1 duplicate(Continental Guard#man) Continental Guard#man4 852 -prt_fild09,246,17,1 duplicate(Continental Guard#man) Continental Guard#man5 852 -moc_fild13,32,171,6 duplicate(Continental Guard#man) Continental Guard#man6 852 -moc_fild16,124,381,4 duplicate(Continental Guard#man) Continental Guard#man7 852 -moc_fild16,333,380,4 duplicate(Continental Guard#man) Continental Guard#man8 852 -moc_fild01,84,19,1 duplicate(Continental Guard#man) Continental Guard#man9 852 +moc_fild07,380,202,1 duplicate(Continental Guard#man) Continental Guard#man1 4_M_EIN_SOLDIER +moc_fild11,189,360,6 duplicate(Continental Guard#man) Continental Guard#man2 4_M_EIN_SOLDIER +prt_fild10,263,23,1 duplicate(Continental Guard#man) Continental Guard#man3 4_M_EIN_SOLDIER +prt_fild09,95,19,1 duplicate(Continental Guard#man) Continental Guard#man4 4_M_EIN_SOLDIER +prt_fild09,246,17,1 duplicate(Continental Guard#man) Continental Guard#man5 4_M_EIN_SOLDIER +moc_fild13,32,171,6 duplicate(Continental Guard#man) Continental Guard#man6 4_M_EIN_SOLDIER +moc_fild16,124,381,4 duplicate(Continental Guard#man) Continental Guard#man7 4_M_EIN_SOLDIER +moc_fild16,333,380,4 duplicate(Continental Guard#man) Continental Guard#man8 4_M_EIN_SOLDIER +moc_fild01,84,19,1 duplicate(Continental Guard#man) Continental Guard#man9 4_M_EIN_SOLDIER // Pyramids Nightmare Mode //============================================================ -moc_prydb1,103,54,3 script Suspicious Cat#night 547,{ +moc_prydb1,103,54,3 script Suspicious Cat#night 4_CAT_SAILOR4,{ mes "[Suspicious Cat]"; mes "I can't believe a mummy could do this to me. Oh man, it hurts. Nobody should find out about this...."; next; @@ -107,7 +107,7 @@ moc_prydb1,103,54,3 script Suspicious Cat#night 547,{ } } -moc_prydn1,94,98,3 script Suspicious Cat#night2 547,{ +moc_prydn1,94,98,3 script Suspicious Cat#night2 4_CAT_SAILOR4,{ mes "[Suspicious Cat]"; mes "That stupid mummy slapped me again while you were looking away! Sniff sniff... Let's go back, meow!"; next; |