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/013-3 | |
| parent | 566297bd2b1467cf23e88bb2c0ad210b7d5a2ffa (diff) | |
| parent | c84e27e10b0f6ed56ae0ee1b0ec4fe7e9d0fd507 (diff) | |
| download | serverdata-2014.4.16.tar.gz serverdata-2014.4.16.tar.bz2 serverdata-2014.4.16.tar.xz serverdata-2014.4.16.zip | |
Merge pull request #79 from wushin/Tile-Fixes-Map-Travelv2014.4.16
Tile map fixes sprite travel
Diffstat (limited to 'world/map/npc/013-3')
| -rw-r--r-- | world/map/npc/013-3/_import.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/013-3/barrier.txt | 6 | ||||
| -rw-r--r-- | world/map/npc/013-3/mapflags.txt | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/world/map/npc/013-3/_import.txt b/world/map/npc/013-3/_import.txt index 79ed5aed..61dbf64f 100644 --- a/world/map/npc/013-3/_import.txt +++ b/world/map/npc/013-3/_import.txt @@ -4,6 +4,7 @@ map: 013-3.gat npc: npc/013-3/_mobs.txt npc: npc/013-3/_warps.txt npc: npc/013-3/barrier.txt +npc: npc/013-3/mapflags.txt npc: npc/013-3/mask_chest.txt npc: npc/013-3/misc.txt npc: npc/013-3/sword_chest.txt diff --git a/world/map/npc/013-3/barrier.txt b/world/map/npc/013-3/barrier.txt index 3b979f5d..40c2600c 100644 --- a/world/map/npc/013-3/barrier.txt +++ b/world/map/npc/013-3/barrier.txt @@ -7,18 +7,18 @@ set @state, ((QUEST_Hurnscald & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); if (@state >= 2) goto L_End; - if (@state == 1 && countitem("JackOSoul") >= 1) goto L_Has_Jack_O_Soul; + if (@state == 1 && countitem("Soul") >= 1) goto L_Has_Soul; message strcharinfo(0), "A barrier around the opening pushes you back as you approach."; warp "013-3.gat", 71, 25; goto L_End; -L_Has_Jack_O_Soul: +L_Has_Soul: message strcharinfo(0), "The barrier around the opening allows you passage."; set @state, 2; callsub S_Update_Mask; - delitem "JackOSoul", 1; + delitem "Soul", 1; goto L_End; L_End: diff --git a/world/map/npc/013-3/mapflags.txt b/world/map/npc/013-3/mapflags.txt new file mode 100644 index 00000000..b9d4496b --- /dev/null +++ b/world/map/npc/013-3/mapflags.txt @@ -0,0 +1 @@ +013-3.gat|mapflag|resave|013-1,126,99 |