Replace homun skills BLOODLUST, MOON, SPEED and FLEET.

3 files changed, 158 insertions, 4 deletions

diff --git a/db/homun_skill_tree.txt b/db/homun_skill_tree.txt
index db6fb849b..a5ac1d285 100644
--- a/db/homun_skill_tree.txt
+++ b/db/homun_skill_tree.txt
@@ -26,14 +26,14 @@
 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,8008,3,0,0,0,0,0,0,0,0,0,0,0 //HAMI_BLOODLUST** - Raise ATK and leech HP
+6004,8050,3,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,8009,5,0,0,0,0,0,0,0,0,0,0,0 //HFLI_MOON** - Like Bash, can also multihit
+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,8011,5,0,0,0,0,0,0,0,0,0,0,0 //HFLI_SPEED** - Raise HC Flee/Evasion
-6008,8010,5,0,0,0,0,0,0,0,0,0,0,0 //HFLI_FLEET** - Raise HC ATK and ASPD
+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
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 8d55c8305..ed583bdac 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -40681,4 +40681,121 @@ skill_db: (
 		}
 	}
 },
+{
+	Id: 8050
+	Name: "TMW2_BLOODLUST"
+	Description: "Bloodlust"
+	MaxLevel: 5
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Self: true
+	}
+	DamageType: {
+		NoDamage: true
+	}
+	NumberOfHits: 0
+	FixedCastTime: -1
+	Requirements: {
+		SPCost: {
+			Lv1: 40
+			Lv2: 80
+			Lv3: 120
+			Lv4: 150
+			Lv5: 180
+			Lv6: 210
+			Lv7: 240
+			Lv8: 270
+			Lv9: 300
+			Lv10: 400
+		}
+	}
+},
+{
+	Id: 8051
+	Name: "TMW2_MOON"
+	Description: "Moonlight"
+	MaxLevel: 5
+	Range: 1
+	Hit: "BDT_MULTIHIT"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	AfterCastWalkDelay: 1000
+	FixedCastTime: -1
+	Requirements: {
+		SPCost: {
+			Lv1: 4
+			Lv2: 8
+			Lv3: 12
+			Lv4: 16
+			Lv5: 20
+			Lv6: 24
+			Lv7: 28
+			Lv8: 32
+			Lv9: 36
+			Lv10: 40
+		}
+	}
+},
+{
+	Id: 8052
+	Name: "TMW2_FLEET"
+	Description: "Fleeting Move"
+	MaxLevel: 5
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Self: true
+	}
+	DamageType: {
+		NoDamage: true
+	}
+	NumberOfHits: 0
+	FixedCastTime: -1
+	Requirements: {
+		SPCost: {
+			Lv1: 30
+			Lv2: 40
+			Lv3: 50
+			Lv4: 60
+			Lv5: 70
+			Lv6: 80
+			Lv7: 90
+			Lv8: 100
+			Lv9: 110
+			Lv10: 120
+		}
+	}
+},
+{
+	Id: 8053
+	Name: "TMW2_SPEED"
+	Description: "Speed"
+	MaxLevel: 5
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Self: true
+	}
+	AttackType: "Misc"
+	DamageType: {
+		NoDamage: true
+	}
+	NumberOfHits: 0
+	InterruptCast: true
+	FixedCastTime: -1
+	Requirements: {
+		SPCost: {
+			Lv1: 30
+			Lv2: 40
+			Lv3: 50
+			Lv4: 60
+			Lv5: 70
+			Lv6: 80
+			Lv7: 90
+			Lv8: 100
+			Lv9: 110
+			Lv10: 120
+		}
+	}
+},
 )
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index d63d4247b..9d5cdfeaf 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -409,6 +409,43 @@ function	script	HUB_SkillInvoke	{
             SC_Bonus(.@t, SC_INCVIT, .@p);
             sc_start SC_INCVIT, .@t * 1000, .@p, 10000, SCFLAG_NOAVOID, @skillCaster;
             break;
+        case TMW2_BLOODLUST:
+            // SC_HAMI_BLOODLUST (val1, % ATK Bonus, % Drain Cth, % Drain Rate)
+            .@t = (50 + (@skillLv * 10)) * 1000;
+            .@atk = 10+(@skillLv * 10);
+            .@drc = 2 * @skillLv;
+            .@drn = 15 + @skillLv;
+            sc_start4 SC_HAMI_BLOODLUST, .@t, 100, .@atk, .@drc, .@drn, 10000, SCFLAG_NOAVOID, @skillCaster;
+            break;
+        case TMW2_MOON:
+            .@gid = @skillCaster; // gethominfo(0);
+            .@ak1 = getunitdata(.@gid, UDT_ATKMIN);
+            .@ak2 = getunitdata(.@gid, UDT_ATKMAX);
+            .@hit = 1 + (@skillLv / 2);
+            .@dmg = rand2(.@ak1, .@ak2) / .@hit;
+            .@dmg += .@dmg * @skillLv / 3; // +33% DMG per level
+            for (.@i=0; .@i < .@hit; .@i++) {
+                // 5% special "crit" chance
+                if (rand2(20) == 14)
+                    harm(@skillTarget, .@dmg+10, HARM_MISC, Ele_Neutral, .@gid);
+                else
+                    harm(@skillTarget, .@dmg, HARM_MAGI, Ele_Neutral, .@gid);
+                sleep2(100);
+            }
+            break;
+        case TMW2_FLEET:
+            // SC_HLIF_FLEET (val1, % ASPD, % ATK)
+            .@t = (65 - (@skillLv * 5)) * 1000;
+            .@atk = 5+(@skillLv * 5);
+            .@asp = 3 * @skillLv;
+            sc_start4 SC_HLIF_FLEET, .@t, 100, .@asp, .@atk, 0, 10000, SCFLAG_NOAVOID, @skillCaster;
+            break;
+        case TMW2_SPEED:
+            // SC_INCFLEE (int flee)
+            .@t = (65 - (@skillLv * 5)) * 1000;
+            .@val = 15+(@skillLv * 10);
+            sc_start SC_INCFLEE, .@t, .@val, 10000, SCFLAG_NOAVOID, @skillCaster;
+            break;
         }
         return;
     }