Mobaile

backend/game/commands.py

@@ -26,6 +26,7 @@ class ActionType(str, Enum):
     QUERY = "query"
     QUERY_UNITS = "query_units"      # zone and/or unit_type → returns unit_ids
     ASSIGN_TO_GROUP = "assign_to_group"  # group_index (1-3), unit_ids (from query_units)
+    DEFEND = "defend"                # patrol around a base/zone to defend it
     RESIGN = "resign"                # abandon the game, opponent wins
 
 

backend/game/engine.py

@@ -122,6 +122,7 @@ class GameEngine:
             self._tick_mining(player)
 
         self._tick_movement_and_combat()
+        self._apply_crowd_pressure()
         self._tick_healing()
         self._remove_dead()
 
@@ -719,6 +720,80 @@ class GameEngine:
                 ally.target_x = attacker.x
                 ally.target_y = attacker.y
 
+    def _apply_crowd_pressure(self) -> None:
+        """Nudge ground units that are not firing when allied moving units press behind them.
+
+        For each non-firing idle/moving ground unit, we sum the pressure vectors of
+        nearby allies that are actively advancing toward it (within a ~3-unit cone).
+        A small fraction of the resulting vector is applied as a nudge, provided the
+        destination is collision-free.
+        """
+        PUSH_RADIUS = UNIT_RADIUS * 5   # ~2.5 tile look-ahead for pushers
+        NUDGE = UNIT_RADIUS * 0.35      # ≈0.175 tiles per tick (soft shove)
+        MIN_DOT = 0.45                  # cos ~63° — pusher must face the blockee
+
+        for player in self.state.players.values():
+            for unit in player.units.values():
+                defn = UNIT_DEFS[unit.unit_type]
+                # Only nudge ground units that are not shooting and not doing special work
+                if defn.is_flying:
+                    continue
+                if unit.attack_target_id or unit.attack_target_building_id:
+                    continue
+                if unit.is_sieged:
+                    continue
+                if unit.status in (
+                    UnitStatus.MINING_MINERALS,
+                    UnitStatus.MINING_GAS,
+                    UnitStatus.BUILDING,
+                    UnitStatus.MOVING_TO_BUILD,
+                ):
+                    continue
+
+                fx, fy = 0.0, 0.0
+                for pusher in player.units.values():
+                    if pusher.id == unit.id:
+                        continue
+                    if pusher.status not in (UnitStatus.MOVING, UnitStatus.ATTACKING, UnitStatus.PATROLLING):
+                        continue
+                    if pusher.target_x is None or pusher.target_y is None:
+                        continue
+
+                    dx_rel = unit.x - pusher.x
+                    dy_rel = unit.y - pusher.y
+                    d = math.hypot(dx_rel, dy_rel)
+                    if d > PUSH_RADIUS or d < 1e-6:
+                        continue
+
+                    # Direction the pusher wants to go
+                    dx_m = pusher.target_x - pusher.x
+                    dy_m = pusher.target_y - pusher.y
+                    dm = math.hypot(dx_m, dy_m)
+                    if dm < 1e-6:
+                        continue
+                    nx_m, ny_m = dx_m / dm, dy_m / dm
+
+                    # The blockee must be roughly in the pusher's forward cone
+                    dot = (dx_rel / d) * nx_m + (dy_rel / d) * ny_m
+                    if dot < MIN_DOT:
+                        continue
+
+                    # Pressure strength: stronger when closer and more aligned
+                    strength = dot * (1.0 - d / PUSH_RADIUS)
+                    fx += nx_m * strength
+                    fy += ny_m * strength
+
+                fmag = math.hypot(fx, fy)
+                if fmag < 1e-6:
+                    continue
+
+                new_x = unit.x + (fx / fmag) * NUDGE
+                new_y = unit.y + (fy / fmag) * NUDGE
+
+                if not self._would_overlap(unit, new_x, new_y):
+                    unit.x = new_x
+                    unit.y = new_y
+
     def _tick_healing(self) -> None:
         """Medics heal the most-injured adjacent infantry unit."""
         for player in self.state.players.values():
@@ -1191,6 +1266,8 @@ class GameEngine:
                 return self._cmd_query_units(player, action)
             if t == ActionType.ASSIGN_TO_GROUP:
                 return self._cmd_assign_to_group(player, action)
+            if t == ActionType.DEFEND:
+                return self._cmd_defend(player, action)
             if t == ActionType.RESIGN:
                 return self._cmd_resign(player)
             return ActionResult(
@@ -1604,6 +1681,48 @@ class GameEngine:
             data={"gi": gi, "n": len(valid_ids)},
         )
 
+    def _cmd_defend(self, player: PlayerState, action: GameAction) -> ActionResult:
+        """Send available military units to patrol around a base zone.
+
+        Units are spread evenly on a circle around the zone center and bounce
+        between two diametrically-opposite perimeter points so they continuously
+        sweep the area and auto-attack any enemy that enters their weapon range.
+        """
+        units = self._resolve_selector(
+            player, action.unit_selector or "all_military", max_count=action.count
+        )
+        units = [u for u in units if not u.is_sieged and u.unit_type != UnitType.SCV]
+        if not units:
+            return ActionResult(action_type="defend", success=False, data={"error": "no_units_selected"})
+
+        zone = action.target_zone or "my_base"
+        cx, cy = self._resolve_zone(player.player_id, zone)
+
+        DEFEND_RADIUS = 6.0  # patrol orbit radius around the base center
+        n = len(units)
+        for i, unit in enumerate(units):
+            angle = (2 * math.pi * i) / n
+            # Two opposite points on the perimeter
+            px1 = cx + DEFEND_RADIUS * math.cos(angle)
+            py1 = cy + DEFEND_RADIUS * math.sin(angle)
+            px2 = cx + DEFEND_RADIUS * math.cos(angle + math.pi)
+            py2 = cy + DEFEND_RADIUS * math.sin(angle + math.pi)
+
+            is_flying = UNIT_DEFS[unit.unit_type].is_flying
+            unit.attack_target_id = None
+            unit.attack_target_building_id = None
+            # Store the far patrol point as the return waypoint
+            unit.patrol_x = px2
+            unit.patrol_y = py2
+            unit.status = UnitStatus.PATROLLING
+            self._set_unit_destination(unit, px1, py1, is_flying=is_flying)
+
+        move_ack = [{"kind": "move_ack", "unit_type": units[0].unit_type.value}]
+        return ActionResult(
+            action_type="defend", success=True,
+            data={"n": len(units), "zone": zone}, sound_events=move_ack,
+        )
+
     def _cmd_resign(self, player: PlayerState) -> ActionResult:
         """Player forfeits — opponent is declared winner immediately."""
         opponent_id = next(

backend/voice/command_parser.py

@@ -42,6 +42,7 @@ supply_depot, barracks, engineering_bay, refinery, factory, armory, starport
 - gather       : collecter ressources    → champs: unit_selector, resource_type ("minerals"|"gas"), count (optionnel)
 - stop         : arrêter des unités      → champs: unit_selector, count (optionnel)
 - patrol       : patrouiller            → champs: unit_selector, target_zone, count (optionnel)
+- defend       : défendre une base (unités militaires patrouillent en cercle autour de la zone en attaquant automatiquement) → champs: unit_selector (optionnel), target_zone (défaut: my_base), count (optionnel). Utiliser quand le joueur dit "défends ma base", "protège la base", "garde la base", "defend my base", "hold the base", etc.
 - query        : information sur l'état  → aucun champ requis
 - query_units  : lister les IDs d'unités (pour affectation aux groupes) → champs optionnels: target_zone, unit_type
 - assign_to_group : affecter des unités à un groupe (1, 2 ou 3) → champs: group_index (1-3). Utilise le résultat du query_units précédent si unit_ids vide. Pour "mets mes marines dans le groupe 1", génère d'abord query_units (unit_type: marine) puis assign_to_group (group_index: 1).

frontend/src/lib/components/Minimap.svelte

@@ -1,9 +1,9 @@
 <script lang="ts">
   import { backendUrl } from '$lib/socket';
-  import { gameState, myPlayerId, mapViewport, mapCenterRequest, mapVisibleCells, mapExploredCells, isTutorial } from '$lib/stores/game';
+  import { gameState, myPlayerId, mapViewport, mapCenterRequest, mapVisibleCells, mapExploredCells, isTutorial, mapTextureUrl } from '$lib/stores/game';
   import { BUILDING_SIZES } from '$lib/types';
 
-  $: mapImageUrl = typeof window !== 'undefined' ? `${backendUrl()}/static/MAP.png` : '';
+  $: mapImageUrl = $mapTextureUrl ?? (typeof window !== 'undefined' ? `${backendUrl()}/static/MAP.png` : '');
 
   const MAP_W = 80;
   const MAP_H = 80;
@@ -32,13 +32,20 @@
     return visibleCells.has(key);
   }
 
-  function onClick(e: MouseEvent) {
+  function getClickCoords(e: MouseEvent | TouchEvent): { clientX: number; clientY: number } {
+    if ('touches' in e && e.touches.length > 0) return { clientX: e.touches[0].clientX, clientY: e.touches[0].clientY };
+    if ('changedTouches' in e && e.changedTouches.length > 0) return { clientX: e.changedTouches[0].clientX, clientY: e.changedTouches[0].clientY };
+    return { clientX: (e as MouseEvent).clientX, clientY: (e as MouseEvent).clientY };
+  }
+
+  function onClick(e: MouseEvent | TouchEvent) {
     e.preventDefault();
     e.stopPropagation();
     const target = e.currentTarget as HTMLButtonElement;
     const rect = target.getBoundingClientRect();
-    const px = Math.max(0, Math.min(1, (e.clientX - rect.left) / rect.width));
-    const py = Math.max(0, Math.min(1, (e.clientY - rect.top) / rect.height));
+    const { clientX, clientY } = getClickCoords(e);
+    const px = Math.max(0, Math.min(1, (clientX - rect.left) / rect.width));
+    const py = Math.max(0, Math.min(1, (clientY - rect.top) / rect.height));
     const cx = px * MAP_W;
     const cy = py * MAP_H;
     mapCenterRequest.set({ cx, cy });
@@ -50,6 +57,7 @@
   class="minimap-btn"
   aria-label="Minimap: click to move view"
   on:click={onClick}
+  on:touchend|nonpassive={onClick}
 >
   <svg
     bind:this={minimapEl}
@@ -164,6 +172,9 @@
     cursor: pointer;
     overflow: hidden;
     box-shadow: 0 2px 12px rgba(0, 0, 0, 0.4);
+    touch-action: manipulation;
+    -webkit-touch-callout: none;
+    user-select: none;
   }
 
   .minimap-btn:hover {
@@ -177,4 +188,11 @@
     height: 160px;
     pointer-events: none;
   }
+
+  @media (max-width: 600px) {
+    .minimap-svg {
+      width: 80px;
+      height: 80px;
+    }
+  }
 </style>

frontend/src/lib/components/VoiceButton.svelte

@@ -113,6 +113,10 @@
     transition: all 0.15s;
     flex-shrink: 0;
     overflow: visible;
+    touch-action: none;
+    -webkit-touch-callout: none;
+    user-select: none;
+    -webkit-user-select: none;
   }
 
   .voice-btn:not(:disabled):active,

frontend/src/routes/+page.svelte

@@ -1562,4 +1562,106 @@
   .activity-toast-link:hover {
     color: #c4b5fd;
   }
+
+  @media (max-width: 480px) {
+    .lobby {
+      --banner-height: 38px;
+    }
+
+    .powered-banner {
+      gap: 2px;
+      padding: 4px 8px;
+    }
+
+    .powered-label {
+      display: none;
+    }
+
+    .powered-separator {
+      margin: 0 2px;
+      height: 14px;
+    }
+
+    .powered-logo {
+      padding: 2px 3px;
+    }
+
+    .powered-logo img {
+      height: 14px;
+      max-width: 50px;
+    }
+
+    .powered-author-name {
+      display: none;
+    }
+
+    .powered-author img {
+      height: 14px;
+      width: 14px;
+    }
+
+    .lobby {
+      padding: var(--banner-height) 12px 20px;
+      gap: 12px;
+    }
+
+    .lobby-content {
+      gap: 12px;
+    }
+
+    .btn {
+      padding: 10px 14px;
+      font-size: 0.85rem;
+      gap: 6px;
+    }
+
+    .btn-tutorial {
+      margin-top: 6px;
+    }
+
+    .btn-icon {
+      font-size: 0.95rem;
+    }
+
+    .name-input-row .btn {
+      padding: 10px 12px;
+    }
+
+    .text-input {
+      padding: 10px 12px;
+      font-size: 0.9rem;
+    }
+
+    .home-panel {
+      padding: 14px;
+      gap: 12px;
+    }
+
+    .observe-row {
+      gap: 8px;
+    }
+
+    .btn-observe {
+      padding: 8px 12px;
+      font-size: 0.82rem;
+    }
+
+    .leaderboard-fab,
+    .help-btn {
+      width: 36px;
+      height: 36px;
+      bottom: 12px;
+      border-width: 2px;
+    }
+
+    .leaderboard-fab {
+      left: 12px;
+      font-size: 1rem;
+    }
+
+    .help-btn {
+      right: 12px;
+      font-size: 1.1rem;
+    }
+  }
 </style>