summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/config/magic.txt28
-rw-r--r--npc/functions/util.txt2
2 files changed, 15 insertions, 15 deletions
diff --git a/npc/config/magic.txt b/npc/config/magic.txt
index f8d5423b6..76f207b3a 100644
--- a/npc/config/magic.txt
+++ b/npc/config/magic.txt
@@ -322,13 +322,13 @@ OnInit:
/* Skillchain */
// First Aid
RegisterMagic(1, TMW2_FIRSTAID, 10, SpellBookPage, 1,
- CLASS_SCHOLARSHIP, 100, false, TMW2_HEALING);
+ CLASS_SCHOLARSHIP, 150, false, TMW2_HEALING);
// Healing
RegisterMagic(2, TMW2_HEALING, 10, SpellBookPage, 1,
- CLASS_SCHOLARSHIP, 100, TMW2_FIRSTAID, TMW2_MAGNUSHEAL);
+ CLASS_SCHOLARSHIP, 200, TMW2_FIRSTAID, TMW2_MAGNUSHEAL);
// Magnus Healing
RegisterMagic(3, TMW2_MAGNUSHEAL, 10, SpellBookPage, 1,
- CLASS_SCHOLARSHIP, 100, TMW2_HEALING, false);
+ CLASS_SCHOLARSHIP, 300, TMW2_HEALING, false);
/* Skillchain */
// Provoke
@@ -358,15 +358,15 @@ OnInit:
CLASS_PHYSICAL, 100, SM_BASH, KN_AUTOCOUNTER);
// Counter Attack
RegisterMagic(2, KN_AUTOCOUNTER, 5, FluoPowder, 3,
- CLASS_PHYSICAL, 100, MC_MAMMONITE, false);
+ CLASS_PHYSICAL, 200, MC_MAMMONITE, false);
/* Skillchain */
// Arrow Shower
RegisterMagic(3, AC_SHOWER, 10, FluoPowder, 3,
- CLASS_PHYSICAL, 100, false, SN_SHARPSHOOTING);
+ CLASS_PHYSICAL, 150, false, SN_SHARPSHOOTING);
// Sharpshooter
RegisterMagic(3, SN_SHARPSHOOTING, 1, FluoPowder, 3,
- CLASS_PHYSICAL, 100, AC_SHOWER, false);
+ CLASS_PHYSICAL, 150, AC_SHOWER, false);
@@ -385,10 +385,10 @@ OnInit:
CLASS_DESTRUCTION, 100, false, TMW2_FIREBALL);
// Fire Ball
RegisterMagic(2, TMW2_FIREBALL, 10, Quill, 2,
- CLASS_DESTRUCTION, 100, TMW2_FIREARROW, TMW2_ARMAGEDDON);
+ CLASS_DESTRUCTION, 150, TMW2_FIREARROW, TMW2_ARMAGEDDON);
// Armageddon
RegisterMagic(3, TMW2_ARMAGEDDON, 5, Quill, 3,
- CLASS_DESTRUCTION, 100, TMW2_FIREBALL, false);
+ CLASS_DESTRUCTION, 200, TMW2_FIREBALL, false);
/* Skillchain */
// Napalm Beat
@@ -396,10 +396,10 @@ OnInit:
CLASS_DESTRUCTION, 100, false, TMW2_HOLYLIGHT);
// Holy Light
RegisterMagic(2, TMW2_HOLYLIGHT, 10, Quill, 2,
- CLASS_DESTRUCTION, 100, TMW2_NAPALMBEAT, TMW2_JUDGMENT);
+ CLASS_DESTRUCTION, 150, TMW2_NAPALMBEAT, TMW2_JUDGMENT);
// Judgement
RegisterMagic(3, TMW2_JUDGMENT, 5, Quill, 3,
- CLASS_DESTRUCTION, 100, TMW2_HOLYLIGHT, false);
+ CLASS_DESTRUCTION, 200, TMW2_HOLYLIGHT, false);
/* Skillchain */
// Frost Diver
@@ -407,10 +407,10 @@ OnInit:
CLASS_DESTRUCTION, 100, false, TMW2_FROSTNOVA);
// Frost Nova
RegisterMagic(2, TMW2_FROSTNOVA, 10, Quill, 2,
- CLASS_DESTRUCTION, 100, TMW2_FROSTDIVER, TMW2_NILFHEIM);
+ CLASS_DESTRUCTION, 150, TMW2_FROSTDIVER, TMW2_NILFHEIM);
// Nilfheim
RegisterMagic(3, TMW2_NILFHEIM, 5, Quill, 3,
- CLASS_DESTRUCTION, 100, TMW2_FROSTNOVA, false);
+ CLASS_DESTRUCTION, 200, TMW2_FROSTNOVA, false);
/* Skillchain */
// Magic Strike
@@ -418,10 +418,10 @@ OnInit:
CLASS_DESTRUCTION, 100, false, TMW2_LIGHTNINGBOLT);
// Lightning Bolt
RegisterMagic(2, TMW2_LIGHTNINGBOLT, 10, Quill, 2,
- CLASS_DESTRUCTION, 100, TMW2_MAGICSTRIKE, TMW2_TEMPEST);
+ CLASS_DESTRUCTION, 150, TMW2_MAGICSTRIKE, TMW2_TEMPEST);
// Tempest
RegisterMagic(3, TMW2_TEMPEST, 5, Quill, 3,
- CLASS_DESTRUCTION, 100, TMW2_LIGHTNINGBOLT, false);
+ CLASS_DESTRUCTION, 200, TMW2_LIGHTNINGBOLT, false);
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index e18a56ac5..22da3c1b6 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -763,7 +763,7 @@ function script learn_magic {
.@it=$@MSK_ITEM[.@ski];
.@am=$@MSK_AMOUNT[.@ski];
.@msp=$@MSK_MSPCOST[.@ski];
- .@ap=($@MSK_COST[.@ski]*getskilllv(.@ski)*100)**2;
+ .@ap=($@MSK_COST[.@ski]*getskilllv(.@ski)*100);
// Pre-requisite check
if (.@pre) {