summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/functions/hub.txt59
1 files changed, 35 insertions, 24 deletions
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index e58e9f058..1769a1c4b 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -309,16 +309,19 @@ function script HUB_SkillInvoke {
// TODO: Debuffs
// TODO: Buffs
case TMW2_FIRSTAID:
+ .@PW=90+(10*@skillLv);
// First aid only works on you, so
- .@heal=max(AdjustSpellpower(100), AdjustAttackpower(100));
+ .@heal=max(AdjustSpellpower(.@PW), AdjustAttackpower(.@PW));
heal .@heal, 0;
break;
case TMW2_HEALING:
- harm(@skillTarget, -AdjustSpellpower(150), HARM_MISC);
+ .@PW=130+(20*@skillLv);
+ harm(@skillTarget, -AdjustSpellpower(.@PW), HARM_MISC);
break;
case TMW2_MAGNUSHEAL:
// TODO: Area healing
- harm(@skillTarget, -AdjustSpellpower(220), HARM_MISC);
+ .@PW=200+(20*@skillLv);
+ harm(@skillTarget, -AdjustSpellpower(.@PW), HARM_MISC);
break;
// Provoke: builtin, Mass Provoke: See above
@@ -327,28 +330,33 @@ function script HUB_SkillInvoke {
// Destructive Magic
case TMW2_FIREARROW:
- harm(@skillTarget, AdjustSpellpower(150), HARM_MAGI, Ele_Fire);
+ .@PW=140+(10*@skillLv);
+ harm(@skillTarget, AdjustSpellpower(.@PW), HARM_MAGI, Ele_Fire);
break;
case TMW2_FIREBALL:
+ .@PW=140+(10*@skillLv);
// TODO: areaharm()
- harm(@skillTarget, AdjustSpellpower(150), HARM_MAGI, Ele_Fire);
+ harm(@skillTarget, AdjustSpellpower(.@PW), HARM_MAGI, Ele_Fire);
break;
case TMW2_ARMAGEDDON:
+ .@PW=140+(10*@skillLv);
// TODO: areaharm()
areasc2(getmap(), @skillTargetX, @skillTargetY, 2, 10000, SC_BLOODING, BL_MOB|BL_PC);
- harm(@skillTarget, AdjustSpellpower(150), HARM_MAGI, Ele_Fire);
+ harm(@skillTarget, AdjustSpellpower(.@PW), HARM_MAGI, Ele_Fire);
break;
case TMW2_FROSTDIVER:
+ .@PW=80+(10*@skillLv);
// 8% chance, 10s
sc_start SC_FREEZE, 10000, 1, 800, flag?, @skillTarget;
- harm(@skillTarget, AdjustSpellpower(90), HARM_MAGI, Ele_Water);
+ harm(@skillTarget, AdjustSpellpower(.@PW), HARM_MAGI, Ele_Water);
break;
case TMW2_FROSTNOVA:
+ .@PW=80+(10*@skillLv);
// TODO: All this in area
// 8% chance, 10s
sc_start SC_FREEZE, 10000, 1, 800, flag?, @skillTarget;
- harm(@skillTarget, AdjustSpellpower(90), HARM_MAGI, Ele_Water);
+ harm(@skillTarget, AdjustSpellpower(.@PW), HARM_MAGI, Ele_Water);
break;
// FIXME SK_Nilfheim
@@ -376,28 +384,31 @@ function script HUB_SkillInvoke {
// Brawling Class
case TMW2_BRAWLING:
// 75x3 = 225
- harm(@skillTarget, AdjustAttackpower(75), HARM_PHYS, Ele_Neutral);
- harm(@skillTarget, AdjustAttackpower(75), HARM_PHYS, Ele_Neutral);
- harm(@skillTarget, AdjustAttackpower(75), HARM_PHYS, Ele_Neutral);
+ .@PW=70+(5*@skillLv);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Neutral);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Neutral);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Neutral);
break;
case TMW2_BEARSTRIKE:
// 60x5 = 300
- harm(@skillTarget, AdjustAttackpower(60), HARM_PHYS, Ele_Neutral);
- harm(@skillTarget, AdjustAttackpower(60), HARM_PHYS, Ele_Neutral);
- harm(@skillTarget, AdjustAttackpower(60), HARM_PHYS, Ele_Neutral);
- harm(@skillTarget, AdjustAttackpower(60), HARM_PHYS, Ele_Neutral);
- harm(@skillTarget, AdjustAttackpower(60), HARM_PHYS, Ele_Neutral);
+ .@PW=55+(5*@skillLv);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Neutral);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Neutral);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Neutral);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Neutral);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Neutral);
break;
case TMW2_ALLINONE:
// 45x8 = 360
- harm(@skillTarget, AdjustAttackpower(45), HARM_PHYS, Ele_Neutral);
- harm(@skillTarget, AdjustAttackpower(45), HARM_PHYS, Ele_Fire);
- harm(@skillTarget, AdjustAttackpower(45), HARM_PHYS, Ele_Water);
- harm(@skillTarget, AdjustAttackpower(45), HARM_PHYS, Ele_Earth);
- harm(@skillTarget, AdjustAttackpower(45), HARM_PHYS, Ele_Wind);
- harm(@skillTarget, AdjustAttackpower(45), HARM_PHYS, Ele_Holy);
- harm(@skillTarget, AdjustAttackpower(45), HARM_PHYS, Ele_Shadow);
- harm(@skillTarget, AdjustAttackpower(45), HARM_PHYS, Ele_Ghost);
+ .@PW=40+(5*@skillLv);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Neutral);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Fire);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Water);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Earth);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Wind);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Holy);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Shadow);
+ harm(@skillTarget, AdjustAttackpower(.@PW), HARM_PHYS, Ele_Ghost);
break;
*/
// CLASS_OTHER