diff --git a/data/maps/rooms_background.gif b/data/maps/rooms_background.gif index bc8a8ca..864e6f9 100644 Binary files a/data/maps/rooms_background.gif and b/data/maps/rooms_background.gif differ diff --git a/data/maps/rooms_foreground.gif b/data/maps/rooms_foreground.gif index 7317f9b..e64fdc3 100644 Binary files a/data/maps/rooms_foreground.gif and b/data/maps/rooms_foreground.gif differ diff --git a/data/maps/rooms_items.gif b/data/maps/rooms_items.gif index 010e43b..64d23fb 100644 Binary files a/data/maps/rooms_items.gif and b/data/maps/rooms_items.gif differ diff --git a/data/stages/editor.lua b/data/stages/editor.lua index 105c75c..6132fa7 100644 --- a/data/stages/editor.lua +++ b/data/stages/editor.lua @@ -195,8 +195,10 @@ editor = { end end view.origin(0,0) - draw.text(rooms.pos.x//20,1,96,28) - draw.text(rooms.pos.y//13,5,96,28) + local coords = (rooms.pos.x//20) .. "," .. (rooms.pos.y//13) + draw.text(coords,2,98,1) + draw.text(coords,1,97,28) + --draw.text(rooms.pos.y//13,9,96,28) if editor.msg_timeout > 0 then editor.msg_timeout = editor.msg_timeout - 1 @@ -349,6 +351,11 @@ editor = { mapviewer = { surf = nil, pal = nil, + mx = 0, + my = 0, + sx = 0, + sy = 0, + ants = 0xc936, show = function() if editor.mapviewer.surf == nil then editor.mapviewer.surf = surf.new(160,104) end @@ -370,6 +377,13 @@ editor = { if editor.mapviewer.pal == nil then editor.mapviewer.pal = pal.load("maps/tiles_palette.gif") end pal.set(editor.mapviewer.pal) + editor.mapviewer.sx = (rooms.pos.x)--//20)*20 + editor.mapviewer.sy = (rooms.pos.y)--//13)*13 + editor.mapviewer.mx, editor.mapviewer.my = mouse.pos() + if editor.mapviewer.mx>=0 and editor.mapviewer.mx<160 and editor.mapviewer.my>=0 and editor.mapviewer.my<104 then + editor.mapviewer.sx, editor.mapviewer.sy = (editor.mapviewer.mx//20)*20, (editor.mapviewer.my//13)*13 + end + app.push(editor.mapviewer.update) end, @@ -390,11 +404,21 @@ editor = { draw.rect(x, y, 20, 13, 68) local mx,my = mouse.pos() - mx,my = (mx//20)*20, (my//13)*13 - draw.rect(mx, my, 20, 13, 23) + if editor.mapviewer.mx ~= mx or editor.mapviewer.my ~= my then + editor.mapviewer.mx, editor.mapviewer.my = mx, my + editor.mapviewer.sx, editor.mapviewer.sy = (mx//20)*20, (my//13)*13 + end + draw.mode(draw.PATTERN) + draw.pattern(editor.mapviewer.ants) + draw.rect(editor.mapviewer.sx, editor.mapviewer.sy, 20, 13, 23) + draw.mode(draw.NORMAL) + if sys.chrono() > 0.125 then + sys.chrono(0) + editor.mapviewer.ants = (editor.mapviewer.ants<<12) | (editor.mapviewer.ants>>4) + end if mouse.press(mouse.LEFT) then - rooms.pos.x, rooms.pos.y = mx, my + rooms.pos.x, rooms.pos.y = (mx//20)*20, (my//13)*13 editor.mapviewer.close() end diff --git a/drafts/comic-sprites.xcf b/drafts/comic-sprites.xcf new file mode 100644 index 0000000..03c2edd Binary files /dev/null and b/drafts/comic-sprites.xcf differ diff --git a/drafts/vinyetes.xcf b/drafts/vinyetes.xcf new file mode 100644 index 0000000..674f44a Binary files /dev/null and b/drafts/vinyetes.xcf differ