From 9df6bb9989175954050e84c1e2074ec5b2bf8531 Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Sun, 12 Sep 2021 19:26:47 -0400 Subject: [PATCH 1/3] Small clean-up in PM2 --- tetris/modes/phantom_mania2.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tetris/modes/phantom_mania2.lua b/tetris/modes/phantom_mania2.lua index c1e7421..cae2c3e 100644 --- a/tetris/modes/phantom_mania2.lua +++ b/tetris/modes/phantom_mania2.lua @@ -287,7 +287,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 - self.super:setHoldOpacity(1, self.held and 0.6 or 1) + self.super:setHoldOpacity() end end From c18e7ed244117035ca8a629088263bedcbab271e Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Sun, 12 Sep 2021 19:28:00 -0400 Subject: [PATCH 2/3] Fixed hold opacity when level < 1000 --- tetris/modes/phantom_mania2.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tetris/modes/phantom_mania2.lua b/tetris/modes/phantom_mania2.lua index cae2c3e..12ca98b 100644 --- a/tetris/modes/phantom_mania2.lua +++ b/tetris/modes/phantom_mania2.lua @@ -287,7 +287,8 @@ 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 - self.super:setHoldOpacity() + local colour = self.held and 0.6 or 1 + love.graphics.setColor(colour, colour, colour, 1) end end From 784c768c57ed931ef349eb511851ebbeb17506a2 Mon Sep 17 00:00:00 2001 From: Ishaan Bhardwaj Date: Tue, 14 Sep 2021 22:15:08 -0400 Subject: [PATCH 3/3] Update SOURCES.md --- SOURCES.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/SOURCES.md b/SOURCES.md index c711028..eb03110 100644 --- a/SOURCES.md +++ b/SOURCES.md @@ -169,4 +169,52 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +discord-rpc (https://github.com/discord/discord-rpc) +-------------------- + +Copyright 2017 Discord, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +lua-discordRPC (https://github.com/pfirsich/lua-discordRPC) +-------------------- + +MIT License + +Copyright (c) 2018 Joel Schumacher + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file