From 0a8054c67fdf2241fd0d1561266c61ad107bbfca Mon Sep 17 00:00:00 2001 From: JailDoctor Date: Tue, 27 Dec 2022 14:08:13 +0100 Subject: [PATCH] - Music included - Audio ongoing --- abad.lua | 12 ++++++++++-- audio.lua | 4 ++++ game.ini | 2 +- main.lua | 1 + 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 audio.lua diff --git a/abad.lua b/abad.lua index 92d4b76..012a4a5 100644 --- a/abad.lua +++ b/abad.lua @@ -1,8 +1,8 @@ -abad={x=40,y=24,flip=false,frame=1,wait=0,hab=10,vides=3,energia=40,falling=0,step=0,hurting=0,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, mustep=1,hurting=0,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}} 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,hurting=0,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,mustep=1,draw=abad.draw,hurting=0,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.objects={} @@ -74,6 +74,7 @@ function abad_state_normal() abad.update=abad_state_jumping abad.step=0 abad.jumpfwd=false + playchirp(audio_abad_jump) elseif btn(KEY_DOWN) then abad.update=abad_state_crouch elseif btnp(KEY_SPACE) and cacau.hab==-1 then @@ -143,6 +144,11 @@ function abad_state_walking() if abad.wait==6 then abad.wait=0 abad.step=(abad.step+1)%4 + if abad.step==0 then + playchirp(audio_abad_step[abad.mustep]) + abad.mustep = abad.mustep + 1 + if abad.mustep == 5 then abad.mustep=1 end + end abad.frame=abad.anim[abad.step+1] abad_advance() @@ -159,6 +165,7 @@ function abad_state_walking() abad.update=abad_state_jumping abad.step=0 abad.jumpfwd=true + playchirp(audio_abad_jump) return elseif btn(KEY_DOWN) then abad.update=abad_state_crouch @@ -220,6 +227,7 @@ function abad_state_jumping() end elseif abad.step>6 then abad.update=abad_state_falling + playchirp(audio_abad_fall) end abad.step=abad.step+1 end diff --git a/audio.lua b/audio.lua new file mode 100644 index 0000000..6b38f66 --- /dev/null +++ b/audio.lua @@ -0,0 +1,4 @@ +audio_main_song="t7l1cl0rv2cv4o3l1gl0rv2gv4o4l1cl0rv2cv4l1d#l0rv2d#v4l1dl0rv2dv4o3l1gl0rv2gv4o4l1dl0rv2dv4l1fl0rv2fv4l1d#l0rv2d#v4l1gl0rv2gv4l1fl0rv2fv4l1gl0rv2gv4l1d#l0rv2d#v4l1gl0rv2gv4l1dl0rv2dv4l1gl0rv2gv4l1cl0rv2cv4o3l1gl0rv2gv4o4l1cl0rv2cv4l1d#l0rv2d#v4l1dl0rv2dv4o3l1gl0rv2gv4o4l1dl0rv2dv4l1fl0rv2fv4l1d#l0rv2d#v4l1gl0rv2gv4l1dl0rv2dv4l1gl0rv2gv4l1cl0rv2cv4l1d#l0rv2d#v4l1fl0rv2fv4l1gl0rv2gv4l1g#l0rv2g#v4l1gl0rv2gv4l1g#l0rv2g#v4l1fl0rv2fv4l1dl0rv2dv4o3l1a#l0rv2a#v4o4l1d#l0rv2d#v4l1fl0rv2fv4l1gl0rv2gv4l1fl0rv2fv4l1gl0rv2gv4l1d#l0rv2d#v4l1cl0rv2cv4o3l1g#l0rv2g#v4o4l1dl0rv2dv4l1d#l0rv2d#v4l1fl0rv2fv4l1d#l0rv2d#v4l1fl0rv2fv4l1dl0rv2dv4o3l1bl0rv2bv4l1gl0rv2gv4o4l1cl0rv2cv4l1dl0rv2dv4l1d#l0rv2d#v4l1dl0rv2dv4l1d#l0rv2d#v4l1cl0rv2cv4o5l1cl0rv2cv4o4l1a#l0rv2a#v4l1g#l0rv2g#v4l1gl0rv2gv4l1a#l0rv2a#v4l1g#l0rv2g#v4l1gl0rv2gv4l1fl0rv2fv4l1g#l0rv2g#v4l1gl0rv2gv4l1fl0rv2fv4l1d#l0rv2d#v4l1gl0rv2gv4l1fl0rv2fv4l1d#l0rv2d#v4l1dl0rv2dv4l1cl0rv2cv4o5l1cl0rv2cv4o4l1gl0rv2gv4o5l1cl0rv2cv4o3l1bl0rv2bv4o4l1bl0rv2bv4l1gl0rv2gv4l1bl0rv2bv4o5l1cl0rv2cv4o4l1gl0rv2gv4l1d#l0rv2d#v4l1gl0rv2gv4l1cl0rv2cv4l1gl0rv2gv4l1fl0rv2fv4l1gl0rv2gv4l1d#l0rv2d#v4l1gl0rv2gv4l1dl0rv2dv4l1gl0rv2gv4l1cv2l0cv4rl1g#l0rv2g#v4l1gl0rv2gv4l1g#l0rv2g#v4l1fl0rv2fv4l1g#l0rv2g#v4l1d#l0rv2d#v4l1g#l0rv2g#v4l1dl0rv2dv4l1fl0rv2fv4l1d#l0rv2d#v4l1fl0rv2fv4l1dl0rv2dv4l1fl0rv2fv4l1cl0rv2cv4l1fl0rv2fv4o3l1a#l0rv2a#v4o4l1gl0rv2gv4l1fl0rv2fv4l1gl0rv2gv4l1d#l0rv2d#v4l1gl0rv2gv4l1dl0rv2dv4l1gl0rv2gv4l1cl0rv2cv4o5l1cl0rv2cv4o4l1a#l0rv2a#v4o5l1cl0rv2cv4o4l1g#l0rv2g#v4o5l1cl0rv2cv4o4l1gl0rv2gv4o5l1cl0rv2cv4o4l1fl0rv2fv4l1a#l0rv2a#v4l1g#l0rv2g#v4l1a#l0rv2a#v4l1gl0rv2gv4l1a#l0rv2a#v4l1fl0rv2fv4l1a#l0rv2a#v4l1d#l0rv2d#v4l1g#l0rv2g#v4l1gl0rv2gv4l1g#l0rv2g#v4l1fl0rv2fv4l1g#l0rv2g#v4l1d#l0rv2d#v4l1g#l0rv2g#v4l1dl0rv2dv4l1gl0rv2gv4l1fl0rv2fv4l1gl0rv2gv4o5l1cl0rv2cv4o4l1a#l0rv2a#v4l1g#l0rv2g#v4l1gv2l0rgv4l1a#l0rv2a#v4l1g#l0rv2g#v4l1gl0rv2gv4l1fl0rv2fv4l1g#l0rv2g#v4l1gl0rv2gv4l1fl0rv2fv4l1d#l0rv2d#v4l1gl0rv2gv4l1fl0rv2fv4l1d#l0rv2d#v4l1dl0rv2dv4l1cl0rv2cv4o5l1cl0rv2cv4o4l1gl0rv2gv4o5l1cl0rv2cv4o3l1bl0rv2bv4o4l1bl0rv2bv4l1gl0rv2gv4l1bl0rv2bv4o5l1cl0rv2cv4o4l1gl0rv2gv4l1d#l0rv2d#v4l1gl0rv2gv4l3cv3cv2cv1c" +audio_abad_jump="l1rl0c#dd#eff#gg#" +audio_abad_fall="l1rl0g#gf#fed#dc#" +audio_abad_step={"v1l1c#", "v1l1o5c#", "v1l1g#", "v1l1o5c#"} diff --git a/game.ini b/game.ini index 08392a7..684f2e5 100644 --- a/game.ini +++ b/game.ini @@ -2,4 +2,4 @@ title=Cacaus width=128 height=96 zoom=5 -files=dead.lua,scenes.lua,trigger.lua,score.lua,switches.lua,map.lua,mapa.lua,bol.lua,invisible.lua,gota.lua,fireball.lua,cacau.lua,bambolla.lua,imp.lua,gps.lua,peu.lua,gorro.lua,batman.lua,elalien.lua,premiere.lua,caco.lua,zombie.lua,abad.lua,main.lua +files=audio.lua,dead.lua,scenes.lua,trigger.lua,score.lua,switches.lua,map.lua,mapa.lua,bol.lua,invisible.lua,gota.lua,fireball.lua,cacau.lua,bambolla.lua,imp.lua,gps.lua,peu.lua,gorro.lua,batman.lua,elalien.lua,premiere.lua,caco.lua,zombie.lua,abad.lua,main.lua diff --git a/main.lua b/main.lua index 8e9eca1..78657c6 100644 --- a/main.lua +++ b/main.lua @@ -186,6 +186,7 @@ function update_game() elseif btnp(KEY_RETURN) then mode=modes.playing mapa_do_backup() + playchirp(audio_main_song); elseif btnp(KEY_S) and (btn(KEY_LCTRL) or btn(KEY_LGUI)) then _update=update_dialog elseif btnp(KEY_C) then