nacabaro/vbhelper
1
0
Fork 0
mirror of https://github.com/nacabaro/vbhelper.git synced 2026-06-05 22:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed player attack sprite on enemy screen.

Browse Source 
Was showing enemy attack sprite.
This commit is contained in:
lightheel 2025-08-04 12:02:41 -04:00
parent eff2fadb55
commit c8690152bc
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/github/nacabaro/vbhelper/screens/BattlesScreen.kt
View File

@ -185,7 +185,8 @@ fun BattleScreen(
stage = stage, stage = stage,
opponentName = opponentName, opponentName = opponentName,
attackAnimationProgress = battleSystem.attackProgress, attackAnimationProgress = battleSystem.attackProgress,
activeCharacter = opponentCharacter activeCharacter = opponentCharacter,
playerCharacter = activeCharacter
) )
} }
} }
@ -430,7 +431,8 @@ fun OpponentBattleView(
stage: String, stage: String,
opponentName: String, opponentName: String,
attackAnimationProgress: Float, attackAnimationProgress: Float,
activeCharacter: APIBattleCharacter? = null activeCharacter: APIBattleCharacter? = null,
playerCharacter: APIBattleCharacter? = null
) { ) {
Column( Column(
modifier = Modifier modifier = Modifier
@ -469,10 +471,17 @@ fun OpponentBattleView(
else -> 0.dp else -> 0.dp
} }
// Use correct character ID based on attack phase
val characterId = when (battleSystem.attackPhase) {
2 -> playerCharacter?.charaId ?: "dim011_mon01" // Use player's character ID for player attack
3 -> activeCharacter?.charaId ?: "dim011_mon01" // Use opponent's character ID for opponent attack
else -> "dim011_mon01"
}
println("OpponentBattleView - Attack sprite - Phase: ${battleSystem.attackPhase}, Progress: $attackAnimationProgress, X Offset: $xOffset, CurrentView: ${battleSystem.currentView}") println("OpponentBattleView - Attack sprite - Phase: ${battleSystem.attackPhase}, Progress: $attackAnimationProgress, X Offset: $xOffset, CurrentView: ${battleSystem.currentView}")
AttackSpriteImage( AttackSpriteImage(
characterId = activeCharacter?.charaId ?: "dim011_mon01", characterId = characterId,
isLarge = true, isLarge = true,
modifier = Modifier modifier = Modifier
.size(60.dp) .size(60.dp)
@ -480,7 +489,7 @@ fun OpponentBattleView(
x = xOffset, x = xOffset,
y = 0.dp y = 0.dp
) )
.scale(if (battleSystem.isPlayerAttacking) -1f else 1f, 1f), // Flip player attacks .scale(if (battleSystem.attackPhase == 2) -1f else 1f, 1f), // Flip player attacks only
contentScale = ContentScale.Fit contentScale = ContentScale.Fit
) )
} }