summaryrefslogtreecommitdiff
path: root/world/map/npc/magic
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/magic')
-rw-r--r--world/map/npc/magic/event-summon-managuardian.txt2
-rw-r--r--world/map/npc/magic/level2-barrier.txt4
-rw-r--r--world/map/npc/magic/level2-magic-knuckles.txt2
3 files changed, 5 insertions, 3 deletions
diff --git a/world/map/npc/magic/event-summon-managuardian.txt b/world/map/npc/magic/event-summon-managuardian.txt
index 9a92b16a..2581ab16 100644
--- a/world/map/npc/magic/event-summon-managuardian.txt
+++ b/world/map/npc/magic/event-summon-managuardian.txt
@@ -11,7 +11,7 @@ OnCast:
if (countitem("TinyManaElixir") < 1) end;
if (!$DOOMSDAY_SUMMON) end;
// if (@ddcooldown > gettimetick(2)) goto L_Cooldown;
- if (sc_check (SC_COOLDOWN_MG)) goto L_Cooldown;
+ if (sc_check(SC_COOLDOWN_MG)) goto L_Cooldown;
if (getmap() == "033-1") goto L_SpecialRules6;
goto L_Pay;
diff --git a/world/map/npc/magic/level2-barrier.txt b/world/map/npc/magic/level2-barrier.txt
index 284209c0..def8856e 100644
--- a/world/map/npc/magic/level2-barrier.txt
+++ b/world/map/npc/magic/level2-barrier.txt
@@ -28,8 +28,10 @@ L_Pay:
callfunc "magic_exp";
if (BL_ID != @target_id) misceffect FX_MAGIC_BARRIER_HIT, @args$;
set .@time, (@spellpower*200)+2000;
+ set .@time, .@time+5000; // FIXME: Temporary Boost!
set @asorm_time, .@time, @target_id;
- sc_start SC_MBARRIER, .@time, max(30,(@spellpower/8))+20, @target_id;
+ // FIXME: max(30,(@spellpower/8))+20
+ sc_start SC_MBARRIER, .@time, max(30,(@spellpower/7))+22, @target_id;
message @args$, "Barrier : You are surrounded by a magical barrier.";
set @asorm_future, gettimetick(0) + @asorm_time - 100, @target_id;
addtimer @asorm_time - 100, strnpcinfo(0)+"::OnEnd", @target_id;
diff --git a/world/map/npc/magic/level2-magic-knuckles.txt b/world/map/npc/magic/level2-magic-knuckles.txt
index da276811..3f2d5da1 100644
--- a/world/map/npc/magic/level2-magic-knuckles.txt
+++ b/world/map/npc/magic/level2-magic-knuckles.txt
@@ -17,7 +17,7 @@
setarray @upmarmuspell[0],
max(1, BASE_ATK - 100 + min(100, Int)), // dmg
((@spellpower/10) + ((Dex * 8)/(sqrt(BaseLevel + 34)) + 20)), // charges (you get more at lower levels)
- (sqrt(300 - (Agi * 2)) + (5/2)), // delay
+ (sqrt(190)), // delay - see conf/battle_athena.conf @ max_aspd
((Agi + Int) / 2), // dmg bonus
(((BaseLevel/5) + Str) * 2); // do not allow to equip light armor, cast, and then switch to heavy armor to get bonus str
callfunc "magic_exp";