lua extend stars demo plugin

extend the stars demo plugin with hit testing and more

draw_poly now returns the extent of the  figure it drew

the sim doesn't strip debug info now

unnamed upvals will display "" instead of just ending the debug line

[Bugfix] fix make file name conflict for picross

Change-Id: If342aaff314972c187fa1f299d956e3482366e57

5 files changed, 271 insertions, 99 deletions

diff --git a/apps/plugins/lua/include_lua/draw_poly.lua b/apps/plugins/lua/include_lua/draw_poly.lua
index 23e02d0955..d5bc83ae39 100644
--- a/apps/plugins/lua/include_lua/draw_poly.lua
+++ b/apps/plugins/lua/include_lua/draw_poly.lua
@@ -46,7 +46,9 @@ local _poly = {} do
     local flood_fill
 
     -- draws a non-filled figure based on points in t-points
-    local function polyline(img, x, y, t_pts, color, bClosed, bClip, scale_x, scale_y)
+    local function polyline(img, x, y, t_pts, color, bClosed, bClip, scale_x, scale_y, b_size_only)
+        local draw_fn = _line
+        if b_size_only == true then draw_fn = function() end end
         scale_x = scale_x or 1
         scale_y = scale_y or 1
 
@@ -69,8 +71,7 @@ local _poly = {} do
             else
                 pt2 = {t_pts[i] * scale_x, t_pts[i + 1] * scale_y}
             end-- first and last point
-
-            _line(img, pt1[1] + x, pt1[2] + y, pt2[1] + x, pt2[2] + y, color, bClip)
+            draw_fn(img, pt1[1] + x, pt1[2] + y, pt2[1] + x, pt2[2] + y, color, bClip)
             if pt1[1] > max_x then max_x = pt1[1] end
             if pt1[2] > max_y then max_y = pt1[2] end
         end
@@ -80,12 +81,12 @@ local _poly = {} do
     end
 
     -- draws a closed figure based on points in t_pts
-    _poly.polygon = function(img, x, y, t_pts, color, fillcolor, bClip, scale_x, scale_y)
+    _poly.polygon = function(img, x, y, t_pts, color, fillcolor, bClip, scale_x, scale_y, b_size_only)
         scale_x = scale_x or 1
         scale_y = scale_y or 1
         if #t_pts < 2 then error("not enough points", 3) end
 
-        if fillcolor then
+        if fillcolor and b_size_only ~= true then
             flood_fill = flood_fill or require("draw_floodfill")
             local x_min, x_max = 0, 0
             local y_min, y_max = 0, 0
@@ -119,7 +120,7 @@ local _poly = {} do
                   _NIL, _NIL, _NIL, _NIL, bClip, BSAND, fillcolor)
         end
 
-        polyline(img, x, y, t_pts, color, true, bClip, scale_x, scale_y)
+        return polyline(img, x, y, t_pts, color, true, bClip, scale_x, scale_y, b_size_only)
     end
 
     -- expose internal functions to the outside through _poly table
diff --git a/apps/plugins/lua/lapi.c b/apps/plugins/lua/lapi.c
index 6426cd94a9..120f8c8313 100644
--- a/apps/plugins/lua/lapi.c
+++ b/apps/plugins/lua/lapi.c
@@ -1057,8 +1057,11 @@ static const char *aux_upvalue (StkId fi, int n, TValue **val) {
   }
   else {
     Proto *p = f->l.p;
-    if (!(1 <= n && n <= p->sizeupvalues)) return NULL;
+    if (!(1 <= n && n <= p->nups)) // not a valid upvalue
+        return NULL;
     *val = f->l.upvals[n-1]->v;
+    if (!(1 <= n && n <= p->sizeupvalues)) // don't have a name for this upvalue
+        return "";
     return getstr(p->upvalues[n-1]);
   }
 }
diff --git a/apps/plugins/lua/luaconf.h b/apps/plugins/lua/luaconf.h
index f7dd99b19e..77d4057118 100644
--- a/apps/plugins/lua/luaconf.h
+++ b/apps/plugins/lua/luaconf.h
@@ -818,6 +818,7 @@ extern long rb_pow(long, long);
 /*else*/
 #define LUA_USER_H "lua_user.h"
 #define LUA_DISABLE_BYTECODE
+#ifndef SIMULATOR
 #define LUA_OPTIMIZE_DEBUG 2 /* Lua Compact Debug -- Terry Ellison 2015 */
-
+#endif
 #endif
diff --git a/apps/plugins/lua_scripts/stars.lua b/apps/plugins/lua_scripts/stars.lua
index 14fae0c4b7..e05007afb6 100644
--- a/apps/plugins/lua_scripts/stars.lua
+++ b/apps/plugins/lua_scripts/stars.lua
@@ -17,7 +17,7 @@
 ]]--
 --https://nullprogram.com/blog/2011/06/13/ [Infinite Parallax Starfield]
 
--- Imports 
+-- Imports
 local _clr   = require("color") -- clrset, clrinc provides device independent colors
 local _lcd   = require("lcd")   -- lcd helper functions
 local _draw  = require("draw")  -- draw all the things (primitives)
@@ -32,13 +32,13 @@ local BLACK = _clr.set(0, 0, 0, 0)
 local RED   = _clr.set(WHITE, 100)
 local GREEN = _clr.set(WHITE, 0, 100)
 local BGREEN = _clr.set(WHITE, 0, 255)
-local BLUE  = _clr.set(WHITE, 0, 0, 100)
+local BLUE  = _clr.set(WHITE, 0, 0, 255)
 
-local STAR_SEED = 0x9d2c5680;
+local STAR_SEED = 0x811C9DC5;
 local STAR_TILE_SIZE = math.max(rb.LCD_WIDTH, rb.LCD_HEIGHT) * 4;
 local bxor, band, rshift, lshift, arshift = bit.bxor, bit.band, bit.rshift, bit.lshift, bit.arshift
 local random, randomseed = math.random, math.randomseed
-local start_x, start_y, start_z
+local start_x, start_y, start_z, scale_x, scale_y
 
 -- load users coords from file if it exists
 local fname = rb.PLUGIN_DATA_DIR .. "/stars.pos"
@@ -53,6 +53,10 @@ if file then
            start_y = tonumber(line) or 0
        elseif v == 3 then
            start_z = tonumber(line) or 0
+       elseif v == 4 then
+           scale_x = tonumber(line) or 1
+       elseif v == 5 then
+           scale_y = tonumber(line) or 1
        else
            break;
        end
@@ -62,15 +66,15 @@ end
 
 -- Robert Jenkins' 96 bit Mix Function.
 local function mix (a, b, c)
-    a=a-b;  a=a-c;  a=bxor(a, (rshift(c, 13)));
-    b=b-c;  b=b-a;  b=bxor(b, (lshift(a, 8)));
-    c=c-a;  c=c-b;  c=bxor(c, (rshift(b, 13)));
-    a=a-b;  a=a-c;  a=bxor(a, (rshift(c, 12)));
-    b=b-c;  b=b-a;  b=bxor(b, (lshift(a, 16)));
-    c=c-a;  c=c-b;  c=bxor(c, (rshift(b, 5)));
-    a=a-b;  a=a-c;  a=bxor(a, (rshift(c, 3)));
-    b=b-c;  b=b-a;  b=bxor(b, (lshift(a, 10)));
-    c=c-a;  c=c-b;  c=bxor(c, (rshift(b, 15)));
+    a=a-b;  a=a-c;  a=bxor(a, (rshift(c, 13)))
+    b=b-c;  b=b-a;  b=bxor(b, (lshift(a, 8)))
+    c=c-a;  c=c-b;  c=bxor(c, (rshift(b, 13)))
+    a=a-b;  a=a-c;  a=bxor(a, (rshift(c, 12)))
+    b=b-c;  b=b-a;  b=bxor(b, (lshift(a, 16)))
+    c=c-a;  c=c-b;  c=bxor(c, (rshift(b, 5)))
+    a=a-b;  a=a-c;  a=bxor(a, (rshift(c, 3)))
+    b=b-c;  b=b-a;  b=bxor(b, (lshift(a, 10)))
+    c=c-a;  c=c-b;  c=bxor(c, (rshift(b, 15)))
 
     return c
 end
@@ -94,13 +98,13 @@ local function s_bytes_nib(bits, value)
     return bbuffer
 end
 
---[[ given table t and total elems desired uses random elems of t 
+--[[ given table t and total elems desired uses random elems of t
    and random numbers between 1 and max_v if #t < total_elems]]
 function randomize_table(t, total_elems, max_v)
     local rand_t = {}
     local i = 1
     repeat
-        local v = t[random(1, total_elems)]
+        local v = t[random(i, total_elems)]
         if v then
             rand_t[i] = v
         else
@@ -111,21 +115,30 @@ function randomize_table(t, total_elems, max_v)
     return rand_t
 end
 
-local function drawship(img, x, y, color, ship_t)
+local function drawship(img, ship_t)
     --_poly.polyline(img, x, y, ship_t, color, true, true)
-   _poly.polygon(img, x, y, ship_t, color, BLACK, true)
+   _poly.polygon(img, ship_t.x, ship_t.y, ship_t.disp_t, ship_t.color, ship_t.fillcolor, true)
 end
 
-local function draw_astroid(img, x, y, size, shape, color, scale_x, scale_y)
+local function draw_astroid(img, x, y, shape, color, fillcolor, scale_x, scale_y)
     --the random number generator gets seeded with the hash so we get the same figure each time
     randomseed(shape)
+    local move_x, move_y
     -- we also use the 4 bytes of the hash as 4 coord pairs and randomly generate 8 more (16) half the size (8)
     local uniq_t = randomize_table(s_bytes_nib(32, shape), 16, 8)
-    _poly.polyline(img, x, y, uniq_t, color, true, true, scale_x or 1, scale_y or 1)
-    --_poly.polygon(img, x, y, uniq_t, color, color, true, scale_x or 1, scale_y or 1) --filled figures
+    move_x, move_y = _poly.polyline(img, 0, 0, uniq_t, color, true, true, scale_x or 1, scale_y or 1, true)
+    x = x - move_x / 2
+    y = y - move_y / 2
+    if fillcolor then
+        _poly.polygon(img, x, y, uniq_t, color, fillcolor, true, scale_x or 1, scale_y or 1) --filled figures
+    else
+        _poly.polyline(img, x, y, uniq_t, color, true, true, scale_x or 1, scale_y or 1)
+    end
+
+    return x, y, move_x, move_y
 end
 
-local function drawStars (img, xoff, yoff, starscale, color, scale_x, scale_y)
+local function drawStars(img, drawFn, xoff, yoff, starscale, color, scale_x, scale_y)
     local size = STAR_TILE_SIZE / starscale
     local s_x, s_y = scale_x, scale_y
     local w, h = rb.LCD_WIDTH, rb.LCD_HEIGHT
@@ -139,100 +152,245 @@ local function drawStars (img, xoff, yoff, starscale, color, scale_x, scale_y)
         for j = sy, h + sy + size*3, size do
             local hash = mix(STAR_SEED, (i / size), (j / size))
             for n = 0, 2 do
-                local px = (hash % size) + (i - xoff);
+                local px = (hash % size) + (i - xoff)
                 hash = arshift(hash, 3)
 
-                local py = (hash % size) + (j - yoff);
+                local py = (hash % size) + (j - yoff)
                 hash = arshift(hash, 3)
-
                 if px > 0 and px < w and py > 0 and py < h then
-                    if n > 0 and starscale < 5 then
-                        draw_astroid(img, px, py, n, hash, color, s_x, s_y)
-                    else
-                        if scale_x > 1 then
-                            img:set(px, py, color)
-                            img:set(px + 1, py, color)
-                        elseif scale_y > 1 then
-                            img:set(px, py, color)
-                            img:set(px, py + 1, color)
-                        else
-                            img:set(px, py, color)
-                        end
-                    end
+                    drawFn(img, px, py, color, n, hash)
                 end
             end
         end
     end
 end
 
+local function update_lcd()
+    rb.lcd_puts(0,0, "[Infinite Starfield]")
+    _lcd:update()
+    rb.sleep(100)
+    update_lcd = _lcd.update
+end
+
+local backlight_on
+local function turn_on_backlight()
+    rb.backlight_force_on();
+    backlight_on = function() end
+end
+backlight_on = turn_on_backlight
+
 do
     local act = rb.actions
     local quit = false
-    local last_action = 0
+    --local last_action = 0
     local x,y,z = start_x or 0, start_y or 0, start_z or 8
-    local x_fast = rb.LCD_WIDTH / 4
-    local y_fast = rb.LCD_HEIGHT / 4
-    local ship_x = (rb.LCD_WIDTH - 0xF) / 2
-    local ship_y = rb.LCD_HEIGHT - (rb.LCD_HEIGHT / 3)
-    local scale_x, scale_y = 1, 1
-    -- vector draw the ship points for each direction (<>^v)
-    local ship_lt_t = {0,7, 15,0, 9,7, 15,15, 0,7}
-    local ship_rt_t = {0,0, 5,7, 0,15, 15,7, 0,0}
-    local ship_up_t = {0,15, 7,0, 15,15, 7,9, 0,15}
-    local ship_dn_t = {0,0, 7,15, 15,0, 7,5, 0,0}
-    local ship_t = ship_up_t
+    local s_x, s_y = scale_x or 1, scale_y or 1
+    local ship_t = {x = (rb.LCD_WIDTH - 0xF) / 2,
+                    y = rb.LCD_HEIGHT - (rb.LCD_HEIGHT / 3),
+                    color = BGREEN,
+                    fillcolor = BLACK,
+                    -- ship vector coords x,y, x,y,...
+                    lt_t = {0,7, 15,0, 9,7, 15,15, 0,7},
+                    rt_t = {0,0, 5,7, 0,15, 15,7, 0,0},
+                    up_t = {0,15, 7,0, 15,15, 7,9, 0,15},
+                    dn_t = {0,0, 7,15, 15,0, 7,5, 0,0}
+                    }
+    ship_t.disp_t = ship_t.up_t
+
+    local fast = {x = 1, y = 1, count = 0, inc_x = rb.LCD_WIDTH / 16, inc_y = rb.LCD_HEIGHT / 16}
+
+    local last = {sx = s_x, sy = s_y, dx = 0, dy = 0, inc_x = 0, inc_y = 0}
+
+    local function draw_points(img, x, y, color, n, hash)
+        if s_x > s_y then
+            img:line(x, y, x + s_x, y, color, true)
+        elseif s_y > s_x then
+            img:line(x, y, x, y + s_y, color, true)
+        else
+            img:set(x, y, color, true)
+        end
+    end
+
+    function action_drift()
+        if last.dx > 0 then
+            last.dx = last.dx - 1
+            x = x + last.dx
+        elseif last.dx < 0 then
+            last.dx = last.dx + 1
+            x = x + last.dx
+        end
+        if last.dy > 0 then
+            last.dy = last.dy - 1
+            y = y + last.dy
+        elseif last.dy < 0 then
+            last.dy = last.dy + 1
+            y = y + last.dy
+        end
+        if last.dx == 0 and last.dy == 0 then
+            rockev.suspend("timer")
+        end
+        rockev.trigger("action", true, act.ACTION_REDRAW)
+    end
 
     function action_event(action)
+        backlight_on()
         if action == act.PLA_EXIT or action == act.PLA_CANCEL then
             quit = true
             start_x, start_y, start_z = x, y, z
+            scale_x, scale_y = last.sx, last.sy
         elseif action == act.PLA_RIGHT_REPEAT then
-            x = x + x_fast
-            scale_x = scale_x + 1
-            scale_y = 1
+            fast.count = fast.count + 1
+            if fast.count % 10 == 0 then
+                fast.x = fast.x + fast.inc_x
+                if fast.count > 100 then s_x = s_x + 1 end
+            end
+            x = x + fast.x + last.inc_x
+            s_y = last.sy
+            last.dx = fast.x
+            ship_t.disp_t = ship_t.rt_t
         elseif action == act.PLA_LEFT_REPEAT then
-            x = x - x_fast
-            scale_x = scale_x + 1
-            scale_y = 1
+            fast.count = fast.count + 1
+            if fast.count % 10 == 0 then
+                fast.x = fast.x + fast.inc_x
+                if fast.count > 100 then s_x = s_x + 1 end
+            end
+            x = x - fast.x + last.inc_x
+            s_y = last.sy
+            last.dx = -fast.x
+            ship_t.disp_t = ship_t.lt_t
         elseif action == act.PLA_UP_REPEAT then
-            y = y - y_fast
-            scale_y = scale_y + 1
-            scale_x = 1
+            fast.count = fast.count + 1
+            if fast.count % 10 == 0 then
+                fast.y = fast.y + fast.inc_y
+                if fast.count > 100 then s_y = s_y + 1 end
+            end
+            y = y - fast.y + last.inc_y
+            s_x = last.sx
+            last.dy = -fast.y
+            ship_t.disp_t = ship_t.up_t
         elseif action == act.PLA_DOWN_REPEAT then
-            y = y + y_fast
-            scale_y = scale_y + 1
-            scale_x = 1
+            fast.count = fast.count + 1
+            if fast.count % 10 == 0 then
+                fast.y = fast.y + fast.inc_y
+                if fast.count > 100 then s_y = s_y + 1 end
+            end
+            y = y + fast.y + last.inc_y
+            s_x = last.sx
+            last.dy = fast.y
+            ship_t.disp_t = ship_t.dn_t
         elseif action == act.PLA_RIGHT then
-            x = x + 1
-            ship_t = ship_rt_t
+            last.inc_x = last.inc_x + 1
+            x = x + last.dx + 1
+            if last.inc_x < 0 then
+                last.inc_x = 0
+            end
+            last.dx = last.inc_x
+            ship_t.disp_t = ship_t.rt_t
         elseif action == act.PLA_LEFT then
-            x = x - 1
-            ship_t = ship_lt_t
+            last.inc_x = last.inc_x - 1
+            x = x + last.dx - 1
+            if last.inc_x > 0 then
+                last.inc_x = 0
+            end
+            last.dx = last.inc_x
+            ship_t.disp_t = ship_t.lt_t
         elseif action == act.PLA_UP then
-            y = y - 1
-            ship_t = ship_up_t
+            last.inc_y = last.inc_y - 1
+            y = y + last.dy - 1
+            if last.inc_y > 0 then
+                last.inc_y = 0
+            end
+            last.dy = last.inc_y
+            ship_t.disp_t = ship_t.up_t
         elseif action == act.PLA_DOWN then
-            y = y + 1
-            ship_t = ship_dn_t
+            last.inc_y = last.inc_y + 1
+            y = y + last.dy + 1
+            if last.inc_y < 0 then
+                last.inc_y = 0
+            end
+            last.dy = last.inc_y
+            ship_t.disp_t = ship_t.dn_t
+        elseif action == act.PLA_SELECT_REPEAT then
+            rockev.suspend("timer", true)
+            if s_x < 10 and s_y < 10 then
+                s_x = last.sx + 1
+                s_y = last.sy + 1
+                last.sx = s_x
+                last.sy = s_y
+            end
         elseif action == act.PLA_SELECT then
-            z = z + 4
-            if z > 16 then z = 0 end
+            s_x = last.sx + 1
+            s_y = last.sy + 1
+            if s_x > 10 or s_y > 10 then
+                s_x = 1
+                s_y = 1
+            end
+            last.sx = s_x
+            last.sy = s_y
         elseif action == act.ACTION_NONE then
-            scale_x = 1
-            scale_y = 1
+            if fast.count > 100 then
+                z = (random(0, 400) / 100) * 4
+            end
+            fast.count = 0
+            fast.x = fast.inc_x
+            fast.y = fast.inc_y
+            s_x = last.sx
+            s_y = last.sy
+            backlight_on = turn_on_backlight
+            rb.backlight_use_settings()
+            if last.dx ~= 0 or last.dy ~= 0 then
+                rockev.suspend("timer", false)
+            else
+                last.inc_x = 0
+                last.inc_y = 0
+            end
         end
 
         _lcd:clear(BLACK)
-        for i = 0, z, 4 do
-            drawStars(_LCD, x, y, i+1, RED, scale_x, scale_y)
-            drawStars(_LCD, x, y, i+2, GREEN, scale_x, scale_y)
-            drawStars(_LCD, x, y, i+3, BLUE, scale_x, scale_y)
-            drawStars(_LCD, x, y, i+4, WHITE, scale_x, scale_y)
+       for i = 0, z, 4 do
+            drawStars(_LCD, draw_points, x, y, i+1, RED, s_x, s_y)
+            drawStars(_LCD, draw_points, x, y, i+2, GREEN, s_x, s_y)
+            drawStars(_LCD, draw_points, x, y, i+3, BLUE, s_x, s_y)
+            drawStars(_LCD, draw_points, x, y, i+4, WHITE, s_x, s_y)
+        end
+
+        local hit_t = {}
+        local SHIP_X, SHIP_Y = ship_t.x + 8, ship_t.y + 8 --center the ship coords
+        local function draw_asteroids(img, x, y, color, n, hash)
+            if n > 0 then
+                local x0, y0, w0, h0
+                x0,y0,w0,h0 = draw_astroid(img, x, y, hash, color, false, s_x, s_y)
+                --check bounds
+                if s_x == s_y and x0 <= SHIP_X and x0+w0 >= SHIP_X and y0+h0 >= SHIP_Y and y0 <= SHIP_Y then
+                    local r_t = {x = x0, y = y0, w = w0, h= h0, hash = hash, color = color}
+                    hit_t[#hit_t + 1] = r_t
+                end
+            end
         end
-        drawship(_LCD, ship_x, ship_y, BGREEN, ship_t)
-        _lcd:update()
 
-        last_action = action
+        drawStars(_LCD, draw_asteroids, x, y, 1, RED, s_x, s_y)
+        drawStars(_LCD, draw_asteroids, x, y, 2, GREEN, s_x, s_y)
+        drawStars(_LCD, draw_asteroids, x, y, 3, BLUE, s_x, s_y)
+        drawStars(_LCD, draw_asteroids, x, y, 4, WHITE, s_x, s_y)
+        if fast.count < 10 and last.dx == last.dy then
+            local seen = {} -- might have multiple hits but only show unique hashes
+            for i, v in ipairs(hit_t) do
+                    if i < 4 then
+                        draw_astroid(_LCD, v.x + v.w / 2, v.y + v.h / 2, v.hash, WHITE, v.color, s_x, s_y)
+                    end
+            end
+            for i, v in ipairs(hit_t) do
+                if not seen[v.hash] then
+                    rb.lcd_puts(0, (i - 1), string.format("[%x]", v.hash))
+                end
+                seen[v.hash] = i
+            end
+        end
+
+        drawship(_LCD, ship_t)
+        update_lcd()
+
+        --last_action = action
     end
 
     function action_set_quit(bQuit)
@@ -244,13 +402,22 @@ do
     end
 end
 
+if not rb.backlight_force_on then
+    rb.backlight_force_on = function() end
+end
+
+if not rb.backlight_use_settings then
+    rb.backlight_use_settings = function() end
+end
+
 action_event(rb.actions.ACTION_NONE) -- we can call this now but not after registering..
 local eva = rockev.register("action", action_event)
+local evc = rockev.register("timer", action_drift, rb.HZ/7)
 
 while not action_quit() do rb.sleep(rb.HZ) end
 
 if start_x and start_y then
     file = io.open(fname, "w")
-    file:write(start_x, "\n", start_y, "\n", start_z, "\n")
+    file:write(start_x, "\n", start_y, "\n", start_z or 0, "\n", scale_x or 1, "\n", scale_y or 1, "\n")
     io.close( file )
 end
diff --git a/apps/plugins/picross/picross.make b/apps/plugins/picross/picross.make
index 7e78c0fb1c..d34b251dac 100644
--- a/apps/plugins/picross/picross.make
+++ b/apps/plugins/picross/picross.make
@@ -7,18 +7,18 @@
 # $Id$
 #
 
-LUASCR_SRCDIR := $(APPSDIR)/plugins/picross
-LUASCR_BUILDDIR := $(BUILDDIR)/apps/plugins/picross
-LUASCRS := $(wildcard $(LUASCR_SRCDIR)/*.picross)
+PICRSCR_SRCDIR := $(APPSDIR)/plugins/picross
+PICRSCR_BUILDDIR := $(BUILDDIR)/apps/plugins/picross
+PICRSCRS := $(wildcard $(PICRSCR_SRCDIR)/*.picross)
 
-#DUMMY := $(info [${LUASCRS}])
+#DUMMY := $(info [${PICRSCRS}])
 
 DUMMY : all
 
-all: $(subst $(LUASCR_SRCDIR)/,$(LUASCR_BUILDDIR)/,$(LUASCRS))
+all: $(subst $(PICRSCR_SRCDIR)/,$(PICRSCR_BUILDDIR)/,$(PICRSCRS))
 
-$(LUASCR_BUILDDIR)/%.picross: $(LUASCR_SRCDIR)/%.picross | $(LUASCR_BUILDDIR)
-	$(call PRINTS,CP $(subst $(LUASCR_SRCDIR)/,,$<))cp $< $@
+$(PICRSCR_BUILDDIR)/%.picross: $(PICRSCR_SRCDIR)/%.picross | $(PICRSCR_BUILDDIR)
+	$(call PRINTS,CP $(subst $(PICRSCR_SRCDIR)/,,$<))cp $< $@
 
-$(LUASCR_BUILDDIR):
-	$(call PRINTS,MKDIR $@)mkdir -p $(LUASCR_BUILDDIR)/
+$(PICRSCR_BUILDDIR):
+	$(call PRINTS,MKDIR $@)mkdir -p $(PICRSCR_BUILDDIR)/