3 files changed, 64 insertions, 0 deletions
diff --git a/world/map/npc/magic/_import.txt b/world/map/npc/magic/_import.txt
index 4671ac7a..c3cd11ec 100644
--- a/world/map/npc/magic/_import.txt
+++ b/world/map/npc/magic/_import.txt
@@ -44,3 +44,4 @@ npc: npc/magic/level2-make-tanktop.txt
 npc: npc/magic/level2-make-shirt.txt
 npc: npc/magic/level3-necromancy.txt
 npc: npc/magic/event-summon-managuardian.txt
+npc: npc/magic/event-summon-manatyrant.txt
diff --git a/world/map/npc/magic/event-summon-managuardian.txt b/world/map/npc/magic/event-summon-managuardian.txt
index e18c08ce..bad1213c 100644
--- a/world/map/npc/magic/event-summon-managuardian.txt
+++ b/world/map/npc/magic/event-summon-managuardian.txt
@@ -4,6 +4,8 @@
 
 OnCast:
     if(call("magic_checks")) end;
+    // FIXME: Incomplete check, should still work during sieges
+    if (getmapflag(getmap(), MF_TOWN)) end;
     if (Sp < 100) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (countitem("TinyManaElixir") < 1) end;
diff --git a/world/map/npc/magic/event-summon-manatyrant.txt b/world/map/npc/magic/event-summon-manatyrant.txt
new file mode 100644
index 00000000..f91b2a87
--- /dev/null
+++ b/world/map/npc/magic/event-summon-manatyrant.txt
@@ -0,0 +1,61 @@
+-|script|summon-tyrant|32767
+{
+    end;
+
+OnCast:
+    if(call("magic_checks")) end;
+    if ($DOOMSDAY_SUMMON < 2) end;
+    if (getmapflag(getmap(), MF_TOWN)) end;
+    if (Sp < 100) end;
+    if (getskilllv(SKILL_MAGIC) < .level) end;
+    if (countitem("LargeManaElixir") < 1) end;
+    if (@dd4cooldown > gettimetick(2)) goto L_Cooldown;
+    delitem "LargeManaElixir", 1;
+    set @_M_BLOCK, 1; // block casting, until the timer clears it
+    addtimer 15000, "Magic Timer::OnClear"; // set the new debuff
+    callfunc "adjust_spellpower";
+    set Sp, Sp - 100;
+    misceffect FX_MAGIC_MAGGOT_CAST, strcharinfo(0);
+    callfunc "magic_exp";
+    set .@puppet$, "#"+strnpcinfo(0)+"#"+BL_ID;
+    set .@puppet, puppet(getmap(), POS_X, POS_Y, .@puppet$, 127);
+    if (.@puppet < 1) end;
+    set .master, BL_ID, .@puppet;
+    set .lifetime, (@spellpower*9)+150000, .@puppet;
+    set @dd4cooldown, gettimetick(2)+160; // This is measured in seconds
+    addnpctimer 10000, .@puppet$+"::OnSummon";
+    addnpctimer 11000, .@puppet$+"::OnDestroy";
+    // Causes caster to heal (I thought in converting MP to HP but meh)
+    heal 30000, 0;
+    end;
+
+OnSummon:
+    if (!(isloggedin(.master))) destroy;
+    if(get(Hp, .master) < 1) destroy; // destroy if master is missing
+    if(getmap(.master) != strnpcinfo(3)) destroy; // destroy if master left the map
+    specialeffect FX_MAGIC_MAGGOT_SPAWN;
+    set .@x, getnpcx();
+    set .@y, getnpcy();
+    set .@map$, strnpcinfo(3);
+    callsub S_SummonAll;
+    end;
+
+OnDestroy:
+    destroy;
+
+S_SummonAll:
+    summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1150, 2, .lifetime;
+    destroy;
+
+L_Cooldown:
+    message strcharinfo(0), "This skill is in forced cooldown; Please wait your first summon to expire.";
+    end;
+
+OnInit:
+    set .school, SKILL_MAGIC_ASTRAL;
+    set .invocation$, chr(MAGIC_SYMBOL) + "manatez"; // used in npcs that refer to this spell
+    void call("magic_register", "OnCast");
+    set .level, 1;
+    set .exp_gain, 1;
+    end;
+}