diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2015-05-04 12:26:03 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2015-05-13 09:57:58 -0400 |
| commit | b5c7cd1fd409489279a752b45f40fa3684434ae7 (patch) | |
| tree | 76c82012659d59ac3195f467e25136ea8287c53e /world/map/npc/031-2 | |
| parent | 833c70cf2ada6b6015ed49fc3f98c9aa4bb4ad4c (diff) | |
| download | serverdata-b5c7cd1fd409489279a752b45f40fa3684434ae7.tar.gz serverdata-b5c7cd1fd409489279a752b45f40fa3684434ae7.tar.bz2 serverdata-b5c7cd1fd409489279a752b45f40fa3684434ae7.tar.xz serverdata-b5c7cd1fd409489279a752b45f40fa3684434ae7.zip | |
convert cindy quest
Diffstat (limited to 'world/map/npc/031-2')
| -rw-r--r-- | world/map/npc/031-2/angelaHouse.txt | 22 | ||||
| -rw-r--r-- | world/map/npc/031-2/cindyHouse.txt | 10 |
2 files changed, 4 insertions, 28 deletions
diff --git a/world/map/npc/031-2/angelaHouse.txt b/world/map/npc/031-2/angelaHouse.txt index 3fe6f023..11eeaff6 100644 --- a/world/map/npc/031-2/angelaHouse.txt +++ b/world/map/npc/031-2/angelaHouse.txt @@ -5,13 +5,8 @@ 031-2,29,28,0|script|Angela#house|196 { - set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; - set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; - - set @rescue_Cindy, ((QUEST_Nivalis_state & @Q_Nivalis_state_MASK) >> @Q_Nivalis_state_SHIFT); - - if (@rescue_Cindy == 4) goto L_Hello_Again; - if (@rescue_Cindy == 3) goto L_Reward; + if (QL_CINDY == 4) goto L_Hello_Again; + if (QL_CINDY == 3) goto L_Reward; mes "..."; goto L_Close; @@ -30,8 +25,7 @@ L_Reward: if (@inventorylist_count == 100) goto L_Full_Inv; getitem "RockKnife", 1; - set @rescue_Cindy, 4; - callsub S_Update_Mask; + set QL_CINDY, 4; next; mes "\"I hope this will be useful for you.\""; @@ -87,10 +81,6 @@ L_White: goto L_Close; L_Close: - set @Q_Nivalis_state_MASK, 0; - set @Q_Nivalis_state_SHIFT, 0; - set @rescue_Cindy, 0; - set @dq_level, 0; set @dq_cost, 0; set @dq_count, 0; @@ -100,10 +90,4 @@ L_Close: set @dq_exp, 0; set @dq_return, 0; close; - -S_Update_Mask: - set QUEST_Nivalis_state, - (QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK)) - | (@rescue_Cindy << @Q_Nivalis_state_SHIFT); - return; } diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt index bd4c17fb..564e7935 100644 --- a/world/map/npc/031-2/cindyHouse.txt +++ b/world/map/npc/031-2/cindyHouse.txt @@ -4,12 +4,7 @@ 031-2,27,26,0|script|Cindy#house|197 { - set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; - set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; - - set @rescue_Cindy, ((QUEST_Nivalis_state & @Q_Nivalis_state_MASK) >> @Q_Nivalis_state_SHIFT); - - if (@rescue_Cindy > 2) goto L_Happy_Random; + if (QL_CINDY > 2) goto L_Happy_Random; mes "..."; goto L_Close; @@ -44,9 +39,6 @@ L_Candy: goto L_Close; L_Close: - set @Q_Nivalis_state_MASK, 0; - set @Q_Nivalis_state_SHIFT, 0; - set @rescue_Cindy, 0; set @candy, 0; set @inventorylist_count, 0; set @random, 0; |