diff --git a/music.wav b/music.wav new file mode 100644 index 0000000..c6a449d Binary files /dev/null and b/music.wav differ diff --git a/pulsar.p8 b/pulsar.p8 index d193ce5..0f6ccd9 100644 --- a/pulsar.p8 +++ b/pulsar.p8 @@ -23,12 +23,12 @@ __sfx__ 090a20001837018341183411834118341183411834118341183411834118341183411834118341183411834118341183411834118341183411834118341183411834118341183411834118341183411834118341 010120002667126361233610e3610e3610a3610636103361013600036301363013630135000350003500035002350023500235002550025400254001540004400000000000000000000000000000000000000000 090120003f6503f6413f6413363133635000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -010f20000a8720a842000000a8720a8420a8420a8720a8420a8420a8720a8420a84200000000000f8720f8420d8720d842000000d8720d8420d8420d872000000f8720f84200000000000f8720f8420f8420f842 -010f20001197211942000001197211942119421197200000129721294200000129721397213942139720000014972149420000014972149421494214972000001397213942000001397212972129421297200000 -010f200013a70252351eb23192351e673000001eb232523513a70192351eb23000001e673252351eb230000013a70252351eb23192351e673000001eb232523513a70192351eb23000001e673252351eb2300000 -010f20000a8720a842000000a8720a8420a8420a872000000f8720f84200000000000f8720f8420f8420f8420d8720d842000000d8720d8420d8420d8720d8420f8720f8720f8420f84200000000000f8720f842 -010f20001197211942119721194214972149421497214942169721694216972169421897218942189721894216972169421697216942149721494214972149421397213942139721394212972129421297212942 -010f200013a70252351eb23192351e673000001eb232523513a70192351eb23000001e673272351eb230000013a70292351eb23192351e673000001eb232923513a70192351eb2300000192352a2351eb2300000 +010f20000a8720a842000000a8720a842000000a8720a842000000a8720a8420a84200000000000f8720f8420d8720d842000000d8720d842000000d872000000f8720f84200000000000f8720f8420f8420f842 +010f20000a9720a942000001197211942119421197211942129720a9720a9420a94200000000000f9720f9420d9720d9420000014972149421494214972149421397213972139421394212972129421294212942 +010f200013a70000001eb23000001e673000001eb230000013a70000001eb23000001e673000001eb230000013a70000001eb23000001e673000001eb230000013a70000001eb23000001e673000001eb2300000 +010f20000a8720a842000000a8720a842000000a872000000f8720f84200000000000f8720f8420f84218872168720d872000000d8720d842000000d8720d842000000f8720f8420000000000000000f8720f842 +010f20001197211942000001197214972149421497214942169721697216942169420000000000199721994219972199420000016972149721494214972149421397213972139421394212972129421294212942 +010f200013a70000001eb23000001e673000001eb230000013a70000001eb23000001e673000001eb230000013a70000001eb23000001e673000001eb230000013a70000001eb230000000000000001eb2300000 010f200013a70252351eb23192351e673000001eb232523513a70192351eb23000001e673252351eb230000013a70252351eb23192351e673000001eb232523513a70192351eb23000001e673252351eb2300000 010f20000a8720a842000000a8720a8420a8420a872000000f8720f84200000000000f8720f8420f8420f8420d8720d842000000d8720d8420d8420d8720d8420f8720f8720f8420f84200000000000f8720f842 010f20001197211942119721194214972149421497214942169721694216972169421897218942189721894216972169421697216942149721494214972149421397213942139721394212972129421297212942 diff --git a/unique.lua b/unique.lua index 566f3bc..ee00db9 100644 --- a/unique.lua +++ b/unique.lua @@ -27,9 +27,9 @@ function build_bgm() local yowler=instrument:new(devil(9,2,7,4)) local melo1=instrument:new(melo1) local drums=instrument:new(drums) - local p0=performer:new(bgm,0,bassline,0,{12-2}) - local p1=performer:new(bgm,1,yowler,0,{12-2}) - local p2=performer:new(bgm,2,melo1,0,{12-2}) + local p0=performer:new(bgm,0,bassline,0,{10}) + local p1=performer:new(bgm,1,yowler,0,{10}) + local p2=performer:new(bgm,2,melo1,0,{10}) local pd=performer:new(bgm,2,drums,0,{0}) local ph=performer:new(bgm,2,drums,0,{0}) --local pm=performer:new(bgm,2,melo1,0,{48-2}) @@ -45,9 +45,9 @@ function build_bgm() :add(4,{5,8,15,27}) , { - "Aa.AaaAaaAaa..Aa" .. "Aa.AaaA.Aa..Aaaa", - "Bb.BbbB.Bb.BbbB." .. "Bb.BbbB.Bb.BbbB.", - "Cd.Cd.Cd.Cd.Cdd." .. "Cd.Cd.Cd.Cd.Cdd.", + "Aa.Aa.Aa.Aaa..Aa" .. "Aa.Aa.A.Aa..Aaaa", + "Aa.BbbBbbAaa..Aa" .. "Aa.BbbBbbBbbBbbb", + "Aa.CccCccAaa..Aa" .. "Aa.CccCccCccCccc", "@...!...@...!..." .. "@...!...@.@.!.@.", "..'...'...'...'." .. "..'...'...'...'." } @@ -66,9 +66,9 @@ function build_bgm() :add(4,{5,8,15,32}) , { - "Aa.AaaA.Aa..Aaaa" .. "Aa.AaaAaaAaa..Aa", - "BbBbBbBbBbBbBbBb" .. "BbBbBbBbBbBbBbBb", - "Cd.Cd.Cd.Cd.Cdd." .. "Cd.Cd.Cd.Cd.Cdd.", + "Aa.Aa.A.Aa..Aaab" .. "BA.Aa.Aa.Aa...Aa", + "Bb.BbbBbbBbb..Cc" .. "Cc.BbbBbbBbbBbbb", + "Cc.CccCccDdd..Dd" .. "Dd.DddDddDddDddd", "@.@.!.@.@.@.!.@." .. "@...!...@.@...@.", "..''..'...''..'." .. "..'...'...'...'." } @@ -109,10 +109,11 @@ function drums(duration,pitch,verbs) end function melo1(duration,pitch,verbs) + do return {} end local v=3 local out={} for i=1,duration do - out[i]=nflags:new{p=pitch,w=2,v=v,e=5} + out[i]=nflags:new{p=pitch,w=1,v=v,e=5} end return out end \ No newline at end of file