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-4 | |
| 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/009-4')
| -rw-r--r-- | world/map/npc/009-4/_import.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/009-4/mapflags.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/009-4/torches.txt | 18 |
3 files changed, 11 insertions, 9 deletions
diff --git a/world/map/npc/009-4/_import.txt b/world/map/npc/009-4/_import.txt index 36baf60b..7b30fd2e 100644 --- a/world/map/npc/009-4/_import.txt +++ b/world/map/npc/009-4/_import.txt @@ -4,6 +4,7 @@ map: 009-4.gat npc: npc/009-4/_mobs.txt npc: npc/009-4/_warps.txt npc: npc/009-4/barriers.txt +npc: npc/009-4/mapflags.txt npc: npc/009-4/orum.txt npc: npc/009-4/orum_warps.txt npc: npc/009-4/torches.txt diff --git a/world/map/npc/009-4/mapflags.txt b/world/map/npc/009-4/mapflags.txt new file mode 100644 index 00000000..05aa9324 --- /dev/null +++ b/world/map/npc/009-4/mapflags.txt @@ -0,0 +1 @@ +009-4.gat|mapflag|resave|009-4,37,118 diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt index 22d718af..f093bc10 100644 --- a/world/map/npc/009-4/torches.txt +++ b/world/map/npc/009-4/torches.txt @@ -156,13 +156,13 @@ L_Use_Red: // T R o Y g B p // ^ < < < < , X . > > > > if (@TorchColor == 1) - goto L_Wrong_Color; + goto L_WrongColor; if (2 <= @TorchColor && @TorchColor <= 5) goto L_Color_Dec; if (@TorchColor == 6) goto L_Color_Dec_Wrong; if (@TorchColor == 7) - goto L_Wrong_Color; + goto L_WrongColor; if (@TorchColor == 8) goto L_Color_Inc_Wrong; if (9 <= @TorchColor && @TorchColor <= 12) @@ -184,13 +184,13 @@ L_Use_Yellow: if (1 <= @TorchColor && @TorchColor <= 4) goto L_Color_Inc; if (@TorchColor == 5) - goto L_Wrong_Color; + goto L_WrongColor; if (6 <= @TorchColor && @TorchColor <= 9) goto L_Color_Dec; if (@TorchColor == 10) goto L_Color_Dec_Wrong; if (@TorchColor == 11) - goto L_Wrong_Color; + goto L_WrongColor; if (@TorchColor == 12) goto L_Color_Inc_Wrong; @@ -212,13 +212,13 @@ L_Use_Blue: if (@TorchColor == 2) goto L_Color_Dec_Wrong; if (@TorchColor == 3) - goto L_Wrong_Color; + goto L_WrongColor; if (@TorchColor == 4) goto L_Color_Inc_Wrong; if (5 <= @TorchColor && @TorchColor <= 8) goto L_Color_Inc; if (@TorchColor == 9) - goto L_Wrong_Color; + goto L_WrongColor; if (10 <= @TorchColor && @TorchColor <= 12) goto L_Color_Dec; @@ -241,13 +241,13 @@ L_Color_Dec_Wrong: set @TorchColor, @TorchColor - 1; if (@TorchColor == 0) set @TorchColor, 12; - goto L_Wrong_Color; + goto L_WrongColor; L_Color_Inc_Wrong: set @TorchColor, @TorchColor + 1; if (@TorchColor == 13) set @TorchColor, 1; - goto L_Wrong_Color; + goto L_WrongColor; L_Color_Inc: set @TorchColor, @TorchColor + 1; @@ -261,7 +261,7 @@ L_Show_Color: mes "As your pour the powder into the flame you can see its tint transform to a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + "."; goto L_Color_Loop; -L_Wrong_Color: +L_WrongColor: callfunc "SetTorchColor"; set @TorchIntensity, @TorchIntensity + 1; if (@TorchIntensity > 2) |