Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fae031d2b5 | ||
|
|
2e66567643 | ||
|
|
a8ff9863a6 | ||
|
|
bd12a7a70b | ||
|
|
e370aa0ceb | ||
|
|
59a6ffc940 | ||
|
|
98506c05b7 |
@@ -1,78 +1,61 @@
|
|||||||
> **Moved to Gitea.** CI now runs on Gitea Actions at
|
|
||||||
> `git.wallacenet.ca/devadmin/ProLibertateGames`, publishing to Cloudflare Pages
|
|
||||||
> (`plg.wallacenet.ca`) only. The sandbox notes below describe the earlier GitHub
|
|
||||||
> setup (no CI run from session pushes, `workflow_dispatch` as the workaround);
|
|
||||||
> re-verify them against Gitea before relying on them.
|
|
||||||
|
|
||||||
# Working on this repo with Claude
|
# Working on this repo with Claude
|
||||||
|
|
||||||
## Nothing a session does triggers CI. Dispatch it explicitly.
|
CI runs on **Gitea Actions** at `git.wallacenet.ca/devadmin/ProLibertateGames`
|
||||||
|
(workflows in `.github/workflows/`), publishing to Cloudflare Pages
|
||||||
|
(`plg.wallacenet.ca`). The workflow below was measured on the dev machine
|
||||||
|
(`~/ProLibertateGames`); it replaces the earlier GitHub-sandbox notes, which no
|
||||||
|
longer apply.
|
||||||
|
|
||||||
GitHub creates **no workflow run** for anything this sandbox does — pushing a
|
## Build, test and lint locally
|
||||||
branch, opening a pull request, or merging one. All of it goes through the same
|
|
||||||
integration, and GitHub suppresses event-triggered runs from it. The pull
|
|
||||||
request will say it was opened by the repo owner; that is only how the UI
|
|
||||||
attributes it, and it does not change the suppression.
|
|
||||||
|
|
||||||
This was measured, not assumed:
|
Gradle works on the dev machine. Two environment variables are required: the
|
||||||
|
default JDK is 25, which Gradle 8.14 cannot use, and the Android SDK lives in the
|
||||||
|
home directory.
|
||||||
|
|
||||||
| Action | Result |
|
```
|
||||||
| --- | --- |
|
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
|
||||||
| Human pushes a Claude-authored commit (`d165e5ef`, `469c900e`) | CI runs |
|
export ANDROID_HOME=$HOME/android-sdk # platform 34, build-tools 34.0.0
|
||||||
| Session pushes `dev` / `main` (`43394b8`, `742add4`) | no run |
|
./gradlew testDebugUnitTest lintDebug assembleDebug
|
||||||
| Session opens a PR against `dev` (#1) | no run |
|
```
|
||||||
| Session calls `workflow_dispatch` | **runs** |
|
|
||||||
|
|
||||||
`workflow_dispatch` works because it creates a run directly instead of relying
|
The Katan tests run in seconds; a clean build takes a few minutes. Run the full
|
||||||
on an event. It is the only mechanism available from a session, so every build
|
suite, lint and `assembleDebug` before pushing: they are what CI runs. There is
|
||||||
has to be asked for by hand.
|
no KVM, so no emulator; the engine and the UI logic are covered by unit tests
|
||||||
|
(see `docs/UI-catan.md`).
|
||||||
|
|
||||||
## Verify before merging, without publishing
|
## Shipping: branch, PR, CI, merge
|
||||||
|
|
||||||
`ci.yml` builds, tests and lints on any ref, but its staging and publishing
|
1. Branch from `dev`; before pushing, merge `origin/dev` in (it moves between
|
||||||
steps are gated on `github.ref == 'refs/heads/dev'`. Dispatching it on a
|
sessions).
|
||||||
**feature branch** therefore gives the full check — build, unit tests, Android
|
2. Plain `git push` has no credentials. Use the Gitea token as a one-off header:
|
||||||
lint — and publishes nothing.
|
`git -c "http.extraheader=Authorization: token $(cat ~/.config/gitea/token)" push -u origin <branch>`.
|
||||||
|
3. Open the PR with `POST /api/v1/repos/devadmin/ProLibertateGames/pulls`
|
||||||
So the working loop is:
|
(same token, `Authorization: token ...`). CI (`ci.yml`) runs on the PR: build,
|
||||||
|
unit tests and Android lint; it publishes nothing. Poll
|
||||||
1. Commit and push the feature branch.
|
`/actions/runs` until it completes (about 7 minutes).
|
||||||
2. Dispatch `ci.yml` on that branch. Wait for green. This is the real review
|
4. Merge with `POST .../pulls/N/merge {"Do":"merge"}`. The push to `dev` runs
|
||||||
gate, and it is the only verification that exists (see below).
|
`ci.yml` again and publishes the build (about 9 minutes).
|
||||||
3. Open the PR through the API and merge it there, so the change is reviewable
|
|
||||||
and the merge commit is honest about what happened. Neither step builds
|
|
||||||
anything.
|
|
||||||
4. Dispatch the target branch's workflow to actually build and publish:
|
|
||||||
`ci.yml` on `dev`, `release.yml` on `main`.
|
|
||||||
|
|
||||||
Skipping step 4 leaves a branch whose head was never built and no release.
|
|
||||||
|
|
||||||
## Merging is a shipping action
|
## Merging is a shipping action
|
||||||
|
|
||||||
Both long-lived branches publish, so a merge is a release, not just an
|
Both long-lived branches publish, so a merge is a release, not just an
|
||||||
integration:
|
integration:
|
||||||
|
|
||||||
- **`dev`** → `ci.yml` publishes a `v<series>.N-dev` **prerelease**, offered by the
|
- **`dev`** publishes a `v<series>.N-dev` build to
|
||||||
in-app updater to anyone on the Dev channel.
|
`https://plg.wallacenet.ca/dev/latest.json`, offered by the in-app updater to
|
||||||
- **`main`** → `release.yml` publishes a **production** release, which the
|
anyone on the Dev channel.
|
||||||
updater installs for everyone on the Production channel.
|
- **`main`** runs `release.yml` and publishes a **production** release for
|
||||||
|
everyone on the Production channel. Confirm before merging to `main`.
|
||||||
|
`release.yml` runs `assembleDebug` only (no tests, no lint), so a `main`
|
||||||
|
release is only as verified as the `dev` build it replays.
|
||||||
|
|
||||||
Confirm before shipping to `main`. Note that `release.yml` runs `assembleDebug`
|
## Katan
|
||||||
only — no tests, no lint — so a `main` release is only as verified as the `dev`
|
|
||||||
build it replays.
|
|
||||||
|
|
||||||
## Gradle does not run in the sandbox
|
The island game is catalogue id `catan`, shown as **Katan**. It has two rule
|
||||||
|
sets chosen at setup: the base game (`docs/RULES-catan.md`) and Cities & Knights
|
||||||
`./gradlew` cannot resolve the Android plugin here: the proxy blocks
|
(`docs/RULES-catan-ck.md`, code in `game/catan/CatanCk*.kt`, state behind
|
||||||
`dl.google.com` with a 403. No local build, no local test run, no local lint. A
|
`CatanState.ck`, which is null in the base game). The screen is layered; see
|
||||||
dispatched CI run is the only way to find out whether a change compiles.
|
`docs/UI-catan.md` before changing it.
|
||||||
|
|
||||||
## A permanent fix, if you want one
|
|
||||||
|
|
||||||
The suppression is a property of the sandbox's credential, so it cannot be
|
|
||||||
fixed from inside a session. Giving the environment a personal access token to
|
|
||||||
push with would make pushes and PRs behave normally for everyone. Until then,
|
|
||||||
the dispatch step above is the workaround.
|
|
||||||
|
|
||||||
## Bash output is filtered before it reaches the model
|
## Bash output is filtered before it reaches the model
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,9 @@ import org.prolibertate.games.ui.AppEnv
|
|||||||
import org.prolibertate.games.ui.AppRoot
|
import org.prolibertate.games.ui.AppRoot
|
||||||
import org.prolibertate.games.ui.theme.ProLibertateTheme
|
import org.prolibertate.games.ui.theme.ProLibertateTheme
|
||||||
import org.prolibertate.games.update.Updater
|
import org.prolibertate.games.update.Updater
|
||||||
|
import java.io.File
|
||||||
import java.util.UUID
|
import java.util.UUID
|
||||||
|
import org.prolibertate.games.game.engine.SavedGameStore
|
||||||
|
|
||||||
class MainActivity : ComponentActivity() {
|
class MainActivity : ComponentActivity() {
|
||||||
|
|
||||||
@@ -40,6 +42,7 @@ class MainActivity : ComponentActivity() {
|
|||||||
deviceId = peerId,
|
deviceId = peerId,
|
||||||
),
|
),
|
||||||
peerId = peerId,
|
peerId = peerId,
|
||||||
|
saves = SavedGameStore(File(filesDir, "saved-games")),
|
||||||
)
|
)
|
||||||
|
|
||||||
setContent {
|
setContent {
|
||||||
|
|||||||
@@ -0,0 +1,101 @@
|
|||||||
|
package org.prolibertate.games.game.engine
|
||||||
|
|
||||||
|
import kotlinx.serialization.Serializable
|
||||||
|
import kotlinx.serialization.json.Json
|
||||||
|
import java.io.File
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A game in progress, kept so it can be picked up again after the app has been
|
||||||
|
* closed.
|
||||||
|
*
|
||||||
|
* The match is stored the way the host holds it: the [config] it was dealt from
|
||||||
|
* (seed, seats, options) and the whole authoritative [stateJson], hidden cards
|
||||||
|
* included, as the game's own rules encode it. Nothing here knows what game it
|
||||||
|
* is; [gameId] is only the name of the slot.
|
||||||
|
*/
|
||||||
|
@Serializable
|
||||||
|
data class SavedMatch(
|
||||||
|
val gameId: String,
|
||||||
|
val config: TableConfig,
|
||||||
|
/** The seat the person at this device plays. */
|
||||||
|
val localSeat: Int,
|
||||||
|
val stateJson: String,
|
||||||
|
/** Wall-clock milliseconds when the position was written. */
|
||||||
|
val savedAtMillis: Long,
|
||||||
|
/** A line saying how the game stands, from the rules' own summary. */
|
||||||
|
val summary: String = "",
|
||||||
|
)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* One saved game per game, kept as a file each under [directory].
|
||||||
|
*
|
||||||
|
* One slot per game rather than a list: the player is mid-way through a game of
|
||||||
|
* Chess or they are not. Starting a new one replaces it, which is what the
|
||||||
|
* resume prompt on the setup screen says.
|
||||||
|
*
|
||||||
|
* Writes are atomic — the position goes to a temporary file that is then moved
|
||||||
|
* over the real one — so being killed half way through a save leaves the
|
||||||
|
* previous position, not half of the new one. Reads never throw: a file that
|
||||||
|
* will not parse is a game that cannot be resumed, so it is removed and reported
|
||||||
|
* as absent.
|
||||||
|
*/
|
||||||
|
class SavedGameStore(private val directory: File) {
|
||||||
|
|
||||||
|
private val json = Json {
|
||||||
|
ignoreUnknownKeys = true
|
||||||
|
encodeDefaults = true
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun fileFor(gameId: String): File {
|
||||||
|
// The ids are catalogue constants, but they become file names, so
|
||||||
|
// nothing that could climb out of the directory is let through.
|
||||||
|
require(gameId.isNotBlank() && gameId.all { it.isLetterOrDigit() || it == '_' || it == '-' }) {
|
||||||
|
"Not a game id: $gameId"
|
||||||
|
}
|
||||||
|
return File(directory, "$gameId.json")
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Writes [match] over whatever was saved for its game. */
|
||||||
|
@Synchronized
|
||||||
|
fun save(match: SavedMatch) {
|
||||||
|
directory.mkdirs()
|
||||||
|
val target = fileFor(match.gameId)
|
||||||
|
val temp = File(directory, "${match.gameId}.json.tmp")
|
||||||
|
temp.writeText(json.encodeToString(SavedMatch.serializer(), match))
|
||||||
|
if (!temp.renameTo(target)) {
|
||||||
|
// Some file systems will not rename over an existing file.
|
||||||
|
target.delete()
|
||||||
|
check(temp.renameTo(target)) { "Could not write the saved game" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The saved game for [gameId], or null if there is none or it cannot be read. */
|
||||||
|
@Synchronized
|
||||||
|
fun load(gameId: String): SavedMatch? {
|
||||||
|
val file = fileFor(gameId)
|
||||||
|
if (!file.isFile) return null
|
||||||
|
val match = runCatching {
|
||||||
|
json.decodeFromString(SavedMatch.serializer(), file.readText())
|
||||||
|
}.getOrNull()
|
||||||
|
if (match == null || match.gameId != gameId) {
|
||||||
|
file.delete()
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
return match
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Forgets the saved game for [gameId]. A no-op if there is none. */
|
||||||
|
@Synchronized
|
||||||
|
fun clear(gameId: String) {
|
||||||
|
fileFor(gameId).delete()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Every readable saved game, the most recently played first. */
|
||||||
|
@Synchronized
|
||||||
|
fun all(): List<SavedMatch> {
|
||||||
|
val files = directory.listFiles { f -> f.isFile && f.name.endsWith(".json") } ?: return emptyList()
|
||||||
|
return files
|
||||||
|
.mapNotNull { file -> runCatching { load(file.name.removeSuffix(".json")) }.getOrNull() }
|
||||||
|
.sortedByDescending { it.savedAtMillis }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -96,6 +96,27 @@ class MatchController<S : Any, M : Any>(
|
|||||||
|
|
||||||
/** Host only: the true state. Clients never see this. */
|
/** Host only: the true state. Clients never see this. */
|
||||||
private var authoritative: S? = null
|
private var authoritative: S? = null
|
||||||
|
|
||||||
|
/** A position to carry on from instead of dealing, set by [restore] before [startAsHost]. */
|
||||||
|
private var restored: S? = null
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Host only: told about every position the table reaches, so it can be kept
|
||||||
|
* for later. Called under the table's lock, so it must return quickly — the
|
||||||
|
* snapshot encodes its state only when asked, and the work of writing it
|
||||||
|
* belongs to whoever is listening.
|
||||||
|
*/
|
||||||
|
var onHostState: ((HostSnapshot) -> Unit)? = null
|
||||||
|
|
||||||
|
/** One position of the table, as handed to [onHostState]. */
|
||||||
|
class HostSnapshot(
|
||||||
|
val finished: Boolean,
|
||||||
|
val summary: String,
|
||||||
|
private val encode: () -> String,
|
||||||
|
) {
|
||||||
|
/** The whole true state, encoded by the game's own rules. */
|
||||||
|
fun stateJson(): String = encode()
|
||||||
|
}
|
||||||
private val lock = Mutex()
|
private val lock = Mutex()
|
||||||
private var sequence = 0
|
private var sequence = 0
|
||||||
|
|
||||||
@@ -160,7 +181,7 @@ class MatchController<S : Any, M : Any>(
|
|||||||
check(role == Role.HOST) { "Not hosting" }
|
check(role == Role.HOST) { "Not hosting" }
|
||||||
clients.forEach { connection -> listenToPeer(connection) }
|
clients.forEach { connection -> listenToPeer(connection) }
|
||||||
scope.launch {
|
scope.launch {
|
||||||
val initial = runCatching { rules.initialState(config) }.getOrElse { error ->
|
val initial = restored ?: runCatching { rules.initialState(config) }.getOrElse { error ->
|
||||||
// A table the rules will not accept is a dead end, not a reason
|
// A table the rules will not accept is a dead end, not a reason
|
||||||
// to take the app down with it: this runs in the screen's own
|
// to take the app down with it: this runs in the screen's own
|
||||||
// scope, where nothing would catch it.
|
// scope, where nothing would catch it.
|
||||||
@@ -175,6 +196,20 @@ class MatchController<S : Any, M : Any>(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Host: carry on from a saved position instead of dealing a new game.
|
||||||
|
*
|
||||||
|
* Call before [startAsHost]. Returns false, and changes nothing, if
|
||||||
|
* [stateJson] cannot be read by this version of the game — a save made by an
|
||||||
|
* older build, say — and the caller should deal a fresh table instead.
|
||||||
|
*/
|
||||||
|
fun restore(stateJson: String): Boolean {
|
||||||
|
check(role == Role.HOST) { "Only a host can restore a game" }
|
||||||
|
val state = runCatching { rules.decodeState(stateJson) }.getOrNull() ?: return false
|
||||||
|
restored = state
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
private fun listenToPeer(connection: Connection) {
|
private fun listenToPeer(connection: Connection) {
|
||||||
peers[connection.peerId] = connection
|
peers[connection.peerId] = connection
|
||||||
peerJobs[connection.peerId] = scope.launch {
|
peerJobs[connection.peerId] = scope.launch {
|
||||||
@@ -449,6 +484,16 @@ class MatchController<S : Any, M : Any>(
|
|||||||
}
|
}
|
||||||
_finished.value = rules.isFinished(current)
|
_finished.value = rules.isFinished(current)
|
||||||
|
|
||||||
|
if (role == Role.HOST) {
|
||||||
|
onHostState?.invoke(
|
||||||
|
HostSnapshot(
|
||||||
|
finished = rules.isFinished(current),
|
||||||
|
summary = rules.summary(current),
|
||||||
|
encode = { rules.encodeState(current) },
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
for (slot in config.seats) {
|
for (slot in config.seats) {
|
||||||
val peerId = slot.peerId ?: continue
|
val peerId = slot.peerId ?: continue
|
||||||
val connection = peers[peerId] ?: continue
|
val connection = peers[peerId] ?: continue
|
||||||
|
|||||||
@@ -0,0 +1,95 @@
|
|||||||
|
package org.prolibertate.games.net
|
||||||
|
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.Job
|
||||||
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
|
import kotlinx.coroutines.flow.collectLatest
|
||||||
|
import kotlinx.coroutines.flow.filterNotNull
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
import org.prolibertate.games.game.engine.SavedGameStore
|
||||||
|
import org.prolibertate.games.game.engine.SavedMatch
|
||||||
|
import org.prolibertate.games.game.engine.TableConfig
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Keeps the position of one table on disk as it is played.
|
||||||
|
*
|
||||||
|
* It is fed every position the host reaches ([offer]) and writes the newest one
|
||||||
|
* off the main thread. Positions that arrive while a write is under way are
|
||||||
|
* dropped in favour of the latest — a computer's turn can be several moves in a
|
||||||
|
* second, and only where the game stands matters. A finished game is not kept:
|
||||||
|
* its slot is cleared, so a won game is not offered back as one to resume.
|
||||||
|
*
|
||||||
|
* [flush] writes whatever has not been written yet, on the caller's thread. It
|
||||||
|
* is what makes leaving the table, or the app going to the background, safe: the
|
||||||
|
* background writer may not have caught up, and the process may not be given the
|
||||||
|
* chance to let it.
|
||||||
|
*/
|
||||||
|
class MatchSaver(
|
||||||
|
private val store: SavedGameStore,
|
||||||
|
private val gameId: String,
|
||||||
|
private val config: TableConfig,
|
||||||
|
private val localSeat: Int,
|
||||||
|
private val scope: CoroutineScope,
|
||||||
|
private val clock: () -> Long = System::currentTimeMillis,
|
||||||
|
) {
|
||||||
|
private val latest = MutableStateFlow<MatchController.HostSnapshot?>(null)
|
||||||
|
private var worker: Job? = null
|
||||||
|
private var written: MatchController.HostSnapshot? = null
|
||||||
|
private var discarded = false
|
||||||
|
|
||||||
|
/** Starts the background writer. */
|
||||||
|
fun start() {
|
||||||
|
worker = scope.launch(Dispatchers.IO) {
|
||||||
|
latest.filterNotNull().collectLatest { write(it) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Hands over the newest position. Cheap: the encoding happens on the writer. */
|
||||||
|
fun offer(snapshot: MatchController.HostSnapshot) {
|
||||||
|
latest.value = snapshot
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Writes the newest position now if the writer has not already. */
|
||||||
|
fun flush() {
|
||||||
|
latest.value?.let { write(it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The game was ended on purpose: forget the saved position and write no more. */
|
||||||
|
@Synchronized
|
||||||
|
fun discard() {
|
||||||
|
discarded = true
|
||||||
|
worker?.cancel()
|
||||||
|
worker = null
|
||||||
|
runCatching { store.clear(gameId) }
|
||||||
|
}
|
||||||
|
|
||||||
|
fun stop() {
|
||||||
|
worker?.cancel()
|
||||||
|
worker = null
|
||||||
|
}
|
||||||
|
|
||||||
|
@Synchronized
|
||||||
|
private fun write(snapshot: MatchController.HostSnapshot) {
|
||||||
|
if (discarded || snapshot === written) return
|
||||||
|
written = snapshot
|
||||||
|
// Saving is a courtesy to the player: a full disk must not take the game
|
||||||
|
// down with it.
|
||||||
|
runCatching {
|
||||||
|
if (snapshot.finished) {
|
||||||
|
store.clear(gameId)
|
||||||
|
} else {
|
||||||
|
store.save(
|
||||||
|
SavedMatch(
|
||||||
|
gameId = gameId,
|
||||||
|
config = config,
|
||||||
|
localSeat = localSeat,
|
||||||
|
stateJson = snapshot.stateJson(),
|
||||||
|
savedAtMillis = clock(),
|
||||||
|
summary = snapshot.summary,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -29,6 +29,8 @@ import androidx.compose.runtime.Composable
|
|||||||
import androidx.compose.runtime.CompositionLocalProvider
|
import androidx.compose.runtime.CompositionLocalProvider
|
||||||
import androidx.compose.runtime.collectAsState
|
import androidx.compose.runtime.collectAsState
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.compose.runtime.mutableIntStateOf
|
||||||
|
import androidx.compose.runtime.produceState
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
@@ -50,6 +52,10 @@ import org.prolibertate.games.settings.SettingsRepository
|
|||||||
import org.prolibertate.games.ui.game.LocalCardSpeed
|
import org.prolibertate.games.ui.game.LocalCardSpeed
|
||||||
import org.prolibertate.games.update.UpdateChannel
|
import org.prolibertate.games.update.UpdateChannel
|
||||||
import org.prolibertate.games.update.Updater
|
import org.prolibertate.games.update.Updater
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.withContext
|
||||||
|
import org.prolibertate.games.game.engine.SavedGameStore
|
||||||
|
import org.prolibertate.games.game.engine.SavedMatch
|
||||||
|
|
||||||
/** Everything the screens need, assembled once by the activity. */
|
/** Everything the screens need, assembled once by the activity. */
|
||||||
class AppEnv(
|
class AppEnv(
|
||||||
@@ -60,6 +66,8 @@ class AppEnv(
|
|||||||
/** The shared score sheet, for the Scorekeeper to host or join. */
|
/** The shared score sheet, for the Scorekeeper to host or join. */
|
||||||
val scoreSession: ScorekeeperSession,
|
val scoreSession: ScorekeeperSession,
|
||||||
val peerId: String,
|
val peerId: String,
|
||||||
|
/** Games in progress, kept between sessions. */
|
||||||
|
val saves: SavedGameStore,
|
||||||
)
|
)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -83,6 +91,8 @@ sealed interface Route {
|
|||||||
val config: TableConfig,
|
val config: TableConfig,
|
||||||
val hosting: Boolean,
|
val hosting: Boolean,
|
||||||
val localSeat: Int,
|
val localSeat: Int,
|
||||||
|
/** A saved position to carry on from, as the game's rules encoded it; null deals a new game. */
|
||||||
|
val resumeState: String? = null,
|
||||||
) : Route
|
) : Route
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -167,6 +177,10 @@ private fun AppContent(
|
|||||||
// Dev builds show the games that are not finished yet; production
|
// Dev builds show the games that are not finished yet; production
|
||||||
// releases list only what can actually be played.
|
// releases list only what can actually be played.
|
||||||
showComingSoon = showComingSoon,
|
showComingSoon = showComingSoon,
|
||||||
|
saved = savedGames(env, stack),
|
||||||
|
onResume = { saved ->
|
||||||
|
push(Route.Play(saved.gameId, saved.config, true, saved.localSeat, saved.stateJson))
|
||||||
|
},
|
||||||
onPickSection = { push(Route.Section(it)) },
|
onPickSection = { push(Route.Section(it)) },
|
||||||
onJoinGame = { push(Route.Lobby(gameId = "", optionsJson = "{}", hosting = false)) },
|
onJoinGame = { push(Route.Lobby(gameId = "", optionsJson = "{}", hosting = false)) },
|
||||||
onScorekeeper = { push(Route.Scorekeeper) },
|
onScorekeeper = { push(Route.Scorekeeper) },
|
||||||
@@ -194,15 +208,30 @@ private fun AppContent(
|
|||||||
onBack = { pop() },
|
onBack = { pop() },
|
||||||
)
|
)
|
||||||
|
|
||||||
is Route.Setup -> GameSetupScreen(
|
is Route.Setup -> {
|
||||||
descriptor = GameCatalog.byId(route.gameId)!!,
|
// Bumped when the saved game is thrown away, so the banner goes with it.
|
||||||
playerName = settings.displayName,
|
var discards by remember(route) { mutableIntStateOf(0) }
|
||||||
onBack = { pop() },
|
val saved by produceState<SavedMatch?>(null, route, discards) {
|
||||||
onPlayOffline = { config, seat -> push(Route.Play(route.gameId, config, true, seat)) },
|
value = withContext(Dispatchers.IO) { env.saves.load(route.gameId) }
|
||||||
onHostOnline = { optionsJson ->
|
}
|
||||||
push(Route.Lobby(route.gameId, optionsJson, hosting = true))
|
GameSetupScreen(
|
||||||
},
|
descriptor = GameCatalog.byId(route.gameId)!!,
|
||||||
)
|
playerName = settings.displayName,
|
||||||
|
onBack = { pop() },
|
||||||
|
onPlayOffline = { config, seat -> push(Route.Play(route.gameId, config, true, seat)) },
|
||||||
|
onHostOnline = { optionsJson ->
|
||||||
|
push(Route.Lobby(route.gameId, optionsJson, hosting = true))
|
||||||
|
},
|
||||||
|
saved = saved,
|
||||||
|
onResume = { match ->
|
||||||
|
push(Route.Play(match.gameId, match.config, true, match.localSeat, match.stateJson))
|
||||||
|
},
|
||||||
|
onDiscardSaved = {
|
||||||
|
env.saves.clear(route.gameId)
|
||||||
|
discards++
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
is Route.Lobby -> LobbyScreen(
|
is Route.Lobby -> LobbyScreen(
|
||||||
env = env,
|
env = env,
|
||||||
@@ -231,6 +260,8 @@ private fun AppContent(
|
|||||||
@Composable
|
@Composable
|
||||||
fun MainMenuScreen(
|
fun MainMenuScreen(
|
||||||
showComingSoon: Boolean,
|
showComingSoon: Boolean,
|
||||||
|
saved: List<SavedMatch>,
|
||||||
|
onResume: (SavedMatch) -> Unit,
|
||||||
onPickSection: (GameMenu) -> Unit,
|
onPickSection: (GameMenu) -> Unit,
|
||||||
onJoinGame: () -> Unit,
|
onJoinGame: () -> Unit,
|
||||||
onScorekeeper: () -> Unit,
|
onScorekeeper: () -> Unit,
|
||||||
@@ -280,6 +311,23 @@ fun MainMenuScreen(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Games left half-played, most recent first, above everything
|
||||||
|
// else: coming back to the app is mostly coming back to one.
|
||||||
|
if (saved.isNotEmpty()) {
|
||||||
|
Text(
|
||||||
|
"Continue",
|
||||||
|
style = MaterialTheme.typography.labelLarge,
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
)
|
||||||
|
val now = System.currentTimeMillis()
|
||||||
|
saved.forEach { match ->
|
||||||
|
val title = GameCatalog.byId(match.gameId)?.title ?: match.gameId
|
||||||
|
Button(onClick = { onResume(match) }, modifier = Modifier.fillMaxWidth()) {
|
||||||
|
Text(savedLine(title, match, now))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Below the games, and full width like them, so the column
|
// Below the games, and full width like them, so the column
|
||||||
// stays one column all the way down.
|
// stays one column all the way down.
|
||||||
OutlinedButton(
|
OutlinedButton(
|
||||||
@@ -490,3 +538,17 @@ fun PrimaryAction(text: String, enabled: Boolean = true, onClick: () -> Unit) {
|
|||||||
Text(text)
|
Text(text)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The saved games, read off the main thread each time the menu is the screen
|
||||||
|
* showing — which is when a game has just been left and its last position
|
||||||
|
* written, so the list is not read until that has happened.
|
||||||
|
*/
|
||||||
|
@Composable
|
||||||
|
private fun savedGames(env: AppEnv, stack: List<Route>): List<SavedMatch> {
|
||||||
|
val onMenu = stack.last() is Route.Menu
|
||||||
|
val saved by produceState(emptyList<SavedMatch>(), onMenu, stack.size) {
|
||||||
|
value = if (onMenu) withContext(Dispatchers.IO) { env.saves.all() } else emptyList()
|
||||||
|
}
|
||||||
|
return saved
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package org.prolibertate.games.ui
|
||||||
|
|
||||||
|
import androidx.compose.runtime.staticCompositionLocalOf
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How a screen's "End game" button tells the table to forget the saved game.
|
||||||
|
*
|
||||||
|
* Leaving a table keeps its position so it can be resumed; ending one on purpose
|
||||||
|
* does not. The two arrive at the screen as the same "go back", so the
|
||||||
|
* difference is carried here instead: [PlayScreen] provides one handle, the match
|
||||||
|
* it builds says what ending means for it by setting [onEnd], and each End-game
|
||||||
|
* dialog calls [end] before it leaves.
|
||||||
|
*/
|
||||||
|
class EndGameHandle {
|
||||||
|
/** Set by the table once it knows how to forget its own saved position. */
|
||||||
|
var onEnd: () -> Unit = {}
|
||||||
|
|
||||||
|
fun end() = onEnd()
|
||||||
|
}
|
||||||
|
|
||||||
|
val LocalEndGameHandle = staticCompositionLocalOf { EndGameHandle() }
|
||||||
@@ -9,11 +9,14 @@ import androidx.compose.foundation.layout.fillMaxWidth
|
|||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.rememberScrollState
|
import androidx.compose.foundation.rememberScrollState
|
||||||
import androidx.compose.foundation.verticalScroll
|
import androidx.compose.foundation.verticalScroll
|
||||||
|
import androidx.compose.material3.Button
|
||||||
|
import androidx.compose.material3.Card
|
||||||
import androidx.compose.material3.Divider
|
import androidx.compose.material3.Divider
|
||||||
import androidx.compose.material3.FilterChip
|
import androidx.compose.material3.FilterChip
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Switch
|
import androidx.compose.material3.Switch
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.material3.TextButton
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
@@ -29,6 +32,7 @@ import org.prolibertate.games.game.GameCatalog
|
|||||||
import org.prolibertate.games.game.GameDescriptor
|
import org.prolibertate.games.game.GameDescriptor
|
||||||
import org.prolibertate.games.game.engine.PlayerKind
|
import org.prolibertate.games.game.engine.PlayerKind
|
||||||
import org.prolibertate.games.game.engine.PlayerSlot
|
import org.prolibertate.games.game.engine.PlayerSlot
|
||||||
|
import org.prolibertate.games.game.engine.SavedMatch
|
||||||
import org.prolibertate.games.game.engine.TableConfig
|
import org.prolibertate.games.game.engine.TableConfig
|
||||||
import org.prolibertate.games.game.backgammon.BackgammonLevel
|
import org.prolibertate.games.game.backgammon.BackgammonLevel
|
||||||
import org.prolibertate.games.game.backgammon.BackgammonOptions
|
import org.prolibertate.games.game.backgammon.BackgammonOptions
|
||||||
@@ -83,6 +87,10 @@ fun GameSetupScreen(
|
|||||||
onBack: () -> Unit,
|
onBack: () -> Unit,
|
||||||
onPlayOffline: (TableConfig, Int) -> Unit,
|
onPlayOffline: (TableConfig, Int) -> Unit,
|
||||||
onHostOnline: (String) -> Unit,
|
onHostOnline: (String) -> Unit,
|
||||||
|
/** A game of this kind left half-played, if there is one. */
|
||||||
|
saved: SavedMatch? = null,
|
||||||
|
onResume: (SavedMatch) -> Unit = {},
|
||||||
|
onDiscardSaved: () -> Unit = {},
|
||||||
) {
|
) {
|
||||||
var euchre by remember { mutableStateOf(EuchreOptions()) }
|
var euchre by remember { mutableStateOf(EuchreOptions()) }
|
||||||
var sequence by remember { mutableStateOf(SequenceOptions()) }
|
var sequence by remember { mutableStateOf(SequenceOptions()) }
|
||||||
@@ -149,6 +157,10 @@ fun GameSetupScreen(
|
|||||||
) {
|
) {
|
||||||
Text(descriptor.blurb, style = MaterialTheme.typography.bodyMedium)
|
Text(descriptor.blurb, style = MaterialTheme.typography.bodyMedium)
|
||||||
|
|
||||||
|
if (saved != null) {
|
||||||
|
SavedGameBanner(saved, onResume = { onResume(saved) }, onDiscard = onDiscardSaved)
|
||||||
|
}
|
||||||
|
|
||||||
Divider()
|
Divider()
|
||||||
Text("House rules", fontWeight = FontWeight.Bold)
|
Text("House rules", fontWeight = FontWeight.Bold)
|
||||||
|
|
||||||
@@ -233,6 +245,12 @@ fun GameSetupScreen(
|
|||||||
descriptor.id == GameCatalog.PIRATES && playPirates -> 1
|
descriptor.id == GameCatalog.PIRATES && playPirates -> 1
|
||||||
else -> 0
|
else -> 0
|
||||||
}
|
}
|
||||||
|
if (saved != null) {
|
||||||
|
Text(
|
||||||
|
"Starting a new game replaces the one in progress.",
|
||||||
|
style = MaterialTheme.typography.bodySmall,
|
||||||
|
)
|
||||||
|
}
|
||||||
PrimaryAction(text = if (solo) "Play" else "Play against the computer") {
|
PrimaryAction(text = if (solo) "Play" else "Play against the computer") {
|
||||||
onPlayOffline(
|
onPlayOffline(
|
||||||
offlineConfig(descriptor.id, optionsJson, seatCount, playerName, localSeat),
|
offlineConfig(descriptor.id, optionsJson, seatCount, playerName, localSeat),
|
||||||
@@ -1216,3 +1234,30 @@ private fun PyramidOptionsEditor(options: PyramidOptions, onChange: (PyramidOpti
|
|||||||
onSelect = { onChange(options.copy(redeals = it)) },
|
onSelect = { onChange(options.copy(redeals = it)) },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The game that was left unfinished, with the two things to do about it. Shown
|
||||||
|
* above the options so it is the first thing seen on coming back to a game.
|
||||||
|
*/
|
||||||
|
@Composable
|
||||||
|
private fun SavedGameBanner(saved: SavedMatch, onResume: () -> Unit, onDiscard: () -> Unit) {
|
||||||
|
Card(modifier = Modifier.fillMaxWidth()) {
|
||||||
|
Column(
|
||||||
|
modifier = Modifier.padding(12.dp),
|
||||||
|
verticalArrangement = Arrangement.spacedBy(6.dp),
|
||||||
|
) {
|
||||||
|
Text("Game in progress", fontWeight = FontWeight.Bold)
|
||||||
|
Text(
|
||||||
|
buildString {
|
||||||
|
append("Saved ${agoText(System.currentTimeMillis(), saved.savedAtMillis)}")
|
||||||
|
if (saved.summary.isNotBlank()) append(" · ${saved.summary}")
|
||||||
|
},
|
||||||
|
style = MaterialTheme.typography.bodySmall,
|
||||||
|
)
|
||||||
|
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||||
|
Button(onClick = onResume) { Text("Resume") }
|
||||||
|
TextButton(onClick = onDiscard) { Text("Discard") }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,24 @@
|
|||||||
|
package org.prolibertate.games.ui
|
||||||
|
|
||||||
|
import org.prolibertate.games.game.engine.SavedMatch
|
||||||
|
|
||||||
|
/** How long ago something happened, in the words a person would use. */
|
||||||
|
fun agoText(nowMillis: Long, thenMillis: Long): String {
|
||||||
|
val seconds = ((nowMillis - thenMillis) / 1000).coerceAtLeast(0)
|
||||||
|
val minutes = seconds / 60
|
||||||
|
val hours = minutes / 60
|
||||||
|
val days = hours / 24
|
||||||
|
return when {
|
||||||
|
seconds < 45 -> "just now"
|
||||||
|
minutes < 2 -> "a minute ago"
|
||||||
|
minutes < 60 -> "$minutes minutes ago"
|
||||||
|
hours < 2 -> "an hour ago"
|
||||||
|
hours < 24 -> "$hours hours ago"
|
||||||
|
days < 2 -> "yesterday"
|
||||||
|
else -> "$days days ago"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** "Chess · saved 5 minutes ago" for a menu line. */
|
||||||
|
fun savedLine(title: String, match: SavedMatch, nowMillis: Long): String =
|
||||||
|
"$title · saved ${agoText(nowMillis, match.savedAtMillis)}"
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.prolibertate.games.ui.game
|
package org.prolibertate.games.ui.game
|
||||||
|
|
||||||
|
import org.prolibertate.games.ui.LocalEndGameHandle
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
@@ -378,7 +379,12 @@ private fun LeaveDialog(onEnd: () -> Unit, onKeepPlaying: () -> Unit) {
|
|||||||
"at the table is told you have left."
|
"at the table is told you have left."
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
confirmButton = { TextButton(onClick = onEnd) { Text("End the game") } },
|
confirmButton = {
|
||||||
|
// Ending a game on purpose also forgets the saved position: only
|
||||||
|
// leaving the table keeps it to be picked up again.
|
||||||
|
val handle = LocalEndGameHandle.current
|
||||||
|
TextButton(onClick = { handle.end(); onEnd() }) { Text("End the game") }
|
||||||
|
},
|
||||||
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.prolibertate.games.ui.game
|
package org.prolibertate.games.ui.game
|
||||||
|
|
||||||
|
import org.prolibertate.games.ui.LocalEndGameHandle
|
||||||
import androidx.compose.foundation.BorderStroke
|
import androidx.compose.foundation.BorderStroke
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
@@ -79,7 +80,12 @@ fun PatienceEndDialog(what: String, onEnd: () -> Unit, onKeepPlaying: () -> Unit
|
|||||||
onDismissRequest = onKeepPlaying,
|
onDismissRequest = onKeepPlaying,
|
||||||
title = { Text("End this game?") },
|
title = { Text("End this game?") },
|
||||||
text = { Text(what) },
|
text = { Text(what) },
|
||||||
confirmButton = { TextButton(onClick = onEnd) { Text("End the game") } },
|
confirmButton = {
|
||||||
|
// Ending a game on purpose also forgets the saved position: only
|
||||||
|
// leaving the table keeps it to be picked up again.
|
||||||
|
val handle = LocalEndGameHandle.current
|
||||||
|
TextButton(onClick = { handle.end(); onEnd() }) { Text("End the game") }
|
||||||
|
},
|
||||||
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.prolibertate.games.ui.game
|
package org.prolibertate.games.ui.game
|
||||||
|
|
||||||
|
import org.prolibertate.games.ui.LocalEndGameHandle
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
@@ -314,7 +315,12 @@ private fun EndGameDialog(onEnd: () -> Unit, onKeepPlaying: () -> Unit) {
|
|||||||
"at the table is told you have left."
|
"at the table is told you have left."
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
confirmButton = { TextButton(onClick = onEnd) { Text("End the game") } },
|
confirmButton = {
|
||||||
|
// Ending a game on purpose also forgets the saved position: only
|
||||||
|
// leaving the table keeps it to be picked up again.
|
||||||
|
val handle = LocalEndGameHandle.current
|
||||||
|
TextButton(onClick = { handle.end(); onEnd() }) { Text("End the game") }
|
||||||
|
},
|
||||||
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.prolibertate.games.ui.game
|
package org.prolibertate.games.ui.game
|
||||||
|
|
||||||
|
import org.prolibertate.games.ui.LocalEndGameHandle
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
@@ -215,7 +216,12 @@ private fun ConfirmEndDialog(onEnd: () -> Unit, onKeepPlaying: () -> Unit) {
|
|||||||
"at the table is told you have left."
|
"at the table is told you have left."
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
confirmButton = { TextButton(onClick = onEnd) { Text("End the game") } },
|
confirmButton = {
|
||||||
|
// Ending a game on purpose also forgets the saved position: only
|
||||||
|
// leaving the table keeps it to be picked up again.
|
||||||
|
val handle = LocalEndGameHandle.current
|
||||||
|
TextButton(onClick = { handle.end(); onEnd() }) { Text("End the game") }
|
||||||
|
},
|
||||||
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.prolibertate.games.ui.game
|
package org.prolibertate.games.ui.game
|
||||||
|
|
||||||
|
import org.prolibertate.games.ui.LocalEndGameHandle
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
@@ -268,7 +269,12 @@ private fun EndHeartsDialog(onEnd: () -> Unit, onKeepPlaying: () -> Unit) {
|
|||||||
onDismissRequest = onKeepPlaying,
|
onDismissRequest = onKeepPlaying,
|
||||||
title = { Text("End this game?") },
|
title = { Text("End this game?") },
|
||||||
text = { Text("The game ends here. Anyone else at the table is told you have left.") },
|
text = { Text("The game ends here. Anyone else at the table is told you have left.") },
|
||||||
confirmButton = { TextButton(onClick = onEnd) { Text("End the game") } },
|
confirmButton = {
|
||||||
|
// Ending a game on purpose also forgets the saved position: only
|
||||||
|
// leaving the table keeps it to be picked up again.
|
||||||
|
val handle = LocalEndGameHandle.current
|
||||||
|
TextButton(onClick = { handle.end(); onEnd() }) { Text("End the game") }
|
||||||
|
},
|
||||||
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.prolibertate.games.ui.game
|
package org.prolibertate.games.ui.game
|
||||||
|
|
||||||
|
import org.prolibertate.games.ui.LocalEndGameHandle
|
||||||
import androidx.compose.foundation.BorderStroke
|
import androidx.compose.foundation.BorderStroke
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
@@ -342,7 +343,12 @@ private fun EndTableDialog(onEnd: () -> Unit, onKeepPlaying: () -> Unit) {
|
|||||||
onDismissRequest = onKeepPlaying,
|
onDismissRequest = onKeepPlaying,
|
||||||
title = { Text("End this game?") },
|
title = { Text("End this game?") },
|
||||||
text = { Text("The deal is left as it stands.") },
|
text = { Text("The deal is left as it stands.") },
|
||||||
confirmButton = { TextButton(onClick = onEnd) { Text("End the game") } },
|
confirmButton = {
|
||||||
|
// Ending a game on purpose also forgets the saved position: only
|
||||||
|
// leaving the table keeps it to be picked up again.
|
||||||
|
val handle = LocalEndGameHandle.current
|
||||||
|
TextButton(onClick = { handle.end(); onEnd() }) { Text("End the game") }
|
||||||
|
},
|
||||||
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.prolibertate.games.ui.game
|
package org.prolibertate.games.ui.game
|
||||||
|
|
||||||
|
import org.prolibertate.games.ui.LocalEndGameHandle
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
@@ -356,7 +357,12 @@ private fun EndDialog(onEnd: () -> Unit, onKeepPlaying: () -> Unit) {
|
|||||||
onDismissRequest = onKeepPlaying,
|
onDismissRequest = onKeepPlaying,
|
||||||
title = { Text("End this game?") },
|
title = { Text("End this game?") },
|
||||||
text = { Text("The game ends here. Anyone else at the table is told you have left.") },
|
text = { Text("The game ends here. Anyone else at the table is told you have left.") },
|
||||||
confirmButton = { TextButton(onClick = onEnd) { Text("End the game") } },
|
confirmButton = {
|
||||||
|
// Ending a game on purpose also forgets the saved position: only
|
||||||
|
// leaving the table keeps it to be picked up again.
|
||||||
|
val handle = LocalEndGameHandle.current
|
||||||
|
TextButton(onClick = { handle.end(); onEnd() }) { Text("End the game") }
|
||||||
|
},
|
||||||
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.prolibertate.games.ui.game
|
package org.prolibertate.games.ui.game
|
||||||
|
|
||||||
|
import org.prolibertate.games.ui.LocalEndGameHandle
|
||||||
import androidx.compose.foundation.Canvas
|
import androidx.compose.foundation.Canvas
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
@@ -483,7 +484,12 @@ private fun LeaveBoardDialog(onEnd: () -> Unit, onKeepPlaying: () -> Unit) {
|
|||||||
"at the table is told you have left."
|
"at the table is told you have left."
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
confirmButton = { TextButton(onClick = onEnd) { Text("End the game") } },
|
confirmButton = {
|
||||||
|
// Ending a game on purpose also forgets the saved position: only
|
||||||
|
// leaving the table keeps it to be picked up again.
|
||||||
|
val handle = LocalEndGameHandle.current
|
||||||
|
TextButton(onClick = { handle.end(); onEnd() }) { Text("End the game") }
|
||||||
|
},
|
||||||
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.prolibertate.games.ui.game
|
package org.prolibertate.games.ui.game
|
||||||
|
|
||||||
|
import org.prolibertate.games.ui.LocalEndGameHandle
|
||||||
import androidx.compose.foundation.BorderStroke
|
import androidx.compose.foundation.BorderStroke
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
@@ -242,7 +243,12 @@ private fun EndBoardDialog(onEnd: () -> Unit, onKeepPlaying: () -> Unit) {
|
|||||||
onDismissRequest = onKeepPlaying,
|
onDismissRequest = onKeepPlaying,
|
||||||
title = { Text("End this game?") },
|
title = { Text("End this game?") },
|
||||||
text = { Text("The board is left as it stands.") },
|
text = { Text("The board is left as it stands.") },
|
||||||
confirmButton = { TextButton(onClick = onEnd) { Text("End the game") } },
|
confirmButton = {
|
||||||
|
// Ending a game on purpose also forgets the saved position: only
|
||||||
|
// leaving the table keeps it to be picked up again.
|
||||||
|
val handle = LocalEndGameHandle.current
|
||||||
|
TextButton(onClick = { handle.end(); onEnd() }) { Text("End the game") }
|
||||||
|
},
|
||||||
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.prolibertate.games.ui.game
|
package org.prolibertate.games.ui.game
|
||||||
|
|
||||||
|
import org.prolibertate.games.ui.LocalEndGameHandle
|
||||||
import androidx.compose.foundation.Canvas
|
import androidx.compose.foundation.Canvas
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
@@ -371,7 +372,12 @@ private fun LeaveFieldDialog(onEnd: () -> Unit, onKeepPlaying: () -> Unit) {
|
|||||||
"at the table is told you have left."
|
"at the table is told you have left."
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
confirmButton = { TextButton(onClick = onEnd) { Text("End the game") } },
|
confirmButton = {
|
||||||
|
// Ending a game on purpose also forgets the saved position: only
|
||||||
|
// leaving the table keeps it to be picked up again.
|
||||||
|
val handle = LocalEndGameHandle.current
|
||||||
|
TextButton(onClick = { handle.end(); onEnd() }) { Text("End the game") }
|
||||||
|
},
|
||||||
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.prolibertate.games.ui.game
|
package org.prolibertate.games.ui.game
|
||||||
|
|
||||||
|
import org.prolibertate.games.ui.LocalEndGameHandle
|
||||||
import androidx.compose.foundation.Canvas
|
import androidx.compose.foundation.Canvas
|
||||||
import androidx.compose.foundation.gestures.detectTapGestures
|
import androidx.compose.foundation.gestures.detectTapGestures
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
@@ -668,7 +669,12 @@ private fun TayuConfirmEndDialog(onEnd: () -> Unit, onKeepPlaying: () -> Unit) {
|
|||||||
"table is told you have left."
|
"table is told you have left."
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
confirmButton = { TextButton(onClick = onEnd) { Text("End the game") } },
|
confirmButton = {
|
||||||
|
// Ending a game on purpose also forgets the saved position: only
|
||||||
|
// leaving the table keeps it to be picked up again.
|
||||||
|
val handle = LocalEndGameHandle.current
|
||||||
|
TextButton(onClick = { handle.end(); onEnd() }) { Text("End the game") }
|
||||||
|
},
|
||||||
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.prolibertate.games.ui.game
|
package org.prolibertate.games.ui.game
|
||||||
|
|
||||||
|
import org.prolibertate.games.ui.LocalEndGameHandle
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
@@ -295,7 +296,12 @@ private fun EndCardDialog(onEnd: () -> Unit, onKeepPlaying: () -> Unit) {
|
|||||||
onDismissRequest = onKeepPlaying,
|
onDismissRequest = onKeepPlaying,
|
||||||
title = { Text("End this game?") },
|
title = { Text("End this game?") },
|
||||||
text = { Text("The game ends here. Anyone else at the table is told you have left.") },
|
text = { Text("The game ends here. Anyone else at the table is told you have left.") },
|
||||||
confirmButton = { TextButton(onClick = onEnd) { Text("End the game") } },
|
confirmButton = {
|
||||||
|
// Ending a game on purpose also forgets the saved position: only
|
||||||
|
// leaving the table keeps it to be picked up again.
|
||||||
|
val handle = LocalEndGameHandle.current
|
||||||
|
TextButton(onClick = { handle.end(); onEnd() }) { Text("End the game") }
|
||||||
|
},
|
||||||
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,6 +61,11 @@ fun CatanBoardView(
|
|||||||
rolledHexes: Set<Int> = emptySet(),
|
rolledHexes: Set<Int> = emptySet(),
|
||||||
/** Cities & Knights: the knight whose menu is open or that is about to move. */
|
/** Cities & Knights: the knight whose menu is open or that is about to move. */
|
||||||
selectedKnight: Int? = null,
|
selectedKnight: Int? = null,
|
||||||
|
/** A placement lined up but not yet confirmed (or being dragged over): drawn as a solid ghost. */
|
||||||
|
stagedVertex: Int? = null,
|
||||||
|
stagedEdge: Int? = null,
|
||||||
|
/** The seat that will own the staged piece, for its colour. */
|
||||||
|
stagedSeat: Int? = null,
|
||||||
) {
|
) {
|
||||||
val measurer = rememberTextMeasurer()
|
val measurer = rememberTextMeasurer()
|
||||||
var size by remember { mutableStateOf(IntSize.Zero) }
|
var size by remember { mutableStateOf(IntSize.Zero) }
|
||||||
@@ -118,6 +123,7 @@ fun CatanBoardView(
|
|||||||
drawKnightTargets(targets, board, style)
|
drawKnightTargets(targets, board, style)
|
||||||
drawVertexTargets(targets, selectedVertex ?: selectedKnight, board, style)
|
drawVertexTargets(targets, selectedVertex ?: selectedKnight, board, style)
|
||||||
drawHexTargets(targets, board, style)
|
drawHexTargets(targets, board, style)
|
||||||
|
drawStaged(stagedVertex, stagedEdge, stagedSeat, board, style)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -642,3 +648,21 @@ private fun DrawScope.drawCentered(
|
|||||||
topLeft = Offset(at.x - layout.size.width / 2f, at.y - layout.size.height / 2f),
|
topLeft = Offset(at.x - layout.size.width / 2f, at.y - layout.size.height / 2f),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The ghost of a placement waiting for ✓: a solid piece in the player's colour with a bright ring. */
|
||||||
|
private fun DrawScope.drawStaged(vertex: Int?, edge: Int?, seat: Int?, board: BoardLayout, style: CatanStyle) {
|
||||||
|
val colour = seat?.let { style.seats.getOrNull(it) } ?: style.target
|
||||||
|
if (edge != null) {
|
||||||
|
val (a, b) = board.edgeEnds(edge)
|
||||||
|
val from = lerp(a, b, 0.1f)
|
||||||
|
val to = lerp(a, b, 0.9f)
|
||||||
|
drawLine(style.targetSelected, from.offset(), to.offset(), board.radius * style.roadWidth * 2.1f, StrokeCap.Round)
|
||||||
|
drawLine(colour, from.offset(), to.offset(), board.radius * style.roadWidth * 1.3f, StrokeCap.Round)
|
||||||
|
}
|
||||||
|
if (vertex != null) {
|
||||||
|
val at = board.vertex(vertex).offset()
|
||||||
|
val radius = board.radius * style.targetRadius
|
||||||
|
drawCircle(colour, radius * 1.3f, at)
|
||||||
|
drawCircle(style.targetSelected, radius * 1.9f, at, style = Stroke(width = board.radius * 0.1f))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.prolibertate.games.ui.game.catan
|
package org.prolibertate.games.ui.game.catan
|
||||||
|
|
||||||
|
import org.prolibertate.games.ui.LocalEndGameHandle
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.ExperimentalLayoutApi
|
import androidx.compose.foundation.layout.ExperimentalLayoutApi
|
||||||
@@ -603,7 +604,12 @@ fun CatanEndGameDialog(onEnd: () -> Unit, onKeepPlaying: () -> Unit) {
|
|||||||
"at the table is told you have left.",
|
"at the table is told you have left.",
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
confirmButton = { TextButton(onClick = onEnd) { Text("End the game") } },
|
confirmButton = {
|
||||||
|
// Ending a game on purpose also forgets the saved position: only
|
||||||
|
// leaving the table keeps it to be picked up again.
|
||||||
|
val handle = LocalEndGameHandle.current
|
||||||
|
TextButton(onClick = { handle.end(); onEnd() }) { Text("End the game") }
|
||||||
|
},
|
||||||
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
dismissButton = { TextButton(onClick = onKeepPlaying) { Text("Keep playing") } },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,452 @@
|
|||||||
|
package org.prolibertate.games.ui.game.catan
|
||||||
|
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.border
|
||||||
|
import androidx.compose.foundation.clickable
|
||||||
|
import androidx.compose.foundation.gestures.detectDragGestures
|
||||||
|
import androidx.compose.foundation.gestures.detectTransformGestures
|
||||||
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
|
import androidx.compose.foundation.layout.Box
|
||||||
|
import androidx.compose.foundation.horizontalScroll
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.width
|
||||||
|
import androidx.compose.foundation.rememberScrollState
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.size
|
||||||
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.compose.runtime.mutableFloatStateOf
|
||||||
|
import androidx.compose.runtime.mutableStateOf
|
||||||
|
import androidx.compose.runtime.remember
|
||||||
|
import androidx.compose.runtime.rememberUpdatedState
|
||||||
|
import androidx.compose.runtime.setValue
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.draw.clip
|
||||||
|
import androidx.compose.ui.geometry.Offset
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import androidx.compose.ui.graphics.graphicsLayer
|
||||||
|
import androidx.compose.ui.input.pointer.pointerInput
|
||||||
|
import androidx.compose.ui.layout.LayoutCoordinates
|
||||||
|
import androidx.compose.ui.layout.onGloballyPositioned
|
||||||
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
|
import androidx.compose.ui.unit.Dp
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.unit.sp
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The heads-up display pieces of the landscape Katan screen: the controls the
|
||||||
|
* Catan Universe match screen uses (see docs/RE-catan-universe.md), redrawn in
|
||||||
|
* 2D. Stateless, like everything in CatanPanels.kt: values in, lambdas out.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** A round HUD button: a glyph or short word, optionally with a one-word caption. */
|
||||||
|
@Composable
|
||||||
|
fun HudRoundButton(
|
||||||
|
glyph: String,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
caption: String? = null,
|
||||||
|
enabled: Boolean = true,
|
||||||
|
primary: Boolean = false,
|
||||||
|
tint: Color = Color.Unspecified,
|
||||||
|
diameter: Dp = 56.dp,
|
||||||
|
onClick: () -> Unit,
|
||||||
|
) {
|
||||||
|
val container = when {
|
||||||
|
tint != Color.Unspecified -> tint
|
||||||
|
primary -> MaterialTheme.colorScheme.primary
|
||||||
|
else -> MaterialTheme.colorScheme.secondaryContainer
|
||||||
|
}
|
||||||
|
val ink = if (primary || tint != Color.Unspecified) Color.White else MaterialTheme.colorScheme.onSecondaryContainer
|
||||||
|
Column(modifier, horizontalAlignment = Alignment.CenterHorizontally) {
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.size(diameter)
|
||||||
|
.clip(CircleShape)
|
||||||
|
.background(container.copy(alpha = if (enabled) 1f else 0.35f))
|
||||||
|
.border(2.dp, Color(0x55000000), CircleShape)
|
||||||
|
.then(if (enabled) Modifier.clickable(onClick = onClick) else Modifier),
|
||||||
|
contentAlignment = Alignment.Center,
|
||||||
|
) {
|
||||||
|
Text(glyph, color = ink.copy(alpha = if (enabled) 1f else 0.6f), fontSize = 18.sp, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
// Always laid out, so the button column never changes height.
|
||||||
|
Text(caption ?: " ", fontSize = 10.sp, maxLines = 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The left-hand build column: one icon per piece. **Drag one onto the board** and
|
||||||
|
* release over a lit spot to stage it; or tap to arm the board and tap a spot. The
|
||||||
|
* column reports pointer positions in window coordinates so the screen can find the
|
||||||
|
* spot under the finger whatever the board's zoom and pan.
|
||||||
|
*/
|
||||||
|
@Composable
|
||||||
|
fun HudBuildColumn(
|
||||||
|
kinds: List<BuildKind>,
|
||||||
|
canBuild: Set<BuildKind>,
|
||||||
|
armed: BuildKind?,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
onTap: (BuildKind) -> Unit,
|
||||||
|
onDragStart: (BuildKind, Offset) -> Unit,
|
||||||
|
onDrag: (Offset) -> Unit,
|
||||||
|
onDragEnd: () -> Unit,
|
||||||
|
) {
|
||||||
|
Column(modifier, verticalArrangement = Arrangement.spacedBy(6.dp), horizontalAlignment = Alignment.CenterHorizontally) {
|
||||||
|
kinds.forEach { kind ->
|
||||||
|
BuildChip(kind, enabled = kind in canBuild, armed = armed == kind, onTap, onDragStart, onDrag, onDragEnd)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun BuildChip(
|
||||||
|
kind: BuildKind,
|
||||||
|
enabled: Boolean,
|
||||||
|
armed: Boolean,
|
||||||
|
onTap: (BuildKind) -> Unit,
|
||||||
|
onDragStart: (BuildKind, Offset) -> Unit,
|
||||||
|
onDrag: (Offset) -> Unit,
|
||||||
|
onDragEnd: () -> Unit,
|
||||||
|
) {
|
||||||
|
var coords by remember { mutableStateOf<LayoutCoordinates?>(null) }
|
||||||
|
val start by rememberUpdatedState(onDragStart)
|
||||||
|
val move by rememberUpdatedState(onDrag)
|
||||||
|
val end by rememberUpdatedState(onDragEnd)
|
||||||
|
val tap by rememberUpdatedState(onTap)
|
||||||
|
val shape = RoundedCornerShape(12.dp)
|
||||||
|
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.size(52.dp)
|
||||||
|
.clip(shape)
|
||||||
|
.background(
|
||||||
|
when {
|
||||||
|
armed -> MaterialTheme.colorScheme.primary
|
||||||
|
else -> MaterialTheme.colorScheme.secondaryContainer.copy(alpha = if (enabled) 1f else 0.35f)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.border(2.dp, Color(0x55000000), shape)
|
||||||
|
.onGloballyPositioned { coords = it }
|
||||||
|
.pointerInput(enabled, kind) {
|
||||||
|
if (!enabled) return@pointerInput
|
||||||
|
detectDragGestures(
|
||||||
|
onDragStart = { local ->
|
||||||
|
coords?.localToWindow(local)?.let { start(kind, it) }
|
||||||
|
},
|
||||||
|
onDrag = { change, _ ->
|
||||||
|
change.consume()
|
||||||
|
coords?.localToWindow(change.position)?.let { move(it) }
|
||||||
|
},
|
||||||
|
onDragEnd = { end() },
|
||||||
|
onDragCancel = { end() },
|
||||||
|
)
|
||||||
|
}
|
||||||
|
.then(if (enabled) Modifier.clickable { tap(kind) } else Modifier),
|
||||||
|
contentAlignment = Alignment.Center,
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
CatanHudGlyphs.of(kind),
|
||||||
|
fontSize = 22.sp,
|
||||||
|
color = if (armed) Color.White else MaterialTheme.colorScheme.onSecondaryContainer,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
Text(CatanHudGlyphs.label(kind), fontSize = 10.sp, maxLines = 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Glyphs and captions of the build column. Kept apart so the art can be swapped for drawables. */
|
||||||
|
object CatanHudGlyphs {
|
||||||
|
fun of(kind: BuildKind): String = when (kind) {
|
||||||
|
BuildKind.ROAD -> "━"
|
||||||
|
BuildKind.SETTLEMENT -> "⌂"
|
||||||
|
BuildKind.CITY -> "▲"
|
||||||
|
BuildKind.WALL -> "▦"
|
||||||
|
BuildKind.KNIGHT -> "♞"
|
||||||
|
}
|
||||||
|
|
||||||
|
fun label(kind: BuildKind): String = when (kind) {
|
||||||
|
BuildKind.ROAD -> CatanText.ROAD
|
||||||
|
BuildKind.SETTLEMENT -> CatanText.SETTLEMENT
|
||||||
|
BuildKind.CITY -> CatanText.CITY
|
||||||
|
BuildKind.WALL -> CatanText.WALL
|
||||||
|
BuildKind.KNIGHT -> CatanText.KNIGHT
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** ✓ over ✗: confirm or cancel a staged placement. Always laid out; enabled only while something is staged. */
|
||||||
|
@Composable
|
||||||
|
fun HudConfirmButtons(
|
||||||
|
staged: Boolean,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
onConfirm: () -> Unit,
|
||||||
|
onCancel: () -> Unit,
|
||||||
|
) {
|
||||||
|
Column(modifier, verticalArrangement = Arrangement.spacedBy(8.dp), horizontalAlignment = Alignment.CenterHorizontally) {
|
||||||
|
HudRoundButton("✓", caption = CatanText.CONFIRM_BUILD, enabled = staged, tint = Color(0xFF2E7D32), onClick = onConfirm)
|
||||||
|
HudRoundButton("✕", caption = CatanText.CANCEL_BUILD, enabled = staged, tint = Color(0xFFC62828), onClick = onCancel)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pan with one finger, pinch to zoom, like the Universe board camera. The content
|
||||||
|
* is drawn through a graphics layer, so taps inside it arrive already in the
|
||||||
|
* content's own coordinates and the board's hit-testing needs no changes.
|
||||||
|
*/
|
||||||
|
@Composable
|
||||||
|
fun ZoomPanBox(
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
minScale: Float = 1f,
|
||||||
|
maxScale: Float = 3f,
|
||||||
|
content: @Composable () -> Unit,
|
||||||
|
) {
|
||||||
|
var scale by remember { mutableFloatStateOf(1f) }
|
||||||
|
var offset by remember { mutableStateOf(Offset.Zero) }
|
||||||
|
Box(
|
||||||
|
modifier = modifier
|
||||||
|
.clip(RoundedCornerShape(0.dp))
|
||||||
|
.pointerInput(Unit) {
|
||||||
|
detectTransformGestures { centroid, pan, zoom, _ ->
|
||||||
|
val newScale = (scale * zoom).coerceIn(minScale, maxScale)
|
||||||
|
val centre = Offset(size.width / 2f, size.height / 2f)
|
||||||
|
// The content point under the fingers stays under them while zooming; then pan.
|
||||||
|
val world = (centroid - centre - offset) / scale
|
||||||
|
val next = centroid - centre - world * newScale + pan
|
||||||
|
val maxX = size.width * (newScale - 1f) / 2f
|
||||||
|
val maxY = size.height * (newScale - 1f) / 2f
|
||||||
|
offset = Offset(next.x.coerceIn(-maxX, maxX), next.y.coerceIn(-maxY, maxY))
|
||||||
|
scale = newScale
|
||||||
|
}
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
Box(
|
||||||
|
Modifier
|
||||||
|
.fillMaxSize()
|
||||||
|
.graphicsLayer {
|
||||||
|
scaleX = scale
|
||||||
|
scaleY = scale
|
||||||
|
translationX = offset.x
|
||||||
|
translationY = offset.y
|
||||||
|
},
|
||||||
|
contentAlignment = Alignment.Center,
|
||||||
|
) { content() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A small caption pill, for the drag hint and the staged-move text. */
|
||||||
|
@Composable
|
||||||
|
fun HudPill(text: String, modifier: Modifier = Modifier) {
|
||||||
|
Text(
|
||||||
|
text,
|
||||||
|
color = Color.White,
|
||||||
|
fontSize = 12.sp,
|
||||||
|
maxLines = 1,
|
||||||
|
modifier = modifier
|
||||||
|
.clip(RoundedCornerShape(50))
|
||||||
|
.background(Color(0xCC000000))
|
||||||
|
.padding(horizontal = 12.dp, vertical = 4.dp),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The landscape screen, laid out like the Catan Universe match view:
|
||||||
|
*
|
||||||
|
* ```
|
||||||
|
* ┌ player strip ───────────────────────────────────────────────┐
|
||||||
|
* │ prompt + dice │
|
||||||
|
* │ [build] the island (pinch / pan) [✓] [✕] │
|
||||||
|
* │ [column] │
|
||||||
|
* │ [log] ┌ your cards ┐ [buy][play] [⇄][●]│
|
||||||
|
* └─────────────┴────────────┴───────────────────────────────────┘
|
||||||
|
* ```
|
||||||
|
*
|
||||||
|
* Everything here is wiring around the existing panels; the island is handed in as [board].
|
||||||
|
*/
|
||||||
|
@Composable
|
||||||
|
fun CatanHud(
|
||||||
|
state: org.prolibertate.games.game.catan.CatanState,
|
||||||
|
seats: CatanSeats,
|
||||||
|
style: CatanStyle,
|
||||||
|
actions: CatanActions,
|
||||||
|
prompt: String,
|
||||||
|
notice: String?,
|
||||||
|
legal: List<org.prolibertate.games.game.catan.CatanMove>,
|
||||||
|
localSeat: Int,
|
||||||
|
targets: BoardTargets,
|
||||||
|
pointsOf: (Int) -> Int,
|
||||||
|
staged: org.prolibertate.games.game.catan.CatanMove?,
|
||||||
|
dragKind: BuildKind?,
|
||||||
|
dragAt: Offset?,
|
||||||
|
showLog: Boolean,
|
||||||
|
boardCoords: LayoutCoordinates?,
|
||||||
|
building: BuildKind?,
|
||||||
|
onBoardCoords: (LayoutCoordinates) -> Unit,
|
||||||
|
onToggleLog: () -> Unit,
|
||||||
|
onArm: (BuildKind) -> Unit,
|
||||||
|
onDragStart: (BuildKind, Offset) -> Unit,
|
||||||
|
onDrag: (Offset) -> Unit,
|
||||||
|
onDragEnd: () -> Unit,
|
||||||
|
onConfirm: () -> Unit,
|
||||||
|
onCancelStaged: () -> Unit,
|
||||||
|
onRoll: () -> Unit,
|
||||||
|
onEndTurn: () -> Unit,
|
||||||
|
onEndFreeRoads: () -> Unit,
|
||||||
|
onEndSmith: () -> Unit,
|
||||||
|
onRepickSetup: () -> Unit,
|
||||||
|
onBuyCard: () -> Unit,
|
||||||
|
onPlayCard: () -> Unit,
|
||||||
|
onTrade: () -> Unit,
|
||||||
|
onImprove: () -> Unit,
|
||||||
|
onProgress: () -> Unit,
|
||||||
|
board: @Composable (Modifier) -> Unit,
|
||||||
|
) {
|
||||||
|
Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(4.dp)) {
|
||||||
|
HudPlayerStrip(state, seats, pointsOf, style)
|
||||||
|
Box(Modifier.weight(1f).fillMaxWidth()) {
|
||||||
|
ZoomPanBox(Modifier.fillMaxSize().padding(start = 76.dp, end = 76.dp, top = 52.dp, bottom = 96.dp)) {
|
||||||
|
board(Modifier.onGloballyPositioned(onBoardCoords))
|
||||||
|
}
|
||||||
|
|
||||||
|
// What is going on, and the dice. Two lines, always.
|
||||||
|
Row(
|
||||||
|
Modifier.align(Alignment.TopCenter).fillMaxWidth().padding(horizontal = 8.dp)
|
||||||
|
.clip(RoundedCornerShape(12.dp))
|
||||||
|
.background(MaterialTheme.colorScheme.surface.copy(alpha = 0.78f))
|
||||||
|
.padding(horizontal = 10.dp, vertical = 2.dp),
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
||||||
|
) {
|
||||||
|
androidx.compose.material3.Text(
|
||||||
|
text = notice ?: prompt,
|
||||||
|
style = MaterialTheme.typography.bodySmall,
|
||||||
|
color = if (notice != null) MaterialTheme.colorScheme.error else Color.Unspecified,
|
||||||
|
minLines = 2,
|
||||||
|
maxLines = 2,
|
||||||
|
modifier = Modifier.weight(1f),
|
||||||
|
)
|
||||||
|
CatanDice(state.lastDice, ck = state.isCk, event = state.ck?.eventDie)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Left: pieces to drag onto the island.
|
||||||
|
HudBuildColumn(
|
||||||
|
kinds = actions.buildKinds,
|
||||||
|
canBuild = actions.canBuild,
|
||||||
|
armed = building,
|
||||||
|
modifier = Modifier.align(Alignment.CenterStart).padding(start = 8.dp, top = 40.dp),
|
||||||
|
onTap = onArm,
|
||||||
|
onDragStart = onDragStart,
|
||||||
|
onDrag = onDrag,
|
||||||
|
onDragEnd = onDragEnd,
|
||||||
|
)
|
||||||
|
|
||||||
|
// Right, middle: place or cancel the lined-up piece.
|
||||||
|
HudConfirmButtons(
|
||||||
|
staged = staged != null,
|
||||||
|
modifier = Modifier.align(Alignment.CenterEnd).padding(end = 8.dp, top = 40.dp),
|
||||||
|
onConfirm = onConfirm,
|
||||||
|
onCancel = onCancelStaged,
|
||||||
|
)
|
||||||
|
|
||||||
|
// Bottom centre: your cards.
|
||||||
|
Box(
|
||||||
|
Modifier.align(Alignment.BottomCenter).padding(bottom = 10.dp, start = 120.dp, end = 250.dp)
|
||||||
|
.clip(RoundedCornerShape(14.dp))
|
||||||
|
.background(MaterialTheme.colorScheme.surface.copy(alpha = 0.85f))
|
||||||
|
.horizontalScroll(rememberScrollState())
|
||||||
|
.padding(8.dp),
|
||||||
|
) { CatanHand(state, localSeat) }
|
||||||
|
|
||||||
|
// Bottom left: the log.
|
||||||
|
Column(Modifier.align(Alignment.BottomStart).padding(start = 8.dp, bottom = 10.dp)) {
|
||||||
|
if (showLog) {
|
||||||
|
Surface(
|
||||||
|
modifier = Modifier.padding(bottom = 6.dp),
|
||||||
|
shape = RoundedCornerShape(12.dp),
|
||||||
|
color = MaterialTheme.colorScheme.surface.copy(alpha = 0.92f),
|
||||||
|
tonalElevation = 4.dp,
|
||||||
|
) {
|
||||||
|
CatanLog(state, Modifier.padding(8.dp).height(150.dp).width(260.dp))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
HudRoundButton("☰", caption = CatanText.LOG_BUTTON, diameter = 44.dp, onClick = onToggleLog)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bottom right: the turn button, trade, and the card actions.
|
||||||
|
Column(
|
||||||
|
Modifier.align(Alignment.BottomEnd).padding(end = 8.dp, bottom = 10.dp),
|
||||||
|
horizontalAlignment = Alignment.End,
|
||||||
|
verticalArrangement = Arrangement.spacedBy(4.dp),
|
||||||
|
) {
|
||||||
|
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||||
|
if (actions.ck) {
|
||||||
|
HudRoundButton("⬆", caption = CatanText.IMPROVE, enabled = actions.canImprove, diameter = 44.dp, onClick = onImprove)
|
||||||
|
HudRoundButton("🂠", caption = CatanText.CARDS_SHORT, enabled = actions.canPlayProgress, diameter = 44.dp, onClick = onProgress)
|
||||||
|
} else {
|
||||||
|
HudRoundButton("+", caption = CatanText.BUY_SHORT, enabled = actions.canBuyCard, diameter = 44.dp, onClick = onBuyCard)
|
||||||
|
HudRoundButton("🂠", caption = CatanText.CARDS_SHORT, enabled = actions.canPlayCard, diameter = 44.dp, onClick = onPlayCard)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Row(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.Bottom) {
|
||||||
|
HudRoundButton("⇄", caption = CatanText.TRADE, enabled = actions.canTrade, diameter = 56.dp, onClick = onTrade)
|
||||||
|
PrimaryTurnButton(actions, onRoll, onEndTurn, onEndFreeRoads, onEndSmith, onRepickSetup)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dragKind != null && dragAt == null) HudPill(CatanText.DRAG_HINT, Modifier.align(Alignment.TopCenter))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The one big button: roll, end the turn, finish roads, or step back from a setup choice. */
|
||||||
|
@Composable
|
||||||
|
private fun PrimaryTurnButton(
|
||||||
|
actions: CatanActions,
|
||||||
|
onRoll: () -> Unit,
|
||||||
|
onEndTurn: () -> Unit,
|
||||||
|
onEndFreeRoads: () -> Unit,
|
||||||
|
onEndSmith: () -> Unit,
|
||||||
|
onRepickSetup: () -> Unit,
|
||||||
|
) {
|
||||||
|
val (glyph, caption, enabled, click) = when {
|
||||||
|
actions.canRoll -> Quad("🎲", CatanText.ROLL_SHORT, true, onRoll)
|
||||||
|
actions.canEndFreeRoads -> Quad("✔", CatanText.DONE_SHORT, true, onEndFreeRoads)
|
||||||
|
actions.canEndSmith -> Quad("✔", CatanText.DONE_SHORT, true, onEndSmith)
|
||||||
|
actions.canRepickSetup -> Quad("↺", CatanText.CANCEL, true, onRepickSetup)
|
||||||
|
else -> Quad("➜", CatanText.END_SHORT, actions.canEndTurn, onEndTurn)
|
||||||
|
}
|
||||||
|
HudRoundButton(glyph, caption = caption, enabled = enabled, primary = true, diameter = 72.dp, onClick = click)
|
||||||
|
}
|
||||||
|
|
||||||
|
private data class Quad(val glyph: String, val caption: String, val enabled: Boolean, val click: () -> Unit)
|
||||||
|
|
||||||
|
/** Everyone's colour, name, points and card count in one row across the top. */
|
||||||
|
@Composable
|
||||||
|
private fun HudPlayerStrip(
|
||||||
|
state: org.prolibertate.games.game.catan.CatanState,
|
||||||
|
seats: CatanSeats,
|
||||||
|
pointsOf: (Int) -> Int,
|
||||||
|
style: CatanStyle,
|
||||||
|
) {
|
||||||
|
Row(Modifier.fillMaxWidth().padding(horizontal = 6.dp), horizontalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||||
|
(0 until state.playerCount).forEach { seat ->
|
||||||
|
CatanPlayerCard(
|
||||||
|
state = state,
|
||||||
|
seat = seat,
|
||||||
|
seats = seats,
|
||||||
|
points = pointsOf(seat),
|
||||||
|
modifier = Modifier.weight(1f),
|
||||||
|
style = style,
|
||||||
|
compact = true,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -142,6 +142,42 @@ data class DevCardInHand(val card: DevCard, val plays: List<CatanMove>) {
|
|||||||
*/
|
*/
|
||||||
object CatanInteraction {
|
object CatanInteraction {
|
||||||
|
|
||||||
|
// --- Staged placements and drag-to-build ------------------------------------
|
||||||
|
|
||||||
|
/** A place on the board a dragged piece is over: one crossing or one edge. */
|
||||||
|
data class Spot(val vertex: Int? = null, val edge: Int? = null)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The spot a finger at [at] (board pixels) is nearest to, among [targets]. [reach] is
|
||||||
|
* generous (fingers cover what they point at), and edges are only offered when no
|
||||||
|
* crossing is lit, matching what a tap would do.
|
||||||
|
*/
|
||||||
|
fun snap(layout: BoardLayout, targets: BoardTargets, at: Pt, reach: Float): Spot? = when {
|
||||||
|
targets.tappableVertices.isNotEmpty() ->
|
||||||
|
layout.nearestVertex(at, reach, targets.tappableVertices)?.let { Spot(vertex = it) }
|
||||||
|
|
||||||
|
targets.edges.isNotEmpty() -> layout.nearestEdge(at, reach, targets.edges)?.let { Spot(edge = it) }
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The move a build tap or drop would make, if it is a placement that waits for ✓. */
|
||||||
|
fun stageable(outcome: TapOutcome, building: BuildKind?): CatanMove? {
|
||||||
|
if (building == null || outcome !is TapOutcome.Submit) return null
|
||||||
|
return outcome.move.takeIf {
|
||||||
|
it is BuildRoad || it is BuildSettlement || it is BuildCity || it is BuildWall || it is HireKnight
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Where a staged move sits on the board, for drawing its ghost. */
|
||||||
|
fun spotOf(move: CatanMove?): Spot = when (move) {
|
||||||
|
is BuildRoad -> Spot(edge = move.edge)
|
||||||
|
is BuildSettlement -> Spot(vertex = move.vertex)
|
||||||
|
is BuildCity -> Spot(vertex = move.vertex)
|
||||||
|
is BuildWall -> Spot(vertex = move.vertex)
|
||||||
|
is HireKnight -> Spot(vertex = move.vertex)
|
||||||
|
else -> Spot()
|
||||||
|
}
|
||||||
|
|
||||||
// --- Board ---------------------------------------------------------------
|
// --- Board ---------------------------------------------------------------
|
||||||
|
|
||||||
fun targets(
|
fun targets(
|
||||||
|
|||||||
@@ -9,6 +9,15 @@ import androidx.compose.foundation.layout.Row
|
|||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.horizontalScroll
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.ui.geometry.Offset
|
||||||
|
import androidx.compose.ui.layout.LayoutCoordinates
|
||||||
|
import androidx.compose.ui.layout.onGloballyPositioned
|
||||||
|
import androidx.compose.ui.unit.IntSize
|
||||||
|
import org.prolibertate.games.game.catan.BuildRoad
|
||||||
import androidx.compose.foundation.rememberScrollState
|
import androidx.compose.foundation.rememberScrollState
|
||||||
import androidx.compose.foundation.verticalScroll
|
import androidx.compose.foundation.verticalScroll
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
@@ -22,6 +31,7 @@ import androidx.compose.runtime.getValue
|
|||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
|
import androidx.compose.ui.platform.LocalConfiguration
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
@@ -104,6 +114,18 @@ fun CatanScreen(
|
|||||||
var armed by remember { mutableStateOf<ArmedCard?>(null) }
|
var armed by remember { mutableStateOf<ArmedCard?>(null) }
|
||||||
var showImprove by remember { mutableStateOf(false) }
|
var showImprove by remember { mutableStateOf(false) }
|
||||||
var showProgress by remember { mutableStateOf(false) }
|
var showProgress by remember { mutableStateOf(false) }
|
||||||
|
// The landscape HUD: a placement waiting for its ✓, the piece being dragged from the
|
||||||
|
// build column (and where the finger is, in window pixels), the log popup, and the board.
|
||||||
|
var staged by remember { mutableStateOf<CatanMove?>(null) }
|
||||||
|
var dragKind by remember { mutableStateOf<BuildKind?>(null) }
|
||||||
|
var dragAt by remember { mutableStateOf<Offset?>(null) }
|
||||||
|
var showLog by remember { mutableStateOf(false) }
|
||||||
|
var boardCoords by remember { mutableStateOf<LayoutCoordinates?>(null) }
|
||||||
|
|
||||||
|
val config = LocalConfiguration.current
|
||||||
|
// Landscape gets the heads-up display; portrait keeps the stacked layout.
|
||||||
|
val wide = config.screenWidthDp > config.screenHeightDp * 1.1f
|
||||||
|
val staging = wide
|
||||||
|
|
||||||
val dark = isSystemInDarkTheme()
|
val dark = isSystemInDarkTheme()
|
||||||
val style = remember(dark) { catanStyle(dark) }
|
val style = remember(dark) { catanStyle(dark) }
|
||||||
@@ -114,6 +136,7 @@ fun CatanScreen(
|
|||||||
// settlement that is no longer pending).
|
// settlement that is no longer pending).
|
||||||
LaunchedEffect(legal) {
|
LaunchedEffect(legal) {
|
||||||
if (building != null && building !in CatanInteraction.canBuild(legal)) building = null
|
if (building != null && building !in CatanInteraction.canBuild(legal)) building = null
|
||||||
|
if (staged != null && staged !in legal) staged = null
|
||||||
if (setupVertex != null && legal.none { it is SetupPlace && it.vertex == setupVertex }) {
|
if (setupVertex != null && legal.none { it is SetupPlace && it.vertex == setupVertex }) {
|
||||||
setupVertex = null
|
setupVertex = null
|
||||||
}
|
}
|
||||||
@@ -128,6 +151,7 @@ fun CatanScreen(
|
|||||||
knightMenu = null
|
knightMenu = null
|
||||||
movingKnight = null
|
movingKnight = null
|
||||||
armed = null
|
armed = null
|
||||||
|
staged = null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,6 +167,9 @@ fun CatanScreen(
|
|||||||
knightMenu = null
|
knightMenu = null
|
||||||
movingKnight = null
|
movingKnight = null
|
||||||
armed = null
|
armed = null
|
||||||
|
staged = null
|
||||||
|
dragKind = null
|
||||||
|
dragAt = null
|
||||||
}
|
}
|
||||||
|
|
||||||
val endGameAction: @Composable () -> Unit = {
|
val endGameAction: @Composable () -> Unit = {
|
||||||
@@ -192,13 +219,17 @@ fun CatanScreen(
|
|||||||
)
|
)
|
||||||
|
|
||||||
val handle: (TapOutcome) -> Unit = { outcome ->
|
val handle: (TapOutcome) -> Unit = { outcome ->
|
||||||
when (outcome) {
|
val wait = if (staging) CatanInteraction.stageable(outcome, building) else null
|
||||||
|
when {
|
||||||
|
wait != null -> staged = wait
|
||||||
|
else -> when (outcome) {
|
||||||
TapOutcome.Ignored -> Unit
|
TapOutcome.Ignored -> Unit
|
||||||
is TapOutcome.Submit -> submit(outcome.move)
|
is TapOutcome.Submit -> submit(outcome.move)
|
||||||
is TapOutcome.PickSetupVertex -> setupVertex = outcome.vertex
|
is TapOutcome.PickSetupVertex -> setupVertex = outcome.vertex
|
||||||
is TapOutcome.PickRobberVictim -> victimChoice = outcome
|
is TapOutcome.PickRobberVictim -> victimChoice = outcome
|
||||||
is TapOutcome.PickKnight -> knightMenu = outcome.vertex
|
is TapOutcome.PickKnight -> knightMenu = outcome.vertex
|
||||||
is TapOutcome.PickFirstHex -> armed = armed?.copy(firstHex = outcome.hex)
|
is TapOutcome.PickFirstHex -> armed = armed?.copy(firstHex = outcome.hex)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -210,10 +241,14 @@ fun CatanScreen(
|
|||||||
CompositionLocalProvider(LocalCatanStyle provides style) {
|
CompositionLocalProvider(LocalCatanStyle provides style) {
|
||||||
ScreenScaffold(title = CatanText.TITLE, onBack = onExit, actions = endGameAction) { modifier ->
|
ScreenScaffold(title = CatanText.TITLE, onBack = onExit, actions = endGameAction) { modifier ->
|
||||||
BoxWithConstraints(modifier = modifier) {
|
BoxWithConstraints(modifier = modifier) {
|
||||||
val wide = maxWidth > maxHeight * 1.1f
|
|
||||||
// Phones (either way up) get the one-button build menu.
|
// Phones (either way up) get the one-button build menu.
|
||||||
val compactBuild = !wide || maxWidth < 600.dp
|
val compactBuild = !wide || maxWidth < 600.dp
|
||||||
|
|
||||||
|
val hoverSpot = if (dragKind != null) dragSpot(boardCoords, dragAt, targets) else null
|
||||||
|
val stagedSpot = CatanInteraction.spotOf(staged)
|
||||||
|
val ghostVertex = hoverSpot?.vertex ?: stagedSpot.vertex
|
||||||
|
val ghostEdge = hoverSpot?.edge ?: stagedSpot.edge
|
||||||
|
|
||||||
val board: @Composable (Modifier) -> Unit = { boardModifier ->
|
val board: @Composable (Modifier) -> Unit = { boardModifier ->
|
||||||
CatanBoardView(
|
CatanBoardView(
|
||||||
state = current,
|
state = current,
|
||||||
@@ -233,6 +268,9 @@ fun CatanScreen(
|
|||||||
style = style,
|
style = style,
|
||||||
rolledHexes = rolledHexes,
|
rolledHexes = rolledHexes,
|
||||||
selectedKnight = movingKnight ?: knightMenu,
|
selectedKnight = movingKnight ?: knightMenu,
|
||||||
|
stagedVertex = ghostVertex,
|
||||||
|
stagedEdge = ghostEdge,
|
||||||
|
stagedSeat = localSeat,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
val players: @Composable (Boolean) -> Unit = { grid ->
|
val players: @Composable (Boolean) -> Unit = { grid ->
|
||||||
@@ -265,21 +303,61 @@ fun CatanScreen(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (wide) {
|
if (wide) {
|
||||||
Row(Modifier.fillMaxSize(), horizontalArrangement = Arrangement.spacedBy(12.dp)) {
|
CatanHud(
|
||||||
Box(Modifier.weight(1.5f).fillMaxSize(), contentAlignment = Alignment.Center) {
|
state = current,
|
||||||
board(Modifier)
|
seats = seats,
|
||||||
}
|
style = style,
|
||||||
Column(
|
actions = actions,
|
||||||
modifier = Modifier.weight(1f).fillMaxSize().verticalScroll(rememberScrollState()),
|
prompt = prompt,
|
||||||
verticalArrangement = Arrangement.spacedBy(8.dp),
|
notice = notice,
|
||||||
) {
|
legal = legal,
|
||||||
players(true)
|
localSeat = localSeat,
|
||||||
if (current.isCk) CatanBarbarians(current, style = style)
|
targets = targets,
|
||||||
promptRow()
|
pointsOf = pointsOf,
|
||||||
handAndActions()
|
staged = staged,
|
||||||
CatanLog(current, Modifier.fillMaxWidth().height(120.dp))
|
dragKind = dragKind,
|
||||||
}
|
dragAt = dragAt,
|
||||||
}
|
showLog = showLog,
|
||||||
|
boardCoords = boardCoords,
|
||||||
|
building = building,
|
||||||
|
onBoardCoords = { boardCoords = it },
|
||||||
|
onToggleLog = { showLog = !showLog },
|
||||||
|
onArm = { kind -> building = if (building == kind) null else kind; staged = null },
|
||||||
|
onDragStart = { kind, at ->
|
||||||
|
building = kind
|
||||||
|
staged = null
|
||||||
|
dragKind = kind
|
||||||
|
dragAt = at
|
||||||
|
},
|
||||||
|
onDrag = { dragAt = it },
|
||||||
|
onDragEnd = {
|
||||||
|
val spot = dragSpot(boardCoords, dragAt, targets)
|
||||||
|
dragKind = null
|
||||||
|
dragAt = null
|
||||||
|
val outcome = when {
|
||||||
|
spot?.vertex != null -> CatanInteraction.onVertexTap(
|
||||||
|
spot.vertex, legal, building, setupVertex,
|
||||||
|
ownKnights = if (legal.isNotEmpty()) ownKnights else emptySet(),
|
||||||
|
)
|
||||||
|
spot?.edge != null -> CatanInteraction.onEdgeTap(spot.edge, legal, building, setupVertex, armed)
|
||||||
|
else -> TapOutcome.Ignored
|
||||||
|
}
|
||||||
|
handle(outcome)
|
||||||
|
},
|
||||||
|
onConfirm = { staged?.let(submit) },
|
||||||
|
onCancelStaged = { staged = null; building = null },
|
||||||
|
onRoll = { submit(RollDice()) },
|
||||||
|
onEndTurn = { legal.firstOrNull { m -> m is EndTurn }?.let(submit) },
|
||||||
|
onEndFreeRoads = { legal.firstOrNull { m -> m is EndFreeRoads }?.let(submit) },
|
||||||
|
onEndSmith = { legal.firstOrNull { m -> m is EndSmith }?.let(submit) },
|
||||||
|
onRepickSetup = { setupVertex = null },
|
||||||
|
onBuyCard = { legal.firstOrNull { m -> m is BuyDevCard }?.let(submit) },
|
||||||
|
onPlayCard = { showCards = true },
|
||||||
|
onTrade = { showTrade = true },
|
||||||
|
onImprove = { showImprove = true },
|
||||||
|
onProgress = { showProgress = true },
|
||||||
|
board = { m -> board(m) },
|
||||||
|
)
|
||||||
} else {
|
} else {
|
||||||
Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||||
players(false)
|
players(false)
|
||||||
@@ -291,6 +369,39 @@ fun CatanScreen(
|
|||||||
handAndActions()
|
handAndActions()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The trade board slides up over the bottom of the island (base game; Cities &
|
||||||
|
// Knights trades goods and still uses its dialogs).
|
||||||
|
val offerToMe = current.pendingTrade?.takeIf {
|
||||||
|
current.phase == CatanPhase.TRADE_PENDING && it.asking == localSeat && !current.isCk
|
||||||
|
}
|
||||||
|
val boardsAllowed = abandoned == null && !confirmingEnd && current.phase != CatanPhase.GAME_OVER
|
||||||
|
if (boardsAllowed && offerToMe != null) {
|
||||||
|
CatanTradeReplyBoard(
|
||||||
|
state = current,
|
||||||
|
seat = localSeat,
|
||||||
|
offer = offerToMe,
|
||||||
|
seats = seats,
|
||||||
|
canAccept = CatanInteraction.tradeResponses(legal).first,
|
||||||
|
onAccept = { submit(AcceptTrade) },
|
||||||
|
onDecline = { submit(DeclineTrade) },
|
||||||
|
onCounter = submit,
|
||||||
|
modifier = Modifier.align(Alignment.BottomCenter),
|
||||||
|
style = style,
|
||||||
|
)
|
||||||
|
} else if (boardsAllowed && showTrade && !current.isCk) {
|
||||||
|
CatanTradeBoard(
|
||||||
|
state = current,
|
||||||
|
seat = localSeat,
|
||||||
|
seats = seats,
|
||||||
|
legal = legal,
|
||||||
|
onBank = submit,
|
||||||
|
onOffer = submit,
|
||||||
|
onClose = { showTrade = false },
|
||||||
|
modifier = Modifier.align(Alignment.BottomCenter),
|
||||||
|
style = style,
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CatanDialogHost(
|
CatanDialogHost(
|
||||||
@@ -432,7 +543,6 @@ private fun CatanDialogHost(
|
|||||||
onCancelCards: () -> Unit,
|
onCancelCards: () -> Unit,
|
||||||
onCancelTrade: () -> Unit,
|
onCancelTrade: () -> Unit,
|
||||||
) {
|
) {
|
||||||
val offer = state.pendingTrade
|
|
||||||
val goodsOffer = state.ck?.goodsOffer
|
val goodsOffer = state.ck?.goodsOffer
|
||||||
when {
|
when {
|
||||||
abandoned != null -> CatanAbandonedDialog(abandoned, onExit, onStay)
|
abandoned != null -> CatanAbandonedDialog(abandoned, onExit, onStay)
|
||||||
@@ -473,18 +583,6 @@ private fun CatanDialogHost(
|
|||||||
onNoDeal = { onSubmit(DismissCounters) },
|
onNoDeal = { onSubmit(DismissCounters) },
|
||||||
)
|
)
|
||||||
|
|
||||||
state.phase == CatanPhase.TRADE_PENDING && offer != null && offer.asking == localSeat ->
|
|
||||||
CatanTradeResponseDialog(
|
|
||||||
state = state,
|
|
||||||
seat = localSeat,
|
|
||||||
offer = offer,
|
|
||||||
seats = seats,
|
|
||||||
canAccept = CatanInteraction.tradeResponses(legal).first,
|
|
||||||
onAccept = { onSubmit(AcceptTrade) },
|
|
||||||
onDecline = { onSubmit(DeclineTrade) },
|
|
||||||
onCounter = onSubmit,
|
|
||||||
)
|
|
||||||
|
|
||||||
state.phase == CatanPhase.TRADE_COUNTERS && state.turn == localSeat && legal.isNotEmpty() ->
|
state.phase == CatanPhase.TRADE_COUNTERS && state.turn == localSeat && legal.isNotEmpty() ->
|
||||||
CatanCounterChoiceDialog(
|
CatanCounterChoiceDialog(
|
||||||
counters = CatanInteraction.counterChoices(state, legal),
|
counters = CatanInteraction.counterChoices(state, legal),
|
||||||
@@ -541,17 +639,6 @@ private fun CatanDialogHost(
|
|||||||
onOffer = onSubmit,
|
onOffer = onSubmit,
|
||||||
onCancel = onCancelTrade,
|
onCancel = onCancelTrade,
|
||||||
)
|
)
|
||||||
|
|
||||||
showTrade ->
|
|
||||||
CatanTradeDialog(
|
|
||||||
state = state,
|
|
||||||
seat = localSeat,
|
|
||||||
seats = seats,
|
|
||||||
legal = legal,
|
|
||||||
onBank = onSubmit,
|
|
||||||
onOffer = onSubmit,
|
|
||||||
onCancel = onCancelTrade,
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -612,3 +699,11 @@ private fun ChoreDialog(
|
|||||||
else -> Unit
|
else -> Unit
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The board spot under a dragged finger ([at], in window pixels), or null off the board. */
|
||||||
|
private fun dragSpot(coords: LayoutCoordinates?, at: Offset?, targets: BoardTargets): CatanInteraction.Spot? {
|
||||||
|
if (coords == null || at == null || !coords.isAttached) return null
|
||||||
|
val local = coords.windowToLocal(at)
|
||||||
|
val layout = CatanGeometry.fit(coords.size.width.toFloat(), coords.size.height.toFloat())
|
||||||
|
return CatanInteraction.snap(layout, targets, Pt(local.x, local.y), layout.radius * 1.2f)
|
||||||
|
}
|
||||||
|
|||||||
@@ -139,6 +139,28 @@ object CatanText {
|
|||||||
const val YOU_GIVE = "You give"
|
const val YOU_GIVE = "You give"
|
||||||
const val YOU_GET = "You get"
|
const val YOU_GET = "You get"
|
||||||
const val SEND_OFFER = "Send offer"
|
const val SEND_OFFER = "Send offer"
|
||||||
|
|
||||||
|
// --- Trade board and HUD -----------------------------------------------------
|
||||||
|
const val TAB_PLAYER = "Player"
|
||||||
|
const val TAB_BANK = "Bank"
|
||||||
|
const val YOU_RECEIVE_ROW = "You get"
|
||||||
|
const val YOU_GIVE_ROW = "You give"
|
||||||
|
const val TRADE_HINT_PLAYER = "Tap cards to build an offer. Tap a player to address it to them alone."
|
||||||
|
const val TRADE_HINT_BANK = "Tap what you give, then what you want."
|
||||||
|
const val TRADE_HINT_BANK_EMPTY = "You do not hold enough of any one resource to trade with the bank."
|
||||||
|
const val TRADE_HINT_COUNTER = "Change the terms, then send them back."
|
||||||
|
const val HIDE = "Hide"
|
||||||
|
const val DENY = "Deny"
|
||||||
|
const val CONFIRM_BUILD = "Place"
|
||||||
|
const val CANCEL_BUILD = "Cancel"
|
||||||
|
const val DRAG_HINT = "Drag a piece onto the board"
|
||||||
|
const val LOG_BUTTON = "Log"
|
||||||
|
const val CARDS_SHORT = "Cards"
|
||||||
|
const val BUY_SHORT = "Buy"
|
||||||
|
const val ROLL_SHORT = "Roll"
|
||||||
|
const val END_SHORT = "End"
|
||||||
|
const val DONE_SHORT = "Done"
|
||||||
|
const val LOG_TITLE = "Table log"
|
||||||
const val NO_LOG = "Nothing has happened yet."
|
const val NO_LOG = "Nothing has happened yet."
|
||||||
const val END_GAME = "End game"
|
const val END_GAME = "End game"
|
||||||
const val LOOK_AT_BOARD = "Look at the board"
|
const val LOOK_AT_BOARD = "Look at the board"
|
||||||
|
|||||||
@@ -0,0 +1,415 @@
|
|||||||
|
package org.prolibertate.games.ui.game.catan
|
||||||
|
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.border
|
||||||
|
import androidx.compose.foundation.clickable
|
||||||
|
import androidx.compose.foundation.horizontalScroll
|
||||||
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
|
import androidx.compose.foundation.layout.Box
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.heightIn
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.size
|
||||||
|
import androidx.compose.foundation.layout.width
|
||||||
|
import androidx.compose.foundation.rememberScrollState
|
||||||
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
|
import androidx.compose.material3.HorizontalDivider
|
||||||
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.compose.runtime.mutableStateOf
|
||||||
|
import androidx.compose.runtime.remember
|
||||||
|
import androidx.compose.runtime.setValue
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.draw.alpha
|
||||||
|
import androidx.compose.ui.draw.clip
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.unit.sp
|
||||||
|
import org.prolibertate.games.game.catan.CatanMove
|
||||||
|
import org.prolibertate.games.game.catan.CatanState
|
||||||
|
import org.prolibertate.games.game.catan.CounterTrade
|
||||||
|
import org.prolibertate.games.game.catan.MaritimeTrade
|
||||||
|
import org.prolibertate.games.game.catan.OfferTrade
|
||||||
|
import org.prolibertate.games.game.catan.Resource
|
||||||
|
import org.prolibertate.games.game.catan.TradeOffer
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The trade board: the 2D version of Catan Universe's trade panel (see
|
||||||
|
* docs/RE-catan-universe.md). One panel slides up over the bottom of the board:
|
||||||
|
*
|
||||||
|
* header [Player | Bank] hint rival buttons
|
||||||
|
* top row the cards you GET, tinted with the other side's colour
|
||||||
|
* arrows
|
||||||
|
* bottom row the cards you GIVE, tinted with your colour
|
||||||
|
* right ▾ hide ✕ deny ✓ accept
|
||||||
|
*
|
||||||
|
* Like every Katan panel it decides nothing: what may be offered is asked of
|
||||||
|
* [CatanInteraction], and what a bank trade costs comes from the engine's legal list.
|
||||||
|
*/
|
||||||
|
|
||||||
|
private enum class TradeMode { PLAYER, BANK }
|
||||||
|
|
||||||
|
private fun Map<Resource, Int>.cards(): List<Resource> =
|
||||||
|
Resource.entries.flatMap { r -> List(this[r] ?: 0) { r } }
|
||||||
|
|
||||||
|
/** The panel for starting a trade: with the bank, or an offer to one rival or everyone. */
|
||||||
|
@Composable
|
||||||
|
fun CatanTradeBoard(
|
||||||
|
state: CatanState,
|
||||||
|
seat: Int,
|
||||||
|
seats: CatanSeats,
|
||||||
|
legal: List<CatanMove>,
|
||||||
|
onBank: (MaritimeTrade) -> Unit,
|
||||||
|
onOffer: (OfferTrade) -> Unit,
|
||||||
|
onClose: () -> Unit,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
style: CatanStyle = LocalCatanStyle.current,
|
||||||
|
) {
|
||||||
|
var mode by remember { mutableStateOf(TradeMode.BANK) }
|
||||||
|
var to by remember { mutableStateOf<Int?>(null) }
|
||||||
|
var give by remember { mutableStateOf(emptyMap<Resource, Int>()) }
|
||||||
|
var get by remember { mutableStateOf(emptyMap<Resource, Int>()) }
|
||||||
|
var bankGive by remember { mutableStateOf<Resource?>(null) }
|
||||||
|
var bankGet by remember { mutableStateOf<Resource?>(null) }
|
||||||
|
|
||||||
|
val bank = CatanInteraction.bankTrades(legal)
|
||||||
|
val giveCards = give.cards()
|
||||||
|
val getCards = get.cards()
|
||||||
|
val canSend = CatanInteraction.offerAllowed(state, seat, to, giveCards, getCards)
|
||||||
|
val bankMove = bankGive?.let { g -> bankGet?.takeIf { it in bank[g].orEmpty() }?.let { MaritimeTrade(g, it) } }
|
||||||
|
|
||||||
|
val rivals = (0 until state.playerCount).filter { it != seat }
|
||||||
|
val headerRight: @Composable () -> Unit = {
|
||||||
|
if (mode == TradeMode.PLAYER) {
|
||||||
|
RivalButtons(rivals, to, style, seats) { to = if (to == it) null else it }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
TradeBoardFrame(
|
||||||
|
modifier = modifier,
|
||||||
|
topTint = if (mode == TradeMode.PLAYER && to != null) style.seats[to!!] else Color.Gray,
|
||||||
|
bottomTint = style.seats[seat],
|
||||||
|
header = {
|
||||||
|
TradeTab(CatanText.TAB_BANK, mode == TradeMode.BANK) { mode = TradeMode.BANK }
|
||||||
|
TradeTab(CatanText.TAB_PLAYER, mode == TradeMode.PLAYER) { mode = TradeMode.PLAYER }
|
||||||
|
},
|
||||||
|
headline = when {
|
||||||
|
mode == TradeMode.PLAYER -> CatanText.TRADE_HINT_PLAYER
|
||||||
|
bank.isEmpty() -> CatanText.TRADE_HINT_BANK_EMPTY
|
||||||
|
else -> CatanText.TRADE_HINT_BANK
|
||||||
|
},
|
||||||
|
headerRight = headerRight,
|
||||||
|
topLabel = CatanText.YOU_RECEIVE_ROW,
|
||||||
|
bottomLabel = CatanText.YOU_GIVE_ROW,
|
||||||
|
topRow = {
|
||||||
|
if (mode == TradeMode.PLAYER) {
|
||||||
|
TradeCardRow(
|
||||||
|
counts = get,
|
||||||
|
limit = { 9 },
|
||||||
|
onChange = { get = it },
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
val choices = bankGive?.let { bank[it] }.orEmpty().toSet()
|
||||||
|
TradeCardRow(
|
||||||
|
counts = bankGet?.let { mapOf(it to 1) } ?: emptyMap(),
|
||||||
|
limit = { if (it in choices) 1 else 0 },
|
||||||
|
enabledOf = { it in choices },
|
||||||
|
onChange = {},
|
||||||
|
pick = { bankGet = if (bankGet == it) null else it },
|
||||||
|
)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
bottomRow = {
|
||||||
|
if (mode == TradeMode.PLAYER) {
|
||||||
|
TradeCardRow(
|
||||||
|
counts = give,
|
||||||
|
limit = { state.resources[seat][it] ?: 0 },
|
||||||
|
onChange = { give = it },
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
TradeCardRow(
|
||||||
|
counts = bank.keys.associateWith { CatanInteraction.bankRatio(state, seat, it) },
|
||||||
|
limit = { 0 },
|
||||||
|
enabledOf = { it in bank },
|
||||||
|
selected = bankGive,
|
||||||
|
caption = { r -> if (r in bank) "${CatanInteraction.bankRatio(state, seat, r)} : 1" else " " },
|
||||||
|
onChange = {},
|
||||||
|
pick = { r ->
|
||||||
|
bankGive = if (bankGive == r) null else r
|
||||||
|
bankGet = null
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
acceptEnabled = if (mode == TradeMode.PLAYER) canSend else bankMove != null,
|
||||||
|
onAccept = {
|
||||||
|
if (mode == TradeMode.PLAYER) {
|
||||||
|
onOffer(OfferTrade(to, giveCards, getCards))
|
||||||
|
} else {
|
||||||
|
bankMove?.let(onBank)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
denyEnabled = true,
|
||||||
|
onDeny = {
|
||||||
|
give = emptyMap()
|
||||||
|
get = emptyMap()
|
||||||
|
bankGive = null
|
||||||
|
bankGet = null
|
||||||
|
to = null
|
||||||
|
},
|
||||||
|
onHide = onClose,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The panel for an offer made to the local player: the same layout, read-only. ✓ accepts,
|
||||||
|
* ✕ declines, and *Counter…* turns the rows editable, pre-filled with the mirror of the offer.
|
||||||
|
*/
|
||||||
|
@Composable
|
||||||
|
fun CatanTradeReplyBoard(
|
||||||
|
state: CatanState,
|
||||||
|
seat: Int,
|
||||||
|
offer: TradeOffer,
|
||||||
|
seats: CatanSeats,
|
||||||
|
canAccept: Boolean,
|
||||||
|
onAccept: () -> Unit,
|
||||||
|
onDecline: () -> Unit,
|
||||||
|
onCounter: (CounterTrade) -> Unit,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
style: CatanStyle = LocalCatanStyle.current,
|
||||||
|
) {
|
||||||
|
var countering by remember(offer) { mutableStateOf(false) }
|
||||||
|
var give by remember(offer) { mutableStateOf(offer.get.groupingBy { it }.eachCount()) }
|
||||||
|
var get by remember(offer) { mutableStateOf(offer.give.groupingBy { it }.eachCount()) }
|
||||||
|
val counter = CounterTrade(give.cards(), get.cards())
|
||||||
|
|
||||||
|
TradeBoardFrame(
|
||||||
|
modifier = modifier,
|
||||||
|
topTint = style.seats[offer.by],
|
||||||
|
bottomTint = style.seats[seat],
|
||||||
|
header = {
|
||||||
|
TradeTab(CatanText.COUNTER, countering) { countering = !countering }
|
||||||
|
},
|
||||||
|
headline = if (countering) {
|
||||||
|
CatanText.TRADE_HINT_COUNTER
|
||||||
|
} else {
|
||||||
|
CatanText.tradeSummary(
|
||||||
|
by = seats.label(offer.by),
|
||||||
|
to = if (offer.to == null) "the table" else "you",
|
||||||
|
give = offer.give,
|
||||||
|
get = offer.get,
|
||||||
|
)
|
||||||
|
},
|
||||||
|
headerRight = {},
|
||||||
|
topLabel = CatanText.YOU_RECEIVE_ROW,
|
||||||
|
bottomLabel = CatanText.YOU_GIVE_ROW,
|
||||||
|
topRow = {
|
||||||
|
if (countering) {
|
||||||
|
TradeCardRow(get, limit = { state.resources[offer.by][it] ?: 0 }, onChange = { get = it })
|
||||||
|
} else {
|
||||||
|
TradeCardRow(offer.give.groupingBy { it }.eachCount(), limit = { 0 }, onChange = {})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
bottomRow = {
|
||||||
|
if (countering) {
|
||||||
|
TradeCardRow(give, limit = { state.resources[seat][it] ?: 0 }, onChange = { give = it })
|
||||||
|
} else {
|
||||||
|
TradeCardRow(offer.get.groupingBy { it }.eachCount(), limit = { 0 }, onChange = {})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
acceptEnabled = if (countering) {
|
||||||
|
CatanInteraction.counterAllowed(state, seat, counter.give, counter.get)
|
||||||
|
} else {
|
||||||
|
canAccept
|
||||||
|
},
|
||||||
|
onAccept = { if (countering) onCounter(counter) else onAccept() },
|
||||||
|
denyEnabled = true,
|
||||||
|
onDeny = onDecline,
|
||||||
|
onHide = null,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Pieces
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun TradeBoardFrame(
|
||||||
|
topTint: Color,
|
||||||
|
bottomTint: Color,
|
||||||
|
header: @Composable () -> Unit,
|
||||||
|
headline: String,
|
||||||
|
headerRight: @Composable () -> Unit,
|
||||||
|
topLabel: String,
|
||||||
|
bottomLabel: String,
|
||||||
|
topRow: @Composable () -> Unit,
|
||||||
|
bottomRow: @Composable () -> Unit,
|
||||||
|
acceptEnabled: Boolean,
|
||||||
|
onAccept: () -> Unit,
|
||||||
|
denyEnabled: Boolean,
|
||||||
|
onDeny: () -> Unit,
|
||||||
|
onHide: (() -> Unit)?,
|
||||||
|
modifier: Modifier = Modifier,
|
||||||
|
) {
|
||||||
|
Surface(
|
||||||
|
modifier = modifier.fillMaxWidth(),
|
||||||
|
shape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp),
|
||||||
|
color = MaterialTheme.colorScheme.surface.copy(alpha = 0.97f),
|
||||||
|
tonalElevation = 6.dp,
|
||||||
|
shadowElevation = 12.dp,
|
||||||
|
) {
|
||||||
|
Row(Modifier.padding(horizontal = 12.dp, vertical = 8.dp)) {
|
||||||
|
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||||
|
Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||||
|
header()
|
||||||
|
Text(
|
||||||
|
headline,
|
||||||
|
style = MaterialTheme.typography.bodySmall,
|
||||||
|
// Two lines, always: the panel keeps its height whatever is said.
|
||||||
|
minLines = 2,
|
||||||
|
maxLines = 2,
|
||||||
|
modifier = Modifier.weight(1f),
|
||||||
|
)
|
||||||
|
headerRight()
|
||||||
|
}
|
||||||
|
HorizontalDivider()
|
||||||
|
TintedRow(topTint, topLabel, topRow)
|
||||||
|
Text("⇣ ⇣ ⇣", modifier = Modifier.align(Alignment.CenterHorizontally), fontSize = 14.sp)
|
||||||
|
TintedRow(bottomTint, bottomLabel, bottomRow)
|
||||||
|
}
|
||||||
|
Column(
|
||||||
|
modifier = Modifier.padding(start = 10.dp).width(72.dp),
|
||||||
|
verticalArrangement = Arrangement.spacedBy(6.dp, Alignment.CenterVertically),
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
|
) {
|
||||||
|
// Always three slots, so the column does not shift when there is nothing to hide.
|
||||||
|
if (onHide != null) {
|
||||||
|
HudRoundButton("▾", caption = CatanText.HIDE, diameter = 48.dp, onClick = onHide)
|
||||||
|
} else {
|
||||||
|
Box(Modifier.size(48.dp))
|
||||||
|
}
|
||||||
|
HudRoundButton("✕", caption = CatanText.DENY, enabled = denyEnabled, tint = Color(0xFFC62828), diameter = 52.dp, onClick = onDeny)
|
||||||
|
HudRoundButton("✓", caption = CatanText.ACCEPT, enabled = acceptEnabled, tint = Color(0xFF2E7D32), diameter = 60.dp, onClick = onAccept)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun TintedRow(tint: Color, label: String, content: @Composable () -> Unit) {
|
||||||
|
val shape = RoundedCornerShape(12.dp)
|
||||||
|
Column(
|
||||||
|
Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.clip(shape)
|
||||||
|
.background(tint.copy(alpha = 0.18f))
|
||||||
|
.border(1.dp, tint.copy(alpha = 0.5f), shape)
|
||||||
|
.padding(horizontal = 8.dp, vertical = 4.dp),
|
||||||
|
) {
|
||||||
|
Text(label, fontSize = 10.sp, fontWeight = FontWeight.Bold)
|
||||||
|
Box(Modifier.horizontalScroll(rememberScrollState())) { content() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Five resource cards in a row. Tapping a card adds one (up to [limit]); the "−" under it
|
||||||
|
* takes one back. A bank row passes [pick] instead, and a tap selects the card.
|
||||||
|
*/
|
||||||
|
@Composable
|
||||||
|
private fun TradeCardRow(
|
||||||
|
counts: Map<Resource, Int>,
|
||||||
|
limit: (Resource) -> Int,
|
||||||
|
onChange: (Map<Resource, Int>) -> Unit,
|
||||||
|
enabledOf: (Resource) -> Boolean = { true },
|
||||||
|
selected: Resource? = null,
|
||||||
|
caption: ((Resource) -> String)? = null,
|
||||||
|
pick: ((Resource) -> Unit)? = null,
|
||||||
|
) {
|
||||||
|
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||||
|
Resource.entries.forEach { resource ->
|
||||||
|
val n = counts[resource] ?: 0
|
||||||
|
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||||
|
ResourceTile(
|
||||||
|
resource = resource,
|
||||||
|
count = n,
|
||||||
|
selected = selected == resource,
|
||||||
|
enabled = enabledOf(resource) && (pick != null || n > 0 || limit(resource) > 0),
|
||||||
|
onClick = {
|
||||||
|
if (pick != null) {
|
||||||
|
pick(resource)
|
||||||
|
} else if (n < limit(resource)) {
|
||||||
|
onChange(counts + (resource to n + 1))
|
||||||
|
}
|
||||||
|
},
|
||||||
|
)
|
||||||
|
if (caption != null) {
|
||||||
|
Text(caption(resource), fontSize = 11.sp, fontWeight = FontWeight.Bold)
|
||||||
|
} else {
|
||||||
|
// Always laid out so the row never changes height.
|
||||||
|
Text(
|
||||||
|
"−",
|
||||||
|
fontSize = 20.sp,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
modifier = Modifier
|
||||||
|
.alpha(if (n > 0 && pick == null && limit(resource) >= 0) 1f else 0f)
|
||||||
|
.clickable(enabled = n > 0 && pick == null) {
|
||||||
|
onChange(counts + (resource to n - 1))
|
||||||
|
}
|
||||||
|
.padding(horizontal = 14.dp),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun TradeTab(label: String, selected: Boolean, onClick: () -> Unit) {
|
||||||
|
val shape = RoundedCornerShape(50)
|
||||||
|
Text(
|
||||||
|
label,
|
||||||
|
fontSize = 13.sp,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
color = if (selected) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.onSurface,
|
||||||
|
modifier = Modifier
|
||||||
|
.clip(shape)
|
||||||
|
.background(if (selected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.surfaceVariant)
|
||||||
|
.clickable(onClick = onClick)
|
||||||
|
.padding(horizontal = 14.dp, vertical = 8.dp),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** One round button per rival: tap to address the offer to them alone, tap again for everyone. */
|
||||||
|
@Composable
|
||||||
|
private fun RivalButtons(
|
||||||
|
rivals: List<Int>,
|
||||||
|
chosen: Int?,
|
||||||
|
style: CatanStyle,
|
||||||
|
seats: CatanSeats,
|
||||||
|
onTap: (Int) -> Unit,
|
||||||
|
) {
|
||||||
|
Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||||
|
rivals.forEach { rival ->
|
||||||
|
val picked = chosen == rival
|
||||||
|
Box(
|
||||||
|
Modifier
|
||||||
|
.size(40.dp)
|
||||||
|
.clip(CircleShape)
|
||||||
|
.background(style.seats[rival])
|
||||||
|
.border(if (picked) 4.dp else 1.dp, if (picked) Color.White else Color(0x55000000), CircleShape)
|
||||||
|
.clickable { onTap(rival) },
|
||||||
|
contentAlignment = Alignment.Center,
|
||||||
|
) {
|
||||||
|
Text(seats.label(rival).take(1).uppercase(), color = Color.White, fontWeight = FontWeight.Bold, fontSize = 14.sp)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
package org.prolibertate.games.game.engine
|
||||||
|
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Assert.assertFalse
|
||||||
|
import org.junit.Assert.assertNull
|
||||||
|
import org.junit.Assert.assertTrue
|
||||||
|
import org.junit.Rule
|
||||||
|
import org.junit.Test
|
||||||
|
import org.junit.rules.TemporaryFolder
|
||||||
|
import java.io.File
|
||||||
|
|
||||||
|
class SavedGameStoreTest {
|
||||||
|
|
||||||
|
@get:Rule
|
||||||
|
val folder = TemporaryFolder()
|
||||||
|
|
||||||
|
private fun store() = SavedGameStore(File(folder.root, "saves"))
|
||||||
|
|
||||||
|
private fun match(gameId: String = "chess", state: String = "{\"turn\":1}", at: Long = 1_000L) = SavedMatch(
|
||||||
|
gameId = gameId,
|
||||||
|
config = TableConfig(
|
||||||
|
gameId = gameId,
|
||||||
|
seats = listOf(
|
||||||
|
PlayerSlot(0, "You", PlayerKind.HUMAN_LOCAL, 0),
|
||||||
|
PlayerSlot(1, "Computer", PlayerKind.AI, 1),
|
||||||
|
),
|
||||||
|
optionsJson = "{}",
|
||||||
|
seed = 42L,
|
||||||
|
),
|
||||||
|
localSeat = 0,
|
||||||
|
stateJson = state,
|
||||||
|
savedAtMillis = at,
|
||||||
|
summary = "White to move",
|
||||||
|
)
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `a saved game comes back exactly as it went in`() {
|
||||||
|
val s = store()
|
||||||
|
s.save(match())
|
||||||
|
assertEquals(match(), s.load("chess"))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `there is nothing to load before anything is saved`() {
|
||||||
|
assertNull(store().load("chess"))
|
||||||
|
assertTrue(store().all().isEmpty())
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `a game keeps one slot, and saving again replaces it`() {
|
||||||
|
val s = store()
|
||||||
|
s.save(match(state = "one", at = 1))
|
||||||
|
s.save(match(state = "two", at = 2))
|
||||||
|
assertEquals("two", s.load("chess")!!.stateJson)
|
||||||
|
assertEquals(1, s.all().size)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `clearing forgets the game and leaves the others`() {
|
||||||
|
val s = store()
|
||||||
|
s.save(match("chess"))
|
||||||
|
s.save(match("golf"))
|
||||||
|
s.clear("chess")
|
||||||
|
assertNull(s.load("chess"))
|
||||||
|
assertEquals("golf", s.load("golf")!!.gameId)
|
||||||
|
s.clear("chess") // clearing nothing is fine
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `the most recently played game is listed first`() {
|
||||||
|
val s = store()
|
||||||
|
s.save(match("chess", at = 10))
|
||||||
|
s.save(match("golf", at = 30))
|
||||||
|
s.save(match("catan", at = 20))
|
||||||
|
assertEquals(listOf("golf", "catan", "chess"), s.all().map { it.gameId })
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `a file that cannot be read is dropped rather than thrown`() {
|
||||||
|
val s = store()
|
||||||
|
s.save(match())
|
||||||
|
File(folder.root, "saves/chess.json").writeText("{ this is not json")
|
||||||
|
assertNull(s.load("chess"))
|
||||||
|
assertFalse(File(folder.root, "saves/chess.json").exists())
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `a file holding another game is not served as this one`() {
|
||||||
|
val s = store()
|
||||||
|
s.save(match("golf"))
|
||||||
|
File(folder.root, "saves/golf.json").copyTo(File(folder.root, "saves/chess.json"))
|
||||||
|
assertNull(s.load("chess"))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `a save that was cut off half way leaves the previous position`() {
|
||||||
|
val s = store()
|
||||||
|
s.save(match(state = "good"))
|
||||||
|
// What a kill mid-write leaves behind: a stray temporary file.
|
||||||
|
File(folder.root, "saves/chess.json.tmp").writeText("{ half a wri")
|
||||||
|
assertEquals("good", s.load("chess")!!.stateJson)
|
||||||
|
assertEquals(1, s.all().size)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `a game id cannot climb out of the folder`() {
|
||||||
|
val bad = runCatching { store().load("../secret") }
|
||||||
|
assertTrue(bad.isFailure)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `an unknown field from a newer build does not stop a save loading`() {
|
||||||
|
val s = store()
|
||||||
|
s.save(match())
|
||||||
|
val file = File(folder.root, "saves/chess.json")
|
||||||
|
file.writeText(file.readText().replaceFirst("{", "{\"addedLater\":true,"))
|
||||||
|
assertEquals("chess", s.load("chess")!!.gameId)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,191 @@
|
|||||||
|
package org.prolibertate.games.net
|
||||||
|
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.Job
|
||||||
|
import kotlinx.coroutines.cancel
|
||||||
|
import kotlinx.coroutines.delay
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
|
import org.junit.After
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Assert.assertFalse
|
||||||
|
import org.junit.Assert.assertNotNull
|
||||||
|
import org.junit.Assert.assertNull
|
||||||
|
import org.junit.Assert.assertTrue
|
||||||
|
import org.junit.Rule
|
||||||
|
import org.junit.Test
|
||||||
|
import org.junit.rules.TemporaryFolder
|
||||||
|
import org.prolibertate.games.game.engine.GameAi
|
||||||
|
import org.prolibertate.games.game.engine.GameRules
|
||||||
|
import org.prolibertate.games.game.engine.PlayerKind
|
||||||
|
import org.prolibertate.games.game.engine.PlayerSlot
|
||||||
|
import org.prolibertate.games.game.engine.SavedGameStore
|
||||||
|
import org.prolibertate.games.game.engine.TableConfig
|
||||||
|
import java.io.File
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Saving a table as it is played, and starting a table from a save.
|
||||||
|
*
|
||||||
|
* The game here is a counter: one seat, a move adds one, and it is finished at
|
||||||
|
* [GOAL]. It has hidden state — [Counter.secret] — so the tests can check that
|
||||||
|
* what is saved is the true state, not the view a player is shown.
|
||||||
|
*/
|
||||||
|
class MatchSaverTest {
|
||||||
|
|
||||||
|
@get:Rule
|
||||||
|
val folder = TemporaryFolder()
|
||||||
|
|
||||||
|
private val scopes = mutableListOf<CoroutineScope>()
|
||||||
|
|
||||||
|
@After
|
||||||
|
fun tearDown() {
|
||||||
|
scopes.forEach { it.cancel() }
|
||||||
|
}
|
||||||
|
|
||||||
|
private data class Counter(val n: Int, val secret: String)
|
||||||
|
|
||||||
|
private object Rules : GameRules<Counter, String> {
|
||||||
|
override val gameId = "counter"
|
||||||
|
override fun initialState(config: TableConfig) = Counter(0, "hidden-${config.seed}")
|
||||||
|
override fun currentSeat(state: Counter): Int? = if (state.n >= GOAL) null else 0
|
||||||
|
override fun legalMoves(state: Counter, seat: Int) = if (state.n >= GOAL) emptyList() else listOf("add")
|
||||||
|
override fun applyMove(state: Counter, seat: Int, move: String) = state.copy(n = state.n + 1)
|
||||||
|
override fun isFinished(state: Counter) = state.n >= GOAL
|
||||||
|
override fun summary(state: Counter) = "at ${state.n}"
|
||||||
|
override fun viewFor(state: Counter, seat: Int) = state.copy(secret = "")
|
||||||
|
override fun encodeState(state: Counter) = "${state.n}|${state.secret}"
|
||||||
|
override fun decodeState(json: String): Counter {
|
||||||
|
val (n, secret) = json.split("|", limit = 2)
|
||||||
|
return Counter(n.toInt(), secret)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun encodeMove(move: String) = move
|
||||||
|
override fun decodeMove(json: String) = json
|
||||||
|
}
|
||||||
|
|
||||||
|
private val config = TableConfig(
|
||||||
|
gameId = "counter",
|
||||||
|
seats = listOf(PlayerSlot(0, "You", PlayerKind.HUMAN_LOCAL, 0)),
|
||||||
|
optionsJson = "{}",
|
||||||
|
seed = 7L,
|
||||||
|
)
|
||||||
|
|
||||||
|
private fun scope() = CoroutineScope(Job() + Dispatchers.Default).also { scopes += it }
|
||||||
|
|
||||||
|
private fun controller(): MatchController<Counter, String> = MatchController(
|
||||||
|
rules = Rules,
|
||||||
|
ai = object : GameAi<Counter, String> {
|
||||||
|
override fun chooseMove(state: Counter, seat: Int, legal: List<String>) = legal.first()
|
||||||
|
},
|
||||||
|
config = config,
|
||||||
|
scope = scope(),
|
||||||
|
role = MatchController.Role.HOST,
|
||||||
|
localSeats = setOf(0),
|
||||||
|
primarySeat = 0,
|
||||||
|
)
|
||||||
|
|
||||||
|
private fun store() = SavedGameStore(File(folder.root, "saves"))
|
||||||
|
|
||||||
|
private fun waitFor(what: String, check: () -> Boolean) = runBlocking {
|
||||||
|
repeat(200) {
|
||||||
|
if (check()) return@runBlocking
|
||||||
|
delay(10)
|
||||||
|
}
|
||||||
|
error("Timed out waiting for $what")
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun saver(s: SavedGameStore, c: MatchController<Counter, String>) =
|
||||||
|
MatchSaver(s, "counter", config, localSeat = 0, scope = scope(), clock = { 123L }).also {
|
||||||
|
it.start()
|
||||||
|
c.onHostState = it::offer
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `every position the table reaches is kept, with the true state`() {
|
||||||
|
val s = store()
|
||||||
|
val c = controller()
|
||||||
|
saver(s, c)
|
||||||
|
c.startAsHost(emptyList())
|
||||||
|
waitFor("the deal") { c.state.value != null }
|
||||||
|
c.submit("add")
|
||||||
|
c.submit("add")
|
||||||
|
waitFor("two moves") { s.load("counter")?.stateJson?.startsWith("2|") == true }
|
||||||
|
|
||||||
|
val saved = s.load("counter")!!
|
||||||
|
assertEquals("2|hidden-7", saved.stateJson) // the hidden part is saved; the view blanks it
|
||||||
|
assertEquals("at 2", saved.summary)
|
||||||
|
assertEquals(123L, saved.savedAtMillis)
|
||||||
|
assertEquals(config, saved.config)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `a table started from a save carries on from where it stood`() {
|
||||||
|
val s = store()
|
||||||
|
val first = controller()
|
||||||
|
saver(s, first)
|
||||||
|
first.startAsHost(emptyList())
|
||||||
|
waitFor("the deal") { first.state.value != null }
|
||||||
|
repeat(3) { first.submit("add") }
|
||||||
|
waitFor("three moves") { s.load("counter")?.stateJson?.startsWith("3|") == true }
|
||||||
|
first.close()
|
||||||
|
|
||||||
|
val second = controller()
|
||||||
|
assertTrue(second.restore(s.load("counter")!!.stateJson))
|
||||||
|
second.startAsHost(emptyList())
|
||||||
|
waitFor("the restored table") { second.state.value != null }
|
||||||
|
assertEquals(3, second.state.value!!.n)
|
||||||
|
second.submit("add")
|
||||||
|
waitFor("a move after resuming") { second.state.value!!.n == 4 }
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `a save the game cannot read is refused and the table is dealt afresh`() {
|
||||||
|
val c = controller()
|
||||||
|
assertFalse(c.restore("not a counter"))
|
||||||
|
c.startAsHost(emptyList())
|
||||||
|
waitFor("a fresh deal") { c.state.value != null }
|
||||||
|
assertEquals(0, c.state.value!!.n)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `a finished game is not kept`() {
|
||||||
|
val s = store()
|
||||||
|
val c = controller()
|
||||||
|
saver(s, c)
|
||||||
|
c.startAsHost(emptyList())
|
||||||
|
waitFor("the deal") { s.load("counter") != null }
|
||||||
|
repeat(GOAL) { c.submit("add") }
|
||||||
|
waitFor("the finish") { c.finished.value }
|
||||||
|
waitFor("the slot to clear") { s.load("counter") == null }
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `flush writes the position the background writer has not reached`() {
|
||||||
|
val s = store()
|
||||||
|
val saver = MatchSaver(s, "counter", config, 0, scope(), clock = { 1L })
|
||||||
|
// Not started: nothing is written in the background at all.
|
||||||
|
saver.offer(MatchController.HostSnapshot(false, "at 5") { "5|x" })
|
||||||
|
assertNull(s.load("counter"))
|
||||||
|
saver.flush()
|
||||||
|
assertEquals("5|x", s.load("counter")!!.stateJson)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `ending a game on purpose forgets it and writes no more`() {
|
||||||
|
val s = store()
|
||||||
|
val saver = MatchSaver(s, "counter", config, 0, scope(), clock = { 1L })
|
||||||
|
saver.offer(MatchController.HostSnapshot(false, "at 1") { "1|x" })
|
||||||
|
saver.flush()
|
||||||
|
assertNotNull(s.load("counter"))
|
||||||
|
saver.discard()
|
||||||
|
assertNull(s.load("counter"))
|
||||||
|
// Leaving after ending must not put it back.
|
||||||
|
saver.offer(MatchController.HostSnapshot(false, "at 2") { "2|x" })
|
||||||
|
saver.flush()
|
||||||
|
assertNull(s.load("counter"))
|
||||||
|
}
|
||||||
|
|
||||||
|
private companion object {
|
||||||
|
const val GOAL = 5
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,177 @@
|
|||||||
|
package org.prolibertate.games.net
|
||||||
|
|
||||||
|
import kotlinx.serialization.encodeToString
|
||||||
|
import kotlinx.serialization.json.Json
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Assert.assertTrue
|
||||||
|
import org.junit.Test
|
||||||
|
import org.prolibertate.games.game.GameCatalog
|
||||||
|
import org.prolibertate.games.game.engine.GameAi
|
||||||
|
import org.prolibertate.games.game.engine.GameRules
|
||||||
|
import org.prolibertate.games.game.engine.PlayerKind
|
||||||
|
import org.prolibertate.games.game.engine.PlayerSlot
|
||||||
|
import org.prolibertate.games.game.engine.TableConfig
|
||||||
|
import org.prolibertate.games.ui.seatCountFor
|
||||||
|
import org.prolibertate.games.game.backgammon.BackgammonAi
|
||||||
|
import org.prolibertate.games.game.backgammon.BackgammonOptions
|
||||||
|
import org.prolibertate.games.game.backgammon.BackgammonRules
|
||||||
|
import org.prolibertate.games.game.catan.CatanAi
|
||||||
|
import org.prolibertate.games.game.catan.CatanOptions
|
||||||
|
import org.prolibertate.games.game.catan.CatanRules
|
||||||
|
import org.prolibertate.games.game.checkers.CheckersAi
|
||||||
|
import org.prolibertate.games.game.checkers.CheckersOptions
|
||||||
|
import org.prolibertate.games.game.checkers.CheckersRules
|
||||||
|
import org.prolibertate.games.game.chess.ChessAi
|
||||||
|
import org.prolibertate.games.game.chess.ChessOptions
|
||||||
|
import org.prolibertate.games.game.chess.ChessRules
|
||||||
|
import org.prolibertate.games.game.crazyeights.CrazyEightsAi
|
||||||
|
import org.prolibertate.games.game.crazyeights.CrazyEightsOptions
|
||||||
|
import org.prolibertate.games.game.crazyeights.CrazyEightsRules
|
||||||
|
import org.prolibertate.games.game.cribbage.CribbageAi
|
||||||
|
import org.prolibertate.games.game.cribbage.CribbageOptions
|
||||||
|
import org.prolibertate.games.game.cribbage.CribbageRules
|
||||||
|
import org.prolibertate.games.game.euchre.EuchreAi
|
||||||
|
import org.prolibertate.games.game.euchre.EuchreOptions
|
||||||
|
import org.prolibertate.games.game.euchre.EuchreRules
|
||||||
|
import org.prolibertate.games.game.freecell.FreeCellOptions
|
||||||
|
import org.prolibertate.games.game.freecell.FreeCellRules
|
||||||
|
import org.prolibertate.games.game.golf.GolfAi
|
||||||
|
import org.prolibertate.games.game.golf.GolfOptions
|
||||||
|
import org.prolibertate.games.game.golf.GolfRules
|
||||||
|
import org.prolibertate.games.game.hearts.HeartsAi
|
||||||
|
import org.prolibertate.games.game.hearts.HeartsOptions
|
||||||
|
import org.prolibertate.games.game.hearts.HeartsRules
|
||||||
|
import org.prolibertate.games.game.kaiser.KaiserAi
|
||||||
|
import org.prolibertate.games.game.kaiser.KaiserOptions
|
||||||
|
import org.prolibertate.games.game.kaiser.KaiserRules
|
||||||
|
import org.prolibertate.games.game.klondike.KlondikeAi
|
||||||
|
import org.prolibertate.games.game.klondike.KlondikeOptions
|
||||||
|
import org.prolibertate.games.game.klondike.KlondikeRules
|
||||||
|
import org.prolibertate.games.game.mastermind.MastermindAi
|
||||||
|
import org.prolibertate.games.game.mastermind.MastermindOptions
|
||||||
|
import org.prolibertate.games.game.mastermind.MastermindRules
|
||||||
|
import org.prolibertate.games.game.morris.MorrisAi
|
||||||
|
import org.prolibertate.games.game.morris.MorrisOptions
|
||||||
|
import org.prolibertate.games.game.morris.MorrisRules
|
||||||
|
import org.prolibertate.games.game.pegsolitaire.PegSolitaireAi
|
||||||
|
import org.prolibertate.games.game.pegsolitaire.PegSolitaireOptions
|
||||||
|
import org.prolibertate.games.game.pegsolitaire.PegSolitaireRules
|
||||||
|
import org.prolibertate.games.game.pirates.PiratesAi
|
||||||
|
import org.prolibertate.games.game.pirates.PiratesOptions
|
||||||
|
import org.prolibertate.games.game.pirates.PiratesRules
|
||||||
|
import org.prolibertate.games.game.president.PresidentAi
|
||||||
|
import org.prolibertate.games.game.president.PresidentOptions
|
||||||
|
import org.prolibertate.games.game.president.PresidentRules
|
||||||
|
import org.prolibertate.games.game.pyramid.PyramidOptions
|
||||||
|
import org.prolibertate.games.game.pyramid.PyramidRules
|
||||||
|
import org.prolibertate.games.game.sequence.SequenceAi
|
||||||
|
import org.prolibertate.games.game.sequence.SequenceOptions
|
||||||
|
import org.prolibertate.games.game.sequence.SequenceRules
|
||||||
|
import org.prolibertate.games.game.solitaire.FirstLegalAi
|
||||||
|
import org.prolibertate.games.game.spider.SpiderOptions
|
||||||
|
import org.prolibertate.games.game.spider.SpiderRules
|
||||||
|
import org.prolibertate.games.game.tayu.TayuAi
|
||||||
|
import org.prolibertate.games.game.tayu.TayuOptions
|
||||||
|
import org.prolibertate.games.game.tayu.TayuRules
|
||||||
|
import org.prolibertate.games.game.wizard.WizardAi
|
||||||
|
import org.prolibertate.games.game.wizard.WizardOptions
|
||||||
|
import org.prolibertate.games.game.wizard.WizardRules
|
||||||
|
import org.prolibertate.games.game.yahtzee.YahtzeeAi
|
||||||
|
import org.prolibertate.games.game.yahtzee.YahtzeeOptions
|
||||||
|
import org.prolibertate.games.game.yahtzee.YahtzeeRules
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every game can be saved and picked up again.
|
||||||
|
*
|
||||||
|
* For each game in the catalogue a table is dealt and played by the computer, and
|
||||||
|
* at every single move the whole true state is encoded and decoded again — which
|
||||||
|
* is exactly what saving it to disk and resuming does — and play carries on from
|
||||||
|
* the decoded copy. A game whose state does not survive that, or that cannot make
|
||||||
|
* a legal move from a state it has been through it, fails here.
|
||||||
|
*/
|
||||||
|
class SaveRoundTripAllGamesTest {
|
||||||
|
|
||||||
|
private val json = Json { encodeDefaults = true }
|
||||||
|
|
||||||
|
private fun <S : Any, M : Any> exercise(
|
||||||
|
gameId: String,
|
||||||
|
rules: GameRules<S, M>,
|
||||||
|
ai: GameAi<S, M>,
|
||||||
|
optionsJson: String,
|
||||||
|
steps: Int = 120,
|
||||||
|
) {
|
||||||
|
val seats = seatCountFor(gameId, optionsJson)
|
||||||
|
val config = TableConfig(
|
||||||
|
gameId = gameId,
|
||||||
|
seats = (0 until seats).map {
|
||||||
|
PlayerSlot(it, "P$it", if (it == 0) PlayerKind.HUMAN_LOCAL else PlayerKind.AI, it)
|
||||||
|
},
|
||||||
|
optionsJson = optionsJson,
|
||||||
|
seed = 20240607L,
|
||||||
|
)
|
||||||
|
var state = rules.initialState(config)
|
||||||
|
var moves = 0
|
||||||
|
repeat(steps) {
|
||||||
|
if (rules.isFinished(state)) return
|
||||||
|
// The save and the resume: what goes to disk, and what comes back.
|
||||||
|
val saved = rules.encodeState(state)
|
||||||
|
val back = rules.decodeState(saved)
|
||||||
|
assertEquals("$gameId: a saved state encodes differently after a resume", saved, rules.encodeState(back))
|
||||||
|
assertEquals(
|
||||||
|
"$gameId: a resumed state is not on the same seat's turn",
|
||||||
|
rules.currentSeat(state),
|
||||||
|
rules.currentSeat(back),
|
||||||
|
)
|
||||||
|
assertEquals(
|
||||||
|
"$gameId: a resumed state has different legal moves",
|
||||||
|
rules.currentSeat(state)?.let { rules.legalMoves(state, it) },
|
||||||
|
rules.currentSeat(back)?.let { rules.legalMoves(back, it) },
|
||||||
|
)
|
||||||
|
state = back
|
||||||
|
|
||||||
|
val seat = rules.currentSeat(state) ?: return // waiting on a scoreboard, which is not a move
|
||||||
|
val legal = rules.legalMoves(state, seat)
|
||||||
|
if (legal.isEmpty()) return
|
||||||
|
val move = ai.chooseMove(state, seat, legal)
|
||||||
|
assertTrue("$gameId: move $move is not legal after a resume", rules.isLegalMove(state, seat, move))
|
||||||
|
state = rules.applyMove(state, seat, move)
|
||||||
|
moves++
|
||||||
|
}
|
||||||
|
assertTrue("$gameId: made no moves", moves > 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
private inline fun <reified O> opts(o: O) = json.encodeToString(o)
|
||||||
|
|
||||||
|
@Test fun euchre() = exercise(GameCatalog.EUCHRE, EuchreRules, EuchreAi(), opts(EuchreOptions()))
|
||||||
|
@Test fun sequence() = exercise(GameCatalog.SEQUENCE, SequenceRules, SequenceAi(), opts(SequenceOptions()))
|
||||||
|
@Test fun president() = exercise(GameCatalog.PRESIDENT, PresidentRules, PresidentAi(), opts(PresidentOptions()))
|
||||||
|
@Test fun golf() = exercise(GameCatalog.GOLF, GolfRules, GolfAi(), opts(GolfOptions()))
|
||||||
|
@Test fun kaiser() = exercise(GameCatalog.KAISER, KaiserRules, KaiserAi(), opts(KaiserOptions()))
|
||||||
|
@Test fun wizard() = exercise(GameCatalog.WIZARD, WizardRules, WizardAi(), opts(WizardOptions()))
|
||||||
|
@Test fun crazyEights() = exercise(GameCatalog.CRAZY_EIGHTS, CrazyEightsRules, CrazyEightsAi(), opts(CrazyEightsOptions()))
|
||||||
|
@Test fun cribbage() = exercise(GameCatalog.CRIBBAGE, CribbageRules, CribbageAi(), opts(CribbageOptions()))
|
||||||
|
@Test fun tayu() = exercise(GameCatalog.TAYU, TayuRules, TayuAi(), opts(TayuOptions()))
|
||||||
|
@Test fun checkers() = exercise(GameCatalog.CHECKERS, CheckersRules, CheckersAi(), opts(CheckersOptions()))
|
||||||
|
@Test fun backgammon() = exercise(GameCatalog.BACKGAMMON, BackgammonRules, BackgammonAi(), opts(BackgammonOptions()))
|
||||||
|
@Test fun mastermind() = exercise(GameCatalog.MASTERMIND, MastermindRules, MastermindAi(), opts(MastermindOptions()))
|
||||||
|
@Test fun pirates() = exercise(GameCatalog.PIRATES, PiratesRules, PiratesAi(), opts(PiratesOptions()))
|
||||||
|
@Test fun hearts() = exercise(GameCatalog.HEARTS, HeartsRules, HeartsAi, opts(HeartsOptions()))
|
||||||
|
@Test fun pegSolitaire() = exercise(GameCatalog.PEG_SOLITAIRE, PegSolitaireRules, PegSolitaireAi, opts(PegSolitaireOptions()))
|
||||||
|
@Test fun yahtzee() = exercise(GameCatalog.YAHTZEE, YahtzeeRules, YahtzeeAi, opts(YahtzeeOptions()))
|
||||||
|
@Test fun klondike() = exercise(GameCatalog.KLONDIKE, KlondikeRules, KlondikeAi, opts(KlondikeOptions()))
|
||||||
|
@Test fun freecell() = exercise(GameCatalog.FREECELL, FreeCellRules, FirstLegalAi(), opts(FreeCellOptions()))
|
||||||
|
@Test fun spider() = exercise(GameCatalog.SPIDER, SpiderRules, FirstLegalAi(), opts(SpiderOptions()))
|
||||||
|
@Test fun pyramid() = exercise(GameCatalog.PYRAMID, PyramidRules, FirstLegalAi(), opts(PyramidOptions()))
|
||||||
|
@Test fun morris() = exercise(GameCatalog.MORRIS, MorrisRules, MorrisAi(), opts(MorrisOptions()))
|
||||||
|
@Test fun chess() = exercise(GameCatalog.CHESS, ChessRules, ChessAi(), opts(ChessOptions()), steps = 24)
|
||||||
|
@Test fun catan() = exercise(GameCatalog.CATAN, CatanRules, CatanAi(), opts(CatanOptions()), steps = 400)
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun catanCitiesAndKnights() = exercise(
|
||||||
|
GameCatalog.CATAN,
|
||||||
|
CatanRules,
|
||||||
|
CatanAi(),
|
||||||
|
opts(CatanOptions(3, 13, org.prolibertate.games.game.catan.CatanRuleSet.CITIES_AND_KNIGHTS)),
|
||||||
|
steps = 600,
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -145,6 +145,11 @@ class ScorekeeperSessionTest {
|
|||||||
await("$name to be asking") { host.state.requests.any { it.id == deviceId } }
|
await("$name to be asking") { host.state.requests.any { it.id == deviceId } }
|
||||||
host.session.allow(deviceId)
|
host.session.allow(deviceId)
|
||||||
await("$name to be let in") { guest.state.value.connected }
|
await("$name to be let in") { guest.state.value.connected }
|
||||||
|
// The sheet follows the connection over the socket, so `connected` can
|
||||||
|
// flip while it is still in flight. Callers read the guest's sheet at
|
||||||
|
// once (its players, its rounds), and on a slow runner that was an empty
|
||||||
|
// one: wait until the guest is looking at the host's.
|
||||||
|
await("$name to receive the sheet") { guest.state.value.sheet == host.state.sheet }
|
||||||
return guest
|
return guest
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
package org.prolibertate.games.ui
|
||||||
|
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
|
class SavedGameTextTest {
|
||||||
|
private val minute = 60_000L
|
||||||
|
private val hour = 60 * minute
|
||||||
|
private val day = 24 * hour
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `how long ago reads like a person would say it`() {
|
||||||
|
assertEquals("just now", agoText(1_000, 1_000))
|
||||||
|
assertEquals("just now", agoText(30_000, 0))
|
||||||
|
assertEquals("a minute ago", agoText(minute + 20_000, 0))
|
||||||
|
assertEquals("5 minutes ago", agoText(5 * minute, 0))
|
||||||
|
assertEquals("an hour ago", agoText(90 * minute, 0))
|
||||||
|
assertEquals("3 hours ago", agoText(3 * hour, 0))
|
||||||
|
assertEquals("yesterday", agoText(30 * hour, 0))
|
||||||
|
assertEquals("4 days ago", agoText(4 * day, 0))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `a clock that ran backwards does not say nonsense`() {
|
||||||
|
assertEquals("just now", agoText(0, 10 * minute))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
package org.prolibertate.games.ui.game.catan
|
||||||
|
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Assert.assertNotNull
|
||||||
|
import org.junit.Assert.assertNull
|
||||||
|
import org.junit.Test
|
||||||
|
import org.prolibertate.games.game.catan.BuildRoad
|
||||||
|
import org.prolibertate.games.game.catan.BuildSettlement
|
||||||
|
import org.prolibertate.games.game.catan.EndTurn
|
||||||
|
|
||||||
|
/** The pure half of the landscape HUD: drag-to-build snapping and the staged ✓ / ✗ placement. */
|
||||||
|
class CatanHudTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `a build tap is staged, not sent, but only while a build mode is armed`() {
|
||||||
|
val road = BuildRoad(0)
|
||||||
|
|
||||||
|
val outcome = TapOutcome.Submit(road)
|
||||||
|
assertEquals(road, CatanInteraction.stageable(outcome, BuildKind.ROAD))
|
||||||
|
assertNull(CatanInteraction.stageable(outcome, null))
|
||||||
|
// Ending the turn is never a placement.
|
||||||
|
assertNull(CatanInteraction.stageable(TapOutcome.Submit(EndTurn), BuildKind.ROAD))
|
||||||
|
assertNull(CatanInteraction.stageable(TapOutcome.Ignored, BuildKind.ROAD))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `the ghost of a staged move sits on its crossing or its edge`() {
|
||||||
|
assertEquals(CatanInteraction.Spot(vertex = 4), CatanInteraction.spotOf(BuildSettlement(4)))
|
||||||
|
assertEquals(CatanInteraction.Spot(edge = 9), CatanInteraction.spotOf(BuildRoad(9)))
|
||||||
|
assertEquals(CatanInteraction.Spot(), CatanInteraction.spotOf(null))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `a dragged finger snaps to the nearest lit crossing within reach, and off the board to nothing`() {
|
||||||
|
val layout = CatanGeometry.fit(800f, 600f)
|
||||||
|
val lit = setOf(3, 10, 21)
|
||||||
|
val targets = BoardTargets(vertices = lit)
|
||||||
|
val target = layout.vertex(10)
|
||||||
|
|
||||||
|
// A little off the crossing, well inside reach.
|
||||||
|
val near = Pt(target.x + layout.radius * 0.3f, target.y - layout.radius * 0.2f)
|
||||||
|
assertEquals(CatanInteraction.Spot(vertex = 10), CatanInteraction.snap(layout, targets, near, layout.radius * 1.2f))
|
||||||
|
|
||||||
|
// Far from every lit crossing.
|
||||||
|
assertNull(CatanInteraction.snap(layout, targets, Pt(-500f, -500f), layout.radius * 1.2f))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `with edges lit and no crossings, the drop snaps to an edge`() {
|
||||||
|
val layout = CatanGeometry.fit(800f, 600f)
|
||||||
|
val targets = BoardTargets(edges = setOf(5, 6))
|
||||||
|
val mid = layout.edgeMidpoint(6)
|
||||||
|
assertNotNull(CatanInteraction.snap(layout, targets, mid, layout.radius))
|
||||||
|
assertEquals(CatanInteraction.Spot(edge = 6), CatanInteraction.snap(layout, targets, mid, layout.radius))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
# Catan Universe 2.7.5 — what the reverse engineering showed
|
||||||
|
|
||||||
|
Source: `Catan+Universe_2.7.5_APKPure.xapk` (Unity, IL2CPP). Method: the Unity scenes
|
||||||
|
(`level3` is the match scene) were parsed with UnityPy for the uGUI hierarchy (names,
|
||||||
|
anchors, sizes, which objects start hidden), and `global-metadata.dat` was searched for
|
||||||
|
class, method and game-action names. Code bodies were not decompiled; behaviour below
|
||||||
|
that is not visible in a hierarchy is marked *inferred*.
|
||||||
|
|
||||||
|
The game is **landscape-only**; the canvas is laid out against a 1920×1080 reference.
|
||||||
|
|
||||||
|
## Match HUD (`InGameUI_mobile`)
|
||||||
|
|
||||||
|
| Region | Contents |
|
||||||
|
| --- | --- |
|
||||||
|
| Top | `PlayerFrames`: one frame per player (avatar, colour, VP, card count, timer), a "shuffle stats" button at the right |
|
||||||
|
| Bottom bar | `ResourceContainer`, centred (anchors 25–75 % of the width, 90 px tall): one entry per resource (Lumber, Brick, Wool, Grain, Ore; Cloth, Coins, Paper for C&K; Fish, Feather, Coca for other expansions, hidden otherwise) |
|
||||||
|
| Bottom right | `BtnTurn` (140 px, roll / end turn), `BtnTrade` immediately to its left (counter-offer and "blocked" badge variants), `BtnAddDevCard`, a chat/log `BubblePanel` |
|
||||||
|
| Left edge | `Drag&DropBuild`: a column of piece icons. **The player drags a piece from it onto the board** (`Drag&DropBuildRemove` is the drop target that cancels) |
|
||||||
|
| Mid right | `ConfirmButtonGroup`: a ✓ (`CatanConfirmBuildButton`) over a ✗ (`CatanCancelBuildButton`). A drop only *previews*; the ✓ commits |
|
||||||
|
| Board | `CandidateFactory` makes highlight markers for every legal spot (corner, edge, face); `QuickBuildTrigger{Corner,Edge,Face}` are hit zones for a one-tap/hold build; a candidate ticker shows the one-line instruction |
|
||||||
|
| Centre | Played-card panel, progress-card chooser, discard panel (`CardPanel` slides up over the bottom bar with a header) |
|
||||||
|
|
||||||
|
Gestures (`CatanGestureHandler`, `BaseGesture`, `TapHoldHandler`): one finger pans the
|
||||||
|
board, two-finger pinch zooms (`GetPinchZoomMagnitude`, `AutomaticZoom`), tap selects a
|
||||||
|
candidate, hold opens quick-build. Camera is a fixed-pitch table view.
|
||||||
|
|
||||||
|
## Trade board (`TradeBoard_mobile`)
|
||||||
|
|
||||||
|
A full-width panel that slides up over the bottom of the screen (`Animator`, collapsible):
|
||||||
|
|
||||||
|
```
|
||||||
|
┌────────────────────────────────────────────────────────────┬──────┐
|
||||||
|
│ [Player] [Bank] headline / description ☐ Block trade │ P1 P2│ header
|
||||||
|
├────────────────────────────────────────────────────────────┤ P3 P4│ (135 px)
|
||||||
|
│ OPPONENT row — cards you get (tinted by the opponent's │ │
|
||||||
|
│ colour) │ Hide │
|
||||||
|
│ ⇣⇣⇣ arrows (or the bank ratio chips 4:1 3:1 2:1) │ Deny │
|
||||||
|
│ PLAYER row — cards you give (tinted by your colour) │Accept│
|
||||||
|
└────────────────────────────────────────────────────────────┴──────┘
|
||||||
|
```
|
||||||
|
|
||||||
|
* **Header.** A *Player / Bank* toggle (extra toggles for the Inka 3:2 / 2:1 rules). A
|
||||||
|
**Block trade** checkbox refuses all incoming offers. One round button per rival
|
||||||
|
(`Player1…5`, with a selected border) picks whom the offer is addressed to; none
|
||||||
|
selected means everyone.
|
||||||
|
* **Content.** Two rows of resource cards separated by arrows. The top row is what you
|
||||||
|
*want*, the bottom row what you *give*. Tapping a card in a row adds one; tapping a
|
||||||
|
selected card removes one (*inferred from `AddFieldToTradePayment`/`ApplyCancelTradeResource`*).
|
||||||
|
In Bank mode a ratio row (`CardRatios`) shows the best rate per resource (harbours).
|
||||||
|
* **Right column (180 px).** Hide/collapse, **Deny** (✗), **Accept** (✓). When you
|
||||||
|
are the one receiving an offer, ✓ accepts and the chip-icon variant `Icon_CounterOffer`
|
||||||
|
turns the ✓ into a *counter-offer* send. A circular turn timer wraps the ✓.
|
||||||
|
* **Incoming offers** (`IncomingTradeContainer`) show in the same panel; the offerer's
|
||||||
|
colour tints the opponent row. Counter-offers land back in the proposer's panel with
|
||||||
|
an `AcceptCounterOfferButtonImage`.
|
||||||
|
|
||||||
|
## Seafarers game actions (from the metadata)
|
||||||
|
|
||||||
|
`CatanSeafarer_*_GameAction` names show what the mode adds to the base game:
|
||||||
|
|
||||||
|
* **Ships:** `BuildShip`, `MoveShip` (only the ship at the open end of a route, not on
|
||||||
|
the turn it was built), `BuildFreeRoad`; roads and ships share `AvailableCandidatesRoadAndShip`.
|
||||||
|
* **Pirate** alongside the robber: `RobberPirat_Move`, `RobberPirat_SelectPlayer`;
|
||||||
|
ships cannot be built or moved past a pirate-blocked edge.
|
||||||
|
* **Gold fields:** `ChooseGoldfieldResource` (a hex that pays any resource of choice).
|
||||||
|
* **Fog islands:** `Check_FogField`, `DistributeFogField` (hidden hex revealed when a
|
||||||
|
road/ship reaches it, the player takes the resource), `Shuffle_Islands`, `Shuffle_TileValueList`.
|
||||||
|
* **Treasure islands / Oasis / Great Canal** are Catan Universe scenario extras and are
|
||||||
|
**not** part of the physical Seafarers rules; they are out of scope here.
|
||||||
|
* **Setup:** `StartPhase_BuildSettlement`, `StartPhase_BuildRoadShip`, `PlaceValueChip`
|
||||||
|
(number tokens placed per scenario), `Shuffle_Harbors`.
|
||||||
|
* **Island bonus:** special victory points for the first settlement on a new island
|
||||||
|
(`AllIslandIds`, `CatanIslandState`).
|
||||||
@@ -42,6 +42,8 @@ Naming: the catalogue id, lowercase, e.g. `crazy8s` → `RULES-crazy8s.md`.
|
|||||||
|
|
||||||
- Build, CI, releases and OTA are described in the CI section of the root
|
- Build, CI, releases and OTA are described in the CI section of the root
|
||||||
[README](../README.md).
|
[README](../README.md).
|
||||||
|
- [SAVED-GAMES.md](SAVED-GAMES.md) — how a game in progress is kept between sessions, and what is
|
||||||
|
not kept.
|
||||||
- [UI-catan.md](UI-catan.md) — how the Katan screen is layered, and how to restyle,
|
- [UI-catan.md](UI-catan.md) — how the Katan screen is layered, and how to restyle,
|
||||||
re-copy or re-lay-out it without touching the rules.
|
re-copy or re-lay-out it without touching the rules.
|
||||||
- `licenses/` — third-party licences that must travel with the app
|
- `licenses/` — third-party licences that must travel with the app
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
# Saved games
|
||||||
|
|
||||||
|
A game played against the computer (or on one device) is kept as it is played, and can be
|
||||||
|
picked up again after the app has been closed.
|
||||||
|
|
||||||
|
## What the player sees
|
||||||
|
|
||||||
|
- **Main menu → Continue.** Each game left half-played is listed, most recent first
|
||||||
|
("Chess · saved 5 minutes ago"); tapping it resumes.
|
||||||
|
- **A game's setup screen** shows a *Game in progress* card with **Resume** and **Discard**.
|
||||||
|
Starting a new game from that screen replaces the saved one.
|
||||||
|
- **Leaving the table** (the back arrow, or the app being closed or sent to the background)
|
||||||
|
keeps the position. **End game → End the game** is the deliberate way to throw it away.
|
||||||
|
- A game that is **finished** is not kept.
|
||||||
|
- A **networked** table is not kept: the other player's seat cannot be held for them. Only a
|
||||||
|
table with no remote human at it (`PlayerKind.HUMAN_REMOTE`) is saved.
|
||||||
|
|
||||||
|
One slot per game: there is one saved Chess game, one saved Katan game, and so on.
|
||||||
|
|
||||||
|
## How it works
|
||||||
|
|
||||||
|
| Piece | Where | Does |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `SavedMatch`, `SavedGameStore` | `game/engine/SavedGame.kt` | one JSON file per game under `filesDir/saved-games/`, written atomically (temp file, then renamed); an unreadable file is deleted and read as absent |
|
||||||
|
| `MatchController.onHostState`, `restore` | `net/MatchController.kt` | the host reports every position it reaches; `restore(json)` starts the table from a saved position instead of dealing |
|
||||||
|
| `MatchSaver` | `net/MatchSaver.kt` | takes the newest position and writes it off the main thread; `flush()` writes synchronously on leaving or on `ON_STOP`; `discard()` forgets the game |
|
||||||
|
| `StartMatch` | `ui/PlayScreen.kt` | wires the two together for every game; consumes the resume state once, so a solitaire "new deal" is not put back |
|
||||||
|
| `LocalEndGameHandle` | `ui/EndGameHandle.kt` | how each *End game* dialog tells the table to forget its save |
|
||||||
|
|
||||||
|
What is saved is `rules.encodeState` of the **host's true state** (hidden cards included),
|
||||||
|
plus the `TableConfig` (seed, seats, options) and the local seat. Nothing in the store knows
|
||||||
|
which game it is holding, so a new game is saved with no work, provided its state encodes.
|
||||||
|
|
||||||
|
A save this build cannot decode (one written by an older version whose state has since
|
||||||
|
changed shape) is thrown away and a fresh game is dealt.
|
||||||
|
|
||||||
|
## Tests
|
||||||
|
|
||||||
|
- `SavedGameStoreTest` — the files: round trip, one slot, ordering, corruption, a cut-off write.
|
||||||
|
- `MatchSaverTest` — saving as a table is played, resuming from a save, finished games, flush, discard.
|
||||||
|
- `SaveRoundTripAllGamesTest` — **every game in the catalogue**: the whole state is encoded and
|
||||||
|
decoded at every move of a computer-played game, and play carries on from the decoded copy.
|
||||||
|
A new game should be added to it.
|
||||||
@@ -22,6 +22,8 @@ truth, so the UI can only ever offer a move the rules would accept.
|
|||||||
| **Board drawing** | `CatanBoardView.kt` | The `Canvas`: tiles, tokens, ports, robber, roads, pieces, highlights | Change how a piece is drawn (art, shapes, animation) |
|
| **Board drawing** | `CatanBoardView.kt` | The `Canvas`: tiles, tokens, ports, robber, roads, pieces, highlights | Change how a piece is drawn (art, shapes, animation) |
|
||||||
| **Panels** | `CatanPanels.kt` | Resource tiles, hand, player cards, dice, action bar, log | Restyle or rearrange widgets |
|
| **Panels** | `CatanPanels.kt` | Resource tiles, hand, player cards, dice, action bar, log | Restyle or rearrange widgets |
|
||||||
| **Dialogs** | `CatanDialogs.kt` | Discard, robber victim, play card, trade, trade reply, game over | Change a dialog's flow or look |
|
| **Dialogs** | `CatanDialogs.kt` | Discard, robber victim, play card, trade, trade reply, game over | Change a dialog's flow or look |
|
||||||
|
| **HUD** | `CatanHud.kt` | The landscape controls: build column, ✓ / ✗, round turn / trade buttons, pinch-pan board | Move or restyle a landscape control |
|
||||||
|
| **Trade board** | `CatanTradeBoard.kt` | The base-game trade panel (offer, bank, reply) | Change how trades are composed or answered |
|
||||||
| **Screen** | `CatanScreen.kt` | Wiring to `MatchController`, portrait/landscape layout, which dialog shows | Change the layout or add a new element |
|
| **Screen** | `CatanScreen.kt` | Wiring to `MatchController`, portrait/landscape layout, which dialog shows | Change the layout or add a new element |
|
||||||
| **Previews** | `CatanPreviews.kt` | Android Studio previews of real positions | Iterate on the look without a match |
|
| **Previews** | `CatanPreviews.kt` | Android Studio previews of real positions | Iterate on the look without a match |
|
||||||
|
|
||||||
@@ -169,3 +171,24 @@ Not done yet, in rough priority order:
|
|||||||
4. A timer or cancel button on offers (the engine has neither).
|
4. A timer or cancel button on offers (the engine has neither).
|
||||||
5. A board that shows the *last* move (a faint highlight of what just changed).
|
5. A board that shows the *last* move (a faint highlight of what just changed).
|
||||||
6. Landscape polish on large tablets; the right-hand panel scrolls but is plain.
|
6. Landscape polish on large tablets; the right-hand panel scrolls but is plain.
|
||||||
|
|
||||||
|
## Landscape HUD and trade board (from Catan Universe)
|
||||||
|
|
||||||
|
Landscape screens use the control scheme of Catan Universe's match view, redrawn in 2D
|
||||||
|
(what was learned, and from where: [RE-catan-universe.md](RE-catan-universe.md)). Portrait keeps the stacked layout.
|
||||||
|
|
||||||
|
* **Drag to build.** The left column holds Road / Settlement / City (and Wall / Knight in
|
||||||
|
Cities & Knights). Drag a piece onto the island: lit spots snap under the finger
|
||||||
|
(`CatanInteraction.snap`), release over one to **stage** it, then press **✓** to place or **✕**
|
||||||
|
to cancel (`CatanInteraction.stageable`, `spotOf`). A tap on a piece still arms the board for
|
||||||
|
tapping a spot. Setup placements, free roads and chores are not staged: they commit on tap.
|
||||||
|
* **Pinch and pan** the island (`ZoomPanBox`). The board is drawn through a graphics layer, so
|
||||||
|
taps and drops arrive in board coordinates; hit-testing is unchanged.
|
||||||
|
* **Round buttons**, bottom right: the big one is roll / end turn / done (whatever the engine
|
||||||
|
currently allows); ⇄ is trade; the small pair is buy / play card (Improve / Cards in C&K).
|
||||||
|
* **Trade board** (`CatanTradeBoard`, base game): a panel over the bottom of the island with a
|
||||||
|
Bank / Player toggle, a round button per rival to address an offer to one player, a *get* row on
|
||||||
|
top, a *give* row below, and ▾ hide / ✕ clear / ✓ send on the right. Bank mode shows each resource's
|
||||||
|
ratio under the *give* card. An offer made to you opens the same panel read-only: ✓ accepts,
|
||||||
|
✕ declines, *Counter…* makes the rows editable.
|
||||||
|
Cities & Knights goods trades and the counter-offer chooser still use dialogs.
|
||||||
|
|||||||
Reference in New Issue
Block a user