Merge pull request #131 from eesast/fix-run

Fix run

Author: konpoku

dependency/shell/run.sh

@@ -51,34 +51,6 @@ fi
 : "${TEAM_LABEL:=TeamA}"
 : "${CONNECT_IP:=172.17.0.1}"
 
-# ── Retry helper ───────────────────────────────────────────────────────────
-function retry_command {
-    local command="$1"
-    local max_attempts=5
-    local attempt_num=1
-    local sleep_seconds=10
-
-    while [ $attempt_num -le $max_attempts ]; do
-        echo "Attempt $attempt_num / $max_attempts to run command: $command"
-
-        eval $command &
-        local pid=$!
-
-        sleep $sleep_seconds
-
-        if kill -0 $pid 2>/dev/null; then
-            echo "Failed to connect to server. Retrying..."
-            ((attempt_num++))
-        else
-            echo "Connected to server successfully."
-            return 0
-        fi
-    done
-
-    echo "Failed to connect to server after $max_attempts attempts."
-    return 1
-}
-
 # ═══════════════════════════════════════════════════════════════════════════
 #  SERVER
 # ═══════════════════════════════════════════════════════════════════════════
@@ -170,20 +142,22 @@ elif [ "$TERMINAL" = "CLIENT" ]; then
 
             command="nice -n 0 python3 ${cp_dir}/PyAPI/main.py \
                 -I $CONNECT_IP -P $PORT \
-                -t $team_id -s $TEAM_SEQ_ID \
+                -t $team_id \
                 -p $player_idx"
 
-            retry_command "$command" > "$output_dir/team${TEAM_SEQ_ID}-$code_name.log" 2>&1 &
+            echo "Launching: $command"
+            eval "$command" > "$output_dir/team${TEAM_SEQ_ID}-$code_name.log" 2>&1 &
 
         elif [ -f "./$code_name" ]; then
             echo "Found ./$code_name"
 
             command="nice -n 0 ./$code_name \
                 -I $CONNECT_IP -P $PORT \
-                -t $team_id -s $TEAM_SEQ_ID \
+                -t $team_id \
                 -p $player_idx"
 
-            retry_command "$command" > "$output_dir/team${TEAM_SEQ_ID}-$code_name.log" 2>&1 &
+            echo "Launching: $command"
+            eval "$command" > "$output_dir/team${TEAM_SEQ_ID}-$code_name.log" 2>&1 &
 
         else
             break

logic/Gaming/Game.cs

@@ -34,7 +34,7 @@ public Game(MapStruct mapResource, int numOfTeam)
             tradeManager = new(this, gameMap);
             uplevelManager = new(this);
             teams = new ConcurrentDictionary<long, TeamState>();
-            InitTeams();
+            InitTeams(numOfTeam);
 
             tradeManager = new TradeManager(this, gameMap);
             uplevelManager = new UplevelManager(this);

logic/Gaming/Teams.cs

@@ -76,18 +76,29 @@ public TeamSnapshot(long teamId, long score, int costTech, int efficiencyTech, i
             }
         }
 
-        private void InitTeams()
+        private void InitTeams(int numOfTeam)
         {
-            // 工厂位置应该对应地图中 PlaceType.FACTORY 的位置
-            // MapInfo 中 defaultMap 的工厂位置是 [3,3], [3,46], [46,3], [46,46]
+            if (numOfTeam < 2 || numOfTeam > 4)
+            {
+                throw new ArgumentOutOfRangeException(
+                    nameof(numOfTeam),
+                    numOfTeam,
+                    "Team count must be 2, 3, or 4."
+                );
+            }
+
+            // Team layout order:
+            // Team 1: top-left, Team 2: bottom-right,
+            // Team 3: bottom-left, Team 4: top-right.
             var corners = new (int cx, int cy)[]
             {
-                (3, 3),      // Team 1 工厂位置
-                (3, 46),     // Team 2 工厂位置
-                (46, 3),     // Team 3 工厂位置
-                (46, 46)     // Team 4 工厂位置
+                (3, 3),
+                (46, 46),
+                (3, 46),
+                (46, 3),
             };
-            for (int i = 0; i < 4; i++)
+
+            for (int i = 0; i < numOfTeam; i++)
             {
                 long teamId = i + 1;
                 var (cx, cy) = corners[i];