diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/functions/clear_vars.txt | 23 | ||||
| -rw-r--r-- | npc/functions/mob_points.txt | 41 |
2 files changed, 46 insertions, 18 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 diff --git a/npc/functions/mob_points.txt b/npc/functions/mob_points.txt index f4cbedf0..b4361f0a 100644 --- a/npc/functions/mob_points.txt +++ b/npc/functions/mob_points.txt @@ -52,32 +52,39 @@ function script MobPoints { // Attitude adjustment for Sagatha switch (@mobId) { - case 1018: - case 1020: - case 1027: - case 1094: - case 1112: - case 1113: + case Pinkie: + case Fluffy: + case EasterFluffy: + case Reinboo: + case Santaboo: + case Pollett: QuestSagathaAnnoy(3); break; - case 1028: + case Mouboo: QuestSagathaAnnoy(4); break; - case 1038: + case Squirrel: QuestSagathaAnnoy(2); break; - case 1003: - case 1004: - case 1009: - case 1057: - case 1104: - case 1105: - case 1106: - case 1107: + case Scorpion: + case RedScorpion: + case BlackScorpion: + case AngryScorpion: + case DemonicMouboo: + case ViciousSquirrel: + case WickedMushroom: + case Bluepar: QuestSagathaHappy(1); break; } if (QL_CELESTIA >= 5 && QL_CELESTIA < 205 && @mobId == Yeti) { - QL_CELESTIA = QL_CELESTIA + 1; + QL_CELESTIA += 1; if (QL_CELESTIA == 205) message strcharinfo(0), "Yeti : ##3This should be enough yetis killed to please Celestia."; } + + if (TERRAC > 1 && TERRAC < 1500 && @mobId == Terranite) { + if (TERRAC % 100 == 0) + dispbottom("Terranite : ##3"+l("Total Terranites Slain: %s", fnum(TERRAC))); + TERRAC += 1; + } + return; } |