Compare commits

..
Author SHA1 Message Date
devadmin 5360545398 Merge pull request 'Release: Katan Seafarers' (#25) from dev into main
Build and Release APK / Build APK and publish release (push) Successful in 4m24s
Build and Release APK / Deploy to Cloudflare Pages (push) Successful in 31s
2026-10-28 21:46:17 -06:00
devadmin 6278f472db Merge pull request 'Release: Yahtzee improvements' (#24) from dev into main
Build and Release APK / Build APK and publish release (push) Successful in 4m25s
Build and Release APK / Deploy to Cloudflare Pages (push) Successful in 32s
2026-10-28 20:43:39 -06:00
devadmin 8c89174c21 Merge pull request 'Release Katan and Meowdoku to production' (#20) from dev into main
Build and Release APK / Build APK and publish release (push) Successful in 4m17s
Build and Release APK / Deploy to Cloudflare Pages (push) Successful in 33s
2026-10-26 12:41:15 -06:00
devadmin ee8a4f27d3 Merge pull request 'Release: Meowdoku refinements and Scorekeeper name memory' (#18) from dev into main
Build and Release APK / Build APK and publish release (push) Successful in 4m27s
Build and Release APK / Deploy to Cloudflare Pages (push) Successful in 39s
2026-10-26 10:55:04 -06:00
devadmin 518f80b998 Merge pull request 'Release: dev to main (Cities & Knights)' (#9) from dev into main
Build and Release APK / Build APK and publish release (push) Successful in 4m2s
Build and Release APK / Deploy to Cloudflare Pages (push) Successful in 32s
2026-10-17 12:43:30 -06:00
devadmin 5fdb70cae0 Merge pull request 'Release: dev to main' (#7) from dev into main
Build and Release APK / Build APK and publish release (push) Successful in 4m1s
Build and Release APK / Deploy to Cloudflare Pages (push) Successful in 33s
2026-10-15 18:01:36 -06:00
@@ -313,10 +313,6 @@ fun CatanHud(
) {
Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(2.dp)) {
HudPlayerStrip(state, seats, pointsOf, style)
// Cities & Knights: the ship and the improvement levels are as much part
// of the game as the scores, so they sit with them rather than in a panel
// this layout does not have room for.
if (state.isCk) CatanBarbarians(state, Modifier.padding(horizontal = 8.dp), style)
Box(Modifier.weight(1f).fillMaxWidth()) {
// The island fills the whole area; controls float over its sea margin.
ZoomPanBox(Modifier.fillMaxSize().padding(start = 64.dp, end = 64.dp, top = 30.dp, bottom = 44.dp)) {
@@ -457,16 +453,6 @@ private fun HudPlayerStrip(
Modifier.size(14.dp).clip(CircleShape).background(style.seats[seat]).border(1.dp, style.pieceOutline, CircleShape),
)
Text(seats.label(seat), fontSize = 12.sp, fontWeight = FontWeight.Bold, maxLines = 1, modifier = Modifier.weight(1f))
// Trade, politics, science: the three improvement levels.
if (state.isCk) {
Text(
text = org.prolibertate.games.game.catan.Track.entries.joinToString(" ") {
"${it.name.first()}${org.prolibertate.games.game.catan.CatanCk.improvement(state, seat, it)}"
},
fontSize = 12.sp,
maxLines = 1,
)
}
Text("${pointsOf(seat)} VP · ${state.resourceCount(seat)}🂠", fontSize = 12.sp, maxLines = 1)
}
}