Remove disabled magic and old holiday quests

1 files changed, 0 insertions, 321 deletions

diff --git a/world/map/conf/magic-base.conf b/world/map/conf/magic-base.conf
index 87e1cac6..5faf0f89 100644
--- a/world/map/conf/magic-base.conf
+++ b/world/map/conf/magic-base.conf
@@ -287,15 +287,6 @@ SPELL ask-magic-exp : "#abizit" =
                     ELSE message (caster, "You feel completely overwhelmed by your magic.");
                 )
 
-# SPELL ask-life-magic-exp : "#heyogo" =
-#       LET level = 0
-#           school = MAGIC
-#       IN (MANA 1, CASTTIME 1000,
-#           REQUIRE skill(caster, MAGIC) > level)
-#       => EFFECT CALL adjust_spellpower(school);
-#                 CALL default_effect();
-#                 message(caster, "You have " + ((script_int(caster, "MAGIC_EXPERIENCE") >> 24) & 0xff) + " Life Magic Experience points.");
-
 SPELL transmute-wood-to-figurine (name : STRING) : "#parum" =
       LET level = 0
           school = TRANSMUTE
@@ -714,30 +705,6 @@ SPELL magic-knuckles : "#upmarmu" =
                     CALL install_melee_spell(10 + spellpower / 10, 1300, 34);
              ATTRIGGER CALL melee_damage(target, 30, 5 + (str * 2));
 
-#SPELL death-wave : "#nertuq" =
-#      LET level = 1
-#          school = DARK
-#      IN (MANA 75, CASTTIME 10000,
-#          REQUIRE skill(caster, MAGIC) > level,
-#          REQUIRE skill(caster, school) > level,
-#          REQUIRE (script_int(caster, "OrumQuest") > 50),
-#          COMPONENTS [5 * 704])
-#      => EFFECT CALL adjust_spellpower(school);
-#                CALL default_effect();
-#                CALL gain_xp(3, 30);
-#                sfx(location, SFX_SUMMON_START, 0);
-#                WAIT 500;
-#                sfx(location, SFX_SUMMON_FIRE, 0);
-#                          IF hp(caster) < 220
-#                          THEN itemheal(caster, -220, 0);
-#                        h = (hp(caster) / 2) * -1;
-#                        itemheal(caster, h, 0);
-#                        d = level(caster);
-#                        damage = spellpower;
-#                        damage_bonus = sqrt(spellpower) * 2;
-#                        FOREACH MOB target IN rbox(location(caster), d / 20) DO
-#                                (CALL elt_damage(target, damage, damage_bonus, ELT_HOLY, ELT_SHADOW, 15 + random(5));)
-
 LOCAL SPELL summon-snakes : "#halhiss" =
       LET level = 1
           school = DARK
@@ -751,51 +718,6 @@ LOCAL SPELL summon-snakes : "#halhiss" =
                 CALL gain_xp(3, 31);
                 CALL summon_dark_spell(1010, 1 + spellpower / 300, 4000 - (spellpower * 9), spellpower * 80, 2);
 
-#LOCAL SPELL summon-black-scorpions : "#halproc" =
-#      LET level = 1
-#        school = DARK
-#      IN (MANA 40, CASTTIME 15000,
-#          REQUIRE skill(caster, MAGIC) > level,
-#          REQUIRE skill(caster, school) > level,
-#          REQUIRE (script_int(caster, "OrumQuest") > 50),
-#          COMPONENTS ["Root", "BlackScorpionStinger"])
-#      => EFFECT CALL adjust_spellpower(school);
-#                CALL default_effect();
-#                CALL gain_xp(3, 32);
-#                CALL summon_dark_spell(1009, 1 + spellpower / 300, 4000 - (spellpower * 9), spellpower * 80, 2);
-
-#LOCAL SPELL summon-skeletons : "#halheth" = # only release this if content has been adjusted or mob has been replaced with a nerfed one
-#      LET level = 1
-#        school = DARK
-#      IN (MANA 50, CASTTIME 17000,
-#          REQUIRE skill(caster, MAGIC) > level,
-#          REQUIRE skill(caster, school) > level,
-#          REQUIRE (script_int(caster, "OrumQuest") > 50),
-#          COMPONENTS ["Bone", "DarkCrystal"])
-#      => EFFECT CALL adjust_spellpower(school);
-#                CALL default_effect();
-#                CALL gain_xp(3, 33);
-#                CALL summon_dark_spell(1043, spellpower / 325, 4000 - (spellpower * 9), spellpower * 70, 2);
-
-#SPELL shadow-strike : "#phlos" =
-#      LET level = 1
-#        school = DARK
-#      IN (MANA 20, CASTTIME 1300,
-#          REQUIRE skill(caster, MAGIC) > level,
-#          REQUIRE skill(caster, DARK) > 0,
-#          REQUIRE (script_int(caster, "OrumQuest") > 50),
-#          (REQUIRE skill(caster, school) > 2 OR COMPONENTS ["DarkCrystal"]))
-#      => EFFECT CALL adjust_spellpower(school);
-#                CALL default_effect();
-#                damage = spellpower / 2;
-#                damage_bonus = 1 + (spellpower - 150);
-#                CALL install_attack_spell(1 + spellpower / 100, 2800, 8, 31);
-#                  IF hp(caster) > 170
-#                  THEN itemheal(caster, -160, 0);
-#                CALL gain_xp(3, 34);
-#                ATTRIGGER CALL attack_check(target);
-#                CALL elt_damage (target, damage, damage_bonus, ELT_HOLY, ELT_SHADOW, 15 + random(5));
-
 SPELL toxic-dart : "#phlex" =
       LET level = 1
         school = DARK
@@ -1396,51 +1318,6 @@ NONMAGIC SILENT SPELL marriage (target : PC) : "marry" =
               IF not (is_married(caster))
               THEN message(caster, name_of(target) + " turned down your marriage offer.");
 
-# SPELL change-hair-colour (colour : STRING) : "trapa" =
-#       (MANA 20) => EFFECT IF colour = "nworbl"
-#                           THEN x = 0; # light brown
-#                           ELSE IF colour = "der"
-#                           THEN x = 1; # red
-#                           ELSE IF colour = "neerg"
-#                           THEN x = 2; # green
-#                           ELSE IF colour = "elprup"
-#                           THEN x = 3; # purple
-#                           ELSE IF colour = "yerg"
-#                           THEN x = 4; # grey
-#                           ELSE IF colour = "wolley"
-#                           THEN x = 5; # yellow
-#                           ELSE IF colour = "eulb"
-#                           THEN x = 6; # blue
-#                           ELSE IF colour = "nwrob"
-#                           THEN x = 7; # brown
-#                           ELSE IF colour = "elpropl"
-#                           THEN x = 8; # light purple
-#                           ELSE IF colour = "elpropd"
-#                           THEN x = 9; # dark purple
-#                           ELSE x = random(10);
-#                           sfx(caster, 2, 0);
-#                           set_hair_colour(caster, x);
-
-
-# SPELL trick-or-treat : "trick-or-treat" =
-#       (CASTTIME 30000, MANA 20,
-#        COMPONENTS [ "BugLeg" ]) => EFFECT              IF (random(2))
-#                                                        THEN (sfx(caster, 2, 0);
-#                                                              FOR i = 0 TO random(10) DO
-#                                                                  drop_item_for (random_location(rbox(location(caster), 5)),
-#                                                                                 "Candy", 1, 10000 + random(10000), caster, 3000);
-#                                                              FOR i = 0 TO random(10) DO
-#                                                                  drop_item_for (random_location(rbox(location(caster), 5)),
-#                                                                                 "ChocolateBar", 1, 10000 + random(10000), caster, 3000);
-#                                                             )
-#                                                        ELSE (sfx(caster, 5, 0);
-#                                                              message(caster, "No treat for you!");
-#                                                              spawn(rbox(location(caster), 3), caster, 1010, 0, 1 + random(3), 10000 + random(20000));
-#                                                              FOREACH MOB target IN rbox(location(caster), 5) DO
-#                                                                      (sfx(target, 5, 0);
-#                                                                       aggravate(target, 0, caster);))
-
-
 LOCAL SPELL mouboo-groan : "#g" =
       (MANA 1,
        REQUIRE name_of(caster) = "MOUBOOTAUR") =>
@@ -1463,167 +1340,6 @@ LOCAL SPELL mouboo-smell : "#s" =
 
 CONST E10_FLAG_USED_FREE_WARP_SHIFT = 17
 
-#NONMAGIC SILENT SPELL easter (type : STRING) : "#m" =
-#    (REQUIRE name_of(caster) == "Freeyorp") =>
-#        EFFECT IF (type == "EE_RF") THEN (
-#            {
-#                doevent("Old Woman::OnReplenish");
-#            }
-#        ) ELSE IF (type == "EE_SUS") THEN (
-#            {
-#                doevent "Old Woman::OnManualStopTimer";
-#            }
-#        ) ELSE IF (type == "EE_INIT") THEN (
-#            {
-#                doevent "Old Woman::OnManualStartTimer";
-#            }
-#        ) ELSE IF (type == "BLOCKER_DISABLE") THEN (
-#            {
-#                set $Easter_2010_Npc_State2, ($Easter_2010_Npc_State2 & ~(E10_BARRIER_MASK << E10_BARRIER_SHIFT)) | (E10_BARRIER_OPEN << E10_BARRIER_SHIFT);
-#            }
-#        ) ELSE IF (type == "BLOCKER_ENABLE") THEN (
-#            {
-#                set $Easter_2010_Npc_State2, ($Easter_2010_Npc_State2 & ~(E10_BARRIER_MASK << E10_BARRIER_SHIFT)) | (E10_BARRIER_ACTIVE << E10_BARRIER_SHIFT);
-#            }
-#        ) ELSE message(caster, "Unknown action '" + type + "'!");
-
-# Invader spells
-
-#NONMAGIC SILENT SPELL easter-invader-init : "#i" =
-#    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#      EFFECT warp(caster, @("028-1.gat", 145, 49));
-#             {
-#              gmcommand "@blvl -255";
-#              gmcommand "@blvl 199";
-#              gmcommand "@setmagic all 5 Xakelbael the Dark";
-#              gmcommand "@allstats";
-#              savepoint "028-1.gat", 136, 49;
-#             }
-#             create_item(caster, "DarkTalisman", 1);
-
-#NONMAGIC SILENT SPELL easter-invader-hide : "#h" =
-#    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#      EFFECT { if (checkoption(4096)) goto L_toggle;
-#               setoption(4096);
-#               end;
-#               L_toggle:
-#               setoption(0);
-#               end; };
-#               warp(caster, location(caster));
-
-#NONMAGIC SILENT SPELL easter-invader-warp-taunt : "#o" =
-#    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#      EFFECT warp(caster, @("009-1.gat", 48, 35));
-#             WAIT 80;
-#             sfx(caster, 32, 0);
-#             WAIT 80;
-#             FOREACH PC p IN rbox(location(caster), 50)
-#                     DO IF (p <> caster) THEN (
-#                         message(p, "A powerful explosion " + if_then_else(distance(location(caster), location(p)) < 10, "right around you nearly deafens you!", if_then_else(distance(location(caster), location(p)) < 30, "nearby shocks you!", "in the distance erupts... you're not sure of the source, but it will be something big...")));
-#                         itemheal(p, -1 - random(hp(p)), 0-(random(sp(p) >> 2)));
-#                     )
-#             WAIT 1000;
-#             FOREACH PC p IN rbox(location(caster), 15)
-#                     DO (
-#                         message(p, "As the smoke clears, you hear a distant, sickly laughing ringing in your ears...");
-#                     )
-
-#NONMAGIC SILENT SPELL easter-invader-warp-taunt-explosion : "#q" =
-#    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#      EFFECT sfx(caster, 32, 0);
-#             WAIT 100;
-#             sfx(caster, 31, 0);
-#             WAIT 30;
-#             sfx(caster, 30, 0);
-#             WAIT 30;
-#             sfx(caster, 30, 0);
-#             WAIT 20;
-#             sfx(caster, 30, 0);
-#             WAIT 10;
-#             sfx(caster, 30, 0);
-#             WAIT 10;
-
-#NONMAGIC SILENT SPELL easter-invader-warp-taunt-end : "#p" =
-#    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#      EFFECT FOREACH PC p IN rbox(location(caster), 50) DO IF (p <> caster)
-#             THEN ( script_target = p;
-#                    { gmcommand "@jump"; }
-#                    message(p, "A powerful force sends you flying!");
-#                  )
-#             warp(caster, @("028-1.gat", 136, 49));
-
-
-#NONMAGIC SILENT SPELL easter-invader-attack-pulse : "#a" =
-#    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#      EFFECT IF (script_int(caster, "InvState") == 1) THEN ( set_script_variable(caster, "InvState", 0); ABORT; );
-#             set_script_variable(caster, "InvState", 1);
-#             FOR i = 1 TO 500
-#             DO ( sfx(caster, 31, 0);
-#                  WAIT 80;
-#                  FOREACH PC p IN rbox(location(caster), 4)
-#                          DO IF (p <> caster) THEN ( injure(caster, p, 30 - random(random(25)) - random(5) + random(i), 0); )
-#                  WAIT 420;
-#                  IF (script_int(caster, "InvState") == 0) THEN ABORT;
-#                )
-#             set_script_variable(caster, "InvState", 0);
-
-#NONMAGIC SILENT SPELL easter-invader-command : "#d" =
-#    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#      EFFECT override_attack(caster, 3, ((200 - agi(caster)) * 5000) / 200,
-#                             8, ATTACK_ICON_GENERIC, 31, 0);
-#      ATTRIGGER CALL attack_check(target);
-#                area = rbox(location(target), 8);
-#                FOREACH MOB m IN area
-#                DO (message(caster, "Class Id: " + mob_id(m));
-#                    IF (mob_id(m) = 1040 || mob_id(m) == 1042 || mob_id(m) == 1047) THEN (
-#                    CALL sfx_generic(m);
-#                    aggravate(m, 0, target);
-#                    )
-#                    )
-
-#NONMAGIC SILENT SPELL easter-invader-spike : "#w" =
-#    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#      EFFECT FOR i = 1 TO 40
-#             DO ( point = random_location(rbox(location(caster), sqrt(i) << 1));
-#                  IF (random(3))
-#                  THEN (sfx(point, 32, 0);
-#                        WAIT 50;
-#                        FOREACH PC p IN rbox(point, sqrt(i) >> 1)
-#                        DO IF (p <> caster)
-#                           THEN (injure(caster, p, i + random(i << 1), random(random(i)));)
-#                  ) ELSE (sfx(point, 31, 0);
-#                          WAIT 50;
-#                          FOREACH PC p IN rbox(point, sqrt(i))
-#                          DO IF (p <> caster)
-#                             THEN (injure(caster, p, i + random(i << 2), random(random(i)));)
-#                  )
-#                  WAIT 400 - (i << 3);
-#                )
-
-#NONMAGIC SILENT SPELL easter-invader-jump (t : STRING) : "#j" =
-#    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#      EFFECT IF not (status_option(caster, 4096)) THEN ( sfx(caster, 33, 0);
-#                                                  WAIT 200; );
-#             IF (t == "r") THEN ( warp(caster, @("028-1.gat", 135, 49)); )
-#             ELSE IF (t == "s") THEN ( warp(caster, @("028-1.gat", 75, 99)); )
-#             ELSE IF (t == "c") THEN ( warp(caster, @("028-3.gat", 50, 58)); )
-#             ELSE IF (t == "t") THEN ( warp(caster, @("009-1.gat", 48, 35)); )
-#             ELSE { gmcommand "@jump"; };
-
-#NONMAGIC SILENT SPELL easter-invader-taunt-local (s : STRING) : "#l" =
-#    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#      EFFECT FOREACH PC p IN rbox(location(caster), 20) DO message(p, s);
-
-#NONMAGIC SILENT SPELL easter-invader-taunt-global (s : STRING) : "#b" =
-#    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#      EFFECT FOREACH PC p IN rbox(location(caster), 100) DO message(p, s);
-
-#NONMAGIC SILENT SPELL easter-invader-spawn : "#c" =
-#    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#      EFFECT spawn(rbox(location(caster), 20), caster, 1040, random(random(5)), 1, 100000);
-#             spawn(rbox(location(caster), 20), caster, 1042, random(random(5)), 1, 100000);
-#             spawn(rbox(location(caster), 20), caster, 1047, random(random(5)), 1, 100000);
-
 NONMAGIC SILENT SPELL world-shift : "#alonzialonzo" =
     (REQUIRE (script_int(caster, "Easter_2010_QuestState") >> 16) & 1 == 1 && (script_int(caster, "Easter_2010_QuestState") >> 7) & 3 == 2) => # Travel only works when you have both helped the doctor at least thrice and have defeated the invader - top level requirement.
      (  (REQUIRE (count_item(caster, "DarkPetal")) && # Allow unlimited travel with the petal
@@ -1667,43 +1383,6 @@ NONMAGIC SILENT SPELL world-shift : "#alonzialonzo" =
        )
      )
 
-#NONMAGIC SILENT SPELL easter-invader-killer : "#z" =
-#    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#    EFFECT { gmcommand "@killer"; }
-
-#NONMAGIC SILENT SPELL easter-invader-killable : "#x" =
-#    (REQUIRE name_of(caster) == "Xakelbael the Dark") =>
-#    EFFECT { gmcommand "@killable"; }
-
-#NONMAGIC SILENT SPELL easter-debug-reset (s : STRING) : "#r" =
-#    (REQUIRE name_of(caster) == "Freeyorp") =>
-#    EFFECT set_script_variable(pc(s), "Easter_2010_QuestState", 0);
-
-#NONMAGIC SILENT SPELL easter-set-flag (s : PC) : "#k" =
-#    (REQUIRE name_of(caster) == "Freeyorp" || name_of(caster) == "Xakelbael the Dark") =>
-#    EFFECT IF (s == caster) THEN ABORT;
-#           IF ((script_int(s, "Easter_2010_QuestState") >> 16) & 1) THEN ( message(caster, s + " already has the flag set!"); ABORT; )
-#           script_target = s;
-#           {    set Easter_2010_QuestState, Easter_2010_QuestState | (1 << 16); // RETURN_READY flag
-#                mes "As the smoke clears, you feel stronger, vivified.";
-#                next;
-#                mes "The world seems more vibrant. It looks the same as ever, but you get a sense of something more.";
-#                next;
-#                mes "You feel something familiar.";
-#                next;
-#                mes "This sensation... could it be home?";
-#                next;
-#                mes "A single word comes to your mind - " + getspellinvocation("world-shift") + ". While it sounds magical, you know with certainty that you will not need any magical power to use it.";
-#                next;
-#                mes "Could this be the way to move to and from the worlds? Either way, the dark petal the rose vanished into seems to be the key.";
-#                next;
-#                mes "Though you might be able to succeed in one trip without it, returning home.";
-#                if ((Easter_2010_QuestState >> E10_STATE_ROSE_SHIFT) & E10_STATE_ROSE_MASK == E10_STATE_ROSE_ROSE_COMPLETE) close;
-#                next;
-#                mes "But the world is still not quite right. Perhaps there is someone you should help before the world releases its hold on you?";
-#                close;
-#           }
-
 NONMAGIC SILENT SPELL easter-get-debug (p : PC) : "#e" =
     (REQUIRE name_of(caster) == "Freeyorp" || name_of(caster) == "Xakelbael the Dark") =>
     EFFECT { message strcharinfo(0), "Global state egg1: " + $Easter_2010_Egg_Loc_State1;