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 damage application timing.

Browse Source
This commit is contained in:
lightheel 2025-08-04 11:13:01 -04:00
parent 7af8e00e6f
commit 31fab9dba4
1 changed files with 24 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,12 +108,12 @@ fun BattleScreen(
battleSystem.setAttackProgress(progress) battleSystem.setAttackProgress(progress)
delay(16) // 60 FPS delay(16) // 60 FPS
} }
println("Phase 2 completed, applying damage and starting opponent attack") println("Phase 2 completed, applying damage and starting opponent attack")
// Apply player's damage and start opponent attack // Apply player's damage and start opponent attack
battleSystem.completeAttackAnimation(opponentDamage = pendingOpponentDamage) battleSystem.completeAttackAnimation(opponentDamage = pendingOpponentDamage)
pendingOpponentDamage = 0f pendingOpponentDamage = 0f
delay(500) delay(500)
battleSystem.startOpponentAttack() battleSystem.startOpponentAttack()
} }
3 -> { 3 -> {
// Phase 3: Opponent attack on opponent screen // Phase 3: Opponent attack on opponent screen
@ -138,12 +138,12 @@ fun BattleScreen(
battleSystem.setAttackProgress(progress) battleSystem.setAttackProgress(progress)
delay(16) // 60 FPS delay(16) // 60 FPS
} }
println("Phase 4 completed, applying damage and resetting") println("Phase 4 completed, applying damage and resetting")
// Apply opponent's damage and reset // Apply opponent's damage and reset
battleSystem.completeAttackAnimation(playerDamage = pendingPlayerDamage) battleSystem.completeAttackAnimation(playerDamage = pendingPlayerDamage)
pendingPlayerDamage = 0f pendingPlayerDamage = 0f
battleSystem.resetAttackState() battleSystem.resetAttackState()
battleSystem.enableAttackButton() battleSystem.enableAttackButton()
// Check if battle is over // Check if battle is over
if (battleSystem.checkBattleOver()) { if (battleSystem.checkBattleOver()) {
@ -306,25 +306,6 @@ fun PlayerBattleView(
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(16.dp))
// Enemy HP bar
LinearProgressIndicator(
progress = battleSystem.opponentHP / (opponent?.baseHp?.toFloat() ?: 100f),
modifier = Modifier
.fillMaxWidth()
.height(10.dp),
color = Color.Red,
trackColor = Color.Gray
)
// Enemy HP display numbers
Text(
text = "Enemy HP: ${battleSystem.opponentHP.toInt()}/${opponent?.baseHp ?: 100}",
fontSize = 14.sp,
color = Color.Black
)
Spacer(modifier = Modifier.height(16.dp))
// Attack button // Attack button
Button( Button(
onClick = { onClick = {
@ -374,21 +355,18 @@ fun PlayerBattleView(
// Match is still ongoing - update HP and continue // Match is still ongoing - update HP and continue
println("Round ${apiResult.currentRound}: Player HP=${apiResult.playerHP}, Opponent HP=${apiResult.opponentHP}") println("Round ${apiResult.currentRound}: Player HP=${apiResult.playerHP}, Opponent HP=${apiResult.opponentHP}")
// Handle damage timing based on hit/miss // Set pending damage based on API result
if (apiResult.playerAttackHit) { if (apiResult.playerAttackHit) {
// Player attack hit - enemy takes damage at end of player animation // Player attack hit - enemy takes damage at end of player animation
println("Player attack hit! Enemy will take ${apiResult.playerAttackDamage} damage") println("Player attack hit! Enemy will take ${apiResult.playerAttackDamage} damage")
onSetPendingDamage(0f, apiResult.playerAttackDamage.toFloat()) // Opponent takes damage onSetPendingDamage(0f, apiResult.playerAttackDamage.toFloat()) // Opponent takes damage
battleSystem.setAttackHitState(true) battleSystem.setAttackHitState(true)
} else { } else {
// Player attack missed - player takes damage at end of enemy animation // Player attack missed - enemy counter-attacks and player takes damage
println("Player attack missed! Player will take damage from enemy attack") println("Player attack missed! Enemy counter-attacks and player takes ${apiResult.opponentAttackDamage} damage")
onSetPendingDamage(apiResult.opponentAttackDamage.toFloat(), 0f) // Player takes damage onSetPendingDamage(apiResult.opponentAttackDamage.toFloat(), 0f) // Player takes damage
battleSystem.setAttackHitState(false) battleSystem.setAttackHitState(false)
} }
// Update HP from API
battleSystem.updateHPFromAPI(apiResult.playerHP.toFloat(), apiResult.opponentHP.toFloat())
} }
2 -> { 2 -> {
// Match is over - transition to results screen // Match is over - transition to results screen