summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/homun_skill_tree.txt3
-rw-r--r--db/re/skill_db.conf3
-rw-r--r--npc/functions/clientversion.txt2
-rw-r--r--npc/functions/hub.txt13
4 files changed, 13 insertions, 8 deletions
diff --git a/db/homun_skill_tree.txt b/db/homun_skill_tree.txt
index e8f00011c..2ceee473c 100644
--- a/db/homun_skill_tree.txt
+++ b/db/homun_skill_tree.txt
@@ -50,6 +50,7 @@
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
-// Special for underpowered Homunculus
+// 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
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index ed583bdac..96edd865e 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -40720,6 +40720,9 @@ skill_db: (
SkillType: {
Enemy: true
}
+ DamageType: {
+ NoDamage: true
+ }
AttackType: "Weapon"
AfterCastWalkDelay: 1000
FixedCastTime: -1
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index 9090457cb..223756a74 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -990,7 +990,7 @@ function script clientupdater {
mesn ("TMW2 Staff");
mesc l("Hello, %s! Congratulations for finishing the %s!", strcharinfo(0), b(l("Christmas 2021 Joint Event"))), 3;
mesc l("You need to pick your prizes!"), 3;
- inventoryplace NPCEyes, 6, Iten, 1;
+ inventoryplace NPCEyes, 6, Iten, 5;
next;
mesc l("Select one:"), 3;
menuint
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 51d4bf707..3fc728805 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -390,7 +390,7 @@ function script HUB_SkillInvoke {
break;
case TMW2_CAPRICE:
.@gid = @skillCaster;
- .@ak1 = max(getunitdata(.@gid, UDT_MATKMIN), getunitdata(.@gid, UDT_INT));
+ .@ak1 = max(getunitdata(.@gid, UDT_MATKMIN), getunitdata(.@gid, UDT_INT) * 4 / 3);
.@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++) {
@@ -422,15 +422,16 @@ function script HUB_SkillInvoke {
break;
case TMW2_MOON:
.@gid = @skillCaster; // gethominfo(0);
- .@ak1 = getunitdata(.@gid, UDT_ATKMIN);
- .@ak2 = getunitdata(.@gid, UDT_ATKMAX);
+ .@ak1 = max(getunitdata(.@gid, UDT_ATKMIN), getunitdata(.@gid, UDT_STR) * 3);
+ .@ak2 = max(getunitdata(.@gid, UDT_ATKMAX), .@ak1 * 12 / 10);
.@hit = 1 + (@skillLv / 2);
.@dmg = rand2(.@ak1, .@ak2) / .@hit;
.@dmg += .@dmg * @skillLv / 3; // +33% DMG per level
+ .@dmx = max(.@dmg * 5 / 4, .@dmg + 10); // ~ +25% DMG on crit
for (.@i=0; .@i < .@hit; .@i++) {
- // 5% special "crit" chance
- if (rand2(20) == 14)
- harm(@skillTarget, .@dmg+10, HARM_MISC, Ele_Neutral, .@gid);
+ // 10% special "crit" chance
+ if (rand2(10) == 7)
+ harm(@skillTarget, .@dmx, HARM_MISC, Ele_Neutral, .@gid);
else
harm(@skillTarget, .@dmg, HARM_MAGI, Ele_Neutral, .@gid);
sleep2(100);