fix round anim on combo attack

Author: MokhaLeee

Data/DesignerConfig/designer-config.c

@@ -34,7 +34,7 @@ const struct KernelDesigerConfig gKernelDesigerConfig = {
 	.kernel_tutorial_level = CONFIG_KTUT_LEVEL,
 
 #ifdef CONFIG_USE_COMBO_ATTACK
-	.combo_attack_en = true, // true, // can be opened by the user
+	.combo_attack_en = false, // true, // can be opened by the user
 #endif
 
 #ifdef CONFIG_BATTLE_SURROUND

Wizardry/Core/BattleSys/RoundAnim/Source/BanimRound.c

@@ -1,6 +1,7 @@
 #include <common-chax.h>
 #include <strmag.h>
 #include <battle-system.h>
+#include <combo-attack.h>
 
 #define LOCAL_TRACE 0
 
@@ -173,6 +174,28 @@ void ParseBattleHitToBanimCmd(void)
 			gpEkrTriangleUnits[1] = gBattleStats.taUnitB;
 		}
 
+#ifdef CONFIG_USE_COMBO_ATTACK
+		/**
+		 * Modify for combo attack
+		 */
+		if (gpKernelDesigerConfig->combo_attack_en) {
+			if (i < COMBO_ATK_MAX) {
+				struct ComboAtkTarget *combo = &gComboAtkList[i];
+
+				if (combo->uid != COMBO_ATK_UID_INVALID) {
+					int weapon = combo->weapon;
+
+					magic_attack = IsMagicAttackAttr(GetItemAttributes(weapon));
+
+					if (CheckForceFarAttackAnimItem(weapon))
+						distance_modes_cur[attacker_pos] = EKR_DISTANCE_FAR;
+					else
+						distance_modes_cur[attacker_pos] = gEkrDistanceType;
+				}
+			}
+		}
+#endif /* USE_COMBO_ATTACK */
+
 		/**
 		 * Attacker round base types
 		 */

Wizardry/Core/ComboAttack/Source/combo-atk.c

@@ -15,7 +15,15 @@ void ResetComboAtkList(void)
 		gComboAtkList[i].uid = COMBO_ATK_UID_INVALID;
 }
 
-STATIC_DECLAR bool CheckMeleeWeapon(int weapon)
+STATIC_DECLAR bool ChecComboMagi(int weapon)
+{
+	if (GetItemAttributes(weapon) & (IA_MAGIC | IA_MAGICDAMAGE))
+		return true;
+
+	return true;
+}
+
+STATIC_DECLAR bool CheckComboMelee(int weapon)
 {
 	int max_range;
 
@@ -36,7 +44,7 @@ void BattleGenerateComboAtkList(void)
 	struct Unit *unit;
 	u16 item;
 	int range, battle_range;
-	bool melee_combo, melee_attack;
+	bool melee_attack;
 	int i, cnt = 0;
 
 	ResetComboAtkList();
@@ -95,17 +103,16 @@ void BattleGenerateComboAtkList(void)
 			continue;
 		}
 
+		if (!ChecComboMagi(item) && CheckComboMelee(item) != melee_attack)
+			continue;
+
 		/**
 		 * ! check in range
 		 */
 		range = RECT_DISTANCE(
 			unit->xPos, unit->yPos,
 			gBattleTarget.unit.xPos, gBattleTarget.unit.yPos);
 
-		melee_combo = CheckMeleeWeapon(item);
-		if (melee_attack != melee_combo)
-			continue;
-
 		if (!IsItemCoveringRangeRework(item, range, unit))
 			continue;