fix: docker build and z ordering

Xenira · Jun 4, 2023 · 9223bfc · 9223bfc
1 parent 34b5dac
commit 9223bfc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -44,8 +44,8 @@ WORKDIR /usr/local/bin
 RUN apk add libgcc && addgroup -S serveruser && adduser -S serveruser -G serveruser
 COPY --from=builder-server /server/target/x86_64-unknown-linux-musl/release/rog-server .
 COPY --from=builder-client /client/dist ./static
+COPY --from=builder-client /client/assets ./static/assets
 COPY ./server/static ./static
-COPY ./client/assets ./static/assets
 USER root
 EXPOSE 8000/tcp
 CMD ["rog-server"]
diff --git a/TODO b/TODO
@@ -1,4 +1,5 @@
 Service:
+	☐ Validate display name
 	Lobby:
 		☐ Kick Player
 		☐ Promote Player

diff --git a/client/src/states/game_shop.rs b/client/src/states/game_shop.rs
@@ -188,7 +188,7 @@ fn setup(
     commands.spawn((
         SpriteBundle {
             texture: asset_server.load("textures/ui/reroll.png"),
-            transform: Transform::from_translation(Vec3::new(64.0 * 6.0, 200.0, 0.0)),
+            transform: Transform::from_translation(Vec3::new(64.0 * 6.0, 200.0, 5.0)),
             ..Default::default()
         },
         Hoverable("hover".to_string(), "leave".to_string()),

diff --git a/server/src/service/combat_service.rs b/server/src/service/combat_service.rs
@@ -200,7 +200,7 @@ fn execute_turn(
 
     // Get attacking creature
     while battle.board[*index].is_none() {
-        if *index < 6 {
+        if *index < 5 {
             *index += 1;
         } else {
             *index = 0;