Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions app/src/main/java/com/messark/hawker/ui/components/StallConsole.kt
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,6 @@ fun StallConsole(
StallType.BAK_KUT_TEH -> "Boost"
else -> "Damage"
}
val hungerValue = when (stall.stallType) {
StallType.TEH_TARIK, StallType.TRAY_RETURN_UNCLE -> "${stall.effectDurationMs}ms"
StallType.ICE_KACHANG -> "${stall.freezeDurationMs}ms"
StallType.BAK_KUT_TEH -> "+${stall.damage.toInt()}%"
else -> "${stall.damage.toInt()}"
}
val hungerLabel = if (stall.stallType == StallType.BAK_KUT_TEH) {
if (bktBuffType == com.messark.hawker.model.BktBuffType.HERBAL) "Rate Boost" else "Dmg Boost"
} else hungerWord
Expand All @@ -147,11 +141,14 @@ fun StallConsole(
}
StatLine(label = buildInlinedLabel(stall, hungerLabel, hungerCategory), value = hungerDisplayValue)

StatLine(label = buildInlinedLabel(stall, "Range", "Range"), value = String.format("%.1f", stall.range))
val rangeLabel = if (stall.stallType == StallType.BAK_KUT_TEH) "Boost Range" else "Range"
StatLine(label = buildInlinedLabel(stall, rangeLabel, "Range"), value = String.format("%.1f", stall.range))

val rateCategory = if (stall.stallType == StallType.TRAY_RETURN_UNCLE) "Grab Rate" else "Rate"
val displayRate = if (stall.stallType == StallType.BAK_KUT_TEH) 0f else (stall.fireRateMs / rateMultiplier) / 1000f
StatLine(label = buildInlinedLabel(stall, "Rate", rateCategory), value = String.format("%.1fs", displayRate))
if (stall.stallType != StallType.BAK_KUT_TEH) {
val rateLabel = if (stall.stallType == StallType.TRAY_RETURN_UNCLE) "Grab Rate" else "Rate"
val displayRate = (stall.fireRateMs / rateMultiplier) / 1000f
StatLine(label = buildInlinedLabel(stall, rateLabel, rateLabel), value = String.format("%.1fs", displayRate))
}

if (stall.aoeRadius > 0) {
StatLine(label = buildInlinedLabel(stall, "Area", "Radius"), value = String.format("%.1f", stall.aoeRadius))
Expand Down
1 change: 1 addition & 0 deletions fixes.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ This document tracks identified and resolved bugs in the Hawker Rush codebase.
| FIX-014 | 2026-05-20 | Fixed a bug where `undoSell` did not enforce pathing or Tray Return Uncle rules, allowing players to block the main path or leave Uncles without neighbors. Centralized validation into `validateStallPlacement`. | Resolved |
| REF-012 | 2026-05-18 | Refactored the enemy processing pipeline in `MainViewModel.kt` to consolidate movement and transient logic into `handleEnemyPipeline`. Introduced `EngineUpdateBatch` for efficient state updates and optimized "held enemy" tracking to eliminate redundant grid-wide iterations. | Resolved |
| REF-013 | 2026-07-10 | Refactored `MainViewModel.kt` stall interaction logic (onCellClick, sellStall, undoSell) for better modularity and atomicity. Optimized `validateStallPlacement` by skipping redundant A* pathfinding for enemies whose paths are not intersected by new stalls. | Resolved |
| FIX-015 | 2026-07-15 | Improved `StallConsole.kt` UI by hiding redundant "Rate" stats for Bak Kut Teh stalls, re-labeling their "Range" to "Boost Range", and ensuring consistent "Grab Rate" labeling for the Tray Return Uncle stall. Removed unused `hungerValue` code. | Resolved |
Comment thread
candour marked this conversation as resolved.
Loading