Add a debug homunculus, replace the superior skills, and balance them.

Note that right now, the pre-requisite check is always failing

4 files changed, 215 insertions, 21 deletions

diff --git a/db/homun_skill_tree.txt b/db/homun_skill_tree.txt
index 2ceee473c..989b71401 100644
--- a/db/homun_skill_tree.txt
+++ b/db/homun_skill_tree.txt
@@ -23,34 +23,40 @@
 // 6007 = all rounder
 // 6008 = superior
 
-6001,8047,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_CAPRICE** - Rand-cast bolts
+6001,8047,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_CAPRICE - Rand-cast bolts
 6002,8045,9,0,0,0,0,0,0,0,0,0,0,0 //TMW2_HOMUN_HEAL - healing skill.
-6003,8048,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_AVOID***** Raises walk speed
-6004,8050,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_BLOODLUST** - Raise ATK and leech HP
-6004,8049,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_HDEFENCE**** - Raises vit for both
-6005,8051,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_MOON** - Like Bash, can also multihit
+6003,8048,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_AVOID - Raises walk speed
+6004,8050,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_BLOODLUST - Raise ATK and leech HP
+6004,8049,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_HDEFENCE - Raises vit for both
+6005,8051,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_MOON - Like Bash, can also multihit
 6005,8046,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_LITTLE_WONDERS - Dispel some ailments
 6006,8044,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_SKILLX - Raises EXP gain from target
-6007,8007,5,0,0,0,0,0,0,0,0,0,0,0 //HAMI_SKIN* - Passive, raises HC HP/Regen/DEF
-6007,8053,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_SPEED** - Raise HC Flee/Evasion
-6008,8052,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_FLEET** - Raise HC ATK and ASPD
-6008,8015,5,0,0,0,0,0,0,0,0,0,0,0 //HVAN_INSTRUCT* - PASSIVE SMALL HC STR/INT+.
+6007,8007,5,0,0,0,0,0,0,0,0,0,0,0 //*HAMI_SKIN - Passive, raises HC HP/Regen/DEF
+6007,8053,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_SPEED - Raise HC Flee/Evasion
+6008,8052,5,0,0,0,0,0,0,0,0,0,0,0 //TMW2_FLEET - Raise HC ATK and ASPD
+6008,8015,5,0,0,0,0,0,0,0,0,0,0,0 //*HVAN_INSTRUCT - PASSIVE SMALL HC STR/INT+.
 
 // Second tier skills
-6001,8020,2,8013,3,0,0,0,0,0,0,0,0,850 //MH_POISON_MIST** → AOE blind, nature dmg
-6005,8020,2,8009,3,0,0,0,0,0,0,0,0,850 //MH_POISON_MIST** → AOE blind, nature dmg
-6008,8020,2,8010,4,8015,4,0,0,0,0,0,0,950 //MH_POISON_MIST → AOE blind, nature dmg
+6001,8054,5,8047,3,0,0,0,0,0,0,0,0,850 //TMW2_POISONMIST → AOE blind, nature dmg
+6005,8054,5,8051,3,8046,1,0,0,0,0,0,0,850 //TMW2_POISONMIST → AOE blind, nature dmg
+6008,8054,5,8052,4,8015,4,0,0,0,0,0,0,950 //TMW2_POISONMIST → AOE blind, nature dmg
 
-6002,8003,5,8001,3,0,0,0,0,0,0,0,0,750 //HLIF_BRAIN*** Raises Max SP and SP Regen
-6006,8003,5,8006,3,0,0,0,0,0,0,0,0,750 //HLIF_BRAIN*** Raises Max SP and SP Regen
-6007,8003,5,8007,4,8011,4,0,0,0,0,0,0,850 //HLIF_BRAIN Raises Max SP and SP Regen
-6008,8003,5,8015,4,8010,4,0,0,0,0,0,0,850 //HLIF_BRAIN Raises Max SP and SP Regen
+6002,8003,5,8045,3,0,0,0,0,0,0,0,0,750 //*HLIF_BRAIN (P) Raises Max SP and Regen
+6006,8003,5,8049,3,0,0,0,0,0,0,0,0,750 //*HLIF_BRAIN (P) Raises Max SP and Regen
+6007,8003,5,8007,4,8053,4,0,0,0,0,0,0,850 //*HLIF_BRAIN (P) Raises Max SP and Regen
+6008,8003,5,8015,4,8052,4,0,0,0,0,0,0,850 //*HLIF_BRAIN (P) Raises Max SP and Regen
 
-6003,8032,2,8002,3,0,0,0,0,0,0,0,0,850 //MH_GOLDENE_FERSE** → +FLEE, ASPD ~ Holydmg
-6004,8032,2,8008,3,0,0,0,0,0,0,0,0,850 //MH_GOLDENE_FERSE** → +FLEE, ASPD ~ Holydmg
-6007,8032,2,8011,4,0,0,0,0,0,0,0,0,950 //MH_GOLDENE_FERSE** → +FLEE, ASPD ~ Holydmg
+6003,8055,5,8048,3,0,0,0,0,0,0,0,0,850 //TMW2_GOLDENFERSE → +FLEE, ASPD ~ Holydmg
+6004,8055,5,8050,3,0,0,0,0,0,0,0,0,850 //TMW2_GOLDENFERSE → +FLEE, ASPD ~ Holydmg
+6007,8055,5,8053,4,0,0,0,0,0,0,0,0,950 //TMW2_GOLDENFERSE → +FLEE, ASPD ~ Holydmg
 
 // Specials for underpowered Homunculus
-6006,8050,1,0,0,0,0,0,0,0,0,0,0,500 //TMW2_BLOODLUST** - Raise ATK and leech HP
-6002,8031,1,8001,9,8003,5,0,0,0,0,0,0,900 //MH_STAHL_HORN → EXTREME DAMAGE, STUN AND KNOCKBACK
+6006,8052,1,0,0,0,0,0,0,0,0,0,0,500 //TMW2_FLEET - Raise HC ATK and ASPD
+6002,8056,1,8045,9,8003,5,0,0,0,0,0,0,900 //TMW2_STAHLHORN → EXTREME DAMAGE, STUN AND KNOCKBACK
+
+// Debug Homunculus
+6010,8054,1,0,0,0,0,0,0,0,0,0,0,500
+6010,8055,1,0,0,0,0,0,0,0,0,0,0,500
+6010,8056,1,0,0,0,0,0,0,0,0,0,0,500
+6010,8003,1,0,0,0,0,0,0,0,0,0,0,500
 
diff --git a/db/re/homunculus_db.txt b/db/re/homunculus_db.txt
index f0d005cc5..89d206e24 100644
--- a/db/re/homunculus_db.txt
+++ b/db/re/homunculus_db.txt
@@ -27,4 +27,5 @@
 6006,6036,Accurate,502,300000,0,1,7,0,670,320,40,14,12,20,15,35,24,40,60,6,9,10,20,4,15,5,15,5,15,15,25,5,15,800,2400,220,480,10,30,30,50,20,40,20,40,10,30,10,20
 6007,6037,All Rounder,502,300000,0,1,7,0,720,300,40,20,20,20,20,20,20,40,60,6,9,15,20,8,15,10,15,10,15,10,15,10,15,800,2400,220,480,10,30,30,50,20,40,20,40,10,30,10,20
 6008,6038,Superior Machine,502,300000,0,1,7,0,720,300,40,15,10,30,20,30,10,40,60,6,9,10,25,4,20,5,20,5,20,5,20,5,20,800,2400,220,480,10,30,30,50,20,40,20,40,10,30,10,20
+6010,6039,Elanore,502,300000,0,1,7,0,720,300,40,20,20,20,20,20,20,40,60,6,9,15,20,8,15,10,15,10,15,10,15,10,15,800,2400,220,480,10,30,30,50,20,40,20,40,10,30,10,20
 
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 96edd865e..48e97456f 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -40801,4 +40801,153 @@ skill_db: (
 		}
 	}
 },
+{
+	Id: 8054
+	Name: "TMW2_POISONMIST"
+	Description: "Poison Mist"
+	MaxLevel: 5
+	Range: 5
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	DamageType: {
+		NoDamage: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Nature"
+	CastTime: {
+		Lv1: 500
+		Lv2: 700
+		Lv3: 900
+		Lv4: 1100
+		Lv5: 1300
+		Lv6: 1500
+		Lv7: 1700
+		Lv8: 1900
+		Lv9: 2100
+		Lv10: 2300
+	}
+	FixedCastTime: 500
+	Requirements: {
+		SPCost: {
+			Lv1: 65
+			Lv2: 75
+			Lv3: 85
+			Lv4: 95
+			Lv5: 105
+			Lv6: 115
+			Lv7: 125
+			Lv8: 135
+			Lv9: 145
+			Lv10: 155
+		}
+	}
+},
+{
+	Id: 8055
+	Name: "TMW2_GOLDENFERSE"
+	Description: "Golden Ferse"
+	MaxLevel: 5
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Self: true
+	}
+	DamageType: {
+		NoDamage: true
+	}
+	CastTime: {
+		Lv1: 1000
+		Lv2: 1200
+		Lv3: 1400
+		Lv4: 1600
+		Lv5: 1800
+		Lv6: 2000
+		Lv7: 2200
+		Lv8: 2400
+		Lv9: 2600
+		Lv10: 2800
+	}
+	FixedCastTime: -1
+	Requirements: {
+		SPCost: {
+			Lv1: 60
+			Lv2: 65
+			Lv3: 70
+			Lv4: 75
+			Lv5: 80
+			Lv6: 85
+			Lv7: 90
+			Lv8: 95
+			Lv9: 100
+			Lv10: 105
+		}
+	}
+},
+{
+	Id: 8056
+	Name: "TMW2_STAHLHORN"
+	Description: "Stahl Horn"
+	MaxLevel: 5
+	Range: {
+		Lv1: 5
+		Lv2: 6
+		Lv3: 7
+		Lv4: 8
+		Lv5: 9
+		Lv6: 10
+		Lv7: 11
+		Lv8: 12
+		Lv9: 13
+		Lv10: 14
+	}
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	DamageType: {
+		NoDamage: true
+	}
+	AttackType: "Weapon"
+	KnockBackTiles: 4
+	CastTime: {
+		Lv1: 800
+		Lv2: 600
+		Lv3: 400
+		Lv4: 200
+		Lv5: 0
+		Lv6: 1
+		Lv7: 1
+		Lv8: 1
+		Lv9: 1
+		Lv10: 1
+	}
+	SkillData1: 5000
+	FixedCastTime: {
+		Lv1: 200
+		Lv2: 400
+		Lv3: 600
+		Lv4: 800
+		Lv5: 1000
+		Lv6: 1200
+		Lv7: 1400
+		Lv8: 1600
+		Lv9: 1800
+		Lv10: 2000
+	}
+	Requirements: {
+		SPCost: {
+			Lv1: 40
+			Lv2: 45
+			Lv3: 50
+			Lv4: 55
+			Lv5: 60
+			Lv6: 65
+			Lv7: 70
+			Lv8: 75
+			Lv9: 80
+			Lv10: 85
+		}
+	}
+},
 )
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index fde9e3604..144ae2270 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -450,6 +450,44 @@ function	script	HUB_SkillInvoke	{
             .@val = 15+(@skillLv * 10);
             sc_start SC_INCFLEE, .@t, .@val, 10000, SCFLAG_NOAVOID, @skillCaster;
             break;
+        case TMW2_POISONMIST:
+            // SC_BLIND
+            .@ak1 = max(getunitdata(.@gid, UDT_MATKMIN), getunitdata(.@gid, UDT_INT) * 4 / 3);
+            .@ak2 = max(getunitdata(.@gid, UDT_MATKMAX), .@ak1 * 12 / 10);
+            .@dmg = rand2(.@ak1, .@ak2) + gethominfo(6);
+            .@dmg += .@dmg * @skillLv * 2 / 3; // +67% DMG per level
+            .@dur = (3 + (@skillLv * 2)) * 1000;
+            .@cth = 2000 + (1000 * @skillLv);
+
+            /* First strike (magic) */
+            areaharm(@skillTarget, 7, .@dmg, HARM_MAGI, Ele_Earth);
+            areasc(7, .@dur, SC_BLIND, BL_MOB|BL_PC|BL_HOM|BL_MER, 1, "filter_hostile", @skillTarget, .@cth);
+
+            sleep2(500);
+
+            /* Delayed strike (physical) */
+            areaharm(@skillTarget, 7, .@dmg, HARM_PHYS, Ele_Wind);
+            areasc(7, .@dur, SC_BLIND, BL_MOB|BL_PC|BL_HOM|BL_MER, 1, "filter_hostile", @skillTarget, .@cth);
+            break;
+        case TMW2_GOLDENFERSE:
+            // SC_GOLDENE_FERSE (val1, % MaxHP, % Aspd, % Holy Cth)
+            .@t = (50 + (@skillLv * 10)) * 1000;
+            .@mhp = @skillLv;
+            .@asp = 6 + (4 * @skillLv);
+            .@hol = 40 + (10 * @skillLv);
+            sc_start4 SC_GOLDENE_FERSE, .@t, .@mhp, .@asp, .@hol, 0, 10000, SCFLAG_NOAVOID, @skillCaster;
+            break;
+        case TMW2_STAHLHORN:
+            .@ak1 = max(getunitdata(.@gid, UDT_ATKMIN), getunitdata(.@gid, UDT_STR) * 3);
+            .@ak2 = max(getunitdata(.@gid, UDT_ATKMAX), .@ak1 * 12 / 10);
+            .@dmg = rand2(.@ak1, .@ak2) * 2; // 200% DMG
+            .@dmg += rand2(.@ak1, .@ak2) * @skillLv; // +100% per level
+            .@rng = 5 + (@skillLv / 2);
+            .@dur = 500 * @skillLv;
+            .@cth = 500 + (400 * @skillLv); // 5% + 4% per level (starts at 9%)
+            areaharm(@skillTarget, .@rng, .@dmg, HARM_MAGI, Ele_Holy);
+            areasc(.@rng, .@dur, SC_STUN, BL_MOB|BL_PC|BL_HOM|BL_MER, 1, "filter_hostile", @skillTarget, .@cth);
+            break;
         }
         return;
     }