akkartik/sokoban.love - Change 7GQ5TOWHFPXHGR7RFYWHWWMO32MDSVVK7WRLWDEROVTKCQRHRMTAC

animate compound moves and support undoing them

Created by akkartik on March 13, 2024

7GQ5TOWHFPXHGR7RFYWHWWMO32MDSVVK7WRLWDEROVTKCQRHRMTAC

Dependencies

In channels

main

Change contents

Replacement in screens/solve at line 15 [3.30]

B:BD[3.538] → [3.538:750]

        table.insert(cands, {x=x-1, y=y, prev=cand})
        table.insert(cands, {x=x+1, y=y, prev=cand})
        table.insert(cands, {x=x, y=y-1, prev=cand})
        table.insert(cands, {x=x, y=y+1, prev=cand})

[3.538]

[3.750]

        table.insert(cands, {x=x-1, y=y, dir='left', prev=cand})
        table.insert(cands, {x=x+1, y=y, dir='right', prev=cand})
        table.insert(cands, {x=x, y=y-1, dir='up', prev=cand})
        table.insert(cands, {x=x, y=y+1, dir='down', prev=cand})

Insertion in screens/solve at line 30 [3.30]

[3.913]

function unwind_steps(c, out)
  -- insert steps in reverse order
  if c then
    table.insert(out, c.dir)
    unwind_steps(c.prev, out)
  end
  return out
end

Replacement in screens/move at line 1 [2.1]
B:BD[2.1] → [2.2:23]
```
function move_down()
```
[2.1]
[2.23]
```
function move_down(add_to_undo)
```

Replacement in screens/move at line 20 [2.1]

B:BD[2.786] → [2.786:818]

  table.insert(undo_history, u)

[2.786]

[2.818]

  if add_to_undo then
    table.insert(undo_history, u)
  end

Replacement in screens/move at line 25 [2.1]
B:BD[2.823] → [2.823:842]
```
function move_up()
```
[2.823]
[2.842]
```
function move_up(add_to_undo)
```

Replacement in screens/move at line 44 [2.1]

B:BD[2.1581] → [2.1581:1613]

  table.insert(undo_history, u)

[2.1581]

[2.1613]

  if add_to_undo then
    table.insert(undo_history, u)
  end

Replacement in screens/move at line 49 [2.1]
B:BD[2.1618] → [2.1618:1639]
```
function move_left()
```
[2.1618]
[2.1639]
```
function move_left(add_to_undo)
```

Replacement in screens/move at line 68 [2.1]

B:BD[2.2378] → [2.2378:2410]

  table.insert(undo_history, u)

[2.2378]

[2.2410]

  if add_to_undo then
    table.insert(undo_history, u)
  end

Replacement in screens/move at line 73 [2.1]
B:BD[2.2415] → [2.2415:2437]
```
function move_right()
```
[2.2415]
[2.2437]
```
function move_right(add_to_undo)
```

Replacement in screens/move at line 92 [2.1]

B:BD[2.3206] → [2.3206:3238]

  table.insert(undo_history, u)

[2.3206]

[2.3238]

  if add_to_undo then
    table.insert(undo_history, u)
  end

Replacement in screens/move at line 97 [2.1]
B:BD[2.3243] → [2.3243:3278]
```
function move_to_empty_space(y, x)
```
[2.3243]
[2.3278]
```
function move_to_empty_space(y, x, add_to_undo)
```

Replacement in screens/move at line 111 [2.1]

B:BD[2.3732] → [2.3732:3764]

  table.insert(undo_history, u)

[2.3732]

[2.3764]

  if add_to_undo then
    table.insert(undo_history, u)
  end
end
function plan_move_to_empty_space(y, x)
  local path = find_path(level_state, player, {y=y, x=x})
  if path == nil then return end
  pending_moves = unwind_steps(path, {})
  local src = level_state[player.y][player.x]
  local dest = level_state[y][x]
  local u = {
    {x=player.x, y=player.y, cell=src},
    {x=x, y=y, cell=dest}}
  table.insert(undo_history, u)  -- add to undo without making move yet
  next_pending_move = Current_time
end
function car.update()
  if next_pending_move and Current_time >= next_pending_move then
    if #pending_moves > 0 then
      local dir = table.remove(pending_moves)
      move(dir, --[[add to undo]] false)
      next_pending_move = Current_time + 0.1
    end
  end

Insertion in screens/move at line 139 [2.1]

[2.3769]

function make_all_pending_moves()
  while #pending_moves > 0 do
    local dir = table.remove(pending_moves)
    move(dir, --[[add to undo]] false)
  end
end

Insertion in screens/main at line 13 [5.6482]

[4.285]

[2.9462]

pending_moves = {}  -- moves already made, but need to be animated

Insertion in screens/main at line 45 [5.6482]

[6.529358]

  if #pending_moves > 0 then
    make_all_pending_moves()
    return
  end

Replacement in screens/main at line 53 [5.6482]

B:BD[7.599] → [7.599:670]

    move_to_empty_space(1+floor((y-top)/side), 1+floor((x-left)/side))

[7.599]

[7.670]

    local y, x = 1+floor((y-top)/side), 1+floor((x-left)/side)
    plan_move_to_empty_space(y, x)

Replacement in screens/main at line 61 [5.6482]

B:BD[6.529550] → [8.287:469]

  elseif chord == 'left' then
    move_left()
  elseif chord == 'right' then
    move_right()
  elseif chord == 'up' then
    move_up()
  elseif chord == 'down' then
    move_down()

[6.529550]

[9.353]

  elseif chord == 'left' or chord == 'right' or chord == 'up' or chord == 'down' then
    move(chord, --[[add to undo]] true)

Insertion in screens/main at line 72 [5.6482]

[8.481]

[10.972]

function move(dir, add_to_undo)
  if dir == 'left' then
    move_left(add_to_undo)
  elseif dir == 'right' then
    move_right(add_to_undo)
  elseif dir == 'up' then
    move_up(add_to_undo)
  elseif dir == 'down' then
    move_down(add_to_undo)
  end
end