spinners and gems

2026-06-21 18:27:45 -05:00
parent 9b53552f4a
commit d4b9278838
17 changed files with 626 additions and 56 deletions
@@ -68,9 +68,15 @@ fn tick(dt) {
        let changed = false;
        for i in 0..8 {
            let n = (i + step) % 8;
+            let pn = (i + step - 1) % 8;
            let dx = ox + ring[n][0];
            let dy = oy + ring[n][1];
-            if moves[i] && !passable(dx, dy) && !moves[n] {
+            let sx = ox + ring[pn][0];
+            let sy = oy + ring[pn][1];
+
+            let blocked = !passable(dx, dy) && !combinable(sx, sy, dx, dy);
+
+            if moves[i] && blocked && !moves[n] {
                moves[i] = false;
                changed = true;
            }