akkartik/sokoban.love - Change RCEWATRPX3MDVMAIEBEYIRL2MXPQYD47IU7XQUKSUZVFJRU4AN4AC

this seems to improve things a bit

I'm still seeing situations where it doesn't work. Does find_path_for_crate also need to account for mutations to level?

I'm starting to suspect we can get rid of all the crate identity tracking.

Created by akkartik on March 13, 2024

RCEWATRPX3MDVMAIEBEYIRL2MXPQYD47IU7XQUKSUZVFJRU4AN4AC

Dependencies

In channels

main

Change contents

Replacement in screens/solve at line 18 [3.30]

B:BD[2.2066] → [2.2066:2149]

        local moves = find_almost_empty_path(level, p, {x=c.x+1, y=c.y}, crate.id)

[2.2066]

[2.2149]

        local moves = find_almost_empty_path(level, p, {x=c.x+1, y=c.y}, --[[empty]] crate, --[[occupied]] c)

Replacement in screens/solve at line 24 [3.30]

B:BD[2.2428] → [2.2428:2505]

        moves = find_almost_empty_path(level, p, {x=c.x-1, y=c.y}, crate.id)

[2.2428]

[2.2505]

        moves = find_almost_empty_path(level, p, {x=c.x-1, y=c.y}, crate, c)

Replacement in screens/solve at line 29 [3.30]

B:BD[2.2720] → [2.2720:2803]

        local moves = find_almost_empty_path(level, p, {x=c.x, y=c.y+1}, crate.id)

[2.2720]

[2.2803]

        local moves = find_almost_empty_path(level, p, {x=c.x, y=c.y+1}, crate, c)

Replacement in screens/solve at line 34 [3.30]

B:BD[2.3017] → [2.3017:3094]

        moves = find_almost_empty_path(level, p, {x=c.x, y=c.y-1}, crate.id)

[2.3017]

[2.3094]

        moves = find_almost_empty_path(level, p, {x=c.x, y=c.y-1}, crate, c)

Replacement in screens/solve at line 40 [3.30]

B:BD[4.9460] → [2.3299:3353]

function find_almost_empty_path(level, src, dst, cid)

[4.9460]

[2.3353]

-- like find_empty_path, but always allow going through empty_cell and never allow going through occupied_cell, regardless of what level says
function find_almost_empty_path(level, src, dst, empty_cell, occupied_cell)

Replacement in screens/solve at line 52 [3.30]

B:BD[2.3736] → [2.3736:3878]

      if curr ~= CELL_WALL and (curr ~= CELL_CRATE or crate_id[y][x] ~= cid) and (curr ~= CELL_CRATE_ON_TARGET or crate_id[y][x] ~= cid) then

[2.3736]

[2.3878]

      if (y == empty_cell.y and x == empty_cell.x) or
          (not (y == occupied_cell.y and x == occupied_cell.x) and
           curr ~= CELL_WALL and
           curr ~= CELL_CRATE and
           curr ~= CELL_CRATE_ON_TARGET) then