Merge pull request #3018 from SinjiPrasetio/SinjiContribution

Fix Doram Skills Picky Peck and Bite
HerculesWS · Jan 5, 2022 · a5290c4 · a5290c4
2 parents 94c1db6 + 3131836
commit a5290c4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
@@ -35487,7 +35487,7 @@ skill_db: (
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
-	NumberOfHits: -5
+	NumberOfHits: 5
 	InterruptCast: true
 	CastTime: 2500
 	AfterCastActDelay: 1000
@@ -35517,7 +35517,7 @@ skill_db: (
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
-	NumberOfHits: -5
+	NumberOfHits: 5
 	InterruptCast: true
 	AfterCastActDelay: 1000
 	Requirements: {

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
@@ -36340,7 +36340,7 @@ skill_db: (
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
-	NumberOfHits: -5
+	NumberOfHits: 5
 	InterruptCast: true
 	CastTime: 2500
 	AfterCastActDelay: 1000
@@ -36371,7 +36371,7 @@ skill_db: (
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
-	NumberOfHits: -5
+	NumberOfHits: 5
 	InterruptCast: true
 	AfterCastActDelay: 1000
 	FixedCastTime: 0

diff --git a/src/map/battle.c b/src/map/battle.c
@@ -1774,6 +1774,8 @@ static int battle_calc_skillratio(int attack_type, struct block_list *src, struc
 					skillratio += 100 + 100 * skill_lv;
 					if ((status_get_max_hp(target) / 100) <= 50)
 						skillratio *= 2;
+					if (sd != NULL && pc->checkskill(sd, SU_SPIRITOFLIFE) > 0)
+						skillratio += skillratio * status_get_hp(src) / status_get_max_hp(src);
 					break;
 				case SU_LUNATICCARROTBEAT:
 					skillratio += 100 + 100 * skill_lv;

diff --git a/src/map/skill.c b/src/map/skill.c
@@ -5063,16 +5063,15 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 				skill->attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag);
 			break;
 
+		case SU_PICKYPECK:
+			clif->skill_nodamage(src, bl, skill_id, skill_lv, 1);
+			FALLTHROUGH
 		case SU_BITE:
 			skill->attack(BF_WEAPON, src, src, bl, skill_id, skill_lv, tick, flag);
-			if (status->get_lv(src) >= 30 && (rnd() % 100 < (int)(status->get_lv(src) / 30) + 10)) // TODO: Need activation chance.
+			if (status->get_lv(src) >= 30 && (rnd() % 100 < (int)(status->get_lv(src) / 30) * 10 + 10))
 				skill->addtimerskill(src, tick + skill->get_delay(skill_id, skill_lv), bl->id, 0, 0, skill_id, skill_lv, BF_WEAPON, flag);
 			break;
 
-		case SU_PICKYPECK:
-			clif->skill_nodamage(src, bl, skill_id, skill_lv, 1);
-			break;
-
 		// Splash attack skills.
 		case AS_GRIMTOOTH:
 		case MC_CARTREVOLUTION: