Merge pull request #1326 from imring/mika-na

fix mika normal attacks
genshinsim · Apr 9, 2023 · 7b561bd · 7b561bd
2 parents 1e0447f + 7d54aff
commit 7b561bd
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/internal/characters/mika/attack.go b/internal/characters/mika/attack.go
@@ -64,19 +64,23 @@ func (c *char) Attack(p map[string]int) action.ActionInfo {
 			CanBeDefenseHalted: attackDefHalt[c.NormalCounter][i],
 		}
 		ai.Mult = mult[c.TalentLvlAttack()]
-		ap := combat.NewCircleHitOnTargetFanAngle(
-			c.Core.Combat.Player(),
-			geometry.Point{Y: attackOffsets[c.NormalCounter]},
-			attackHitboxes[c.NormalCounter][i][0],
-			attackFanAngles[c.NormalCounter],
-		)
-		if c.NormalCounter != 1 {
+
+		var ap combat.AttackPattern
+		switch c.NormalCounter {
+		case 0, 2, 4:
 			ap = combat.NewBoxHitOnTarget(
 				c.Core.Combat.Player(),
 				geometry.Point{Y: attackOffsets[c.NormalCounter]},
 				attackHitboxes[c.NormalCounter][i][0],
 				attackHitboxes[c.NormalCounter][i][1],
 			)
+		case 1, 3:
+			ap = combat.NewCircleHitOnTargetFanAngle(
+				c.Core.Combat.Player(),
+				geometry.Point{Y: attackOffsets[c.NormalCounter]},
+				attackHitboxes[c.NormalCounter][i][0],
+				attackFanAngles[c.NormalCounter],
+			)
 		}
 		if c.NormalCounter == 2 || c.NormalCounter == 3 {
 			ai.StrikeType = attacks.StrikeTypeSpear