Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pla 777 bg multi add doubling cube action sg UI #138

Merged
merged 3 commits into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dependency-graph.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
update-graph:
name: Update Dependency Graph
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: scalacenter/sbt-dependency-submission@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:

jobs:
openjdk14:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Check if organization member
id: check_org_member
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

jobs:
openjdk13:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Check if organization member
id: check_org_member
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ libraryDependencies += "io.lettuce" % "lettuce-core"
libraryDependencies += "io.netty" % "netty-handler" % nettyVersion
libraryDependencies += "io.netty" % "netty-codec-http" % nettyVersion
libraryDependencies += "io.netty" % "netty-transport-native-epoll" % nettyVersion classifier "linux-x86_64"
libraryDependencies += "org.playstrategy" %% "strategygames" % "10.2.1-pstrat168"
libraryDependencies += "org.playstrategy" %% "strategygames" % "10.2.1-pstrat170"
libraryDependencies += "com.typesafe.akka" %% "akka-actor-typed" % akkaVersion
libraryDependencies += "com.typesafe.akka" %% "akka-slf4j" % akkaVersion
libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.9.3"
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/LilaHandler.scala
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ final class LilaHandler(
History.round.add(gameId, versioned)
publish(_ room gameId, versioned)
if (
List("move", "drop", "lift", "undo", "endturn", "pass", "diceroll", "selectSquares").contains(tpe)
List("move", "drop", "lift", "undo", "endturn", "pass", "diceroll", "cubeaction", "selectSquares").contains(tpe)
)
Fens.move(gameId, data, flags.moveBy)
case TellRoom(roomId, payload) => publish(_ room roomId, ClientIn.Payload(payload))
Expand Down
10 changes: 10 additions & 0 deletions src/main/scala/ipc/ClientOut.scala
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,16 @@ object ClientOut {
blur = d int "b" contains 1
ackId = d int "a"
} yield RoundMove(variant.gameFamily, diceroll, blur, parseMetrics(d), ackId)
case "cubeaction" =>
for {
d <- o obj "d"
lib = dataGameLogic(d)
variant = dataVariant(d, lib)
interaction <- d str "interaction"
cubeaction <- Uci.CubeAction.fromStrings(lib, interaction)
blur = d int "b" contains 1
ackId = d int "a"
} yield RoundMove(variant.gameFamily, cubeaction, blur, parseMetrics(d), ackId)
case "selectSquares" =>
for {
d <- o obj "d"
Expand Down