diff options
Diffstat (limited to 'npc/functions/clear_vars.txt')
| -rw-r--r-- | npc/functions/clear_vars.txt | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/npc/functions/clear_vars.txt b/npc/functions/clear_vars.txt index 9d75fef0..60567cd8 100644 --- a/npc/functions/clear_vars.txt +++ b/npc/functions/clear_vars.txt @@ -29,10 +29,31 @@ function script ClearVariables { QL_CINDY = 0; } if (MAGIC_EXPERIENCE) { - setq1(MagicQuest_Healing, (QUEST_MAGIC2 & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); // Needed as QUEST_MAGIC2 wasn't completely deleted setq2(MagicQuest_Healing, MAGIC_EXPERIENCE >> 24); MAGIC_EXP = (MAGIC_EXPERIENCE & 65535); MAGIC_EXPERIENCE = 0; + /* Convert the old magic system to new magic system */ + setq1(MagicQuest_Healing, + (QUEST_MAGIC2 & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); + //setq1(MagicQuest_Wyara, + // (QUEST_MAGIC2 & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); + //setq1(MagicQuest_Kadiya, + // (QUEST_MAGIC2 & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); + //setq1(MagicQuest_Pauline, + // (QUEST_MAGIC2 & NIBBLE_4_MASK) >> NIBBLE_4_SHIFT); + //setq1(MagicQuest_BrotherSword, + // (QUEST_MAGIC2 & NIBBLE_6_MASK) >> NIBBLE_6_SHIFT); + //setq1(MagicQuest_SisterSword, + // (QUEST_MAGIC2 & (NIBBLE_6_MASK | NIBBLE_7_MASK)) >> NIBBLE_6_SHIFT); // Twobits, overlap w/ brothersword o.o + //setq1(MagicQuest_Auldsbel, + // (QUEST_MAGIC & (NIBBLE_0_MASK | NIBBLE_1_MASK)) >> NIBBLE_0_SHIFT); // Twobits + //setq1(MagicQuest_WhiteMage, + // (QUEST_MAGIC & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); // Boo + Druid + //SAGATHA_ST = (QUEST_MAGIC & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT; // Unhappy + //Saggy - 4+5 + //Alchemist - 6+7 (War Quest - Swords again?) + QUEST_MAGIC = 0; + QUEST_MAGIC2 = 0; } // Don't ask me what code below does |