diff --git a/Page Assets/calendar.png b/Page Assets/calendar.png new file mode 100644 index 0000000..e026af9 Binary files /dev/null and b/Page Assets/calendar.png differ diff --git a/Page Assets/info.png b/Page Assets/info.png new file mode 100644 index 0000000..37d28da Binary files /dev/null and b/Page Assets/info.png differ diff --git a/Page Assets/size.png b/Page Assets/size.png new file mode 100644 index 0000000..0dc8aa6 Binary files /dev/null and b/Page Assets/size.png differ diff --git a/Page Assets/smile.png b/Page Assets/smile.png new file mode 100644 index 0000000..5618622 Binary files /dev/null and b/Page Assets/smile.png differ diff --git a/Source/Player.lua b/Source/Player.lua index 423cb30..49e9424 100644 --- a/Source/Player.lua +++ b/Source/Player.lua @@ -87,6 +87,8 @@ function updatePlayer() elseif dead == true then if scale > 0.1 then scale -= 0.05 + else + sprRocket:setVisible(false) end end updateExit() diff --git a/Source/Saws.lua b/Source/Saws.lua index eb18b03..7fabc88 100644 --- a/Source/Saws.lua +++ b/Source/Saws.lua @@ -7,6 +7,7 @@ assert(imgSaw) assert(imgTarget) local blades = {} +local spinblades = {} function loadBlades(_blades) for i = 1, #_blades,1 do @@ -44,17 +45,19 @@ function loadSpins(_spins) s.middle:moveTo(s.x,s.y) s.middle:add() + local sb = {speed=s.speed,arms=s.arms,armlen=s.armlen,blades={},time=0} for i = 1, s.arms, 1 do for p = 1, s.armlen, 1 do local degrees = (360 / s.arms) * i local position = {x=math.sin(math.rad(degrees)) * 20 * p,y=math.cos(math.rad(degrees)) * 20 * p} - local newSpr = gfx.sprite.new(imgSaw) - newSpr:moveTo(s.x + position.x, s.y + position.y) - newSpr:setCollideRect(0,0,16,16) - newSpr:add() + sb.blades[#sb.blades+1] = gfx.sprite.new(imgSaw) + sb.blades[#sb.blades]:moveTo(s.x + position.x, s.y + position.y) + sb.blades[#sb.blades]:setCollideRect(0,0,16,16) + sb.blades[#sb.blades]:add() end end + spinblades[#spinblades+1] = sb end end diff --git a/Source/launcher/card-highlighted/1.png b/Source/launcher/card-highlighted/1.png new file mode 100644 index 0000000..eb70e6c Binary files /dev/null and b/Source/launcher/card-highlighted/1.png differ diff --git a/Source/launcher/card-highlighted/2.png b/Source/launcher/card-highlighted/2.png new file mode 100644 index 0000000..bfe6a38 Binary files /dev/null and b/Source/launcher/card-highlighted/2.png differ diff --git a/Source/launcher/card-highlighted/3.png b/Source/launcher/card-highlighted/3.png new file mode 100644 index 0000000..9692859 Binary files /dev/null and b/Source/launcher/card-highlighted/3.png differ diff --git a/Source/launcher/card-highlighted/4.png b/Source/launcher/card-highlighted/4.png new file mode 100644 index 0000000..9e7740f Binary files /dev/null and b/Source/launcher/card-highlighted/4.png differ diff --git a/Source/launcher/card-highlighted/animation.txt b/Source/launcher/card-highlighted/animation.txt new file mode 100644 index 0000000..32693ba --- /dev/null +++ b/Source/launcher/card-highlighted/animation.txt @@ -0,0 +1 @@ +frames = 1x4, 2x4, 3x4, 4x4 \ No newline at end of file diff --git a/Source/launcher/card.ase b/Source/launcher/card.ase new file mode 100644 index 0000000..368dcb9 Binary files /dev/null and b/Source/launcher/card.ase differ diff --git a/Source/launcher/card.png b/Source/launcher/card.png index 46d3482..354a12b 100644 Binary files a/Source/launcher/card.png and b/Source/launcher/card.png differ diff --git a/Source/levels/rotate.json b/Source/levels/rotate.json index 6c1ad8f..4d1ac22 100644 --- a/Source/levels/rotate.json +++ b/Source/levels/rotate.json @@ -1 +1 @@ -{"bigrocket":{"x":73.333333,"y":144.79638},"dimensions":{"x":22,"y":17},"rocket":{"x":300,"y":120},"rotators":[{"x":200,"y":200,"arms":4,"armlen":3,"speed":20,"middle":true}],"tiles":[{"t":2,"x":2,"y":1},{"t":2,"x":14,"y":1},{"t":2,"x":14,"y":5},{"t":2,"x":22,"y":5},{"t":2,"x":8,"y":6},{"t":2,"x":2,"y":12},{"t":2,"x":8,"y":12},{"t":2,"x":8,"y":17},{"t":2,"x":22,"y":17},{"t":3,"x":3,"y":1},{"t":3,"x":4,"y":1},{"t":3,"x":5,"y":1},{"t":3,"x":6,"y":1},{"t":3,"x":7,"y":1},{"t":3,"x":8,"y":1},{"t":3,"x":9,"y":1},{"t":3,"x":10,"y":1},{"t":3,"x":11,"y":1},{"t":3,"x":12,"y":1},{"t":3,"x":13,"y":1},{"t":3,"x":15,"y":5},{"t":3,"x":16,"y":5},{"t":3,"x":17,"y":5},{"t":3,"x":18,"y":5},{"t":3,"x":19,"y":5},{"t":3,"x":20,"y":5},{"t":3,"x":21,"y":5},{"t":3,"x":3,"y":12},{"t":3,"x":4,"y":12},{"t":3,"x":5,"y":12},{"t":3,"x":6,"y":12},{"t":3,"x":7,"y":12},{"t":3,"x":9,"y":17},{"t":3,"x":10,"y":17},{"t":3,"x":11,"y":17},{"t":3,"x":12,"y":17},{"t":3,"x":13,"y":17},{"t":3,"x":14,"y":17},{"t":3,"x":15,"y":17},{"t":3,"x":16,"y":17},{"t":3,"x":17,"y":17},{"t":3,"x":18,"y":17},{"t":3,"x":19,"y":17},{"t":3,"x":20,"y":17},{"t":3,"x":21,"y":17},{"t":4,"x":2,"y":2},{"t":4,"x":14,"y":2},{"t":4,"x":2,"y":3},{"t":4,"x":14,"y":3},{"t":4,"x":2,"y":4},{"t":4,"x":14,"y":4},{"t":4,"x":2,"y":5},{"t":4,"x":2,"y":6},{"t":4,"x":22,"y":6},{"t":4,"x":2,"y":7},{"t":4,"x":8,"y":7},{"t":4,"x":22,"y":7},{"t":4,"x":2,"y":8},{"t":4,"x":8,"y":8},{"t":4,"x":22,"y":8},{"t":4,"x":2,"y":9},{"t":4,"x":8,"y":9},{"t":4,"x":22,"y":9},{"t":4,"x":2,"y":10},{"t":4,"x":8,"y":10},{"t":4,"x":22,"y":10},{"t":4,"x":2,"y":11},{"t":4,"x":8,"y":11},{"t":4,"x":22,"y":11},{"t":4,"x":22,"y":12},{"t":4,"x":8,"y":13},{"t":4,"x":22,"y":13},{"t":4,"x":8,"y":14},{"t":4,"x":22,"y":14},{"t":4,"x":8,"y":15},{"t":4,"x":22,"y":15},{"t":4,"x":8,"y":16},{"t":4,"x":22,"y":16}]} \ No newline at end of file +{"bigrocket":{"x":73.333333,"y":144.79638},"dimensions":{"x":22,"y":17},"rocket":{"x":300,"y":120},"rotators":[{"x":200,"y":200,"arms":5,"armlen":2,"speed":20,"middle":true}],"tiles":[{"t":2,"x":2,"y":1},{"t":2,"x":14,"y":1},{"t":2,"x":14,"y":5},{"t":2,"x":22,"y":5},{"t":2,"x":8,"y":6},{"t":2,"x":2,"y":12},{"t":2,"x":8,"y":12},{"t":2,"x":8,"y":17},{"t":2,"x":22,"y":17},{"t":3,"x":3,"y":1},{"t":3,"x":4,"y":1},{"t":3,"x":5,"y":1},{"t":3,"x":6,"y":1},{"t":3,"x":7,"y":1},{"t":3,"x":8,"y":1},{"t":3,"x":9,"y":1},{"t":3,"x":10,"y":1},{"t":3,"x":11,"y":1},{"t":3,"x":12,"y":1},{"t":3,"x":13,"y":1},{"t":3,"x":15,"y":5},{"t":3,"x":16,"y":5},{"t":3,"x":17,"y":5},{"t":3,"x":18,"y":5},{"t":3,"x":19,"y":5},{"t":3,"x":20,"y":5},{"t":3,"x":21,"y":5},{"t":3,"x":3,"y":12},{"t":3,"x":4,"y":12},{"t":3,"x":5,"y":12},{"t":3,"x":6,"y":12},{"t":3,"x":7,"y":12},{"t":3,"x":9,"y":17},{"t":3,"x":10,"y":17},{"t":3,"x":11,"y":17},{"t":3,"x":12,"y":17},{"t":3,"x":13,"y":17},{"t":3,"x":14,"y":17},{"t":3,"x":15,"y":17},{"t":3,"x":16,"y":17},{"t":3,"x":17,"y":17},{"t":3,"x":18,"y":17},{"t":3,"x":19,"y":17},{"t":3,"x":20,"y":17},{"t":3,"x":21,"y":17},{"t":4,"x":2,"y":2},{"t":4,"x":14,"y":2},{"t":4,"x":2,"y":3},{"t":4,"x":14,"y":3},{"t":4,"x":2,"y":4},{"t":4,"x":14,"y":4},{"t":4,"x":2,"y":5},{"t":4,"x":2,"y":6},{"t":4,"x":22,"y":6},{"t":4,"x":2,"y":7},{"t":4,"x":8,"y":7},{"t":4,"x":22,"y":7},{"t":4,"x":2,"y":8},{"t":4,"x":8,"y":8},{"t":4,"x":22,"y":8},{"t":4,"x":2,"y":9},{"t":4,"x":8,"y":9},{"t":4,"x":22,"y":9},{"t":4,"x":2,"y":10},{"t":4,"x":8,"y":10},{"t":4,"x":22,"y":10},{"t":4,"x":2,"y":11},{"t":4,"x":8,"y":11},{"t":4,"x":22,"y":11},{"t":4,"x":22,"y":12},{"t":4,"x":8,"y":13},{"t":4,"x":22,"y":13},{"t":4,"x":8,"y":14},{"t":4,"x":22,"y":14},{"t":4,"x":8,"y":15},{"t":4,"x":22,"y":15},{"t":4,"x":8,"y":16},{"t":4,"x":22,"y":16}]} \ No newline at end of file diff --git a/Source/levels/level1.json b/Source/levels/win.json similarity index 100% rename from Source/levels/level1.json rename to Source/levels/win.json