diff --git a/src/netdeck/NetDeck.ino b/src/netdeck/NetDeck.ino index 9eeddf8..62ac34c 100644 --- a/src/netdeck/NetDeck.ino +++ b/src/netdeck/NetDeck.ino @@ -617,7 +617,7 @@ struct UnitStat { uint8_t maxHp; }; static const UnitStat STATS[4] = { - { 14 * 14, 5, 65, 1, 4, 6 }, // marine + { 14 * 14, 5, 65, 1, 5, 6 }, // marine { 14 * 14, 6, 55, 1, 5, 4 }, // droid { 14 * 14, 7, 50, 2, 7, 10 }, // heavy { 14 * 14, 4, 60, 1, 0, 8 }, // turret @@ -928,6 +928,9 @@ static void unitMove(int i) u.tx = nx; u.ty = ny; u.mvCd = STATS[u.kind].speed; + if (u.kind == U_MARINE && u.tgt >= 0) { + u.mvCd *= 2; // walking slowly while targetting + } if (u.pathIdx >= u.pathLen) u.hasPath = false; } @@ -964,7 +967,6 @@ static void stepUnits() u.tgt = acquireTarget(i); if (u.tgt >= 0) { if (u.fireCd == 0) fireAt(i, u.tgt); - continue; // hold position while firing } // movement goals diff --git a/src/netdeck/STATUS.md b/src/netdeck/STATUS.md index 14fe959..a2165c3 100644 --- a/src/netdeck/STATUS.md +++ b/src/netdeck/STATUS.md @@ -9,7 +9,7 @@ milestone lands. | **M0 — Emulator** | SDL2 emulator support + M1 surface tested locally | **done** | | **M1 — Hardware Sandbox** | Full-frame sprite rendering to ST7789, shared tactical view + HUD, cursor, `Space` freeze, `P` view switch | **compiled + emulator-verified; on-device check pending** | | M2 — Network Graph & Traces | 4-node sub-net in shared space (AIRLK→JUNC→DOOR/HIVE), animated link routing (1.5 s / 3.0 s ICE), door control, red trace → feedback spike + OVERHEAT, `X` sever, `R` reset | **done (emulator-verified)** | -| M3 — Squad vs. Droids | 2 marines (BFS to the player beacon, stop-and-fire), patrol/stationary droids, heavy droid + ceiling turret on the terminal, cover crates, tracers/HP bars, win/loss banners, reinforcement on feedback spike | **done (emulator-verified; firmware build fixed)** | +| M3 — Squad vs. Droids | 2 marines (BFS to the player beacon, continue walking while firing), patrol/stationary droids, heavy droid + ceiling turret on the terminal, cover crates, tracers/HP bars, win/loss banners, reinforcement on feedback spike | **done (emulator-verified; firmware build fixed)** | | M3 — Squad vs. Droids | Ship floorplan in Cameras view, 3 marines → beacon, 4 droids, gunfire | planned | | M4 — Cyber-Physical Bridge | Hive link + `1` FRENZY.EXE turns droids on each other (shared coordinate space) | **done** | @@ -97,8 +97,9 @@ the M2 sub-net, in the same 320x192 coordinate space: - **Squad**: 2 identical marines spawning in the airlock; BFS pathfinding to the player-placed beacon (re-planned while blocked or every 8 ticks), - stop-and-fire hitscan combat with inCover() cover rule (adjacent crate - halves incoming hit chance), overhead HP bars + live SQUAD meters in the HUD. + continues walking while firing hitscan combat with inCover() cover rule + (adjacent crate halves incoming hit chance), overhead HP bars + live SQUAD + meters in the HUD. - **Enemies**: 1 patrolling + 1 stationary security droid in the corridor; 1 heavy droid (2 dmg) + 1 stationary ceiling turret (high ROF) guarding the objective terminal at tile (34,7). Units may not share a tile; walls