UI & Authority

Author: Pastor

.gitignore

@@ -3,3 +3,4 @@ target
 *.iml
 engine/program.some
 engine/*.png
+*.png

engine/src/main/java/ru/base/game/engine/Game.java

@@ -6,6 +6,7 @@
 import ru.base.game.engine.lang.Parser;
 import ru.base.game.engine.lang.VirtualMachine;
 import ru.base.game.engine.map.StandardMapGenerator;
+import ru.base.game.engine.messages.SourceLevel;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -16,13 +17,13 @@ public final class Game implements Evaluator.ObjectTarget, Context {
     private final Map.Generator generator = new StandardMapGenerator();
     private final int width = 41;
     private final int height = 41;
-    private final Listener listener;
+    private final Message.Listener listener;
     private final Player player = new Player();
     private boolean userAttacked = false;
     private Map map;
     private State state = State.INITIATE;
 
-    public Game(Listener listener) {
+    public Game(Message.Listener listener) {
         this.listener = listener;
     }
 
@@ -52,7 +53,7 @@ public void tick() {
                     .filter(co -> co.source() instanceof Event e && e.type() == Event.Type.ENTER)
                     .findAny().ifPresent(c -> player.flyTo(c.x(), c.y()));
                 change(State.RUNNING);
-                emitRefresh();
+                emitLevel();
                 break;
             }
             default: {
@@ -61,8 +62,21 @@ public void tick() {
         }
     }
 
-    private void emitRefresh() {
-        listener.emit(new Listener.Refresh(map, player));
+    private void emitLevel() {
+        int[][] layers = new int[width][height];
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                layers[x][y] = ((Map.BlockType) map.at(x, y, Map.Layer.BLOCKS)).ordinal() + 2;
+            }
+        }
+        var assets = new SourceLevel.Asset[]{
+            new SourceLevel.Asset("grass-short", false, 0),
+            new SourceLevel.Asset("grass-tall", false, 1),
+            new SourceLevel.Asset("bush", true, 0),
+            new SourceLevel.Asset("wave", true, 1),
+        };
+        listener.emit(new Message<>(Message.Type.LEVEL,
+            new SourceLevel(width, height, layers, player.x(), player.y(), player.viewport(), assets)));
     }
 
     private void change(State state) {
@@ -113,7 +127,7 @@ private void actionTo(int x, int y) {
                         map.set(x, y, Map.Layer.EVENTS, null);
                     }
                 }
-                emitRefresh();
+                emitLevel();
             } else {
                 change(State.BATTLE);
                 if (userAttacked) {
@@ -139,7 +153,7 @@ private void actionTo(int x, int y) {
                     change(State.BATTLE);
                 }
             }
-            emitRefresh();
+            emitLevel();
         }
     }
 

engine/src/main/java/ru/base/game/engine/Listener.java

@@ -0,0 +1,18 @@
+package ru.base.game.engine;
+
+import com.google.gson.annotations.SerializedName;
+
+public record Message<S extends Message.Source>(@SerializedName("type") Type type, @SerializedName("source") S source) {
+    public enum Type {
+        LEVEL
+    }
+
+    @FunctionalInterface
+    public interface Listener {
+        <S extends Source> void emit(Message<S> message);
+    }
+
+    public interface Source {
+
+    }
+}

engine/src/main/java/ru/base/game/engine/Message.java

@@ -20,8 +20,8 @@ public int y() {
         return y;
     }
 
-    public int visibleRadius() {
-        return 3;
+    public int viewport() {
+        return 20;
     }
 
     @Override

engine/src/main/java/ru/base/game/engine/Player.java

@@ -0,0 +1,18 @@
+package ru.base.game.engine.messages;
+
+import com.google.gson.annotations.SerializedName;
+import ru.base.game.engine.Message;
+
+public record SourceLevel(@SerializedName("width") int width,
+                          @SerializedName("height") int height,
+                          @SerializedName("layout") int[][] layers,
+                          @SerializedName("x") int x,
+                          @SerializedName("y") int y,
+                          @SerializedName("viewport") int viewport,
+                          @SerializedName("assets") Asset[] assets) implements Message.Source {
+    public record Asset(@SerializedName("file_name") String name,
+                 @SerializedName("collision") boolean collision,
+                 @SerializedName("frames") int frames) {
+
+    }
+}

engine/src/main/java/ru/base/game/engine/messages/SourceLevel.java

@@ -1,17 +1,15 @@
 package ru.base.game.server.service;
 
 import ru.base.game.engine.Game;
-import ru.base.game.engine.Listener;
-import ru.base.game.engine.Map;
-import ru.base.game.engine.Player;
+import ru.base.game.engine.Message;
 import ru.base.game.server.dto.EventObject;
-import ru.base.game.server.dto.RefreshObject;
 
 import java.time.LocalDateTime;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 @SuppressWarnings({"PMD.UnusedPrivateField", "PMD.EmptyCatchBlock"})
-public final class GameCircle implements Runnable, Listener {
+public final class GameCircle implements Runnable, Message.Listener {
     final String username;
     final Game game;
     private final AtomicBoolean running = new AtomicBoolean(true);
@@ -50,11 +48,8 @@ public void run() {
     }
 
     @Override
-    public <E> void emit(Event<E> event) {
-        if (event instanceof Refresh refresh) {
-            Player player = refresh.player();
-            Map.Coordinated<Map.Matrix> matrix = refresh.data().matrix(player.x(), player.y(), player.visibleRadius());
-            userGameService.sendEvent(username, new EventObject<>("refresh", new RefreshObject(player, matrix.source())));
-        }
+    public <S extends Message.Source> void emit(Message<S> message) {
+        userGameService.sendEvent(username, new EventObject<>(
+            message.type().name().toLowerCase(Locale.ROOT), message.source()));
     }
 }

server/src/main/java/ru/base/game/server/service/GameCircle.java

@@ -7,7 +7,7 @@ const Map = function () {
 
 
 Map.prototype = {
-    refresh: function (data) {
+    initiate: function (data) {
         map.data = data;
         map.width = data.width;
         map.height = data.height;

server/src/main/resources/web/js/map.js

@@ -20,7 +20,7 @@ const Player = function(tile_x, tile_y) {
         y: tile_y
     };
     this.torch = {
-        lit: false,
+        lit: true,
         frame: 0
     };
 };
@@ -51,7 +51,7 @@ Player.prototype = {
         let light_x = pos_x + (config.size.tile / 2);
         let light_y = pos_y + (config.size.tile / 2);
 
-        let radius = 100;
+        let radius = map.data.viewport;
         let radialGradient = context.createRadialGradient(light_x, light_y, 0, light_x, light_y, radius);
 
         radialGradient.addColorStop(0, "rgba(238, 229, 171, 0.325)");

server/src/main/resources/web/js/player.js

@@ -21,10 +21,10 @@ function OnWebSocket() {
                     console.error(error);
                     return;
                 }
-                if (output.type === "refresh") {
-                    map.refresh(output.data);
-                    player.pos.x = output.data.player.x;
-                    player.pos.y = output.data.player.y;
+                if (output.type === "level") {
+                    player.pos.x = output.data.x * config.size.char;
+                    player.pos.y = output.data.y * config.size.char;
+                    map.initiate(output.data);
                 }
                 console.log(output);
             }