diff options
| author | Wushin <pasekei@gmail.com> | 2015-05-11 21:53:16 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-05-11 21:53:16 -0500 |
| commit | da0f4578b83cc2f9df249dc1bb5bb33d720cb7a8 (patch) | |
| tree | e832bd72654a02f5deb41380d494e4e50474f050 /world/map/npc/annuals | |
| parent | 666512014d1a7929d511403c47fc4e49420c5423 (diff) | |
| parent | 46bb91d3389c79c5375f191a7a136eb775559f99 (diff) | |
| download | serverdata-da0f4578b83cc2f9df249dc1bb5bb33d720cb7a8.tar.gz serverdata-da0f4578b83cc2f9df249dc1bb5bb33d720cb7a8.tar.bz2 serverdata-da0f4578b83cc2f9df249dc1bb5bb33d720cb7a8.tar.xz serverdata-da0f4578b83cc2f9df249dc1bb5bb33d720cb7a8.zip | |
Merge pull request #370 from mekolat/close-end
remove close builtin from functions
Diffstat (limited to 'world/map/npc/annuals')
| -rw-r--r-- | world/map/npc/annuals/halloween/debug.txt | 5 | ||||
| -rw-r--r-- | world/map/npc/annuals/xmas/barriers.txt | 8 | ||||
| -rw-r--r-- | world/map/npc/annuals/xmas/debug.txt | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/world/map/npc/annuals/halloween/debug.txt b/world/map/npc/annuals/halloween/debug.txt index 07717b35..cbc918e2 100644 --- a/world/map/npc/annuals/halloween/debug.txt +++ b/world/map/npc/annuals/halloween/debug.txt @@ -1,4 +1,4 @@ -// Halloween Debug +// Halloween Debug // Author: Wushin function|script|HalloweenDebug @@ -137,5 +137,6 @@ L_Close: set @loop, 0; set @menu, 0; set @halloween_npc_id, 0; - close; + close2; + return; } diff --git a/world/map/npc/annuals/xmas/barriers.txt b/world/map/npc/annuals/xmas/barriers.txt index 5dd30774..3e6aad65 100644 --- a/world/map/npc/annuals/xmas/barriers.txt +++ b/world/map/npc/annuals/xmas/barriers.txt @@ -4,6 +4,7 @@ function|script|ThrowOutTheBum { + set @getout, 0; if((@xmas_thrown_out) && ($@xmas_time)) goto L_SideOut; goto L_Return; @@ -18,13 +19,16 @@ L_Hint: mes "[Orum's Homunculus]"; mes "\"What are you doing? Come, see me in the caves below!\""; mes "\"I said go north till you reach the snowman. Then head into the cave to the east.\""; + close2; warp "020-1.gat",33,94; - close; + set @getout, 1; + goto L_Return; L_Warp: message strcharinfo(0), "I said get out, We've no time for your kind here."; warp "020-1.gat",33,94; - end; + set @getout, 1; + goto L_Return; L_Return: return; diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt index 0e3c38a2..d67c3de8 100644 --- a/world/map/npc/annuals/xmas/debug.txt +++ b/world/map/npc/annuals/xmas/debug.txt @@ -168,7 +168,8 @@ L_Close: set @xmas_time_key_rsday, 0; set @xmas_time_key_reday, 0; set @xmas_time_key_year, 0; - close; + close2; + return; } 020-1.gat,86,76,0|script|XmasDebug#1|105 |