new map and coin spawn rules
This commit is contained in:
		
							parent
							
								
									9904cfc9b8
								
							
						
					
					
						commit
						5b83b19bcc
					
				
					 1 changed files with 34 additions and 18 deletions
				
			
		| 
						 | 
				
			
			@ -60,14 +60,22 @@ function hitTest(rect1, rect2)
 | 
			
		|||
   and rect1.y + rect1.h > rect2.y
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
coinCooldown=120
 | 
			
		||||
coinCooldown=160
 | 
			
		||||
coinTimer=coinCooldown
 | 
			
		||||
initialCoinDrop=4
 | 
			
		||||
coinSpawnCount=2
 | 
			
		||||
colors={"blue","red","yellow"}
 | 
			
		||||
spawnLocs={
 | 
			
		||||
	{x=1*8, y=5*8},
 | 
			
		||||
	{x=28*8,y=5*8},
 | 
			
		||||
	{x=12*8,y=11*8},
 | 
			
		||||
	{x=20*8,y=9*8},
 | 
			
		||||
	{x=7*8,y=13*8}
 | 
			
		||||
	{x=6*8, y=5*8},
 | 
			
		||||
	{x=23*8,y=5*8},
 | 
			
		||||
	{x=11*8,y=12*8},
 | 
			
		||||
	{x=18*8,y=12*8},
 | 
			
		||||
	{x=2*8, y=11*8},
 | 
			
		||||
	{x=27*8,y=11*8},
 | 
			
		||||
	{x=4*8, y=15*8},
 | 
			
		||||
	{x=25*8,y=15*8},
 | 
			
		||||
}
 | 
			
		||||
coins={}
 | 
			
		||||
do -- Coin
 | 
			
		||||
| 
						 | 
				
			
			@ -132,16 +140,19 @@ function addRandomCoin()
 | 
			
		|||
	coinTimer=coinCooldown
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
-- MOCK
 | 
			
		||||
addRandomCoin()
 | 
			
		||||
addRandomCoin()
 | 
			
		||||
function dropInitialCoins()
 | 
			
		||||
	coins={}
 | 
			
		||||
	for i=1, initialCoinDrop do
 | 
			
		||||
		addRandomCoin()
 | 
			
		||||
	end
 | 
			
		||||
end
 | 
			
		||||
-- /MOCK
 | 
			
		||||
 | 
			
		||||
do -- Player
 | 
			
		||||
	Player = {
 | 
			
		||||
		spr=0,
 | 
			
		||||
		ani=anis.idle,
 | 
			
		||||
		x=8,y=120,
 | 
			
		||||
		x=14.5*8,y=8*8,
 | 
			
		||||
		w=8,h=8,
 | 
			
		||||
		vx=0,vy=0,
 | 
			
		||||
		isFlipped=false
 | 
			
		||||
| 
						 | 
				
			
			@ -409,6 +420,7 @@ function update(state)
 | 
			
		|||
		if btnp(4) then -- A (Z key)
 | 
			
		||||
			currentState = GameState.game
 | 
			
		||||
			life=100
 | 
			
		||||
			dropInitialCoins()
 | 
			
		||||
		end
 | 
			
		||||
	elseif currentState == GameState.game then
 | 
			
		||||
		updateGame()
 | 
			
		||||
| 
						 | 
				
			
			@ -441,7 +453,11 @@ function updateGame()
 | 
			
		|||
	-- 	currentState = GameState.gameover
 | 
			
		||||
	-- end
 | 
			
		||||
	if coinTimer>0 then coinTimer=coinTimer-1 end
 | 
			
		||||
	if coinTimer == 0 then addRandomCoin() end
 | 
			
		||||
	if coinTimer == 0 then 
 | 
			
		||||
		for i=1, coinSpawnCount do
 | 
			
		||||
			addRandomCoin() 
 | 
			
		||||
		end
 | 
			
		||||
	end
 | 
			
		||||
 | 
			
		||||
	-- Coin market
 | 
			
		||||
	valueBlue=math.floor((math.sin(t/200)+1)*50)/10
 | 
			
		||||
| 
						 | 
				
			
			@ -547,15 +563,15 @@ end
 | 
			
		|||
-- 003:110000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 004:110000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 005:110000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 006:110000000000000000000000000000000000000000000000000010202011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 007:110000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 008:110000000000000000000000000000000000000000001020300000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 009:110000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 010:110000000000000000000000000212000000001030000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 011:110000000000000000000000000313000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 012:110000000000000000000000102020203000000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 013:110000000000000000000000111111111100000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 014:110000001020202020300000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 006:112030000010202030000000000000000000000000102020300000102011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 007:111111000011111100000000000002120000000000001111110000111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 008:110000000000000000000000000003130000000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 009:110000000000000000000010202020202020300000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 010:110000000000000000000000111111111111000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 011:110000000000000000000000001111111100000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 012:110010202020300000000000000000000000000000001020202020300011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 013:110011111111000000001030000000000000103000000000111111110011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 014:110000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 015:110000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- 016:112020202020202020202020202020202020202020202020202020202011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 | 
			
		||||
-- </MAP>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue