diff options
| author | Fate <fate-tmw@googlemail.com> | 2009-05-16 15:20:10 +0000 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2009-05-16 15:20:10 +0000 |
| commit | 9c025c897e112583b68de9d8545f81edb95dbe5c (patch) | |
| tree | 0712c68e84e8f12650d07a90420003b6fd9e1cdd /npc/functions | |
| parent | 25c4fee3bc0196a381b529f495bce8143ee0f501 (diff) | |
| parent | 25789740c889c6f37d31b32cebb741ab7cfeb869 (diff) | |
| download | serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.tar.gz serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.tar.bz2 serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.tar.xz serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.zip | |
Merge branch 'master' of git@gitorious.org:tmw-eathena-data/mainline
Conflicts:
db/item_db.txt
npc/013-3_Cave/barrier.txt
Diffstat (limited to 'npc/functions')
| -rw-r--r-- | npc/functions/clear_vars.txt | 61 | ||||
| -rw-r--r-- | npc/functions/soul_menhir.txt | 4 |
2 files changed, 64 insertions, 1 deletions
diff --git a/npc/functions/clear_vars.txt b/npc/functions/clear_vars.txt new file mode 100644 index 00000000..706c5cd8 --- /dev/null +++ b/npc/functions/clear_vars.txt @@ -0,0 +1,61 @@ +// Clears old variables + +function script ClearVariables { + // Halloween 2006 + set HWQUEST1, 0; + set HWQUEST2, 0; + set HWQUEST3, 0; + set HWQUEST4, 0; + set HWQUEST5, 0; + set HWQUEST6, 0; + set HWQUEST7, 0; + set HWQUEST8, 0; + set HWQUEST9, 0; + set HWQUEST10, 0; + set HWQUEST11, 0; + set HWQUEST12, 0; + set HWQUEST13, 0; + set HWQUEST14, 0; + set HWQUEST15, 0; + set HWQUEST16, 0; + set HWQUEST17, 0; + set HWQUEST18, 0; + set HWQUEST18, 0; + set HWQUEST19, 0; + set HWQUEST20, 0; + + // Christmas 2006 + set XMASQUEST1, 0; + set XMASQUEST2, 0; + set XMASQUEST3, 0; + set XMASQUEST4, 0; + set XMASQUEST5, 0; + set XMASQUEST6, 0; + set XMASQUEST7, 0; + set XMASQUEST8, 0; + set XMASQUEST9, 0; + set XMASQUEST10, 0; + set XMASQUEST11, 0; + set XMASQUEST12, 0; + set XMASQUEST13, 0; + set XMASQUEST14, 0; + set XMASQUEST15, 0; + set XMASQUEST16, 0; + set XMASQUEST17, 0; + set XMASQUEST18, 0; + set XMASQUEST19, 0; + set XMASQUEST20, 0; + + set QUEST_xmas07_state, 0; + set QUEST_xmas07_milk, 0; + set QUEST_xmas07_cookies, 0; + set QUEST_xmas07_presents, 0; + + set QUEST_Easter08_state, 0; + + set Halloween08, 0; + + set QUEST_xmas08_state, 0; + + return; +} diff --git a/npc/functions/soul_menhir.txt b/npc/functions/soul_menhir.txt index ccedc319..25ccc4db 100644 --- a/npc/functions/soul_menhir.txt +++ b/npc/functions/soul_menhir.txt @@ -5,7 +5,7 @@ function script SoulMenhir { menu "Touch it", -, - "Leave it alone", return; + "Leave it alone", L_Return; if (Menhir_Activated == 1) goto L_Shortversion; @@ -31,5 +31,7 @@ L_Shortversion: L_Save: savepoint @map$, @x, @y; + +L_Return: return; } |