diff --git a/Source/Editor.lua b/Source/Editor.lua index ca0a964..0eb784c 100644 --- a/Source/Editor.lua +++ b/Source/Editor.lua @@ -27,7 +27,7 @@ local pos1 = {x,y} local editor = "main" -local editorSongs = {"song1","song2","song5", "song6", "song7"} +local editorSongs = {"song1","song2","song5", "song6", "song7", "song8"} local selSong = "song2" local songIndexSel = 10 diff --git a/Source/Menu.lua b/Source/Menu.lua index fbfbf2c..4f1cf5f 100644 --- a/Source/Menu.lua +++ b/Source/Menu.lua @@ -180,7 +180,7 @@ function editLoad() createMenu(m) end -songlist = {"BACK","POV: YOU ARE A ROCKET","A LONELY, LOST SHIP", "LEVEL COMPLETE", "GAME COMPLETE", "CHIPVIBE2", "ORANGER CHIP","WACKMAN"} +songlist = {"BACK","POV: YOU ARE A ROCKET","A LONELY, LOST SHIP", "LEVEL COMPLETE", "GAME COMPLETE", "CHIPVIBE2", "ORANGER CHIP","WACKMAN", "UFO"} songlist[0] = "musicbox" function menuButtonPress(name, index) diff --git a/Source/Player.lua b/Source/Player.lua index a0b059f..615b2d8 100644 --- a/Source/Player.lua +++ b/Source/Player.lua @@ -46,6 +46,7 @@ local function die() sprRocket:moveTo(startpos.x, startpos.y) miniExplode(startpos.x,startpos.y) sfxDie:play() + createStars() end function addPlayer(_x,_y,__x,__y) diff --git a/Source/Saws.lua b/Source/Saws.lua index c0c9e8c..7551210 100644 --- a/Source/Saws.lua +++ b/Source/Saws.lua @@ -164,11 +164,10 @@ function updateSaws() spinblades[spinner].time += spinblades[spinner].speed local degrees = (360 / #spinblades[spinner].arms * arm + spinblades[spinner].time) - if degrees % 360 == 0 then spinblades[spinner].time = 0 end - local position = {x=math.sin(math.rad(degrees)) * 20 * blade,y=math.cos(math.rad(degrees)) * 20 * blade} - + --if degrees % 360 == 0 then spinblades[spinner].time = 0 end + spinblades[spinner].arms[arm][blade]:setImage(loopSaws:image()) - spinblades[spinner].arms[arm][blade]:moveTo(spinblades[spinner].mid.x + position.x, spinblades[spinner].mid.y + position.y) + spinblades[spinner].arms[arm][blade]:moveTo(spinblades[spinner].mid.x + math.sin(math.rad(degrees)) * 20 * blade, spinblades[spinner].mid.y + math.cos(math.rad(degrees)) * 20 * blade) end end end diff --git a/Source/data/LEVEL.json b/Source/data/LEVEL.json index 9ef7064..393d152 100644 --- a/Source/data/LEVEL.json +++ b/Source/data/LEVEL.json @@ -11,7 +11,6 @@ "y":1596 }, "rotators": [ - {"x":1368,"y":1624,"speed":-0.5,"arms":1,"armlen":4} ], "saws": [], "tiles": [ diff --git a/Source/sfx/song8.wav b/Source/sfx/song8.wav new file mode 100644 index 0000000..6b4dfec Binary files /dev/null and b/Source/sfx/song8.wav differ