rolled it all back and added song 8
This commit is contained in:
parent
b21e47bcf5
commit
891f1a152e
6 changed files with 6 additions and 7 deletions
|
@ -27,7 +27,7 @@ local pos1 = {x,y}
|
||||||
|
|
||||||
local editor = "main"
|
local editor = "main"
|
||||||
|
|
||||||
local editorSongs = {"song1","song2","song5", "song6", "song7"}
|
local editorSongs = {"song1","song2","song5", "song6", "song7", "song8"}
|
||||||
local selSong = "song2"
|
local selSong = "song2"
|
||||||
local songIndexSel = 10
|
local songIndexSel = 10
|
||||||
|
|
||||||
|
|
|
@ -180,7 +180,7 @@ function editLoad()
|
||||||
createMenu(m)
|
createMenu(m)
|
||||||
end
|
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"
|
songlist[0] = "musicbox"
|
||||||
|
|
||||||
function menuButtonPress(name, index)
|
function menuButtonPress(name, index)
|
||||||
|
|
|
@ -46,6 +46,7 @@ local function die()
|
||||||
sprRocket:moveTo(startpos.x, startpos.y)
|
sprRocket:moveTo(startpos.x, startpos.y)
|
||||||
miniExplode(startpos.x,startpos.y)
|
miniExplode(startpos.x,startpos.y)
|
||||||
sfxDie:play()
|
sfxDie:play()
|
||||||
|
createStars()
|
||||||
end
|
end
|
||||||
|
|
||||||
function addPlayer(_x,_y,__x,__y)
|
function addPlayer(_x,_y,__x,__y)
|
||||||
|
|
|
@ -164,11 +164,10 @@ function updateSaws()
|
||||||
spinblades[spinner].time += spinblades[spinner].speed
|
spinblades[spinner].time += spinblades[spinner].speed
|
||||||
|
|
||||||
local degrees = (360 / #spinblades[spinner].arms * arm + spinblades[spinner].time)
|
local degrees = (360 / #spinblades[spinner].arms * arm + spinblades[spinner].time)
|
||||||
if degrees % 360 == 0 then spinblades[spinner].time = 0 end
|
--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}
|
|
||||||
|
|
||||||
spinblades[spinner].arms[arm][blade]:setImage(loopSaws:image())
|
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
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
"y":1596
|
"y":1596
|
||||||
},
|
},
|
||||||
"rotators": [
|
"rotators": [
|
||||||
{"x":1368,"y":1624,"speed":-0.5,"arms":1,"armlen":4}
|
|
||||||
],
|
],
|
||||||
"saws": [],
|
"saws": [],
|
||||||
"tiles": [
|
"tiles": [
|
||||||
|
|
BIN
Source/sfx/song8.wav
Normal file
BIN
Source/sfx/song8.wav
Normal file
Binary file not shown.
Loading…
Reference in a new issue