From 176a8fc7c1699adeab6322429f7bb6b9351631a2 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Thu, 30 Dec 2021 11:34:56 -0300 Subject: Fix or polish some minor stuff after testing, up to homun 6004 --- db/homun_skill_tree.txt | 2 +- npc/functions/hub.txt | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/db/homun_skill_tree.txt b/db/homun_skill_tree.txt index a5ac1d285..e8f00011c 100644 --- a/db/homun_skill_tree.txt +++ b/db/homun_skill_tree.txt @@ -26,7 +26,7 @@ 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,3,0,0,0,0,0,0,0,0,0,0,0 //TMW2_BLOODLUST** - Raise ATK and leech HP +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 diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt index 9d5cdfeaf..51d4bf707 100644 --- a/npc/functions/hub.txt +++ b/npc/functions/hub.txt @@ -389,11 +389,14 @@ function script HUB_SkillInvoke { sc_start SC_CURSE, rand2(3500, 5000), 1, 10000, SCFLAG_NONE, @skillCaster; break; case TMW2_CAPRICE: - .@gid = @skillCaster; // gethominfo(0); - .@ak1 = getunitdata(.@gid, UDT_MATKMIN); - .@ak2 = getunitdata(.@gid, UDT_MATKMAX); + .@gid = @skillCaster; + .@ak1 = max(getunitdata(.@gid, UDT_MATKMIN), getunitdata(.@gid, UDT_INT)); + .@ak2 = max(getunitdata(.@gid, UDT_MATKMAX), .@ak1 * 12 / 10); + /* FIXME: Validate if mob is still alive after each hit */ for (.@i=0; .@i < limit(1, @skillLv, 10); .@i++) { - harm(@skillTarget, rand2(.@ak1, .@ak2), HARM_MAGI, any(Ele_Fire, Ele_Water, Ele_Wind, Ele_Earth), .@gid); + .@dmg=rand2(.@ak1, .@ak2); + .@ele=any(Ele_Fire, Ele_Water, Ele_Wind, Ele_Earth); + harm(@skillTarget, .@dmg, HARM_MAGI, .@ele, .@gid); sleep2(100); } break; -- cgit v1.2.3-70-g09d2