diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-02-09 22:25:06 -0800 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-02-12 23:05:13 +0100 |
| commit | 55b20f23de4c709398b65e6833b29138e4307e7a (patch) | |
| tree | db7c5f06fda9d681b0acdda65100272506070f5c /world | |
| parent | 726a2d9c8707109d22f20074439d2047915f0d36 (diff) | |
| download | serverdata-55b20f23de4c709398b65e6833b29138e4307e7a.tar.gz serverdata-55b20f23de4c709398b65e6833b29138e4307e7a.tar.bz2 serverdata-55b20f23de4c709398b65e6833b29138e4307e7a.tar.xz serverdata-55b20f23de4c709398b65e6833b29138e4307e7a.zip | |
o11c's review of the conversion function
Diffstat (limited to 'world')
| -rw-r--r-- | world/map/npc/functions/clear_vars.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt index 9faef2be..14e9cc5f 100644 --- a/world/map/npc/functions/clear_vars.txt +++ b/world/map/npc/functions/clear_vars.txt @@ -149,41 +149,41 @@ L_Fix_Full: function|script|ClearVarTMW_Quest|{ if (TMW_Quest == 0) goto L_Done; - if (TMW_Quest < 7) goto L_Bernard_Mikhail; - if (TMW_Quest < 9) goto L_Sarah; - if (TMW_Quest < 11) goto L_Vincent; - if (TMW_Quest < 13) goto L_Sandra; - if (TMW_Quest < 41) goto L_Desert; + if (TMW_Quest <= 6) goto L_Bernard_Mikhail; + if (TMW_Quest <= 8) goto L_Sarah; + if (TMW_Quest <= 10) goto L_Vincent; + if (TMW_Quest <= 12) goto L_Sandra; + if (TMW_Quest <= 40) goto L_Desert; L_Bandit: -// move Banditt subquest into Nibble 0 of QUEST_Hurnscald +// move Bandit subquest into Nibble 0 of QUEST_Hurnscald set @bandit, TMW_Quest - 40; set QUEST_Hurnscald, (QUEST_Hurnscald & ~(NIBBLE_0_MASK) | (@bandit << NIBBLE_0_SHIFT)); - set TMW_Quest, TMW_Quest - @bandit; + set TMW_Quest, 40; set @bandit, 0; L_Desert: // move guard and miner subquest into Byte 2 (Nibble 4 and 5) of QUEST_SouthTulimshar set @miners, TMW_Quest - 12; set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@miners << BYTE_2_SHIFT)); - set TMW_Quest, TMW_Quest - @miners; + set TMW_Quest, 12; set @miners, 0; L_Sandra: // move Sandra subquest into Nibble 3 of QUEST_SouthTulimshar set @sandra, TMW_Quest - 10; set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(NIBBLE_3_MASK) | (@sandra << NIBBLE_3_SHIFT)); - set TMW_Quest, TMW_Quest - @sandra; + set TMW_Quest, 10; set @sandra, 0; L_Vincent: // move Vincent subquest into Nibble 2 of QUEST_SouthTulimshar set @vincent, TMW_Quest - 8; set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(NIBBLE_2_MASK) | (@vincent << NIBBLE_2_SHIFT)); - set TMW_Quest, TMW_Quest - @vincent; + set TMW_Quest, 8; set @vincent, 0; L_Sarah: // move Sarah subquest into Nibble 1 of QUEST_SouthTulimshar set @sarah, TMW_Quest - 6; set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(NIBBLE_1_MASK) | (@sarah << NIBBLE_1_SHIFT)); - set TMW_Quest, TMW_Quest - @sarah; + set TMW_Quest, 6; set @sarah, 0; L_Bernard_Mikhail: // move Bernard and Mikhail subquest into Nibble 0 of QUEST_SouthTulimshar |