akkartik/sokoban.love - Change BRBXUGRGKUXWDUB667VHZJDEGNWGQH4YOOHQ23Y6HHLHOZZHN5AQC

resolve conflicts

Created by akkartik on May 6, 2025

BRBXUGRGKUXWDUB667VHZJDEGNWGQH4YOOHQ23Y6HHLHOZZHN5AQC

Dependencies

In channels

main

Change contents

File deletion: drawing.lua, drawing.lua

BFD:BFD[8.2] → [9.1542:1577]

BFD:BFD[9.1577] → [9.98:98]

B:BD[11.7422] → [12.14880:17584]

∅:D[13.1410] → [12.17584:17629]

B:BD[12.17584] → [12.17584:17629]

∅:D[13.1477] → [12.17716:18327]

B:BD[12.17716] → [12.17716:18327]

∅:D[14.8904] → [12.18367:18373]

B:BD[12.18367] → [12.18367:18373]

B:BD[12.18669] → [12.18669:18674]

B:BD[15.6250] → [16.10765:10770]

B:BD[16.10770] → [7.3273:3362]

∅:D[7.3362] → [12.18675:18720]

B:BD[17.953] → [12.18675:18720]

∅:D[16.10822] → [12.18773:18827]

B:BD[12.18773] → [12.18773:18827]

∅:D[16.10873] → [12.18888:19797]

B:BD[12.18888] → [12.18888:19797]

B:BD[11.7465] → [12.19798:19871]

∅:D[14.8989] → [12.19927:20157]

B:BD[12.19927] → [12.19927:20157]

∅:D[14.9067] → [12.20266:20370]

B:BD[12.20266] → [12.20266:20370]

∅:D[16.11024] → [12.20433:20461]

B:BD[12.20433] → [12.20433:20461]

∅:D[16.11104] → [12.20546:20939]

B:BD[12.20546] → [12.20546:20939]

∅:D[16.11185] → [12.21025:21692]

B:BD[12.21025] → [12.21025:21692]

B:BD[12.21692] → [7.3363:3439]

∅:D[7.3439] → [12.21693:22064]

B:BD[11.7523] → [12.21693:22064]

∅:D[16.11261] → [12.22139:22495]

B:BD[12.22139] → [12.22139:22495]

∅:D[16.11363] → [12.22607:22947]

B:BD[12.22607] → [12.22607:22947]

∅:D[16.11465] → [12.23059:23470]

B:BD[12.23059] → [12.23059:23470]

∅:D[16.11579] → [12.23594:23714]

B:BD[12.23594] → [12.23594:23714]

∅:D[16.11681] → [12.23826:24131]

B:BD[12.23826] → [12.23826:24131]

∅:D[14.9183] → [12.24178:24225]

B:BD[12.24178] → [12.24178:24225]

∅:D[16.11785] → [12.24339:25113]

B:BD[12.24339] → [12.24339:25113]

∅:D[14.9294] → [12.25160:25207]

B:BD[12.25160] → [12.25160:25207]

∅:D[16.11889] → [12.25321:26037]

B:BD[12.25321] → [12.25321:26037]

∅:D[16.11991] → [12.26149:26475]

B:BD[12.26149] → [12.26149:26475]

∅:D[16.12093] → [12.26587:26978]

B:BD[12.26587] → [12.26587:26978]

∅:D[14.9375] → [12.27036:27152]

B:BD[12.27036] → [12.27036:27152]

B:BD[12.27152] → [7.3440:3512]

∅:D[7.3512] → [12.27153:31955]

B:BD[11.7570] → [12.27153:31955]

∅:D[16.12335] → [12.32151:32415]

B:BD[12.32151] → [12.32151:32415]

∅:D[16.12575] → [12.32611:33022]

B:BD[12.32611] → [12.32611:33022]

∅:D[16.12694] → [12.33086:33119]

B:BD[12.33086] → [12.33086:33119]

∅:D[16.12816] → [12.33251:34209]

B:BD[12.33251] → [12.33251:34209]

∅:D[16.12894] → [12.34295:34740]

B:BD[12.34295] → [12.34295:34740]

∅:D[16.12982] → [12.34836:35589]

B:BD[12.34836] → [12.34836:35589]

∅:D[14.9440] → [12.35613:38422]

B:BD[12.35613] → [12.35613:38422]

∅:D[16.13104] → [12.38610:38838]

B:BD[12.38610] → [12.38610:38838]

∅:D[16.13345] → [12.39090:39139]

B:BD[12.39090] → [12.39090:39139]

B:BD[12.39163] → [12.39163:39218]

∅:D[16.13388] → [12.39264:39505]

B:BD[12.39264] → [12.39264:39505]

∅:D[16.13629] → [12.39757:39806]

B:BD[12.39757] → [12.39757:39806]

B:BD[12.39830] → [12.39830:39888]

∅:D[16.13686] → [12.39948:40191]

B:BD[12.39948] → [12.39948:40191]

∅:D[16.13771] → [12.40331:40949]

B:BD[12.40331] → [12.40331:40949]

∅:D[14.9507] → [12.40989:41033]

B:BD[12.40989] → [12.40989:41033]

∅:D[14.9580] → [12.41068:42200]

B:BD[12.41068] → [12.41068:42200]

B:BD[12.42200] → [7.3514:3514]

  pmx,pmy = px(mx), py(my)
  local shape = drawing.pending
  if shape.mode == nil then
    -- nothing pending
  elseif shape.mode == 'freehand' then
    local shape_copy = deepcopy(shape)
    Drawing.smoothen(shape_copy)
    Drawing.draw_shape(drawing, shape_copy, top, left,right)
  elseif shape.mode == 'line' then
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    local p1 = drawing.points[shape.p1]
    love.graphics.line(px(p1.x),py(p1.y), pmx,pmy)
  elseif shape.mode == 'manhattan' then
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    local p1 = drawing.points[shape.p1]
    if math.abs(mx-p1.x) > math.abs(my-p1.y) then
      love.graphics.line(px(p1.x),py(p1.y), pmx,     py(p1.y))
    else
      love.graphics.line(px(p1.x),py(p1.y), px(p1.x),pmy)
    end
  elseif shape.mode == 'polygon' then
    -- don't close the loop on a pending polygon
    local prev = nil
    for _,point in ipairs(shape.vertices) do
      local curr = drawing.points[point]
      if prev then
        love.graphics.line(px(prev.x),py(prev.y), px(curr.x),py(curr.y))
      end
      prev = curr
    end
    love.graphics.line(px(prev.x),py(prev.y), pmx,pmy)
  elseif shape.mode == 'rectangle' then
    local first = drawing.points[shape.vertices[1]]
    if #shape.vertices == 1 then
      love.graphics.line(px(first.x),py(first.y), pmx,pmy)
      return
    end
    local second = drawing.points[shape.vertices[2]]
    local thirdx,thirdy, fourthx,fourthy = Drawing.complete_rectangle(first.x,first.y, second.x,second.y, mx,my)
    love.graphics.line(px(first.x),py(first.y), px(second.x),py(second.y))
    love.graphics.line(px(second.x),py(second.y), px(thirdx),py(thirdy))
    love.graphics.line(px(thirdx),py(thirdy), px(fourthx),py(fourthy))
    love.graphics.line(px(fourthx),py(fourthy), px(first.x),py(first.y))
  elseif shape.mode == 'square' then
    local first = drawing.points[shape.vertices[1]]
    if #shape.vertices == 1 then
      love.graphics.line(px(first.x),py(first.y), pmx,pmy)
      return
    end
    local second = drawing.points[shape.vertices[2]]
    local thirdx,thirdy, fourthx,fourthy = Drawing.complete_square(first.x,first.y, second.x,second.y, mx,my)
    love.graphics.line(px(first.x),py(first.y), px(second.x),py(second.y))
    love.graphics.line(px(second.x),py(second.y), px(thirdx),py(thirdy))
    love.graphics.line(px(thirdx),py(thirdy), px(fourthx),py(fourthy))
    love.graphics.line(px(fourthx),py(fourthy), px(first.x),py(first.y))
  elseif shape.mode == 'circle' then
    local center = drawing.points[shape.center]
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    local cx,cy = px(center.x), py(center.y)
  elseif shape.mode == 'arc' then
    local center = drawing.points[shape.center]
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    shape.end_angle = geom.angle_with_hint(center.x,center.y, mx,my, shape.end_angle)
    local cx,cy = px(center.x), py(center.y)
    love.graphics.arc('line', 'open', cx,cy, Drawing.pixels(shape.radius, width), shape.start_angle, shape.end_angle, 360)
  elseif shape.mode == 'move' then
    -- nothing pending; changes are immediately committed
  elseif shape.mode == 'name' then
    -- nothing pending; changes are immediately committed
  else
  end
end
end
function Drawing.mouse_press(State, drawing_index, x,y, mouse_button, is_touch, presses)
  local drawing = State.lines[drawing_index]
  local cx = Drawing.coord(x-State.left, State.width)
  if State.current_drawing_mode == 'freehand' then
    drawing.pending = {mode=State.current_drawing_mode, points={{x=cx, y=cy}}}
  elseif State.current_drawing_mode == 'line' or State.current_drawing_mode == 'manhattan' then
    local j = Drawing.find_or_insert_point(drawing.points, cx, cy, State.width)
    drawing.pending = {mode=State.current_drawing_mode, p1=j}
  elseif State.current_drawing_mode == 'polygon' or State.current_drawing_mode == 'rectangle' or State.current_drawing_mode == 'square' then
    local j = Drawing.find_or_insert_point(drawing.points, cx, cy, State.width)
    drawing.pending = {mode=State.current_drawing_mode, vertices={j}}
  elseif State.current_drawing_mode == 'circle' then
    local j = Drawing.find_or_insert_point(drawing.points, cx, cy, State.width)
    drawing.pending = {mode=State.current_drawing_mode, center=j}
  elseif State.current_drawing_mode == 'move' then
  elseif State.current_drawing_mode == 'name' then
    -- nothing
  else
  end
end
-- a couple of operations on drawings need to constantly check the state of the mouse
function Drawing.update(State)
  if State.lines.current_drawing == nil then return end
  local drawing = State.lines.current_drawing
  local pmx, pmy = App.mouse_x(), App.mouse_y()
  local mx = Drawing.coord(pmx-State.left, State.width)
  if App.mouse_down(1) then
      if drawing.pending.mode == 'freehand' then
        table.insert(drawing.pending.points, {x=mx, y=my})
      elseif drawing.pending.mode == 'move' then
        drawing.pending.target_point.x = mx
        drawing.pending.target_point.y = my
        Drawing.relax_constraints(drawing, drawing.pending.target_point_index)
      end
    end
  elseif State.current_drawing_mode == 'move' then
      drawing.pending.target_point.x = mx
      drawing.pending.target_point.y = my
      Drawing.relax_constraints(drawing, drawing.pending.target_point_index)
    end
  else
    -- do nothing
  end
end
function Drawing.relax_constraints(drawing, p)
  for _,shape in ipairs(drawing.shapes) do
    if shape.mode == 'manhattan' then
      if shape.p1 == p then
        shape.mode = 'line'
      elseif shape.p2 == p then
        shape.mode = 'line'
      end
    elseif shape.mode == 'rectangle' or shape.mode == 'square' then
      for _,v in ipairs(shape.vertices) do
        if v == p then
          shape.mode = 'polygon'
        end
      end
    end
  end
end
function Drawing.mouse_release(State, x,y, mouse_button, is_touch, presses)
  if State.current_drawing_mode == 'move' then
    State.current_drawing_mode = State.previous_drawing_mode
    State.previous_drawing_mode = nil
    if State.lines.current_drawing then
      State.lines.current_drawing.pending = {}
      State.lines.current_drawing = nil
    end
  elseif State.lines.current_drawing then
    local drawing = State.lines.current_drawing
    if drawing.pending then
      if drawing.pending.mode == nil then
        -- nothing pending
      elseif drawing.pending.mode == 'freehand' then
        -- the last point added during update is good enough
        Drawing.smoothen(drawing.pending)
        table.insert(drawing.shapes, drawing.pending)
      elseif drawing.pending.mode == 'line' then
        if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
          drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, mx,my, State.width)
          table.insert(drawing.shapes, drawing.pending)
        end
      elseif drawing.pending.mode == 'manhattan' then
        local p1 = drawing.points[drawing.pending.p1]
        if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
          if math.abs(mx-p1.x) > math.abs(my-p1.y) then
            drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, mx, p1.y, State.width)
          else
            drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, p1.x, my, State.width)
          end
          local p2 = drawing.points[drawing.pending.p2]
          table.insert(drawing.shapes, drawing.pending)
        end
      elseif drawing.pending.mode == 'polygon' then
        if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
          table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, mx,my, State.width))
          table.insert(drawing.shapes, drawing.pending)
        end
      elseif drawing.pending.mode == 'rectangle' then
        if #drawing.pending.vertices == 2 then
          if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
            local first = drawing.points[drawing.pending.vertices[1]]
            local second = drawing.points[drawing.pending.vertices[2]]
            local thirdx,thirdy, fourthx,fourthy = Drawing.complete_rectangle(first.x,first.y, second.x,second.y, mx,my)
            table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, thirdx,thirdy, State.width))
            table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, fourthx,fourthy, State.width))
            table.insert(drawing.shapes, drawing.pending)
          end
        else
          -- too few points; draw nothing
        end
      elseif drawing.pending.mode == 'square' then
        if #drawing.pending.vertices == 2 then
          if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
            local first = drawing.points[drawing.pending.vertices[1]]
            local second = drawing.points[drawing.pending.vertices[2]]
            local thirdx,thirdy, fourthx,fourthy = Drawing.complete_square(first.x,first.y, second.x,second.y, mx,my)
            table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, thirdx,thirdy, State.width))
            table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, fourthx,fourthy, State.width))
            table.insert(drawing.shapes, drawing.pending)
          end
        end
      elseif drawing.pending.mode == 'circle' then
        if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
          local center = drawing.points[drawing.pending.center]
          drawing.pending.radius = round(geom.dist(center.x,center.y, mx,my))
          table.insert(drawing.shapes, drawing.pending)
        end
      elseif drawing.pending.mode == 'arc' then
        if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
          local center = drawing.points[drawing.pending.center]
          drawing.pending.end_angle = geom.angle_with_hint(center.x,center.y, mx,my, drawing.pending.end_angle)
          table.insert(drawing.shapes, drawing.pending)
        end
      elseif drawing.pending.mode == 'name' then
        -- drop it
      else
      end
      State.lines.current_drawing.pending = {}
      State.lines.current_drawing = nil
    end
  end
end
function Drawing.keychord_press(State, chord, key, scancode, is_repeat)
  if chord == 'C-p' and not App.mouse_down(1) then
    State.current_drawing_mode = 'freehand'
  elseif App.mouse_down(1) and chord == 'l' then
    State.current_drawing_mode = 'line'
    local _,drawing = Drawing.current_drawing(State)
    if drawing.pending.mode == 'freehand' then
      drawing.pending.p1 = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)
    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then
      drawing.pending.p1 = drawing.pending.vertices[1]
    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then
      drawing.pending.p1 = drawing.pending.center
    end
    drawing.pending.mode = 'line'
  elseif chord == 'C-l' and not App.mouse_down(1) then
    State.current_drawing_mode = 'line'
  elseif App.mouse_down(1) and chord == 'm' then
    State.current_drawing_mode = 'manhattan'
    local drawing = Drawing.select_drawing_at_mouse(State)
    if drawing.pending.mode == 'freehand' then
      drawing.pending.p1 = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)
    elseif drawing.pending.mode == 'line' then
      -- do nothing
    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then
      drawing.pending.p1 = drawing.pending.vertices[1]
    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then
      drawing.pending.p1 = drawing.pending.center
    end
    drawing.pending.mode = 'manhattan'
  elseif chord == 'C-m' and not App.mouse_down(1) then
    State.current_drawing_mode = 'manhattan'
  elseif chord == 'C-g' and not App.mouse_down(1) then
    State.current_drawing_mode = 'polygon'
  elseif App.mouse_down(1) and chord == 'g' then
    State.current_drawing_mode = 'polygon'
    local _,drawing = Drawing.current_drawing(State)
    if drawing.pending.mode == 'freehand' then
      drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)}
    elseif drawing.pending.mode == 'line' or drawing.pending.mode == 'manhattan' then
      if drawing.pending.vertices == nil then
        drawing.pending.vertices = {drawing.pending.p1}
      end
    elseif drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then
      -- reuse existing vertices
    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then
      drawing.pending.vertices = {drawing.pending.center}
    end
    drawing.pending.mode = 'polygon'
  elseif chord == 'C-r' and not App.mouse_down(1) then
    State.current_drawing_mode = 'rectangle'
  elseif App.mouse_down(1) and chord == 'r' then
    State.current_drawing_mode = 'rectangle'
    local _,drawing = Drawing.current_drawing(State)
    if drawing.pending.mode == 'freehand' then
      drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)}
    elseif drawing.pending.mode == 'line' or drawing.pending.mode == 'manhattan' then
      if drawing.pending.vertices == nil then
        drawing.pending.vertices = {drawing.pending.p1}
      end
    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'square' then
      -- reuse existing (1-2) vertices
    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then
      drawing.pending.vertices = {drawing.pending.center}
    end
    drawing.pending.mode = 'rectangle'
  elseif chord == 'C-s' and not App.mouse_down(1) then
    State.current_drawing_mode = 'square'
  elseif App.mouse_down(1) and chord == 's' then
    State.current_drawing_mode = 'square'
    local _,drawing = Drawing.current_drawing(State)
    if drawing.pending.mode == 'freehand' then
      drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)}
    elseif drawing.pending.mode == 'line' or drawing.pending.mode == 'manhattan' then
      if drawing.pending.vertices == nil then
        drawing.pending.vertices = {drawing.pending.p1}
      end
    elseif drawing.pending.mode == 'polygon' then
      while #drawing.pending.vertices > 2 do
        table.remove(drawing.pending.vertices)
      end
    elseif drawing.pending.mode == 'rectangle' then
      -- reuse existing (1-2) vertices
    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then
      drawing.pending.vertices = {drawing.pending.center}
    end
    drawing.pending.mode = 'square'
  elseif App.mouse_down(1) and chord == 'p' and State.current_drawing_mode == 'polygon' then
    local j = Drawing.find_or_insert_point(drawing.points, mx,my, State.width)
    table.insert(drawing.pending.vertices, j)
  elseif App.mouse_down(1) and chord == 'p' and (State.current_drawing_mode == 'rectangle' or State.current_drawing_mode == 'square') then
    local j = Drawing.find_or_insert_point(drawing.points, mx,my, State.width)
    while #drawing.pending.vertices >= 2 do
      table.remove(drawing.pending.vertices)
    end
    table.insert(drawing.pending.vertices, j)
  elseif chord == 'C-o' and not App.mouse_down(1) then
    State.current_drawing_mode = 'circle'
  elseif App.mouse_down(1) and chord == 'a' and State.current_drawing_mode == 'circle' then
    drawing.pending.mode = 'arc'
    local center = drawing.points[drawing.pending.center]
    drawing.pending.radius = round(geom.dist(center.x,center.y, mx,my))
    drawing.pending.start_angle = geom.angle(center.x,center.y, mx,my)
  elseif App.mouse_down(1) and chord == 'o' then
    State.current_drawing_mode = 'circle'
    local _,drawing = Drawing.current_drawing(State)
    if drawing.pending.mode == 'freehand' then
      drawing.pending.center = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)
    elseif drawing.pending.mode == 'line' or drawing.pending.mode == 'manhattan' then
      drawing.pending.center = drawing.pending.p1
    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then
      drawing.pending.center = drawing.pending.vertices[1]
    end
    drawing.pending.mode = 'circle'
  elseif chord == 'C-u' and not App.mouse_down(1) then
    if drawing then
      if State.previous_drawing_mode == nil then
        State.previous_drawing_mode = State.current_drawing_mode
      end
      State.current_drawing_mode = 'move'
      drawing.pending = {mode=State.current_drawing_mode, target_point=p, target_point_index=i}
      State.lines.current_drawing_index = drawing_index
      State.lines.current_drawing = drawing
    end
  elseif chord == 'C-n' and not App.mouse_down(1) then
    if drawing then
      if State.previous_drawing_mode == nil then
        -- don't clobber
        State.previous_drawing_mode = State.current_drawing_mode
      end
      State.current_drawing_mode = 'name'
      p.name = ''
      drawing.pending = {mode=State.current_drawing_mode, target_point=point_index}
      State.lines.current_drawing_index = drawing_index
      State.lines.current_drawing = drawing
    end
  elseif chord == 'C-d' and not App.mouse_down(1) then
    local _,drawing,_,i,p = Drawing.select_point_at_mouse(State)
    if drawing then
      for _,shape in ipairs(drawing.shapes) do
        if Drawing.contains_point(shape, i) then
          if shape.mode == 'polygon' then
            local idx = table.find(shape.vertices, i)
            table.remove(shape.vertices, idx)
            if #shape.vertices < 3 then
              shape.mode = 'deleted'
            end
          else
            shape.mode = 'deleted'
          end
        end
      end
      drawing.points[i].deleted = true
    end
    local drawing,_,_,shape = Drawing.select_shape_at_mouse(State)
    if drawing then
      shape.mode = 'deleted'
    end
  elseif chord == 'C-h' and not App.mouse_down(1) then
    local drawing = Drawing.select_drawing_at_mouse(State)
    if drawing then
      drawing.show_help = true
    end
  elseif chord == 'escape' and App.mouse_down(1) then
    local _,drawing = Drawing.current_drawing(State)
    drawing.pending = {}
  end
end
function Drawing.complete_rectangle(firstx,firsty, secondx,secondy, x,y)
  if firstx == secondx then
    return x,secondy, x,firsty
  end
  if firsty == secondy then
    return secondx,y, firstx,y
  end
  local first_slope = (secondy-firsty)/(secondx-firstx)
  -- slope of second edge:
  --    -1/first_slope
  -- equation of line containing the second edge:
  --    y-secondy = -1/first_slope*(x-secondx)
  -- => 1/first_slope*x + y + (- secondy - secondx/first_slope) = 0
  -- now we want to find the point on this line that's closest to the mouse pointer.
  -- https://en.wikipedia.org/wiki/Distance_from_a_point_to_a_line#Line_defined_by_an_equation
  local a = 1/first_slope
  local c = -secondy - secondx/first_slope
  local thirdx = round(((x-a*y) - a*c) / (a*a + 1))
  local thirdy = round((a*(-x + a*y) - c) / (a*a + 1))
  -- slope of third edge = first_slope
  -- equation of line containing third edge:
  --     y - thirdy = first_slope*(x-thirdx)
  --  => -first_slope*x + y + (-thirdy + thirdx*first_slope) = 0
  -- now we want to find the point on this line that's closest to the first point
  local a = -first_slope
  local c = -thirdy + thirdx*first_slope
  local fourthx = round(((firstx-a*firsty) - a*c) / (a*a + 1))
  local fourthy = round((a*(-firstx + a*firsty) - c) / (a*a + 1))
  return thirdx,thirdy, fourthx,fourthy
end
function Drawing.complete_square(firstx,firsty, secondx,secondy, x,y)
  -- use x,y only to decide which side of the first edge to complete the square on
  local deltax = secondx-firstx
  local deltay = secondy-firsty
  local thirdx = secondx+deltay
  local thirdy = secondy-deltax
  if not geom.same_side(firstx,firsty, secondx,secondy, thirdx,thirdy, x,y) then
    deltax = -deltax
    deltay = -deltay
    thirdx = secondx+deltay
    thirdy = secondy-deltax
  end
  local fourthx = firstx+deltay
  local fourthy = firsty-deltax
  return thirdx,thirdy, fourthx,fourthy
end
function Drawing.current_drawing(State)
  local x, y = App.mouse_x(), App.mouse_y()
  for drawing_index,drawing in ipairs(State.lines) do
    if drawing.mode == 'drawing' then
      end
    end
  end
  return nil
end
function Drawing.select_shape_at_mouse(State)
  for drawing_index,drawing in ipairs(State.lines) do
    if drawing.mode == 'drawing' then
      local x, y = App.mouse_x(), App.mouse_y()
        for i,shape in ipairs(drawing.shapes) do
          if geom.on_shape(mx,my, drawing, shape) then
          end
        end
      end
    end
  end
end
function Drawing.select_point_at_mouse(State)
  for drawing_index,drawing in ipairs(State.lines) do
    if drawing.mode == 'drawing' then
      local x, y = App.mouse_x(), App.mouse_y()
        for i,point in ipairs(drawing.points) do
          if Drawing.near(point, mx,my, State.width) then
          end
        end
      end
    end
  end
end
function Drawing.select_drawing_at_mouse(State)
  for drawing_index,drawing in ipairs(State.lines) do
    if drawing.mode == 'drawing' then
      local x, y = App.mouse_x(), App.mouse_y()
        return drawing
      end
    end
  end
end
function Drawing.contains_point(shape, p)
  if shape.mode == 'freehand' then
    -- not supported
  elseif shape.mode == 'line' or shape.mode == 'manhattan' then
    return shape.p1 == p or shape.p2 == p
  elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then
    return table.find(shape.vertices, p)
  elseif shape.mode == 'circle' then
    return shape.center == p
  elseif shape.mode == 'arc' then
    return shape.center == p
    -- ugh, how to support angles
  elseif shape.mode == 'deleted' then
    -- already done
  else
  end
end
function Drawing.smoothen(shape)
  for _=1,7 do
    for i=2,#shape.points-1 do
      local a = shape.points[i-1]
      local b = shape.points[i]
      local c = shape.points[i+1]
      b.x = round((a.x + b.x + c.x)/3)
      b.y = round((a.y + b.y + c.y)/3)
    end
  end
end
function round(num)
  return math.floor(num+.5)
end
function Drawing.find_or_insert_point(points, x,y, width)
  -- check if UI would snap the two points together
  for i,point in ipairs(points) do
    if Drawing.near(point, x,y, width) then
      return i
    end
  end
  table.insert(points, {x=x, y=y})
  return #points
end
function Drawing.near(point, x,y, width)
  local px,py = Drawing.pixels(x, width),Drawing.pixels(y, width)
  local cx,cy = Drawing.pixels(point.x, width), Drawing.pixels(point.y, width)
  return (cx-px)*(cx-px) + (cy-py)*(cy-py) < Same_point_distance*Same_point_distance
end
function Drawing.pixels(n, width)  -- parts to pixels
  return math.floor(n*width/256)
end
function Drawing.coord(n, width)  -- pixels to parts
  return math.floor(n*256/width)
end
function table.find(h, x)
  for k,v in pairs(h) do
    if v == x then
      return k
    end
  end
end

File deletion: source_text.lua, source_text.lua
BFD:BFD[8.2] → [18.147125:147164]
BFD:BFD[8.2] → [18.147125:147164]
BFD:BFD[18.147164] → [18.83786:83786]
B:BD[12.5515] → [7.8:77]
∅:D[7.77] → [19.21139:21212]
```
function Text.keychord_press(State, chord, key, scancode, is_repeat)
--?   print('chord', chord, State.selection1.line, State.selection1.pos)
```

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[8.2] → [18.165788:165827]

BFD:BFD[18.165827] → [18.152503:152503]

B:BD[18.157121] → [7.82:153]

B:BD[20.20742] → [7.154:239]

B:BD[18.157761] → [7.240:313]

B:BD[20.20935] → [7.314:385]

B:BD[18.158159] → [7.386:455]

B:BD[20.22039] → [7.456:525]

B:BD[18.163191] → [7.526:590]

∅:D[7.590] → [18.163338:163349]

∅:D[7.525] → [20.22084:22390]

∅:D[7.455] → [19.25356:25659]

∅:D[7.385] → [20.21013:21189]

∅:D[7.313] → [20.20835:20874]

∅:D[7.239] → [21.4943:4958]

∅:D[7.153] → [18.157175:157214]

function edit.mouse_press(State, x,y, mouse_button, is_touch, presses)
        Drawing.mouse_press(State, line_index, x,y, mouse_button, is_touch, presses)
function edit.mouse_release(State, x,y, mouse_button, is_touch, presses)
    Drawing.mouse_release(State, x,y, mouse_button, is_touch, presses)
function edit.keychord_press(State, chord, key, scancode, is_repeat)
      Drawing.keychord_press(State, chord, key, scancode, is_repeat)
    Text.keychord_press(State, chord, key, scancode, is_repeat)
  end
end
      record_undo_event(State, {before=before, after=snapshot(State, drawing_index)})
      schedule_save(State)
    end
  elseif chord == 'escape' and not App.mouse_down(1) then
    for _,line in ipairs(State.lines) do
      if line.mode == 'drawing' then
        line.show_help = false
      end
    end
  if State.selection1.line and
      not State.lines.current_drawing and
      -- printable character created using shift key => delete selection
      -- (we're not creating any ctrl-shift- or alt-shift- combinations using regular/printable keys)
      (not App.shift_down() or utf8.len(key) == 1) and
    if Drawing.before then
      record_undo_event(State, {before=Drawing.before, after=snapshot(State, State.lines.current_drawing_index)})
      Drawing.before = nil
    end
  if State.search_term then return end
        return
  if State.search_term then return end

File deletion: source.lua, source.lua

BFD:BFD[8.2] → [18.177715:177749]

BFD:BFD[18.177749] → [18.165829:165829]

B:BD[18.166800] → [7.592:640]

B:BD[18.171278] → [7.641:669]

B:BD[18.174633] → [7.670:736]

B:BD[22.2826] → [7.737:810]

B:BD[18.175054] → [7.811:884]

B:BD[18.175324] → [7.885:970]

B:BD[18.175517] → [7.971:1039]

B:BD[18.175667] → [7.1040:1122]

B:BD[18.175738] → [7.1123:1217]

B:BD[18.176070] → [7.1218:1282]

B:BD[18.177101] → [7.1283:1361]

B:BD[18.177167] → [7.1362:1452]

B:BD[18.177458] → [7.1453:1522]

∅:D[7.1522] → [18.177681:177687]

∅:D[7.1452] → [18.177238:177249]

∅:D[7.1361] → [18.177160:177167]

∅:D[7.1282] → [18.176115:176250]

∅:D[7.1217] → [18.175814:175825]

∅:D[7.1122] → [18.175731:175738]

∅:D[7.1039] → [18.175567:175667]

∅:D[7.970] → [18.175506:175517]

∅:D[7.884] → [18.175110:175316]

∅:D[7.810] → [22.2882:2899]

∅:D[7.736] → [18.174682:174756]

∅:D[7.669] → [18.171307:171997]

∅:D[7.640] → [23.517:537]

function source.initialize(arg, unfiltered_arg)
function source.resize(w,h)
function source.mouse_press(x,y, mouse_button, is_touch, presses)
    edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)
    edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)
    log_browser.mouse_press(Log_browser_state, x,y, mouse_button, is_touch, presses)
function source.mouse_release(x,y, mouse_button, is_touch, presses)
    return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)
    return log_browser.mouse_release(Log_browser_state, x,y, mouse_button, is_touch, presses)
function source.keychord_press(chord, key, scancode, is_repeat)
    return edit.keychord_press(Editor_state, chord, key, scancode, is_repeat)
    return log_browser.keychord_press(Log_browser_state, chord, key, scancode, is_repeat)
    return log_browser.key_release(Log_browser_state, key, scancode)
  end
  end
end
  else
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
--?   print('source keychord')
  if Show_file_navigator then
  end
end
  else
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
  if Focus == 'edit' then
  end
end
  elseif Show_log_browser_side and Log_browser_state.left <= x and x < Log_browser_state.right then
--?     print('click on log_browser side')
    if Focus ~= 'log_browser' then
      Focus = 'log_browser'
    return
  end
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
--?   print(("Window resized to width: %d and height: %d."):format(w, h))
  App.screen.width, App.screen.height = w, h
  Text.redraw_all(Editor_state)
  Editor_state.selection1 = {}  -- no support for shift drag while we're resizing
  if Show_log_browser_side then
    Editor_state.right = App.screen.width/2 - Margin_right
  else
    Editor_state.right = App.screen.width-Margin_right
  end
  Log_browser_state.left = App.screen.width/2 + Margin_right
  Log_browser_state.right = App.screen.width-Margin_right
  Editor_state.width = Editor_state.right-Editor_state.left
  Text.tweak_screen_top_and_cursor(Editor_state, Editor_state.left, Editor_state.right)
--?   print('end resize')
end
  log_new('source')

File deletion: run.lua, run.lua

BFD:BFD[8.2] → [18.183867:183898]

BFD:BFD[18.183898] → [18.178107:178107]

B:BD[18.178423] → [7.1527:1572]

B:BD[18.181211] → [7.1573:1598]

B:BD[24.314] → [7.1599:1662]

B:BD[25.164] → [7.1663:1741]

B:BD[18.183012] → [7.1742:1807]

B:BD[18.183133] → [7.1808:1888]

B:BD[18.183346] → [7.1889:1950]

B:BD[18.183462] → [7.1951:2027]

∅:D[7.2027] → [18.183519:183524]

∅:D[7.1950] → [18.183388:183462]

∅:D[7.1888] → [18.183195:183200]

∅:D[7.1807] → [18.183059:183133]

∅:D[7.1741] → [18.183007:183012]

∅:D[7.1662] → [18.182872:182946]

∅:D[7.1598] → [18.181237:181676]

∅:D[7.1572] → [23.718:735]

function run.initialize(arg, unfiltered_arg)
function run.resize(w,h)
function run.mouse_press(x,y, mouse_button, is_touch, presses)
  return edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)
function run.mouse_release(x,y, mouse_button, is_touch, presses)
  return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)
function run.keychord_press(chord, key, scancode, is_repeat)
  return edit.keychord_press(Editor_state, chord, key, scancode, is_repeat)
end
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
end
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
end
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
--?   print(("Window resized to width: %d and height: %d."):format(w, h))
  App.screen.width, App.screen.height = w, h
  Text.redraw_all(Editor_state)
  Editor_state.selection1 = {}  -- no support for shift drag while we're resizing
  Editor_state.right = App.screen.width-Margin_right
  Editor_state.width = Editor_state.right-Editor_state.left
  Text.tweak_screen_top_and_cursor(Editor_state, Editor_state.left, Editor_state.right)
end
  log_new('run')

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[8.2] → [18.202684:202723]

BFD:BFD[18.202723] → [18.191243:191243]

B:BD[18.198624] → [7.2743:2821]

B:BD[18.200825] → [7.2822:2902]

B:BD[18.200938] → [7.2903:2979]

∅:D[7.2979] → [18.200995:201029]

∅:D[7.2902] → [27.1211:1447]

∅:D[7.2821] → [18.198685:200109]

function log_browser.mouse_press(State, x,y, mouse_button, is_touch, presses)
function log_browser.mouse_release(State, x,y, mouse_button, is_touch, presses)
function log_browser.keychord_press(State, chord, key, scancode, is_repeat)
  -- move
  if chord == 'up' then
end
function log_browser.mouse_wheel_move(State, dx,dy)
  if dy > 0 then
    for i=1,math.floor(dy) do
      log_browser.up(State)
    end
  elseif dy < 0 then
    for i=1,math.floor(-dy) do
      log_browser.down(State)
    end
  end
  local line_index = log_browser.line_index(State, x,y)
  if line_index == nil then
    -- below lower margin
    return
  end
  -- leave some space to click without focusing
  local line = State.lines[line_index]
  local xleft = log_browser.left_margin(State, line)
  local xright = log_browser.right_margin(State, line)
  if x < xleft or x > xright then
    return
  end
  -- if it's a section begin/end and the section is collapsed, expand it
  -- TODO: how to collapse?
  if line.section_begin or line.section_end then
    -- HACK: get section reference from next/previous line
    local new_section
    if line.section_begin then
      if line_index < #State.lines then
        local next_section_stack = State.lines[line_index+1].section_stack
        if next_section_stack then
          new_section = next_section_stack[#next_section_stack]
        end
      end
    elseif line.section_end then
      if line_index > 1 then
        local previous_section_stack = State.lines[line_index-1].section_stack
        if previous_section_stack then
          new_section = previous_section_stack[#previous_section_stack]
        end
      end
    end
    if new_section and new_section.expanded == nil then
      new_section.expanded = true
      return
    end
  end
  -- open appropriate file in source side
  if line.filename ~= Editor_state.filename then
    source.switch_to_file(line.filename)
  end
  -- set cursor

Resurrecting zombie bytes in main.lua at line 39 [30.2]
B:B[28.1016] → [29.134:162]
BD:B[28.1016] → [29.134:162]
```
-- called only for real run
```
Insertion in main.lua at line 40 [30.2]
[29.162]
[32.2424]
```
function App.initialize(arg, unfiltered_arg)
```
Deletion in main.lua at line 47 [30.2]
B:BD[32.2567] → [29.164:164]
B:BD[28.1016] → [31.2011:2056]
BD:BD[28.1016] → [31.2011:2056]
B:BD[34.187174] → [31.2057:2097]
BD:BD[34.187174] → [31.2057:2097]
B:BD[34.187236] → [31.2098:2141]
BD:BD[34.187236] → [31.2098:2141]
BD:BD[34.187236] → [31.2098:2141]
```
function App.initialize(arg, unfiltered_arg)
    run.initialize(arg, unfiltered_arg)
    source.initialize(arg, unfiltered_arg)
```
Solving an order conflict in main.lua at line 47 [30.2]
[32.2567]
[34.187263]

Replacement in main.lua at line 227 [30.2]

B:BD[32.6775] → [32.6775:6820]

function App.mousepressed(x,y, mouse_button)

[32.6775]

[32.6820]

function App.mousepressed(x,y, mouse_button, is_touch, presses)

Replacement in main.lua at line 230 [30.2]

∅:D[4.84] → [35.8:67]

B:BD[32.6894] → [35.8:67]

  return edit.mouse_press(Editor_state, x,y, mouse_button)

[4.84]

[32.6955]

  return edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)

Replacement in main.lua at line 233 [30.2]

B:BD[32.6960] → [32.6960:7006]

function App.mousereleased(x,y, mouse_button)

[32.6960]

[32.7006]

function App.mousereleased(x,y, mouse_button, is_touch, presses)

Replacement in main.lua at line 235 [30.2]

B:BD[32.7080] → [35.68:129]

  return edit.mouse_release(Editor_state, x,y, mouse_button)

[32.7080]

[32.7142]

  return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)

Replacement in main.lua at line 255 [30.2]

B:BD[32.7306] → [36.11:11]

B:BD[36.11] → [36.12:67]

  return edit.keychord_press(Editor_state, chord, key)

[32.7306]

[2.12]

  return edit.keychord_press(Editor_state, chord, key, scancode, is_repeat)

Deletion in main.lua at line 271 [30.2]
B:BD[37.213] → [7.2094:2094]
BD:BD[37.213] → [7.2094:2094]
BD:BD[37.213] → [7.2094:2094]
B:BD[39.361] → [7.2095:2159]
BD:BD[39.361] → [7.2095:2159]
BD:BD[39.361] → [7.2095:2159]
B:BD[18.190137] → [7.2160:2246]
BD:BD[18.190137] → [7.2160:2246]
B:BD[18.190246] → [7.2248:2248]
BD:BD[18.190246] → [7.2248:2248]
B:BD[7.2248] → [7.2249:2341]
BD:BD[7.2248] → [7.2249:2341]
BD:BD[7.2248] → [7.2249:2341]
∅:D[27.842] → [41.823:883]
∅:D[42.946] → [41.823:883]
∅:D[7.2341] → [41.823:883]
∅:D[31.2884] → [41.823:883]
B:BD[11.5101] → [41.823:883]
D:D[27.842] → [41.823:883]
BD:BD[11.5101] → [41.823:883]
```
function App.mousepressed(x,y, mouse_button, is_touch, presses)
    if run.mouse_press then run.mouse_press(x,y, mouse_button, is_touch, presses) end
    if source.mouse_press then source.mouse_press(x,y, mouse_button, is_touch, presses) end
  else
    assert(false, 'unknown app "'..Current_app..'"')
```
Resurrecting zombie bytes in main.lua at line 271 [30.2]
∅:∅[41.883] → [41.883:889]
∅:∅[41.883] → [41.883:889]
∅:∅[41.883] → [41.883:889]
∅:∅[41.883] → [41.883:889]
B:B[41.883] → [41.883:889]
D:∅[41.883] → [41.883:889]
BD:B[41.883] → [41.883:889]
```
  end
```
Deletion in main.lua at line 272 [30.2]
B:BD[41.889] → [41.889:893]
D:D[40.172] → [41.889:893]
D:D[41.889] → [41.889:893]
D:D[41.889] → [41.889:893]
BD:BD[41.889] → [41.889:893]
B:BD[41.893] → [41.893:894]
D:D[41.893] → [41.893:894]
BD:BD[41.893] → [41.893:894]
B:BD[41.894] → [7.2342:2407]
BD:BD[41.894] → [7.2342:2407]
BD:BD[41.894] → [7.2342:2407]
∅:D[7.2407] → [45.21:21]
BD:BD[27.889] → [45.21:21]
B:BD[46.143] → [7.2408:2498]
BD:BD[46.143] → [7.2408:2498]
∅:D[45.93] → [46.196:234]
∅:D[7.2498] → [46.196:234]
∅:D[31.2953] → [46.196:234]
B:BD[46.196] → [46.196:234]
D:D[45.93] → [46.196:234]
BD:BD[46.196] → [46.196:234]
B:BD[47.466] → [29.634:634]
∅:D[29.634] → [43.201:207]
B:BD[47.466] → [43.201:207]
```
end
function App.mousereleased(x,y, mouse_button, is_touch, presses)
    if run.mouse_release then run.mouse_release(x,y, mouse_button, is_touch, presses) end
  elseif Current_app == 'source' then
  end
```
Solving an order conflict in main.lua at line 272 [30.2]
[41.889]
[43.207]
Deletion in main.lua at line 274 [30.2]
B:BD[43.336] → [3.12:12]
B:BD[46.234] → [7.2499:2595]
BD:BD[46.234] → [7.2499:2595]
∅:D[45.171] → [46.293:359]
∅:D[7.2595] → [46.293:359]
∅:D[31.3028] → [46.293:359]
B:BD[46.293] → [46.293:359]
D:D[45.171] → [46.293:359]
BD:BD[46.293] → [46.293:359]
```
    if source.mouse_release then source.mouse_release(x,y, mouse_button, is_touch, presses) end
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
```
Resurrecting zombie bytes in main.lua at line 274 [30.2]
∅:∅[46.359] → [46.359:363]
∅:∅[46.359] → [46.359:363]
∅:∅[46.359] → [46.359:363]
B:B[46.359] → [46.359:363]
D:∅[46.359] → [46.359:363]
BD:B[46.359] → [46.359:363]
```
end
```
Deletion in main.lua at line 275 [30.2]
B:BD[46.363] → [46.363:364]
BD:BD[46.363] → [46.363:364]
∅:D[27.889] → [41.925:956]
∅:D[48.1144] → [41.925:956]
∅:D[49.1404] → [41.925:956]
B:BD[41.925] → [41.925:956]
D:D[27.889] → [41.925:956]
BD:BD[41.925] → [41.925:956]
B:BD[41.956] → [7.2596:2664]
BD:BD[41.956] → [7.2596:2664]
∅:D[45.272] → [41.1021:1059]
∅:D[27.961] → [41.1021:1059]
∅:D[7.2664] → [41.1021:1059]
B:BD[41.1021] → [41.1021:1059]
D:D[27.961] → [41.1021:1059]
BD:BD[41.1021] → [41.1021:1059]
B:BD[41.1059] → [7.2665:2739]
BD:BD[41.1059] → [7.2665:2739]
BD:BD[41.1059] → [7.2665:2739]
∅:D[3.12] → [50.151:155]
∅:D[26.12] → [50.151:155]
∅:D[44.12] → [50.151:155]
B:BD[50.151] → [50.151:155]
B:BD[50.155] → [7.2741:2741]
B:BD[34.189628] → [31.2204:2291]
BD:BD[34.189628] → [31.2204:2291]
B:BD[34.189736] → [31.2292:2385]
BD:BD[34.189736] → [31.2292:2385]
```
  if Current_app == 'run' then
    if run.mouse_move then run.mouse_move(x,y, dx,dy, is_touch) end
  elseif Current_app == 'source' then
    if source.mouse_move then source.mouse_move(x,y, dx,dy, is_touch) end
end
    if run.keychord_press then run.keychord_press(chord, key, scancode, is_repeat) end
    if source.keychord_press then source.keychord_press(chord, key, scancode, is_repeat) end
```
Solving an order conflict in main.lua at line 275 [30.2]
[46.363]

resolve conflicts

Dependencies

In channels

Change contents

File deletion: drawing.lua, drawing.lua

File deletion: source_text.lua, source_text.lua

File deletion: source_edit.lua, source_edit.lua

File deletion: source.lua, source.lua

File deletion: run.lua, run.lua

File deletion: log_browser.lua, log_browser.lua

Resurrecting zombie bytes in main.lua at line 39 [30.2]

Insertion in main.lua at line 40 [30.2]

Deletion in main.lua at line 47 [30.2]

Solving an order conflict in main.lua at line 47 [30.2]

Replacement in main.lua at line 227 [30.2]

Replacement in main.lua at line 230 [30.2]

Replacement in main.lua at line 233 [30.2]

Replacement in main.lua at line 235 [30.2]

Replacement in main.lua at line 255 [30.2]

Deletion in main.lua at line 271 [30.2]

Resurrecting zombie bytes in main.lua at line 271 [30.2]

Deletion in main.lua at line 272 [30.2]

Solving an order conflict in main.lua at line 272 [30.2]

Deletion in main.lua at line 274 [30.2]

Resurrecting zombie bytes in main.lua at line 274 [30.2]

Deletion in main.lua at line 275 [30.2]

Solving an order conflict in main.lua at line 275 [30.2]