summaryrefslogtreecommitdiff
path: root/npc/functions/clear_vars.txt
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-07-15 12:30:58 -0300
committerJesusaves <cpntb1@ymail.com>2021-07-15 12:30:58 -0300
commitef5e8039265bd8b3e55de5903a1215b2ff4db8b7 (patch)
tree69d6203c329613f5e449f2c23a5501c56448c971 /npc/functions/clear_vars.txt
parentdea723cd59fd08eae2ed235d3b9f0571ba0ff214 (diff)
downloadserverdata-ef5e8039265bd8b3e55de5903a1215b2ff4db8b7.tar.gz
serverdata-ef5e8039265bd8b3e55de5903a1215b2ff4db8b7.tar.bz2
serverdata-ef5e8039265bd8b3e55de5903a1215b2ff4db8b7.tar.xz
serverdata-ef5e8039265bd8b3e55de5903a1215b2ff4db8b7.zip
Magic reset OR bugfix. Fix missing code to close #61 (Terranite Counting)
Diffstat (limited to 'npc/functions/clear_vars.txt')
-rw-r--r--npc/functions/clear_vars.txt23
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