summaryrefslogtreecommitdiff
path: root/world/map/npc/magic/level2-rain.txt
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/magic/level2-rain.txt')
-rw-r--r--world/map/npc/magic/level2-rain.txt10
1 files changed, 3 insertions, 7 deletions
diff --git a/world/map/npc/magic/level2-rain.txt b/world/map/npc/magic/level2-rain.txt
index 83cb4f89..7d642425 100644
--- a/world/map/npc/magic/level2-rain.txt
+++ b/world/map/npc/magic/level2-rain.txt
@@ -7,21 +7,17 @@ OnCast:
if(call("magic_checks")) end;
if (getskilllv(.school) < .level) end;
if (getskilllv(SKILL_MAGIC) < .level) end;
+ if (getskilllv(.school) < 4 && countitem("BottleOfWater") < 1) end;
+ elif (getskilllv(.school) < 4) end;
if (Sp < 17) end;
explode .@map_ext[0], getmap(), "-";
if (.@map_ext[1] != 1 && getmap() != "099-5") end; // XXX this is fugly, in the future let's use MF_OUTSIDE to detect if a map is "outside" or "inside"
if (getmapflag(getmap(), MF_TOWN)) end;
- if (countitem("BottleOfWater") < 1) end;
- if (getskilllv(.school) < 4 && countitem("BottleOfWater") >= 1) goto L_Continue;
- elif (getskilllv(.school) < 4) end;
- goto L_Continue;
-
-L_Continue:
if (getmap() == "033-1") goto L_SpecialRules6;
goto L_Pay;
L_Pay:
- delitem "BottleOfWater", 1;
+ if (getskilllv(.school) < 4) delitem "BottleOfWater", 1;
set Sp, Sp - 17;
set @_M_BLOCK, 1; // block casting, until the timer clears it
addtimer 3000, "Magic Timer::OnClear"; // set the new debuff