From ff7acaa28efa798aa724602780376b6952335b0c Mon Sep 17 00:00:00 2001 From: guilevi Date: Mon, 28 Aug 2023 01:00:22 +0200 Subject: [PATCH] wtf I don't know --- .DS_Store | Bin 8196 -> 8196 bytes alsoft.conf | 1 - audio/.DS_Store | Bin 8196 -> 8196 bytes audio/enemies/.DS_Store | Bin 6148 -> 6148 bytes audio/enemies/1/.DS_Store | Bin 0 -> 6148 bytes audio/enemies/1/oloop.flac | Bin 8904 -> 0 bytes audio/radar.flac | Bin 0 -> 13938 bytes enemies/basic.lua | 1 - enemy.lua | 23 ++++++++++++++++++++--- field.lua | 1 + game.lua | 16 +++++++++++----- main.lua | 5 +++-- player.lua | 2 +- soundgroups.lua | 10 +++------- tracks/gourmet.lua | 4 ++-- utils.lua | 6 ++++++ 16 files changed, 47 insertions(+), 22 deletions(-) delete mode 100644 alsoft.conf create mode 100644 audio/enemies/1/.DS_Store delete mode 100644 audio/enemies/1/oloop.flac create mode 100644 audio/radar.flac diff --git a/.DS_Store b/.DS_Store index 4598eca0b6ddc3bf1cb1617072aeda685f63a5f8..88d1c81108520cf805f9b31736b2b1688778ffdf 100644 GIT binary patch delta 79 xcmZp1XmQvuOMt`3&|F8s$jEqdkBI%|hXR_6s3L(v^313r+eLS>ql@@50RV3g7196z delta 43 ncmZp1XmQvuOJH(~i2LS;0-B6qMxc;9GnlbmbSFEM;mZU7X8;er diff --git a/alsoft.conf b/alsoft.conf deleted file mode 100644 index 499fa4d..0000000 --- a/alsoft.conf +++ /dev/null @@ -1 +0,0 @@ -hrtf = false diff --git a/audio/.DS_Store b/audio/.DS_Store index 8043bae2ddeeac590f357d84047952c2b8143bc6..99ce10b6d1569aecbddef02ea3f008fd7bb8be65 100644 GIT binary patch delta 39 ncmZp1XmQvuPk_V7&|F8s$jErIhLHW{rvlcDaFNX#LU(up;Mxke delta 25 fcmZp1XmQvuPhj#aVb9Ia1uPkX4EN3HLUVZmh1?0T diff --git a/audio/enemies/.DS_Store b/audio/enemies/.DS_Store index 5d77cc4f8584f145a92e02f991578570ffb57fd9..bb2847840fe1c2902984a1629100e943d8b19536 100644 GIT binary patch delta 21 ccmZoMXffC@iHXC=&|F8s$jEr}ET$|`07f(h00000 delta 21 ccmZoMXffC@iHXC|)KW*m$ii^*ET$|`07i=j2><{9 diff --git a/audio/enemies/1/.DS_Store b/audio/enemies/1/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 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 literal 0 HcmV?d00001 diff --git a/enemies/basic.lua b/enemies/basic.lua index 38dc6f7..393511d 100644 --- a/enemies/basic.lua +++ b/enemies/basic.lua @@ -5,5 +5,4 @@ sounds=group("audio/enemies/1") sounds.loop:setLooping(true) enemyBasic.super.new(self,x,y,sounds) sounds.loop:play() - end \ No newline at end of file diff --git a/enemy.lua b/enemy.lua index fa9b827..fc3c352 100644 --- a/enemy.lua +++ b/enemy.lua @@ -1,12 +1,18 @@ enemy=object:extend() -function enemy:new(x,y,sounds) +function enemy:new(x,y,sounds,hp) self.x=x self.y=y self.dx=0 self.dy=-1 +self.hp=hp or 10 self.sounds=sounds; sounds.loop:setPosition(x,y,0) +for k,v in pairs(sounds) do +if v:typeOf("Source") then +v:setAttenuationDistances(110,game.field.height) +end +end self.lastMoveTick=0 self.rate=game.currentTrack.info.beatDivisions end -- new @@ -21,5 +27,16 @@ function enemy:move() self.lastMoveTick=game.ticker.ticks self.x=self.x+self.dx self.y=self.y+self.dy -self.sounds.loop:setPosition(self.x,self.y,0) -end \ No newline at end of file +utils.setSourcePosition(self.sounds.loop, self.x,self.y) +if(self.y<=0) then self:land() end +end + +function enemy:land() +tts.say("landed") +for k,v in pairs(self.sounds) do +if v:typeOf("Source") then +if v:isLooping() then v:stop() end +end +end -- stop all loops +self.destroy=true +end -- land \ No newline at end of file diff --git a/field.lua b/field.lua index 4bcbfc3..47744f5 100644 --- a/field.lua +++ b/field.lua @@ -9,5 +9,6 @@ end -- new function field:update(dt) for k,v in pairs(self.contents) do v:update(dt) +if v.destroy then game.field.contents[k]=nil end end -- for field end \ No newline at end of file diff --git a/game.lua b/game.lua index 23874c8..224b9bb 100644 --- a/game.lua +++ b/game.lua @@ -1,7 +1,7 @@ require "field" game={} -game.field=field(40,20) +game.field=field(40,30) game.player=player game.ticker=ticker(0.125) game.currentTrack={} @@ -31,7 +31,8 @@ game.trackRunning=false end -- loadtrack function game.init() -table.insert(game.field.contents, enemyBasic(5,20)) +game.meh=enemyBasic(6,game.field.height) +table.insert(game.field.contents, game.meh) function game.ticker:tick() for k,event in pairs(game.events) do local adjustedTicks=game.ticker.ticks-1+(event.shift or 0) @@ -48,12 +49,17 @@ end -- if fire one-shot event end -- if recurring end -- for events end -local click={ -i=2, +local radar={ +i=1, recurring=true, func=function() +for k,v in pairs(game.field.contents) do +if v.x==player.x then aud.meh:stop() aud.meh:play() +return +end +end end } local beep={ @@ -64,6 +70,6 @@ aud.beep:stop() aud.beep:play() end } --- game.events.click=click +game.events.radar=radar -- game.events.beep=beep end \ No newline at end of file diff --git a/main.lua b/main.lua index c151088..30500b1 100644 --- a/main.lua +++ b/main.lua @@ -18,7 +18,9 @@ require "player" require "game" require "enemy" require "enemies/basic" +love.audio.setDistanceModel("exponent") aud=group("audio") +aud.meh:setRelative(true) c=require "tracks/gourmet" love.timer.sleep(1) game.loadTrack(c) @@ -39,8 +41,7 @@ player.direction=-1 elseif key=="c" then tts.say(player.x) elseif key=="d" then -print(love.audio.getOrientation()) -love.audio.setPosition(100,0,30) +tts.say(game.meh.y) end end -- keyPressed diff --git a/player.lua b/player.lua index 912fca8..134e4fa 100644 --- a/player.lua +++ b/player.lua @@ -20,6 +20,6 @@ if dx<0 or dx>game.field.width then -- boundary shit goes here else player.x=dx -love.audio.setPosition(player.x, player.y, 0) +love.audio.setPosition(player.x, player.y, 3) end -- if boundary end \ No newline at end of file diff --git a/soundgroups.lua b/soundgroups.lua index 83d405c..a4fa5be 100644 --- a/soundgroups.lua +++ b/soundgroups.lua @@ -9,9 +9,9 @@ function group:addDirectory(directory) files=fs.getDirectoryItems(directory) sound=love.audio.newSource(fullpath, "static") if sound:typeOf("Source") then --print("Loaded " .. nameOnly) - if sound:getChannelCount()==1 then sound:setRelative(true) end + -- if sound:getChannelCount()==1 then sound:setRelative(true) end self[nameOnly]=sound - self.sounds[nameOnly] =sound + -- self.sounds[nameOnly] =sound end --if is a sound end --if it's a file end -- if it's not a dot @@ -20,7 +20,7 @@ function group:addDirectory(directory) files=fs.getDirectoryItems(directory) end --addDirectory function group:new(directory) - self.sounds={} + -- self.sounds={} self:addDirectory(directory) end @@ -42,7 +42,3 @@ end --setEffect function -t={ -a=2, -b=3 -} \ No newline at end of file diff --git a/tracks/gourmet.lua b/tracks/gourmet.lua index 003a39f..8233bbd 100644 --- a/tracks/gourmet.lua +++ b/tracks/gourmet.lua @@ -1,9 +1,9 @@ local t={ path="audio/tracks/gourmet.mp3", bpm=160, -startTime=0.05, +startTime=0.02, beatDivisions=4, -volumeBase=0 +volumeBase=0.02 } return track(t) \ No newline at end of file diff --git a/utils.lua b/utils.lua index a4d448a..2bc019d 100644 --- a/utils.lua +++ b/utils.lua @@ -9,4 +9,10 @@ local closest=math.min(math.abs(time-prevDivTime), math.abs(time-nextDivTime)) local halfDivision=beatDivisions/2*game.ticker.tickTime -- print(math.abs(time-nextDivTime),"to next beat, ",math.abs(time-prevDivTime)," to previous beat. Half division is ",halfDivision,". Closest is ",closest,". The current time is ",time,", and the next division is at ", nextDivTime,", last tick happened at ",game.ticker.lastTickTime," and is tick number ",game.ticker.ticks) return (halfDivision-closest)/halfDivision -- Math is hard +end + +local volumeScale=0.0029 +function utils.setSourcePosition(source, x, y) +source:setPosition(x,8,0) +source:setVolume(volumeScale*game.field.height-volumeScale*math.abs(player.y-y)) end \ No newline at end of file