10 files changed, 2 insertions, 11 deletions
diff --git a/world/map/npc/magic/event-summon-managuardian.txt b/world/map/npc/magic/event-summon-managuardian.txt
index e66c3eb7..1aa172ad 100644
--- a/world/map/npc/magic/event-summon-managuardian.txt
+++ b/world/map/npc/magic/event-summon-managuardian.txt
@@ -5,7 +5,6 @@
 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
index bf2634c5..ff082930 100644
--- a/world/map/npc/magic/event-summon-manatyrant.txt
+++ b/world/map/npc/magic/event-summon-manatyrant.txt
@@ -5,7 +5,6 @@
 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;
diff --git a/world/map/npc/magic/level1-summon-maggots.txt b/world/map/npc/magic/level1-summon-maggots.txt
index 05cadbc8..ce95422c 100644
--- a/world/map/npc/magic/level1-summon-maggots.txt
+++ b/world/map/npc/magic/level1-summon-maggots.txt
@@ -5,7 +5,6 @@
 OnCast:
     if(call("magic_checks")) end;
     if (Sp < 21) end;
-    if (getmapflag(getmap(), MF_TOWN)) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (countitem("InsectSlime") < 1 || countitem("Root") < 1) end;
     if (getmap() == "033-1") goto L_SpecialRules6;
diff --git a/world/map/npc/magic/level2-lightning-strike.txt b/world/map/npc/magic/level2-lightning-strike.txt
index bdd311a6..0a97dc63 100644
--- a/world/map/npc/magic/level2-lightning-strike.txt
+++ b/world/map/npc/magic/level2-lightning-strike.txt
@@ -30,12 +30,11 @@
 
 OnAttack:
     if (target(BL_ID, @target_id, 0x36) != 0x36) goto L_FreeRecast; // 0x10 | 0x02 | 0x04 | 0x20
-
     set .@p, get(.max_radius, "rain") + 1;
     set @ingravspell[5], @target_id; // store it because foreach overwrites it
     foreach 1, getmap(), POS_X-.@p, POS_Y-.@p, POS_X+.@p, POS_Y+.@p, strnpcinfo(0)+"::OnNpc";
     set @target_id, @ingravspell[5]; // now restore it
-
+    if (@ingravspell[2] <= 0) overrideattack; // workaround for caster in rain death case
     set @ingravspell[2], @ingravspell[2] - 1;
     if (@ingravspell[4] & 1) goto L_InRain;
     void call("elt_damage", @ingravspell[0], (@ingravspell[0]/2)+1, ELT_EARTH, ELT_WIND, FX_LIGHTNING1 + rand(3));
@@ -49,6 +48,7 @@ L_FreeRecast:
 OnDischarge:
     if (@ingravspell[2] < 1) end;
     set @ingravspell[2], 0;
+    set @ingravspell[4], 0;     // Clean up "in rain" flag, it caused funny bugs.
     misceffect FX_MAGIC_DISCHARGE, strcharinfo(0);
     overrideattack;
     end;
diff --git a/world/map/npc/magic/level2-summon-fluffies.txt b/world/map/npc/magic/level2-summon-fluffies.txt
index f10a86b5..fef40a17 100644
--- a/world/map/npc/magic/level2-summon-fluffies.txt
+++ b/world/map/npc/magic/level2-summon-fluffies.txt
@@ -5,7 +5,6 @@
 OnCast:
     if(call("magic_checks")) end;
     if (Sp < 39) end;
-    if (getmapflag(getmap(), MF_TOWN)) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (getskilllv(.school) < .level) end;
     if (countitem("WhiteFur") < 1 || countitem("Root") < 1) end;
diff --git a/world/map/npc/magic/level2-summon-mouboo.txt b/world/map/npc/magic/level2-summon-mouboo.txt
index c692e9cf..8a8603c6 100644
--- a/world/map/npc/magic/level2-summon-mouboo.txt
+++ b/world/map/npc/magic/level2-summon-mouboo.txt
@@ -5,7 +5,6 @@
 OnCast:
     if(call("magic_checks")) end;
     if (Sp < 35) end;
-    if (getmapflag(getmap(), MF_TOWN)) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (getskilllv(.school) < .level) end;
     if (countitem("MoubooFigurine") < 1 || countitem("Root") < 1) end;
diff --git a/world/map/npc/magic/level2-summon-pinkie.txt b/world/map/npc/magic/level2-summon-pinkie.txt
index 61af9eed..b4774584 100644
--- a/world/map/npc/magic/level2-summon-pinkie.txt
+++ b/world/map/npc/magic/level2-summon-pinkie.txt
@@ -5,7 +5,6 @@
 OnCast:
     if(call("magic_checks")) end;
     if (Sp < 35) end;
-    if (getmapflag(getmap(), MF_TOWN)) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (getskilllv(.school) < .level) end;
     if (countitem("PinkAntenna") < 1 || countitem("Root") < 1) end;
diff --git a/world/map/npc/magic/level2-summon-snakes.txt b/world/map/npc/magic/level2-summon-snakes.txt
index 0723961b..5815cef5 100644
--- a/world/map/npc/magic/level2-summon-snakes.txt
+++ b/world/map/npc/magic/level2-summon-snakes.txt
@@ -5,7 +5,6 @@
 OnCast:
     if(call("magic_checks")) end;
     if (Sp < 40) end;
-    if (getmapflag(getmap(), MF_TOWN)) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (getskilllv(.school) < .level) end;
     if (countitem("DarkCrystal") < 1 || countitem("SnakeEgg") < 1) end;
diff --git a/world/map/npc/magic/level2-summon-spiky-mushroom.txt b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
index 701648d5..0f884185 100644
--- a/world/map/npc/magic/level2-summon-spiky-mushroom.txt
+++ b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
@@ -5,7 +5,6 @@
 OnCast:
     if(call("magic_checks")) end;
     if (Sp < 33) end;
-    if (getmapflag(getmap(), MF_TOWN)) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (getskilllv(.school) < .level) end;
     if (countitem("HardSpike") < 1 || countitem("Root") < 1) end;
diff --git a/world/map/npc/magic/level2-summon-wickedmushroom.txt b/world/map/npc/magic/level2-summon-wickedmushroom.txt
index 014a5d80..7d0e93c1 100644
--- a/world/map/npc/magic/level2-summon-wickedmushroom.txt
+++ b/world/map/npc/magic/level2-summon-wickedmushroom.txt
@@ -5,7 +5,6 @@
 OnCast:
     if(call("magic_checks")) end;
     if (Sp < 42) end;
-    if (getmapflag(getmap(), MF_TOWN)) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (getskilllv(.school) < .level) end;
     if (countitem("DarkCrystal") < 1 || countitem("SmallMushroom") < 1) end;