- el alien and premiere now reset correctly
- gorro and peu camera should not appear again once picked up items
This commit is contained in:
1
abad.lua
1
abad.lua
@@ -5,6 +5,7 @@ function abad_init()
|
|||||||
abad={x=40,y=24,flip=false,frame=1,wait=0,hab=10,vides=3,energia=40,falling=0,step=0,draw=abad.draw,update=nil,jumpfwd=false,anim={0,1,0,2},bb={x=4,y=0,w=8,h=16},safe={hab=10,x=40,y=24}}
|
abad={x=40,y=24,flip=false,frame=1,wait=0,hab=10,vides=3,energia=40,falling=0,step=0,draw=abad.draw,update=nil,jumpfwd=false,anim={0,1,0,2},bb={x=4,y=0,w=8,h=16},safe={hab=10,x=40,y=24}}
|
||||||
abad.update=abad_state_normal
|
abad.update=abad_state_normal
|
||||||
abad.objects={}
|
abad.objects={}
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function abad:draw()
|
function abad:draw()
|
||||||
|
|||||||
10
elalien.lua
10
elalien.lua
@@ -1,9 +1,15 @@
|
|||||||
elalien={hab=66,x=24,y=24,flip=true,goup=true,frame=8,stairscooldown=0,wait=0,step=0,anim={8,9,8,10},bb={x=4,y=0,w=8,h=16},scene_intro=false,scene_object=false}
|
elalien={hab=66,x=24,y=24,flip=true,goup=true,frame=8,stairscooldown=0,wait=0,step=0,anim={8,9,8,10},bb={x=4,y=0,w=8,h=16},scene_intro=false,scene_object=false}
|
||||||
|
|
||||||
function elalien.init()
|
function elalien.init()
|
||||||
elalien.hit=elalien.hit
|
elalien.x=24
|
||||||
|
elalien.y=24
|
||||||
|
elalien.frame=8
|
||||||
|
elalien.stairscooldown=0
|
||||||
|
elalien.wait=0
|
||||||
|
elalien.step=0
|
||||||
elalien.update=elalien.update_normal
|
elalien.update=elalien.update_normal
|
||||||
elalien.draw=elalien.draw
|
elalien.scene_intro=false
|
||||||
|
elalien.scene_object=false
|
||||||
local habs={66,56,59,53}
|
local habs={66,56,59,53}
|
||||||
elalien.hab=habs[1+rnd(4)]
|
elalien.hab=habs[1+rnd(4)]
|
||||||
end
|
end
|
||||||
|
|||||||
4
main.lua
4
main.lua
@@ -234,9 +234,9 @@ function update_game()
|
|||||||
end
|
end
|
||||||
if abad.objects.gps~=nil then
|
if abad.objects.gps~=nil then
|
||||||
if btnp(KEY_1) then
|
if btnp(KEY_1) then
|
||||||
if abad.objects.gorro==nil then current_camera=1 end
|
if abad.objects.gorro==nil and abad.objects.clau_premiere==nil then current_camera=1 end
|
||||||
elseif btnp(KEY_2) then
|
elseif btnp(KEY_2) then
|
||||||
if abad.objects.peu==nil then current_camera=2 end
|
if abad.objects.peu==nil and abad.objects.clau_elalien==nil then current_camera=2 end
|
||||||
elseif btnp(KEY_3) then
|
elseif btnp(KEY_3) then
|
||||||
current_camera=3
|
current_camera=3
|
||||||
elseif btnp(KEY_4) then
|
elseif btnp(KEY_4) then
|
||||||
|
|||||||
@@ -1,9 +1,14 @@
|
|||||||
premiere={hab=75,x=24,y=24,flip=true,frame=12,wait=0,step=0,anim={12,13,12,14},bb={x=4,y=0,w=8,h=16},scene_intro=false,scene_object=false}
|
premiere={hab=75,x=24,y=24,flip=true,frame=12,wait=0,step=0,anim={12,13,12,14},bb={x=4,y=0,w=8,h=16},scene_intro=false,scene_object=false}
|
||||||
|
|
||||||
function premiere.init()
|
function premiere.init()
|
||||||
premiere.hit=premiere.hit
|
premiere.x=24
|
||||||
|
premiere.y=24
|
||||||
|
premiere.frame=12
|
||||||
|
premiere.wait=0
|
||||||
|
premiere.step=0
|
||||||
premiere.update=premiere.update_normal
|
premiere.update=premiere.update_normal
|
||||||
premiere.draw=premiere.draw
|
premiere.scene_intro=false
|
||||||
|
premiere.scene_object=false
|
||||||
local habs={75,44,20,0}
|
local habs={75,44,20,0}
|
||||||
premiere.hab=habs[1+rnd(4)]
|
premiere.hab=habs[1+rnd(4)]
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user