diff --git a/SOURCES.md b/SOURCES.md index 0a1f4ed..6424bcf 100644 --- a/SOURCES.md +++ b/SOURCES.md @@ -38,8 +38,9 @@ Sounds ------ All piece sounds are (c) 2020 Damian Yerrick. -Ready / go sounds from NullpoMino. -Menu sounds from TGM3 (will be replaced.) +Other sounds from: +- NullpoMino +- DTET, (c) 2003 Mihys. Music ----- diff --git a/load/sounds.lua b/load/sounds.lua index df41457..bae8b0c 100644 --- a/load/sounds.lua +++ b/load/sounds.lua @@ -20,6 +20,8 @@ sounds = { fall = love.audio.newSource("res/se/fall.wav", "static"), ready = love.audio.newSource("res/se/ready.wav", "static"), go = love.audio.newSource("res/se/go.wav", "static"), + irs = love.audio.newSource("res/se/irs.wav", "static"), + ihs = love.audio.newSource("res/se/ihs.wav", "static"), } function playSE(sound, subsound) diff --git a/res/se/cursor.wav b/res/se/cursor.wav index b55ae9a..06b8d8d 100644 Binary files a/res/se/cursor.wav and b/res/se/cursor.wav differ diff --git a/res/se/cursor_lr.wav b/res/se/cursor_lr.wav index 9e7245e..b89fe7e 100644 Binary files a/res/se/cursor_lr.wav and b/res/se/cursor_lr.wav differ diff --git a/res/se/ihs.wav b/res/se/ihs.wav new file mode 100644 index 0000000..cb9ad45 Binary files /dev/null and b/res/se/ihs.wav differ diff --git a/res/se/irs.wav b/res/se/irs.wav new file mode 100644 index 0000000..1a42e1e Binary files /dev/null and b/res/se/irs.wav differ diff --git a/res/se/main_decide.wav b/res/se/main_decide.wav index 63944ad..2e511f1 100644 Binary files a/res/se/main_decide.wav and b/res/se/main_decide.wav differ diff --git a/res/se/mode_decide.wav b/res/se/mode_decide.wav index 7e31e50..1b7a6da 100644 Binary files a/res/se/mode_decide.wav and b/res/se/mode_decide.wav differ diff --git a/tetris/modes/gamemode.lua b/tetris/modes/gamemode.lua index f5cf2ee..71d3e22 100644 --- a/tetris/modes/gamemode.lua +++ b/tetris/modes/gamemode.lua @@ -224,9 +224,7 @@ end function GameMode:onLineClear(cleared_row_count) end function GameMode:onPieceEnter() end -function GameMode:onHold() - playSE("hold") -end +function GameMode:onHold() end function GameMode:onSoftDrop(dropped_row_count) self.drop_bonus = self.drop_bonus + 1 * dropped_row_count @@ -363,7 +361,7 @@ end function GameMode:initializeOrHold(inputs, ruleset) if self.ihs and self.enable_hold and inputs["hold"] == true then - self:hold(inputs, ruleset) + self:hold(inputs, ruleset, true) else self:initializeNextPiece(inputs, ruleset, self.next_queue[1]) end @@ -374,7 +372,7 @@ function GameMode:initializeOrHold(inputs, ruleset) end end -function GameMode:hold(inputs, ruleset) +function GameMode:hold(inputs, ruleset, ihs) local data = copy(self.hold_queue) if self.piece == nil then self.hold_queue = self.next_queue[1] @@ -393,6 +391,8 @@ function GameMode:hold(inputs, ruleset) self:initializeNextPiece(inputs, ruleset, data, false) end self.held = true + if ihs then playSE("ihs") + else playSE("hold") end self:onHold() end diff --git a/tetris/modes/phantom_mania2.lua b/tetris/modes/phantom_mania2.lua index cd2bab2..fed310c 100644 --- a/tetris/modes/phantom_mania2.lua +++ b/tetris/modes/phantom_mania2.lua @@ -291,7 +291,7 @@ function PhantomMania2Game:setHoldOpacity() if self.level > 1000 and self.level < 1300 then love.graphics.setColor(1, 1, 1, 1 - math.min(1, self.hold_age / 15)) else - love.graphics.setColor(1, 1, 1, 1) + self.super:setHoldOpacity(1, self.held and 0.6 or 1) end end diff --git a/tetris/rulesets/ruleset.lua b/tetris/rulesets/ruleset.lua index ccd1220..537de97 100644 --- a/tetris/rulesets/ruleset.lua +++ b/tetris/rulesets/ruleset.lua @@ -197,7 +197,14 @@ function Ruleset:initializePiece( }, self.block_offsets, 0, 0, data.skin, colours[data.shape], big) self:onPieceCreate(piece) - if irs then self:rotatePiece(inputs, piece, grid, {}, true) end + if irs then + if inputs.rotate_left or inputs.rotate_left2 or + inputs.rotate_right or inputs.rotate_right2 or + inputs.rotate_180 then + playSE("irs") + end + self:rotatePiece(inputs, piece, grid, {}, true) + end self:dropPiece(inputs, piece, grid, gravity, drop_speed, drop_locked, hard_drop_locked) return piece end