Selaa lähdekoodia

Fixed CN Meteor and Lunatic Carrot Beat damage (#3746)

* Fixes #3734.
* Added missing battle cases.
Thanks to @teededung and @Playtester!
Aleos 6 vuotta sitten
vanhempi
commit
faee0cde45
1 muutettua tiedostoa jossa 3 lisäystä ja 1 poistoa
  1. 3 1
      src/map/battle.cpp

+ 3 - 1
src/map/battle.cpp

@@ -3307,7 +3307,7 @@ static void battle_apply_div_fix(struct Damage* d, uint16 skill_id)
 	if(d->damage) {
 	if(d->damage) {
 		DAMAGE_DIV_FIX(d->damage, d->div_);
 		DAMAGE_DIV_FIX(d->damage, d->div_);
 		//Min damage
 		//Min damage
-		if(d->damage < d->div_ && (skill_id == SU_LUNATICCARROTBEAT || skill_id == SU_CN_METEOR || (battle_config.skill_min_damage&d->flag)))
+		if(d->damage < d->div_ && (skill_id == SU_LUNATICCARROTBEAT || skill_id == SU_LUNATICCARROTBEAT2 || skill_id == SU_CN_METEOR || skill_id == SU_CN_METEOR2 || (battle_config.skill_min_damage&d->flag)))
 			d->damage = d->div_;
 			d->damage = d->div_;
 	} else if (d->div_ < 0) {
 	} else if (d->div_ < 0) {
 		d->div_ *= -1;
 		d->div_ *= -1;
@@ -4359,6 +4359,7 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list *
 				skillratio += skillratio * status_get_hp(src) / status_get_max_hp(src);
 				skillratio += skillratio * status_get_hp(src) / status_get_max_hp(src);
 			break;
 			break;
 		case SU_LUNATICCARROTBEAT:
 		case SU_LUNATICCARROTBEAT:
+		case SU_LUNATICCARROTBEAT2:
 			skillratio += 100 + 100 * skill_lv;
 			skillratio += 100 + 100 * skill_lv;
 			if (sd && pc_checkskill(sd, SU_SPIRITOFLIFE))
 			if (sd && pc_checkskill(sd, SU_SPIRITOFLIFE))
 				skillratio += skillratio * status_get_hp(src) / status_get_max_hp(src);
 				skillratio += skillratio * status_get_hp(src) / status_get_max_hp(src);
@@ -6206,6 +6207,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
 						skillratio += 600;
 						skillratio += 600;
 						break;
 						break;
 					case SU_CN_METEOR:
 					case SU_CN_METEOR:
+					case SU_CN_METEOR2:
 						skillratio += 100 + 100 * skill_lv;
 						skillratio += 100 + 100 * skill_lv;
 						break;
 						break;
 					case NPC_VENOMFOG:
 					case NPC_VENOMFOG: