Add Brawling skills to server CI

3 files changed, 126 insertions, 8 deletions

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 3f1e4f615..fa491b4e8 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -39975,6 +39975,120 @@ skill_db: (
 		SPCost: 210
 	}
 },
+{
+	Id: 20068
+	Name: "TMW2_BRAWLING"
+	Description: "Brawling"
+	MaxLevel: 10
+	Range: 1
+	SkillType: {
+		Enemy: true
+	}
+	SkillInfo: {
+		Quest: true
+	}
+	Hit: "BDT_SKILL"
+	AttackType: "Weapon"
+	Element: "Ele_Neutral"
+	DamageType: {
+		NoDamage: true
+	}
+	InterruptCast: true
+	CoolDown: {
+		Lv1: 5000
+		Lv2: 4500
+		Lv3: 4000
+		Lv4: 3500
+		Lv5: 3000
+		Lv6: 2500
+		Lv7: 2000
+		Lv8: 1500
+		Lv9: 1000
+		Lv10: 500
+	}
+	CastTime: 200
+	FixedCastTime: 100
+	AfterCastActDelay: 100
+	Requirements: {
+		SPCost: 70
+	}
+},
+{
+	Id: 20069
+	Name: "TMW2_BEARSTRIKE"
+	Description: "Bear Strike"
+	MaxLevel: 10
+	Range: 1
+	SkillType: {
+		Enemy: true
+	}
+	SkillInfo: {
+		Quest: true
+	}
+	Hit: "BDT_SKILL"
+	AttackType: "Weapon"
+	Element: "Ele_Neutral"
+	DamageType: {
+		NoDamage: true
+	}
+	InterruptCast: true
+	CoolDown: {
+		Lv1: 7000
+		Lv2: 6000
+		Lv3: 5000
+		Lv4: 4000
+		Lv5: 3000
+		Lv6: 2500
+		Lv7: 2000
+		Lv8: 1500
+		Lv9: 1000
+		Lv10: 500
+	}
+	CastTime: 200
+	FixedCastTime: 100
+	AfterCastActDelay: 100
+	Requirements: {
+		SPCost: 100
+	}
+},
+{
+	Id: 20070
+	Name: "TMW2_ALLINONE"
+	Description: "All In One"
+	MaxLevel: 10
+	Range: 1
+	SkillType: {
+		Enemy: true
+	}
+	SkillInfo: {
+		Quest: true
+	}
+	Hit: "BDT_SKILL"
+	AttackType: "Weapon"
+	Element: "Ele_Random"
+	DamageType: {
+		NoDamage: true
+	}
+	InterruptCast: true
+	CoolDown: {
+		Lv1: 10000
+		Lv2: 9000
+		Lv3: 8000
+		Lv4: 7000
+		Lv5: 6000
+		Lv6: 5000
+		Lv7: 4000
+		Lv8: 3000
+		Lv9: 2000
+		Lv10: 1000
+	}
+	CastTime: 300
+	FixedCastTime: 100
+	AfterCastActDelay: 100
+	Requirements: {
+		SPCost: 140
+	}
+},
 // Additional Homunculus Skills
 {
 	Id: 8044
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index d183a5eba..247d85fe4 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -87,18 +87,14 @@ Human: {
 		TMW2_MAGNUSHEAL: 0
 		EVOL_AREA_PROVOKE: 0
 
-		///////////////// Magic v3 (Custom/Destructive)
-		TMW2_JUDGMENT: 0
-		TMW2_NILFHEIM: 0
-
-		///////////////// Magic v3 (Custom/Physical)
-
-		///////////////// Magic v3 (WIP/Work In Progress)
+		///////////////// Magic v3 (Magic Skills)
 		TMW2_FROSTDIVER: 0
 		TMW2_FROSTNOVA: 0
+		TMW2_NILFHEIM: 0
 		TMW2_NAPALMBEAT: 0
 		TMW2_HOLYLIGHT: 0
 		TMW2_MAGICSTRIKE: 0
+		TMW2_JUDGMENT: 0
 		TMW2_LIGHTNINGBOLT: 0
 		TMW2_TEMPEST: 0
 		TMW2_METEORSTRIKE: 0
@@ -108,6 +104,11 @@ Human: {
 		TMW2_FIREBALL: 0
 		TMW2_ARMAGEDDON: 0
 
+		///////////////// Brawler class
+		TMW2_BRAWLING: 0
+		TMW2_BEARSTRIKE: 0
+		TMW2_ALLINONE: 0
+
 		///////////////// Magic v3 (Builtin)
 		ASC_METEORASSAULT: 0
 		AC_SHOWER: 0
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 3979fca82..f3bd41e39 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -650,6 +650,8 @@ function	script	HUB_SkillInvoke	{
             GetManaExp(@skillId, rand2(2,3));
             break;
 
+        */
+        ////////////////////////////////
         // XXX: Brawling Class
         case TMW2_BRAWLING:
             // 75x3 = 225
@@ -704,7 +706,8 @@ function	script	HUB_SkillInvoke	{
             // and also hits behind (and on your square)
             rectharm(@skillTarget, 0, 1, AdjustAttackpower(.@PW/2), HARM_PHYS, Ele_Neutral);
             break;
-        */
+
+        ////////////////////////////////
         // CLASS_OTHER
         case TMW2_PARUM:
             SK_parum();