Disable summoning magic in towns.

close serverdata!2

7 files changed, 7 insertions, 0 deletions

diff --git a/world/map/npc/magic/level1-summon-maggots.txt b/world/map/npc/magic/level1-summon-maggots.txt
index bfbafa79..98ca6096 100644
--- a/world/map/npc/magic/level1-summon-maggots.txt
+++ b/world/map/npc/magic/level1-summon-maggots.txt
@@ -5,6 +5,7 @@
 OnCast:
     if(call("magic_checks")) end;
     if (Sp < 21) end;
+    if (getmapflag(getmap(), MF_TOWN)) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     if (countitem("MaggotSlime") < 1 || countitem("Root") < 1) end;
     delitem "MaggotSlime", 1;
diff --git a/world/map/npc/magic/level2-summon-fluffies.txt b/world/map/npc/magic/level2-summon-fluffies.txt
index 06ad8ae2..b614e4a3 100644
--- a/world/map/npc/magic/level2-summon-fluffies.txt
+++ b/world/map/npc/magic/level2-summon-fluffies.txt
@@ -5,6 +5,7 @@
 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 32adf500..dfa60e57 100644
--- a/world/map/npc/magic/level2-summon-mouboo.txt
+++ b/world/map/npc/magic/level2-summon-mouboo.txt
@@ -5,6 +5,7 @@
 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 e6fa2a11..efcb014c 100644
--- a/world/map/npc/magic/level2-summon-pinkie.txt
+++ b/world/map/npc/magic/level2-summon-pinkie.txt
@@ -5,6 +5,7 @@
 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 8756355a..2e2021ae 100644
--- a/world/map/npc/magic/level2-summon-snakes.txt
+++ b/world/map/npc/magic/level2-summon-snakes.txt
@@ -5,6 +5,7 @@
 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 84d4eb82..ff861283 100644
--- a/world/map/npc/magic/level2-summon-spiky-mushroom.txt
+++ b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
@@ -5,6 +5,7 @@
 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 42060eb1..dc5fb72d 100644
--- a/world/map/npc/magic/level2-summon-wickedmushroom.txt
+++ b/world/map/npc/magic/level2-summon-wickedmushroom.txt
@@ -5,6 +5,7 @@
 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("DarkCrystal") < 1 || countitem("SmallMushroom") < 1) end;