diff options
author | wushin <pasekei@gmail.com> | 2014-04-16 13:09:51 -0500 |
---|---|---|
committer | wushin <pasekei@gmail.com> | 2014-04-16 13:09:51 -0500 |
commit | e04e9eb0065caa6adf12ef36efbd3c5a3c5c3652 (patch) | |
tree | c57506b8665c9acc305bc6c85064bb4a7ab1fbc5 /world/map/npc/009-2/wyara.txt | |
parent | 566297bd2b1467cf23e88bb2c0ad210b7d5a2ffa (diff) | |
parent | c84e27e10b0f6ed56ae0ee1b0ec4fe7e9d0fd507 (diff) | |
download | serverdata-e04e9eb0065caa6adf12ef36efbd3c5a3c5c3652.tar.gz serverdata-e04e9eb0065caa6adf12ef36efbd3c5a3c5c3652.tar.bz2 serverdata-e04e9eb0065caa6adf12ef36efbd3c5a3c5c3652.tar.xz serverdata-e04e9eb0065caa6adf12ef36efbd3c5a3c5c3652.zip |
Merge pull request #79 from wushin/Tile-Fixes-Map-Travelv2014.4.16
Tile map fixes sprite travel
Diffstat (limited to 'world/map/npc/009-2/wyara.txt')
-rw-r--r-- | world/map/npc/009-2/wyara.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt index da2b8dc5..cf1912fc 100644 --- a/world/map/npc/009-2/wyara.txt +++ b/world/map/npc/009-2/wyara.txt @@ -47,11 +47,13 @@ L_Main: "Can you help me learn magic?", L_Magic, "I would like to buy potions.", L_Shop, "Bye!", L_Close; - menu - "What do you know about...", L_Question, - "Can you help me learn magic?", L_Magic, - "I would like to buy potions.", L_Shop, - "Bye!", L_Close; + if (!(!@has_magic && (MAGIC_FLAGS & MFLAG_TOUCHED_MANASEED))) + menu + "What do you know about...", L_Question, + "Can you help me learn magic?", L_Magic, + "I would like to buy potions.", L_Shop, + "Bye!", L_Close; + goto L_Shop; L_Shop: mes "[Wyara the Witch]"; |