diff --git a/Source/Editor.lua b/Source/Editor.lua index 3d7d7ea..2a554c8 100644 --- a/Source/Editor.lua +++ b/Source/Editor.lua @@ -175,7 +175,7 @@ function editUpdate() curY = (math.floor( tileIndex ) % 8) * 28 +7 elseif editor == "pos2Saw" then - traveltime += change * 0.01 + traveltime += change * 0.003 if traveltime < 0.2 then traveltime = 0.2 end traveltime = tonumber(string.format("%.2f", traveltime)) end @@ -210,8 +210,10 @@ function editUpdate() powers[#powers+1] = {x=((position.x + 11) * 16)-7, y=((position.y + 7) * 16)-5} elseif math.floor(tileIndex) == 2 then pos1.x,pos1.y=((position.x + 11) * 16), ((position.y + 7) * 16) - tileIndex = 0 editor = "pos2Saw" + elseif math.floor( tileIndex ) == 3 then + pos1.x,pos1.y=((position.x + 11) * 16), ((position.y + 7) * 16) + editor = "pos2Spin" elseif math.floor(tileIndex) == 4 then playerPos = {x = ((position.x + 11) * 16) - 6, y = ((position.y + 7) * 16) - 4} elseif math.floor(tileIndex) == 5 then @@ -256,6 +258,7 @@ function editUpdate() for saw= 1, #sawblades, 1 do if sawblades[saw].start.x == (position.x + 11) * 16 and sawblades[saw].start.y == (position.y + 7) * 16 then table.remove(sawblades, saw) + break end end end diff --git a/Source/Saws.lua b/Source/Saws.lua index 7380f71..6d1f783 100644 --- a/Source/Saws.lua +++ b/Source/Saws.lua @@ -22,6 +22,7 @@ function loadBlades(_blades) b.ends = playdate.geometry.point.new(b.ends.x+8,b.ends.y+8) b.saw = gfx.sprite.new(loopSaws:image()) b.saw:moveTo(b.start) + b.saw:setZIndex(1) b.saw:setCollideRect(0,0,16,16) b.saw:add() @@ -49,7 +50,7 @@ function loadSpins(_spins) s.middle = gfx.sprite.new(imgTarget) end s.middle:moveTo(s.x,s.y) - s.middle:setZIndex(2) + s.middle:setZIndex(1) s.middle:add() local sb = {speed=s.speed,arms={},mid=s.middle,time=0} @@ -62,7 +63,7 @@ function loadSpins(_spins) sb.arms[i][p] = gfx.sprite.new(loopSaws:image()) sb.arms[i][p]:moveTo(s.x + position.x, s.y + position.y) sb.arms[i][p]:setCollideRect(0,0,16,16) - sb.arms[i][p]:setZIndex(2) + sb.arms[i][p]:setZIndex(1) sb.arms[i][p]:add() end end @@ -79,7 +80,7 @@ function loadFuel(_fuel) fuels[i]:setGroups({2}) fuels[i]:setCollidesWithGroups({3}) fuels[i].active = true - fuels[i]:setZIndex(1) + fuels[i]:setZIndex(2) fuels[i]:setCollideRect(-6,-6 ,30,30) fuels[i]:add() diff --git a/Source/launcher/card-highlighted/1.png b/Source/launcher/card-highlighted/1.png new file mode 100644 index 0000000..47111cd Binary files /dev/null and b/Source/launcher/card-highlighted/1.png differ diff --git a/Source/launcher/card-highlighted/10.png b/Source/launcher/card-highlighted/10.png new file mode 100644 index 0000000..654b612 Binary files /dev/null and b/Source/launcher/card-highlighted/10.png differ diff --git a/Source/launcher/card-highlighted/11.png b/Source/launcher/card-highlighted/11.png new file mode 100644 index 0000000..911facb Binary files /dev/null and b/Source/launcher/card-highlighted/11.png differ diff --git a/Source/launcher/card-highlighted/12.png b/Source/launcher/card-highlighted/12.png new file mode 100644 index 0000000..6e1fc46 Binary files /dev/null and b/Source/launcher/card-highlighted/12.png differ diff --git a/Source/launcher/card-highlighted/13.png b/Source/launcher/card-highlighted/13.png new file mode 100644 index 0000000..a0183ec Binary files /dev/null and b/Source/launcher/card-highlighted/13.png differ diff --git a/Source/launcher/card-highlighted/14.png b/Source/launcher/card-highlighted/14.png new file mode 100644 index 0000000..41c6020 Binary files /dev/null and b/Source/launcher/card-highlighted/14.png differ diff --git a/Source/launcher/card-highlighted/15.png b/Source/launcher/card-highlighted/15.png new file mode 100644 index 0000000..e5a9643 Binary files /dev/null and b/Source/launcher/card-highlighted/15.png differ diff --git a/Source/launcher/card-highlighted/16.png b/Source/launcher/card-highlighted/16.png new file mode 100644 index 0000000..cb11206 Binary files /dev/null and b/Source/launcher/card-highlighted/16.png differ diff --git a/Source/launcher/card-highlighted/17.png b/Source/launcher/card-highlighted/17.png new file mode 100644 index 0000000..513f715 Binary files /dev/null and b/Source/launcher/card-highlighted/17.png differ diff --git a/Source/launcher/card-highlighted/18.png b/Source/launcher/card-highlighted/18.png new file mode 100644 index 0000000..560215a Binary files /dev/null and b/Source/launcher/card-highlighted/18.png differ diff --git a/Source/launcher/card-highlighted/19.png b/Source/launcher/card-highlighted/19.png new file mode 100644 index 0000000..cd7d758 Binary files /dev/null and b/Source/launcher/card-highlighted/19.png differ diff --git a/Source/launcher/card-highlighted/2.png b/Source/launcher/card-highlighted/2.png new file mode 100644 index 0000000..9c6bb50 Binary files /dev/null and b/Source/launcher/card-highlighted/2.png differ diff --git a/Source/launcher/card-highlighted/20.png b/Source/launcher/card-highlighted/20.png new file mode 100644 index 0000000..ef78f81 Binary files /dev/null and b/Source/launcher/card-highlighted/20.png differ diff --git a/Source/launcher/card-highlighted/21.png b/Source/launcher/card-highlighted/21.png new file mode 100644 index 0000000..c9ea0b5 Binary files /dev/null and b/Source/launcher/card-highlighted/21.png differ diff --git a/Source/launcher/card-highlighted/22.png b/Source/launcher/card-highlighted/22.png new file mode 100644 index 0000000..165c9d5 Binary files /dev/null and b/Source/launcher/card-highlighted/22.png differ diff --git a/Source/launcher/card-highlighted/23.png b/Source/launcher/card-highlighted/23.png new file mode 100644 index 0000000..e244d48 Binary files /dev/null and b/Source/launcher/card-highlighted/23.png differ diff --git a/Source/launcher/card-highlighted/24.png b/Source/launcher/card-highlighted/24.png new file mode 100644 index 0000000..7bbf398 Binary files /dev/null and b/Source/launcher/card-highlighted/24.png differ diff --git a/Source/launcher/card-highlighted/25.png b/Source/launcher/card-highlighted/25.png new file mode 100644 index 0000000..13d5332 Binary files /dev/null and b/Source/launcher/card-highlighted/25.png differ diff --git a/Source/launcher/card-highlighted/26.png b/Source/launcher/card-highlighted/26.png new file mode 100644 index 0000000..ccad8c5 Binary files /dev/null and b/Source/launcher/card-highlighted/26.png differ diff --git a/Source/launcher/card-highlighted/27.png b/Source/launcher/card-highlighted/27.png new file mode 100644 index 0000000..8d97691 Binary files /dev/null and b/Source/launcher/card-highlighted/27.png differ diff --git a/Source/launcher/card-highlighted/28.png b/Source/launcher/card-highlighted/28.png new file mode 100644 index 0000000..c3e0cde Binary files /dev/null and b/Source/launcher/card-highlighted/28.png differ diff --git a/Source/launcher/card-highlighted/29.png b/Source/launcher/card-highlighted/29.png new file mode 100644 index 0000000..77f0328 Binary files /dev/null and b/Source/launcher/card-highlighted/29.png differ diff --git a/Source/launcher/card-highlighted/3.png b/Source/launcher/card-highlighted/3.png new file mode 100644 index 0000000..6d12969 Binary files /dev/null and b/Source/launcher/card-highlighted/3.png differ diff --git a/Source/launcher/card-highlighted/30.png b/Source/launcher/card-highlighted/30.png new file mode 100644 index 0000000..8e0fabe Binary files /dev/null and b/Source/launcher/card-highlighted/30.png differ diff --git a/Source/launcher/card-highlighted/31.png b/Source/launcher/card-highlighted/31.png new file mode 100644 index 0000000..a26a6aa Binary files /dev/null and b/Source/launcher/card-highlighted/31.png differ diff --git a/Source/launcher/card-highlighted/32.png b/Source/launcher/card-highlighted/32.png new file mode 100644 index 0000000..9bd2cda Binary files /dev/null and b/Source/launcher/card-highlighted/32.png differ diff --git a/Source/launcher/card-highlighted/4.png b/Source/launcher/card-highlighted/4.png new file mode 100644 index 0000000..e5e8204 Binary files /dev/null and b/Source/launcher/card-highlighted/4.png differ diff --git a/Source/launcher/card-highlighted/5.png b/Source/launcher/card-highlighted/5.png new file mode 100644 index 0000000..09086b3 Binary files /dev/null and b/Source/launcher/card-highlighted/5.png differ diff --git a/Source/launcher/card-highlighted/6.png b/Source/launcher/card-highlighted/6.png new file mode 100644 index 0000000..8dbfc0f Binary files /dev/null and b/Source/launcher/card-highlighted/6.png differ diff --git a/Source/launcher/card-highlighted/7.png b/Source/launcher/card-highlighted/7.png new file mode 100644 index 0000000..d868ed0 Binary files /dev/null and b/Source/launcher/card-highlighted/7.png differ diff --git a/Source/launcher/card-highlighted/8.png b/Source/launcher/card-highlighted/8.png new file mode 100644 index 0000000..e62d3ed Binary files /dev/null and b/Source/launcher/card-highlighted/8.png differ diff --git a/Source/launcher/card-highlighted/9.png b/Source/launcher/card-highlighted/9.png new file mode 100644 index 0000000..47111cd Binary files /dev/null and b/Source/launcher/card-highlighted/9.png differ diff --git a/Source/launcher/card-highlighted/animation.txt b/Source/launcher/card-highlighted/animation.txt new file mode 100644 index 0000000..690d385 --- /dev/null +++ b/Source/launcher/card-highlighted/animation.txt @@ -0,0 +1,2 @@ +frames=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 +introFrames=17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,1,9,10,11,12,13,14,15,16 \ No newline at end of file diff --git a/Source/launcher/card.png b/Source/launcher/card.png index 85f07ef..513f715 100644 Binary files a/Source/launcher/card.png and b/Source/launcher/card.png differ diff --git a/Source/launcher/card.png.ase b/Source/launcher/card.png.ase new file mode 100644 index 0000000..f52cde3 Binary files /dev/null and b/Source/launcher/card.png.ase differ