diff options
| author | shennetsind <ind@henn.et> | 2013-12-08 14:07:51 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-12-08 14:07:51 -0200 |
| commit | 0191e8c774f2675a32b16cdc1ac2be1c61ca252d (patch) | |
| tree | 3901eecefb36b616db93746aa52954719d2dfe6a /npc/quests | |
| parent | 813908c6d116b6afe92cf128cdbb84131860f2c6 (diff) | |
| parent | 8be1bf181369089e6e7288ed6922aba4bb4f8e0a (diff) | |
| download | hercules-0191e8c774f2675a32b16cdc1ac2be1c61ca252d.tar.gz hercules-0191e8c774f2675a32b16cdc1ac2be1c61ca252d.tar.bz2 hercules-0191e8c774f2675a32b16cdc1ac2be1c61ca252d.tar.xz hercules-0191e8c774f2675a32b16cdc1ac2be1c61ca252d.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'npc/quests')
| -rw-r--r-- | npc/quests/quests_morocc.txt | 2 | ||||
| -rw-r--r-- | npc/quests/the_sign_quest.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index 86e07aab1..398aa9a97 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -7772,7 +7772,7 @@ OnTouch: } prt_castle,354,276,0 script #peter WARPNPC,1,1,{ -OnTouch:; +OnTouch: if (checkquest(10019) == 0 || checkquest(10019) == 1) { donpcevent "Prince#eisen5::OnEnable"; } diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt index ba0d259e9..9ede5352e 100644 --- a/npc/quests/the_sign_quest.txt +++ b/npc/quests/the_sign_quest.txt @@ -3546,7 +3546,7 @@ geffen_in,59,74,4 script Jesqurienne#sign 1_F_SIGNZISK,{ mes "But who's going to"; mes "ask us the questions?"; next; - donpcevent "Aaron#sign::onSmile"; + donpcevent "Aaron#sign::OnSmile"; emotion e_gasp; emotion e_gasp,1; mes "[Aaron]"; |