Merge pull request #22 from lugobots/improving-main

Improving main
lugobots · Aug 30, 2024 · e8505c4 · e8505c4
2 parents 010aa46 + 4b12c67
commit e8505c4
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 1,932 deletions.
diff --git a/.dist/main.js b/.dist/main.js
@@ -5,11 +5,10 @@ var lugo4node_1 = require("@lugobots/lugo4node");
 var starter = (0, lugo4node_1.NewDefaultStarter)();
 // ADVANCED
 // the map will help us to see the field in quadrants (called regions) instead of working with coordinates
-//
-// const config = new EnvVarLoader()
+var config = new lugo4node_1.EnvVarLoader();
 // the map will help us to see the field in quadrants (called regions) instead of working with coordinates
-// const map = new Mapper(10, 6, config.getBotTeamSide())
+var map = new lugo4node_1.Mapper(10, 6, config.getBotTeamSide());
 // our bot strategy defines our bot initial position based on its number
-// import {PLAYER_INITIAL_POSITIONS} from "./settings";
-// const initialRegion = map.getRegion( PLAYER_INITIAL_POSITIONS[config.getBotNumber()].Col, PLAYER_INITIAL_POSITIONS[config.getBotNumber()].Row)
-starter.run(new my_bot_1.MyBot(starter.getConfig().getBotTeamSide(), starter.getConfig().getBotNumber(), starter.getInitialPosition(), starter.getMapper()));
+var settings_1 = require("./settings");
+var initialRegion = map.getRegion(settings_1.PLAYER_INITIAL_POSITIONS[config.getBotNumber()].Col, settings_1.PLAYER_INITIAL_POSITIONS[config.getBotNumber()].Row);
+starter.run(new my_bot_1.MyBot(starter.getConfig().getBotTeamSide(), starter.getConfig().getBotNumber(), initialRegion.getCenter(), starter.getMapper()));
diff --git a/.dist/my_bot.js b/.dist/my_bot.js
@@ -24,9 +24,9 @@ var MyBot = /** @class */ (function () {
                 moveDestination = ballPosition;
             }
             var moveOrder = inspector.makeOrderMoveMaxSpeed(moveDestination);
-            // Try other ways to create a move Oorder
+            // Try other ways to create a move Order
             // const moveOrder = reader.makeOrderMoveByDirection(DIRECTION.BACKWARD)
-            // we can ALWAYS try to catch the ball it we are not holding it
+            // we can ALWAYS try to catch the ball if we are not holding it
             var catchOrder = inspector.makeOrderCatch();
             orders.push(moveOrder, catchOrder);
             return orders;

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,12 +6,12 @@ version: '3.9'
 services:
   game_server:
     image: lugobots/server:${SERVER_VERSION:-latest}
-    command: play --dev-mode --listening-duration=${LISTENING_DURATION:-50ms} --timer-mode=${TIMER_MODE:-wait}
+    command: play --dev-mode --listening-duration=${LISTENING_DURATION:-50ms} --grpc-port=${GAME_GRPC_PORT:-5000} --timer-mode=${TIMER_MODE:-wait}
     ports:
-      - "5000:5000"
+      - "${GAME_GRPC_PORT:-5000}:${GAME_GRPC_PORT:-5000}"
       - "8080:8080"
     healthcheck:
-      test: [ "CMD", "grpc-health-probe", "-addr=game_server:5000" ]
+      test: [ "CMD", "grpc-health-probe", "-addr=game_server:${GAME_GRPC_PORT:-5000}" ]
       interval: 2s
       timeout: 10s
       retries: 3
@@ -61,6 +61,7 @@ services:
     environment:
       - BOT_NUMBER=1
       - BOT_TEAM=${PLAYER_SIDE:-home}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
   player_home_02:
     image: node:18
     working_dir: /app
@@ -76,6 +77,7 @@ services:
     environment:
       - BOT_NUMBER=2
       - BOT_TEAM=${PLAYER_SIDE:-home}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
   player_home_03:
     image: node:18
     working_dir: /app
@@ -91,6 +93,7 @@ services:
     environment:
       - BOT_NUMBER=3
       - BOT_TEAM=${PLAYER_SIDE:-home}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
   player_home_04:
     image: node:18
     working_dir: /app
@@ -106,6 +109,7 @@ services:
     environment:
       - BOT_NUMBER=4
       - BOT_TEAM=${PLAYER_SIDE:-home}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
   player_home_05:
     image: node:18
     working_dir: /app
@@ -121,6 +125,7 @@ services:
     environment:
       - BOT_NUMBER=5
       - BOT_TEAM=${PLAYER_SIDE:-home}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
   player_home_06:
     image: node:18
     working_dir: /app
@@ -136,6 +141,7 @@ services:
     environment:
       - BOT_NUMBER=6
       - BOT_TEAM=${PLAYER_SIDE:-home}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
   player_home_07:
     image: node:18
     working_dir: /app
@@ -151,6 +157,7 @@ services:
     environment:
       - BOT_NUMBER=7
       - BOT_TEAM=${PLAYER_SIDE:-home}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
   player_home_08:
     image: node:18
     working_dir: /app
@@ -166,6 +173,7 @@ services:
     environment:
       - BOT_NUMBER=8
       - BOT_TEAM=${PLAYER_SIDE:-home}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
   player_home_09:
     image: node:18
     working_dir: /app
@@ -181,6 +189,7 @@ services:
     environment:
       - BOT_NUMBER=9
       - BOT_TEAM=${PLAYER_SIDE:-home}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
   player_home_10:
     image: node:18
     working_dir: /app
@@ -196,6 +205,7 @@ services:
     environment:
       - BOT_NUMBER=10
       - BOT_TEAM=${PLAYER_SIDE:-home}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
   player_home_11:
     image: node:18
     working_dir: /app
@@ -211,12 +221,14 @@ services:
     environment:
       - BOT_NUMBER=11
       - BOT_TEAM=${PLAYER_SIDE:-home}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
   player_away_01:
     image: ${AWAY_BOT:-lugobots/level-1:latest}
     network_mode: "host"
     environment:
       - BOT_NUMBER=1
       - BOT_TEAM=${OPPONENT_SIDE:-away}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
       - MODE=${MODE:-default} # default zombies statues kids defenses
     restart: unless-stopped
     depends_on:
@@ -228,6 +240,7 @@ services:
     environment:
       - BOT_NUMBER=2
       - BOT_TEAM=${OPPONENT_SIDE:-away}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
       - MODE=${MODE:-default} # default zombies statues kids defenses
     restart: unless-stopped
     depends_on:
@@ -239,6 +252,7 @@ services:
     environment:
       - BOT_NUMBER=3
       - BOT_TEAM=${OPPONENT_SIDE:-away}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
       - MODE=${MODE:-default} # default zombies statues kids defenses
     restart: unless-stopped
     depends_on:
@@ -250,6 +264,7 @@ services:
     environment:
       - BOT_NUMBER=4
       - BOT_TEAM=${OPPONENT_SIDE:-away}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
       - MODE=${MODE:-default} # default zombies statues kids defenses
     restart: unless-stopped
     depends_on:
@@ -261,6 +276,7 @@ services:
     environment:
       - BOT_NUMBER=5
       - BOT_TEAM=${OPPONENT_SIDE:-away}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
       - MODE=${MODE:-default} # default zombies statues kids defenses
     restart: unless-stopped
     depends_on:
@@ -272,6 +288,7 @@ services:
     environment:
       - BOT_NUMBER=6
       - BOT_TEAM=${OPPONENT_SIDE:-away}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
       - MODE=${MODE:-default} # default zombies statues kids defenses
     restart: unless-stopped
     depends_on:
@@ -283,6 +300,7 @@ services:
     environment:
       - BOT_NUMBER=7
       - BOT_TEAM=${OPPONENT_SIDE:-away}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
       - MODE=${MODE:-default} # default zombies statues kids defenses
     restart: unless-stopped
     depends_on:
@@ -294,6 +312,7 @@ services:
     environment:
       - BOT_NUMBER=8
       - BOT_TEAM=${OPPONENT_SIDE:-away}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
       - MODE=${MODE:-default} # default zombies statues kids defenses
     restart: unless-stopped
     depends_on:
@@ -305,6 +324,7 @@ services:
     environment:
       - BOT_NUMBER=9
       - BOT_TEAM=${OPPONENT_SIDE:-away}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
       - MODE=${MODE:-default} # default zombies statues kids defenses
     restart: unless-stopped
     depends_on:
@@ -316,6 +336,7 @@ services:
     environment:
       - BOT_NUMBER=10
       - BOT_TEAM=${OPPONENT_SIDE:-away}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
       - MODE=${MODE:-default} # default zombies statues kids defenses
     restart: unless-stopped
     depends_on:
@@ -327,6 +348,7 @@ services:
     environment:
       - BOT_NUMBER=11
       - BOT_TEAM=${OPPONENT_SIDE:-away}
+      - BOT_GRPC_URL=localhost:${GAME_GRPC_PORT:-5000}
       - MODE=${MODE:-default} # default zombies statues kids defenses
     depends_on:
       game_server: