From 4a656a7a5eadce14756cf64ffedbab263274a4d7 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Tue, 23 Jun 2020 07:51:09 -0300
Subject: TMW2_OVERLOAD

---
 db/re/skill_db.conf   | 30 ++++++++++++++++++++++++++++++
 db/re/skill_tree.conf |  1 +
 npc/functions/hub.txt | 13 ++++++-------
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index e2164da84..8b7a92df4 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -39412,4 +39412,34 @@ skill_db: (
 		}
 	}
 },
+{
+	Id: 20048
+	Name: "TMW2_OVERLOAD"
+	Description: "Weapon Overload"
+	Range: -1
+	MaxLevel: 10
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	DamageType: {
+		NoDamage: true
+	}
+	SkillInfo: {
+		Quest: true
+	}
+	CoolDown: {
+		Lv1: 60000
+		Lv2: 57000
+		Lv3: 54000
+		Lv4: 51000
+		Lv5: 48000
+		Lv6: 45000
+		Lv7: 42000
+		Lv8: 39000
+		Lv9: 36000
+		Lv10: 33000
+	}
+},
 )
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index ea9b669ed..981cd5f42 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -43,6 +43,7 @@ Human: {
 		AM_REST: 0
 		AM_RESURRECTHOMUN: 6
 		AL_DP: 0
+		TMW2_OVERLOAD: 0
 
 		// Mana Skills
 		TMW2_ZARKOR: 3
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index c0356f5fe..b54360e34 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -296,8 +296,12 @@ function	script	HUB_SkillInvoke	{
             SK_spregen();
             GetManaExp(GD_DEVELOPMENT, 10);
             break;
-        // Magic v3
+        // Weapon Overload attack
+        case TMW2_OVERLOAD:
+            .@PW=67+(33*@skillLv);
+            areaharm(@skillTarget, 0, AdjustAttackpower(.@PW), HARM_MISC);
             break;
+        // Magic v3
         case TMW2_JUDGMENT:
             debugmes "Target: %d (%d,%d)", @skillTarget, @skillTargetX, @skillTargetY;
             areasc2(getmap(), @skillTargetX, @skillTargetY, 2, 10000, SC_BLOODING, BL_MOB|BL_PC);
@@ -316,12 +320,6 @@ function	script	HUB_SkillInvoke	{
             Sp=0;
             break;
 
-        // Weapon Overload attack
-        case TMW2_OVERLOAD:
-            .@PW=67+(33*@skillLv);
-            areaharm(@skillTarget, 0, AdjustAttackpower(.@PW), HARM_MISC);
-            break;
-
         // TODO: Ultimate Skills (T5/0)
 
         // Support magic
@@ -460,6 +458,7 @@ function	script	HUB_SkillInvoke	{
             break;
         // Summons which may fail
         case TMW2_KALMURK:
+            // TODO: Allow Giant Maggot summoning
             SK_summon(Maggot, 2, any(1,2));
             break;
         case TMW2_KALWULF:
-- 
cgit v1.2.3-70-g09d2