How did that get away?

Also updated the documentation.

.gitignore

@@ -2,5 +2,3 @@
 *.love
 dist/*.zip
 dist/**/cambridge.exe
-dist/**/libs
-dist/**/*.md

README.md

@@ -1,74 +1,41 @@
-![Cambridge Banner](https://t-sp.in/public/img/cambridge.png)
-
 Cambridge
 =========
 
 Welcome to Cambridge, the next open-source falling-block game engine!
 
-The project is written and maintained exclusively by [SashLilac](https://github.com/SashLilac), [joezeng](https://github.com/joezeng) and [Oshisaure](https://github.com/oshisaure)!  
 
-The Discord server has been reopened! https://discord.gg/AADZUmgsph
+Installation instructions
+-------------------------
 
-The game also has a website now with more detail than seen on this README: https://t-sp.in/cambridge
+Pre-built releases are available on the releases page.
-
-Credits
--------
-
-- [Lilla Oshisaure](https://www.youtube.com/user/LeSpyroshisaure) for being my co-dev!
-- [joezeng](https://github.com/joezeng) for the original project, and for offering to help with the expansion!
-- [The Tetra Legends Discord](http://discord.com/invite/7hMx5r2) for supporting me and playtesting!
-- [The Absolute Plus](https://discord.gg/6Gf2awJ) for being another source of motivation!
-
-More special thanks can be found in-game, under the "Credits" menu.
-
-![Cambridge Logo](https://cdn.discordapp.com/attachments/625496179433668635/763363717730664458/Icon_2.png)
-
-Playing the game
-----------------
 
 ### Windows
 
-You do not need LÖVE on Windows, as it comes bundled with the program.  
+Unzip the exe file and run it directly. All assets are currently bundled inside the executable.
 
-#### Stable release
+### macOS
 
-To get the stable release, simply download either `cambridge-win32.zip` (32-bit) or `cambridge-windows.zip` (64-bit) in the [latest release](https://github.com/sashlilac/cambridge/releases/latest).  
+For the time being, the file `cambridge.love` only works on the command line. Install `love` with [https://brew.sh/](Homebrew), and run:
 
-All assets needed are bundled with the executable.
+    $ love cambridge.love
 
-#### Bleeding edge
+### Linux
 
-If you want the bleeding edge version, download [this](https://github.com/SashLilac/cambridge/archive/master.zip).
+Same as macOS, except install `love` with your favourite package manager.
 
-Extract the ZIP, open a Command Prompt at the folder you extracted Cambridge to, then run this command:
 
-	dist\windows\love.exe .
+Running from source
+-------------------
 
-Alternatively, if you're on a 32-bit system, run this instead:
+If you want the bleeding-edge release, you can also clone the code straight from this repository.
-
-	dist\win32\love.exe .
-
-32-bit systems do not support rich presence integration.
-
-Then, check the mod pack section at the bottom of this page.
 
 ### macOS, Linux
 
 If you haven't already, install `love` with your favourite package manager (Homebrew on macOS, your system's default on Linux). **Make sure you're using LÖVE 11, because it won't work with earlier versions!**
 
-#### Downloading a release
-
-You can download the .love file in the latest release, and run it with:
-
-    love cambridge.love
-
-#### Installing from source
-
 Clone the repository in git:
 
-	git clone https://github.com/SashLilac/cambridge
+    git clone https://github.com/joezeng/cambridge
-
-Alternatively, download the source code ZIP in the latest release.
 
 Then, navigate to the root directory that you just cloned, and type:
 
@@ -76,9 +43,6 @@ Then, navigate to the root directory that you just cloned, and type:
 
 It should run automatically!
 
-## Installing modpacks
-
-For instructions on how to install modpacks, go to [this](https://github.com/SashLilac/cambridge-modpack) mod pack to get a taste of the mod potential.
 
 License
 -------

SOURCES.md

@@ -8,7 +8,7 @@ Some of the assets are used without proper licenses. We aim to have fully licens
 Backgrounds
 -----------
 
-1. Title: Original picrute found on the Wikipedia article for Cambridge
+1. Title: "Motus Glacies." Contributed by Daniel "Explo" McCarthy.
 
 1. *Gameplay level 0: "Quantum foam." Alex Sukontsev. https://www.flickr.com/photos/control9/14957509814/
 2. *Gameplay level 1: No name. http://www.onekind.tv/univision-mqb/q5mqh5brlvuuj2nhdx7ch7eum183uu
@@ -34,18 +34,10 @@ Backgrounds
 Backgrounds marked with a * are placeholders that will be replaced in later versions due to incompatible licenses. We are generally aiming for public domain background images, but will also accept backgrounds given proper licenses to be included within Cambridge.
 
 
-Sounds
-------
-
-All piece sounds are (c) 2020 Damian Yerrick.
-Other sounds from:
-- NullpoMino
-- DTET, (c) 2003 Mihys.
-
 Music
 -----
 
-1. Second Reality opening scene music (1993).
+1. TGM3 credit roll music.
 2. The FitnessGram™ Pacer Test.
 
 All background music is (currently) only unofficially included. In later releases they may be replaced with specifically licensed music as applicable.
@@ -114,59 +106,3 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 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.
-
-simple-slider (https://love2d.org/forums/viewtopic.php?t=80711)
---------------------
-
-Copyright (c) 2016 George Prosser
-
-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.
-
-bigint.lua (https://github.com/empyreuma/bigint.lua)
---------------------
-
-3-Clause BSD License
-
-Copyright (c) Emily "empyreuma" 2016
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the <organization> nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-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.

clean.bat

@@ -1,11 +0,0 @@
-@del cambridge.love
-@del dist\windows\cambridge.exe
-@del dist\windows\SOURCES.md
-@del dist\windows\LICENSE.md
-@rmdir /Q /S dist\windows\libs
-@del dist\win32\cambridge.exe
-@del dist\win32\SOURCES.md
-@del dist\win32\LICENSE.md
-@rmdir /Q /S dist\win32\libs
-@del dist\cambridge-windows.zip
-@del dist\cambridge-win32.zip

conf.lua

@@ -6,6 +6,5 @@ function love.conf(t)
 	t.window.title = "Cambridge"
 	t.window.width = 640
 	t.window.height = 480
-	t.window.icon = "res/img/cambridge_icon.png"
 	t.window.vsync = false
 end

docs/gamemodes.md

@@ -3,11 +3,21 @@ Game modes
 
 There are several classes of game modes. The modes that originate from other games are organized by suffix:
 
+* The "C" series stand for "Classic" games, games that were produced before around 1992-1993 and generally have no wallkicks or lock delay.
+    * C84 - The original version from the Electronika 60.
+    * C88 - Sega Tetris.
+    * C89 - Nintendo / NES Tetris.
 * The "A" series stand for "Arika" games, or games in the Tetris the Grand Master series.
     * A1 - Tetris The Grand Master (the original from 1998).
     * A2 - Tetris The Absolute The Grand Master 2 PLUS.
     * A3 - Tetris The Grand Master 3 Terror-Instinct.
     * AX - Tetris The Grand Master ACE (X for Xbox).
+* The "G" series stand for "Guideline" games, or games that follow the Tetris Guideline.
+    * GF - Tetris Friends (2007-2019)
+    * GJ - Tetris Online Japan (2005-2011)
+* The "N" series stands for Nullpomino, only used for Phantom Mania N.
+* The "W" series stands for "Web" games, which are fanmade games released on the web.
+    * WCB - RainComplex.net's Cat Boi Quatro.
 
 MARATHON
 --------
@@ -15,11 +25,16 @@ MARATHON
 Modes in which the goal is to play as well as possible over a limited game interval.
 
 * **MARATHON 2020**: 2020 levels of pure pain. Can you make it all the way?
+* **MARATHON WCB**: CatBoiQuatro! Can you control the pieces?
 
 From other games:
 * **MARATHON A1**: Tetris the Grand Master 1.
 * **MARATHON A2**: Tetris the Grand Master 2 (TAP Master).
 * **MARATHON A3**: Tetris the Grand Master 3 (no exams).
+* **MARATHON AX**: Normal mode from TGM Ace.
+* **MARATHON AX2**: Hi-Speed1 mode from TGM Ace.
+* **MARATHON AX3**: Hi-Speed2 mode from TGM Ace.
+* **MARATHON C89**: Nintendo NES Tetris. Can you transition and make it to the killscreen?
 
 
 SURVIVAL
@@ -34,6 +49,23 @@ From other games:
 * **SURVIVAL A2**: T.A. Death.
 * **SURVIVAL A3**: Ti Shirase.
 * **SURVIVAL AX**: Another mode from TGM Ace.
+* **SURVIVAL AX2**: Another2 mode from TGM Ace.
+
+
+RACE
+----
+
+Modes with no levels, just a single timed goal.
+
+* **Race 40**: How fast can you clear 40 lines? No limits, no holds barred.
+
+
+CREDITS
+-------
+
+Modes that are just the credit rolls of specific games.
+
+* **CREDITS A3**: Tetris the Grand Master 3's famous M-roll.
 
 
 PHANTOM MANIA
@@ -46,10 +78,13 @@ Modes where pieces turn invisible as soon as you lock them. One of Cambridge's s
 * **Phantom Mania 2**: Phantom Mania but way faster! Can you face a mode where even the garbage and the next preview turn invisible?
 
 
-
 OTHER MODES
 -----------
 
 * **Strategy**: How well can you plan ahead your movements? Can you handle only having a short time to place each piece?
 
-* **Big A2**: Marathon A2 but all the pieces are BIG!
+* **TetrisGram™ Pacer Test**: is a multi-stage piece-placing ability test that progressively gets more difficult as it continues.
+
+* **Interval Training**: 30 seconds per section. 20G. 15 frames of lock delay. How long can you last?
+
+* **Demon Mode**: An original mode from Oshisaure! Can you push through the ever faster levels and not get denied?

docs/rulesets.md

@@ -10,16 +10,13 @@ A ruleset consists of the following things:
 
 If you're used to Nullpomino, you may notice a few things missing from that definition. For example, piece previews, hold queues, and randomizers have been moved to being game-specific rules, rather than rules that are changeable with the ruleset you use. Soft and hard drop behaviour is also game-specific now, so that times can be more plausibly compared across rulesets.
 
+There are six rulesets currently supported:
 
-Rotation system
+* Cambridge - a ruleset original to Cambridge, used for all custom modes. Supports 180-degree rotations!
----------------
-A rotation system defines the following things:
- * The block offsets of each piece orientation.
- * The wall or floor kicks that will be attempted for each type of rotation.
 
-There are four rotation systems currently supported:
+* SRS - the rotation system used in the Tetris Guideline games. Supports 180-degree rotations!
+* Ti-SRS - SRS but with no 180-degree rotations.
 
-* Cambridge
+* ARS - the rotation system from the original Tetris the Grand Master.
-* Classic ARS
+* Ti-ARS - ARS with floorkicks! From TGM3: Terror Instinct.
-* Ti-ARS
+* Ace-ARS - ARS with floorkicks and move reset! From TGM ACE.
-* SRS

funcs.lua

@@ -1,5 +1,4 @@
 function copy(t)
-	-- returns deep copy of t (as opposed to the shallow copy you get from var = t)
 	if type(t) ~= "table" then return t end
     local meta = getmetatable(t)
     local target = {}
@@ -8,8 +7,7 @@ function copy(t)
     return target
 end
 
-function strTrueValues(tbl)
+function st(tbl)
-	-- returns a concatenation of all the keys in tbl with value true, separated with spaces
 	str = ""
 	for k, v in pairs(tbl) do
 		if v == true then
@@ -19,16 +17,14 @@ function strTrueValues(tbl)
 	return str
 end
 
-function frameTime(min, sec, hth)
+function sp(m, s, f)
-	-- returns a time in frames from a time in minutes-seconds-hundredths format
+	if m == nil then m = 0 end
-	if min == nil then min = 0 end
+	if s == nil then s = 0 end
-	if sec == nil then sec = 0 end
+	if f == nil then f = 0 end
-	if hth == nil then hth = 0 end
+	return m*3600 + s*60 + math.ceil(f * 0.6)
-	return min*3600 + sec*60 + math.ceil(hth * 0.6)
 end
 
 function vAdd(v1, v2)
-	-- returns the sum of vectors v1 and v2
 	return {
 		x = v1.x + v2.x,
 		y = v1.y + v2.y
@@ -36,7 +32,6 @@ function vAdd(v1, v2)
 end
 
 function vNeg(v)
-	-- returns the opposite of vector v
 	return {
 		x = -v.x,
 		y = -v.y
@@ -44,52 +39,17 @@ function vNeg(v)
 end
 
 function formatTime(frames)
-	-- returns a mm:ss:hh (h=hundredths) representation of the time in frames given 
 	if frames < 0 then return formatTime(0) end
-	local min, sec, hund
+	str = string.format("%02d", math.floor(frames / 3600)) .. ":"
-	min  = math.floor(frames/3600)
+		.. string.format("%02d", math.floor(frames / 60) % 60) .. "."
-	sec  = math.floor(frames/60) % 60
+		.. string.format("%02d", math.floor(frames / 0.6) % 100)
-	hund = math.floor(frames/.6) % 100
-	str = string.format("%02d:%02d.%02d", min, sec, hund)
 	return str
 end
 
 function formatBigNum(number)
-	-- returns a string representing a number with commas as thousands separator (e.g. 12,345,678)
+	local s = string.format("%d", number)
-	local s
+	local pos = string.len(s) % 3
-	if type(number) == "number" then
+	if pos == 0 then pos = 3 end
-		s = string.format("%d", number)
-	elseif type(number) == "string" then
-		if not tonumber(number) then
-			return
-		else
-			s = number
-		end
-	else
-		return
-	end
-	local pos = Mod1(string.len(s), 3)
 	return string.sub(s, 1, pos)
 		.. string.gsub(string.sub(s, pos+1), "(...)", ",%1")
 end
-
-function Mod1(n, m)
-	-- returns a number congruent to n modulo m in the range [1;m] (as opposed to [0;m-1])
-	return ((n-1) % m) + 1
-end
-
-function table.contains(table, element)
-	for _, value in pairs(table) do
-	  	if value == element then
-			return true
-	  	end
-	end
-	return false
-end
-
-function clamp(x, min, max)
-	if max < min then
-		min, max = max, min
-	end
-	return x < min and min or (x > max and max or x)
-end

libs/bigint/bigint.lua

@@ -1,566 +0,0 @@
-#!/usr/bin/env lua
--- If this variable is true, then strict type checking is performed for all
--- operations. This may result in slower code, but it will allow you to catch
--- errors and bugs earlier.
-local strict = false
-
---------------------------------------------------------------------------------
-
-local bigint = {}
-
-local mt = {
-    __add = function(lhs, rhs)
-        return bigint.add(lhs, rhs)
-    end,
-    __unm = function()
-        return bigint.negate(self)
-    end,
-    __sub = function(lhs, rhs)
-        return bigint.subtract(lhs, rhs)
-    end,
-    __mul = function(lhs, rhs)
-        return bigint.multiply(lhs, rhs)
-    end,
-    __div = function(lhs, rhs)
-        return bigint.divide(lhs, rhs)
-    end,
-    __mod = function(lhs, rhs)
-        return bigint.modulus(lhs, rhs)
-    end,
-    __pow = function(lhs, rhs)
-        return bigint.exponentiate(lhs, rhs)
-    end,
-    __tostring = function()
-        return bigint.unserialize(self, "s")
-    end,
-    __eq = function(lhs, rhs)
-        return bigint.compare(lhs, rhs, "==")
-    end,
-    __lt = function(lhs, rhs)
-        return bigint.compare(lhs, rhs, "<")
-    end,
-    __le = function(lhs, rhs)
-        return bigint.compare(lhs, rhs, "<=")
-    end
-}
-
-local named_powers = require("libs.bigint.named-powers-of-ten")
-
--- Create a new bigint or convert a number or string into a big
--- Returns an empty, positive bigint if no number or string is given
-function bigint.new(num)
-    local self = {
-        sign = "+",
-        digits = {}
-    }
-
-    -- Return a new bigint with the same sign and digits
-    function self:clone()
-        local newint = bigint.new()
-        newint.sign = self.sign
-        for _, digit in pairs(self.digits) do
-            newint.digits[#newint.digits + 1] = digit
-        end
-        return newint
-    end
-
-    setmetatable(self, mt)
-
-    if (num) then
-        local num_string = tostring(num)
-        for digit in string.gmatch(num_string, "[0-9]") do
-            table.insert(self.digits, tonumber(digit))
-        end
-        if string.sub(num_string, 1, 1) == "-" then
-            self.sign = "-"
-        end
-    end
-
-    return self
-end
-
--- Check the type of a big
--- Normally only runs when global variable "strict" == true, but checking can be
--- forced by supplying "true" as the second argument.
-function bigint.check(big, force)
-    if (strict or force) then
-        assert(getmetatable(big) == mt, "at least one arg is not a bigint")
-        assert(#big.digits > 0, "bigint is empty")
-        assert(big.sign == "+" or big.sign == "-", "bigint is unsigned")
-        for _, digit in pairs(big.digits) do
-            assert(type(digit) == "number", "at least one digit is invalid")
-            assert(digit <= 9 and digit >= 0, digit .. " is not between 0 and 9")
-            assert(math.floor(digit) == digit, digit .. " is not an integer")
-        end
-    end
-    return true
-end
-
--- Return a new big with the same digits but with a positive sign (absolute
--- value)
-function bigint.abs(big)
-    bigint.check(big)
-    local result = big:clone()
-    result.sign = "+"
-    return result
-end
-
--- Return a new big with the same digits but the opposite sign (negation)
-function bigint.negate(big)
-    bigint.check(big)
-    local result = big:clone()
-    if (result.sign == "+") then
-        result.sign = "-"
-    else
-        result.sign = "+"
-    end
-    return result
-end
-
--- Return the number of digits in the big
-function bigint.digits(big)
-    bigint.check(big)
-    return #big.digits
-end
-
--- Convert a big to a number or string
-function bigint.unserialize(big, output_type, precision)
-    bigint.check(big)
-
-    local num = ""
-    if big.sign == "-" then
-        num = "-"
-    end
-
-
-    if ((output_type == nil)
-    or (output_type == "number")
-    or (output_type == "n")
-    or (output_type == "string")
-    or (output_type == "s")) then
-        -- Unserialization to a string or number requires reconstructing the
-        -- entire number
-
-        for _, digit in pairs(big.digits) do
-            num = num .. math.floor(digit) -- lazy way of getting rid of .0$
-        end
-
-        if ((output_type == nil)
-        or (output_type == "number")
-        or (output_type == "n")) then
-            return tonumber(num)
-        else
-            return num
-        end
-
-    else
-        -- Unserialization to human-readable form or scientific notation only
-        -- requires reading the first few digits
-        if (precision == nil) then
-            precision = math.min(#big.digits, 3)
-        else
-            assert(precision > 0, "Precision cannot be less than 1")
-            assert(math.floor(precision) == precision,
-                   "Precision must be a positive integer")
-        end
-
-        -- num is the first (precision + 1) digits, the first being separated by
-        -- a decimal point from the others
-        num = num .. math.floor(big.digits[1])
-        if (precision > 1) then
-            num = num .. "."
-            for i = 1, (precision - 1) do
-                num = num .. math.floor(big.digits[i + 1])
-            end
-        end
-
-        if ((output_type == "human-readable")
-        or (output_type == "human")
-        or (output_type == "h"))
-        and (#big.digits >= 3 and #big.digits <= 10002) then
-            -- Human-readable output contributed by 123eee555
-
-            local name
-            local walkback = 0 -- Used to enumerate "ten", "hundred", etc
-
-            -- Walk backwards in the index of named_powers starting at the
-            -- number of digits of the input until the first value is found
-            for i = (#big.digits - 1), (#big.digits - 4), -1 do
-                name = named_powers[i]
-                if (name) then
-                    if (walkback == 1) then
-                        name = "ten " .. name
-                    elseif (walkback == 2) then
-                        name = "hundred " .. name
-                    end
-                    break
-                else
-                    walkback = walkback + 1
-                end
-            end
-
-            return num .. " " .. name
-
-        else
-            return num .. "*10^" .. (#big.digits - 1)
-        end
-
-    end
-end
-
--- Basic comparisons
--- Accepts symbols (<, >=, ~=) and Unix shell-like options (lt, ge, ne)
-function bigint.compare(big1, big2, comparison)
-    bigint.check(big1)
-    bigint.check(big2)
-
-    local greater = false -- If big1.digits > big2.digits
-    local equal = false
-
-    if (big1.sign == "-") and (big2.sign == "+") then
-        greater = false
-    elseif (#big1.digits > #big2.digits)
-    or ((big1.sign == "+") and (big2.sign == "-")) then
-        greater = true
-    elseif (#big1.digits == #big2.digits) then
-        -- Walk left to right, comparing digits
-        for digit = 1, #big1.digits do
-            if (big1.digits[digit] > big2.digits[digit]) then
-                greater = true
-                break
-            elseif (big2.digits[digit] > big1.digits[digit]) then
-                break
-            elseif (digit == #big1.digits)
-                   and (big1.digits[digit] == big2.digits[digit]) then
-                equal = true
-            end
-        end
-
-    end
-
-    -- If both numbers are negative, then the requirements for greater are
-    -- reversed
-    if (not equal) and (big1.sign == "-") and (big2.sign == "-") then
-        greater = not greater
-    end
-
-    return (((comparison == "<") or (comparison == "lt"))
-            and ((not greater) and (not equal)) and true)
-        or (((comparison == ">") or (comparison == "gt"))
-            and ((greater) and (not equal)) and true)
-        or (((comparison == "==") or (comparison == "eq"))
-            and (equal) and true)
-        or (((comparison == ">=") or (comparison == "ge"))
-            and (equal or greater) and true)
-        or (((comparison == "<=") or (comparison == "le"))
-            and (equal or not greater) and true)
-        or (((comparison == "~=") or (comparison == "!=") or (comparison == "ne"))
-            and (not equal) and true)
-        or false
-end
-
--- BACKEND: Add big1 and big2, ignoring signs
-function bigint.add_raw(big1, big2)
-    bigint.check(big1)
-    bigint.check(big2)
-
-    local result = bigint.new()
-    local max_digits = 0
-    local carry = 0
-
-    if (#big1.digits >= #big2.digits) then
-        max_digits = #big1.digits
-    else
-        max_digits = #big2.digits
-    end
-
-    -- Walk backwards right to left, like in long addition
-    for digit = 0, max_digits - 1 do
-        local sum = (big1.digits[#big1.digits - digit] or 0)
-                  + (big2.digits[#big2.digits - digit] or 0)
-                  + carry
-
-        if (sum >= 10) then
-            carry = 1
-            sum = sum - 10
-        else
-            carry = 0
-        end
-
-        result.digits[max_digits - digit] = sum
-    end
-
-    -- Leftover carry in cases when #big1.digits == #big2.digits and sum > 10, ex. 7 + 9
-    if (carry == 1) then
-        table.insert(result.digits, 1, 1)
-    end
-
-    return result
-
-end
-
--- BACKEND: Subtract big2 from big1, ignoring signs
-function bigint.subtract_raw(big1, big2)
-    -- Type checking is done by bigint.compare
-    assert(bigint.compare(bigint.abs(big1), bigint.abs(big2), ">="),
-           "Size of " .. bigint.unserialize(big1, "string") .. " is less than "
-           .. bigint.unserialize(big2, "string"))
-
-    local result = big1:clone()
-    local max_digits = #big1.digits
-    local borrow = 0
-
-    -- Logic mostly copied from bigint.add_raw ---------------------------------
-    -- Walk backwards right to left, like in long subtraction
-    for digit = 0, max_digits - 1 do
-        local diff = (big1.digits[#big1.digits - digit] or 0)
-                   - (big2.digits[#big2.digits - digit] or 0)
-                   - borrow
-
-        if (diff < 0) then
-            borrow = 1
-            diff = diff + 10
-        else
-            borrow = 0
-        end
-
-        result.digits[max_digits - digit] = diff
-    end
-    ----------------------------------------------------------------------------
-
-
-    -- Strip leading zeroes if any, but not if 0 is the only digit
-    while (#result.digits > 1) and (result.digits[1] == 0) do
-        table.remove(result.digits, 1)
-    end
-
-    return result
-end
-
--- FRONTEND: Addition and subtraction operations, accounting for signs
-function bigint.add(big1, big2)
-    -- Type checking is done by bigint.compare
-
-    local result
-
-    -- If adding numbers of different sign, subtract the smaller sized one from
-    -- the bigger sized one and take the sign of the bigger sized one
-    if (big1.sign ~= big2.sign) then
-        if (bigint.compare(bigint.abs(big1), bigint.abs(big2), ">")) then
-            result = bigint.subtract_raw(big1, big2)
-            result.sign = big1.sign
-        else
-            result = bigint.subtract_raw(big2, big1)
-            result.sign = big2.sign
-        end
-
-    elseif (big1.sign == "+") and (big2.sign == "+") then
-        result = bigint.add_raw(big1, big2)
-
-    elseif (big1.sign == "-") and (big2.sign == "-") then
-        result = bigint.add_raw(big1, big2)
-        result.sign = "-"
-    end
-
-    return result
-end
-function bigint.subtract(big1, big2)
-    -- Type checking is done by bigint.compare in bigint.add
-    -- Subtracting is like adding a negative
-    local big2_local = big2:clone()
-    if (big2.sign == "+") then
-        big2_local.sign = "-"
-    else
-        big2_local.sign = "+"
-    end
-    return bigint.add(big1, big2_local)
-end
-
--- BACKEND: Multiply a big by a single digit big, ignoring signs
-function bigint.multiply_single(big1, big2)
-    bigint.check(big1)
-    bigint.check(big2)
-    assert(#big2.digits == 1, bigint.unserialize(big2, "string")
-                              .. " has more than one digit")
-
-    local result = bigint.new()
-    local carry = 0
-
-    -- Logic mostly copied from bigint.add_raw ---------------------------------
-    -- Walk backwards right to left, like in long multiplication
-    for digit = 0, #big1.digits - 1 do
-        local this_digit = big1.digits[#big1.digits - digit]
-                         * big2.digits[1]
-                         + carry
-
-        if (this_digit >= 10) then
-            carry = math.floor(this_digit / 10)
-            this_digit = this_digit - (carry * 10)
-        else
-            carry = 0
-        end
-
-        result.digits[#big1.digits - digit] = this_digit
-    end
-
-    -- Leftover carry in cases when big1.digits[1] * big2.digits[1] > 0
-    if (carry > 0) then
-        table.insert(result.digits, 1, carry)
-    end
-    ----------------------------------------------------------------------------
-
-    return result
-end
-
--- FRONTEND: Multiply two bigs, accounting for signs
-function bigint.multiply(big1, big2)
-    -- Type checking done by bigint.multiply_single
-
-    local result = bigint.new(0)
-    local larger, smaller -- Larger and smaller in terms of digits, not size
-
-    if (bigint.unserialize(big1) == 0) or (bigint.unserialize(big2) == 0) then
-        return result
-    end
-
-    if (#big1.digits >= #big2.digits) then
-        larger = big1
-        smaller = big2
-    else
-        larger = big2
-        smaller = big1
-    end
-
-    -- Walk backwards right to left, like in long multiplication
-    for digit = 0, #smaller.digits - 1 do
-        -- Sorry for going over column 80! There's lots of big names here
-        local this_digit_product = bigint.multiply_single(larger,
-                                                          bigint.new(smaller.digits[#smaller.digits - digit]))
-
-        -- "Placeholding zeroes"
-        if (digit > 0) then
-            for placeholder = 1, digit do
-                table.insert(this_digit_product.digits, 0)
-            end
-        end
-
-        result = bigint.add(result, this_digit_product)
-    end
-
-    if (larger.sign == smaller.sign) then
-        result.sign = "+"
-    else
-        result.sign = "-"
-    end
-
-    return result
-end
-
--- Raise a big to a positive integer or big power (TODO: negative integer power)
-function bigint.exponentiate(big, power)
-    -- Type checking for big done by bigint.multiply
-    assert(bigint.compare(power, bigint.new(0), ">="),
-           " negative powers are not supported")
-    local exp = power:clone()
-
-    if (bigint.compare(exp, bigint.new(0), "==")) then
-        return bigint.new(1)
-    elseif (bigint.compare(exp, bigint.new(1), "==")) then
-        return big:clone()
-    else
-        local result = bigint.new(1)
-        local base = big:clone()
-
-        while (true) do
-            if (bigint.compare(
-                bigint.modulus(exp, bigint.new(2)), bigint.new(1), "=="
-            )) then
-                result = bigint.multiply(result, base)
-            end
-            if (bigint.compare(exp, bigint.new(1), "==")) then
-                break
-            else
-                exp = bigint.divide(exp, bigint.new(2))
-                base = bigint.multiply(base, base)
-            end
-        end
-
-        return result
-    end
-
-end
-
--- BACKEND: Divide two bigs (decimals not supported), returning big result and
--- big remainder
--- WARNING: Only supports positive integers
-function bigint.divide_raw(big1, big2)
-    -- Type checking done by bigint.compare
-    if (bigint.compare(big1, big2, "==")) then
-        return bigint.new(1), bigint.new(0)
-    elseif (bigint.compare(big1, big2, "<")) then
-        return bigint.new(0), big1:clone()
-    else
-        assert(bigint.compare(big2, bigint.new(0), "!="), "error: divide by zero")
-        assert(big1.sign == "+", "error: big1 is not positive")
-        assert(big2.sign == "+", "error: big2 is not positive")
-
-        local result = bigint.new()
-
-        local dividend = bigint.new() -- Dividend of a single operation
-
-        local neg_zero = bigint.new(0)
-        neg_zero.sign = "-"
-
-        for i = 1, #big1.digits do
-            -- Fixes a negative zero bug
-            if (#dividend.digits ~= 0) and (bigint.compare(dividend, neg_zero, "==")) then
-                dividend = bigint.new()
-            end
-            
-            table.insert(dividend.digits, big1.digits[i])
-            
-            local factor = bigint.new(0)
-            while bigint.compare(dividend, big2, ">=") do
-                dividend = bigint.subtract(dividend, big2)
-                factor = bigint.add(factor, bigint.new(1))
-            end
-
-            for i = 0, #factor.digits - 1 do
-                result.digits[#result.digits + 1 - i] = factor.digits[i + 1]
-            end
-        end
-
-        -- Remove leading zeros from result
-        while (result.digits[1] == 0) do
-            table.remove(result.digits, 1)
-        end
-
-        return result, dividend
-    end
-end
-
--- FRONTEND: Divide two bigs (decimals not supported), returning big result and
--- big remainder, accounting for signs
-function bigint.divide(big1, big2)
-    local result, remainder = bigint.divide_raw(bigint.abs(big1),
-                                                bigint.abs(big2))
-    if (big1.sign == big2.sign) then
-        result.sign = "+"
-    else
-        result.sign = "-"
-    end
-
-    return result, remainder
-end
-
--- FRONTEND: Return only the remainder from bigint.divide
-function bigint.modulus(big1, big2)
-    local result, remainder = bigint.divide(big1, big2)
-
-    -- Remainder will always have the same sign as the dividend per C standard
-    -- https://en.wikipedia.org/wiki/Modulo_operation#Remainder_calculation_for_the_modulo_operation
-    remainder.sign = big1.sign
-    return remainder
-end
-
-return bigint

libs/discordRPC.lua

@@ -1,282 +0,0 @@
-local ffi = require "ffi"
-
-
--- Get the host os to load correct lib
-local osname = love.system.getOS()
-local discordRPClib = nil
-
--- FFI requires the libraries really be files just sitting in the filesystem. It
--- can't load libraries from a .love archive, nor a fused executable on Windows.
--- Merely using love.filesystem.getSource() only works when running LOVE with
--- the game unarchived from command line, like "love .".
---
--- The code here setting "source" will set the directory where the game was run
--- from, so FFI can load discordRPC. We assume that the discordRPC library's
--- libs directory is in the same directory as the .love archive; if it's
--- missing, it just won't load.
-local source = love.filesystem.getSource()
-if string.sub(source, -5) == ".love" or love.filesystem.isFused() then
-    source = love.filesystem.getSourceBaseDirectory()
-end
-
-if osname == "Linux" then
-    discordRPClib = ffi.load(source.."/libs/discord-rpc.so")
-elseif osname == "OS X" then
-    discordRPClib = ffi.load(source.."/libs/discord-rpc.dylib")
-elseif osname == "Windows" then
-    discordRPClib = ffi.load(source.."/libs/discord-rpc.dll")
-else
-    -- Else it crashes later on
-    error(string.format("Discord rpc not supported on platform (%s)", osname))
-end
-
-
-ffi.cdef[[
-typedef struct DiscordRichPresence {
-    const char* state;   /* max 128 bytes */
-    const char* details; /* max 128 bytes */
-    int64_t startTimestamp;
-    int64_t endTimestamp;
-    const char* largeImageKey;  /* max 32 bytes */
-    const char* largeImageText; /* max 128 bytes */
-    const char* smallImageKey;  /* max 32 bytes */
-    const char* smallImageText; /* max 128 bytes */
-    const char* partyId;        /* max 128 bytes */
-    int partySize;
-    int partyMax;
-    const char* matchSecret;    /* max 128 bytes */
-    const char* joinSecret;     /* max 128 bytes */
-    const char* spectateSecret; /* max 128 bytes */
-    int8_t instance;
-} DiscordRichPresence;
-
-typedef struct DiscordUser {
-    const char* userId;
-    const char* username;
-    const char* discriminator;
-    const char* avatar;
-} DiscordUser;
-
-typedef void (*readyPtr)(const DiscordUser* request);
-typedef void (*disconnectedPtr)(int errorCode, const char* message);
-typedef void (*erroredPtr)(int errorCode, const char* message);
-typedef void (*joinGamePtr)(const char* joinSecret);
-typedef void (*spectateGamePtr)(const char* spectateSecret);
-typedef void (*joinRequestPtr)(const DiscordUser* request);
-
-typedef struct DiscordEventHandlers {
-    readyPtr ready;
-    disconnectedPtr disconnected;
-    erroredPtr errored;
-    joinGamePtr joinGame;
-    spectateGamePtr spectateGame;
-    joinRequestPtr joinRequest;
-} DiscordEventHandlers;
-
-void Discord_Initialize(const char* applicationId,
-                        DiscordEventHandlers* handlers,
-                        int autoRegister,
-                        const char* optionalSteamId);
-
-void Discord_Shutdown(void);
-
-void Discord_RunCallbacks(void);
-
-void Discord_UpdatePresence(const DiscordRichPresence* presence);
-
-void Discord_ClearPresence(void);
-
-void Discord_Respond(const char* userid, int reply);
-
-void Discord_UpdateHandlers(DiscordEventHandlers* handlers);
-]]
-
-local discordRPC = {} -- module table
-
--- proxy to detect garbage collection of the module
-discordRPC.gcDummy = newproxy(true)
-
-local function unpackDiscordUser(request)
-    return ffi.string(request.userId), ffi.string(request.username),
-        ffi.string(request.discriminator), ffi.string(request.avatar)
-end
-
--- callback proxies
--- note: callbacks are not JIT compiled (= SLOW), try to avoid doing performance critical tasks in them
--- luajit.org/ext_ffi_semantics.html
-local ready_proxy = ffi.cast("readyPtr", function(request)
-    if discordRPC.ready then
-        discordRPC.ready(unpackDiscordUser(request))
-    end
-end)
-
-local disconnected_proxy = ffi.cast("disconnectedPtr", function(errorCode, message)
-    if discordRPC.disconnected then
-        discordRPC.disconnected(errorCode, ffi.string(message))
-    end
-end)
-
-local errored_proxy = ffi.cast("erroredPtr", function(errorCode, message)
-    if discordRPC.errored then
-        discordRPC.errored(errorCode, ffi.string(message))
-    end
-end)
-
-local joinGame_proxy = ffi.cast("joinGamePtr", function(joinSecret)
-    if discordRPC.joinGame then
-        discordRPC.joinGame(ffi.string(joinSecret))
-    end
-end)
-
-local spectateGame_proxy = ffi.cast("spectateGamePtr", function(spectateSecret)
-    if discordRPC.spectateGame then
-        discordRPC.spectateGame(ffi.string(spectateSecret))
-    end
-end)
-
-local joinRequest_proxy = ffi.cast("joinRequestPtr", function(request)
-    if discordRPC.joinRequest then
-        discordRPC.joinRequest(unpackDiscordUser(request))
-    end
-end)
-
--- helpers
-local function checkArg(arg, argType, argName, func, maybeNil)
-    assert(type(arg) == argType or (maybeNil and arg == nil),
-        string.format("Argument \"%s\" to function \"%s\" has to be of type \"%s\"",
-            argName, func, argType))
-end
-
-local function checkStrArg(arg, maxLen, argName, func, maybeNil)
-    if maxLen then
-        assert(type(arg) == "string" and arg:len() <= maxLen or (maybeNil and arg == nil),
-            string.format("Argument \"%s\" of function \"%s\" has to be of type string with maximum length %d",
-                argName, func, maxLen))
-    else
-        checkArg(arg, "string", argName, func, true)
-    end
-end
-
-local function checkIntArg(arg, maxBits, argName, func, maybeNil)
-    maxBits = math.min(maxBits or 32, 52) -- lua number (double) can only store integers < 2^53
-    local maxVal = 2^(maxBits-1) -- assuming signed integers, which, for now, are the only ones in use
-    assert(type(arg) == "number" and math.floor(arg) == arg
-        and arg < maxVal and arg >= -maxVal
-        or (maybeNil and arg == nil),
-        string.format("Argument \"%s\" of function \"%s\" has to be a whole number <= %d",
-            argName, func, maxVal))
-end
-
--- function wrappers
-function discordRPC.initialize(applicationId, autoRegister, optionalSteamId)
-    local func = "discordRPC.Initialize"
-    checkStrArg(applicationId, nil, "applicationId", func)
-    checkArg(autoRegister, "boolean", "autoRegister", func)
-    if optionalSteamId ~= nil then
-        checkStrArg(optionalSteamId, nil, "optionalSteamId", func)
-    end
-
-    local eventHandlers = ffi.new("struct DiscordEventHandlers")
-    eventHandlers.ready = ready_proxy
-    eventHandlers.disconnected = disconnected_proxy
-    eventHandlers.errored = errored_proxy
-    eventHandlers.joinGame = joinGame_proxy
-    eventHandlers.spectateGame = spectateGame_proxy
-    eventHandlers.joinRequest = joinRequest_proxy
-
-    discordRPClib.Discord_Initialize(applicationId, eventHandlers,
-        autoRegister and 1 or 0, optionalSteamId)
-end
-
-function discordRPC.shutdown()
-    discordRPClib.Discord_Shutdown()
-end
-
-function discordRPC.runCallbacks()
-    discordRPClib.Discord_RunCallbacks()
-end
--- http://luajit.org/ext_ffi_semantics.html#callback :
--- It is not allowed, to let an FFI call into a C function (runCallbacks)
--- get JIT-compiled, which in turn calls a callback, calling into Lua again (e.g. discordRPC.ready).
--- Usually this attempt is caught by the interpreter first and the C function
--- is blacklisted for compilation.
--- solution:
--- "Then you'll need to manually turn off JIT-compilation with jit.off() for
--- the surrounding Lua function that invokes such a message polling function."
-jit.off(discordRPC.runCallbacks)
-
-function discordRPC.updatePresence(presence)
-    local func = "discordRPC.updatePresence"
-    checkArg(presence, "table", "presence", func)
-
-    -- -1 for string length because of 0-termination
-    checkStrArg(presence.state, 127, "presence.state", func, true)
-    checkStrArg(presence.details, 127, "presence.details", func, true)
-
-    checkIntArg(presence.startTimestamp, 64, "presence.startTimestamp", func, true)
-    checkIntArg(presence.endTimestamp, 64, "presence.endTimestamp", func, true)
-
-    checkStrArg(presence.largeImageKey, 31, "presence.largeImageKey", func, true)
-    checkStrArg(presence.largeImageText, 127, "presence.largeImageText", func, true)
-    checkStrArg(presence.smallImageKey, 31, "presence.smallImageKey", func, true)
-    checkStrArg(presence.smallImageText, 127, "presence.smallImageText", func, true)
-    checkStrArg(presence.partyId, 127, "presence.partyId", func, true)
-
-    checkIntArg(presence.partySize, 32, "presence.partySize", func, true)
-    checkIntArg(presence.partyMax, 32, "presence.partyMax", func, true)
-
-    checkStrArg(presence.matchSecret, 127, "presence.matchSecret", func, true)
-    checkStrArg(presence.joinSecret, 127, "presence.joinSecret", func, true)
-    checkStrArg(presence.spectateSecret, 127, "presence.spectateSecret", func, true)
-
-    checkIntArg(presence.instance, 8, "presence.instance", func, true)
-
-    local cpresence = ffi.new("struct DiscordRichPresence")
-    cpresence.state = presence.state
-    cpresence.details = presence.details
-    cpresence.startTimestamp = presence.startTimestamp or 0
-    cpresence.endTimestamp = presence.endTimestamp or 0
-    cpresence.largeImageKey = presence.largeImageKey
-    cpresence.largeImageText = presence.largeImageText
-    cpresence.smallImageKey = presence.smallImageKey
-    cpresence.smallImageText = presence.smallImageText
-    cpresence.partyId = presence.partyId
-    cpresence.partySize = presence.partySize or 0
-    cpresence.partyMax = presence.partyMax or 0
-    cpresence.matchSecret = presence.matchSecret
-    cpresence.joinSecret = presence.joinSecret
-    cpresence.spectateSecret = presence.spectateSecret
-    cpresence.instance = presence.instance or 0
-
-    discordRPClib.Discord_UpdatePresence(cpresence)
-end
-
-function discordRPC.clearPresence()
-    discordRPClib.Discord_ClearPresence()
-end
-
-local replyMap = {
-    no = 0,
-    yes = 1,
-    ignore = 2
-}
-
--- maybe let reply take ints too (0, 1, 2) and add constants to the module
-function discordRPC.respond(userId, reply)
-    checkStrArg(userId, nil, "userId", "discordRPC.respond")
-    assert(replyMap[reply], "Argument 'reply' to discordRPC.respond has to be one of \"yes\", \"no\" or \"ignore\"")
-    discordRPClib.Discord_Respond(userId, replyMap[reply])
-end
-
--- garbage collection callback
-getmetatable(discordRPC.gcDummy).__gc = function()
-    discordRPC.shutdown()
-    ready_proxy:free()
-    disconnected_proxy:free()
-    errored_proxy:free()
-    joinGame_proxy:free()
-    spectateGame_proxy:free()
-    joinRequest_proxy:free()
-end
-
-return discordRPC

libs/simple-slider.lua

@@ -1,138 +0,0 @@
---[[
-Copyright (c) 2016 George Prosser
-
-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.
-]]
-
-local slider = {}
-slider.__index = slider
-
-function newSlider(x, y, length, value, min, max, setter, style)
-    local s = {}
-    s.value = (value - min) / (max - min)
-    s.min = min
-    s.max = max
-    s.setter = setter
-    s.x = x
-    s.y = y
-    s.length = length
-
-    local p = style or {}
-    s.width = p.width or length * 0.1
-    s.orientation = p.orientation or 'horizontal'
-    s.track = p.track or 'rectangle'
-    s.knob = p.knob or 'rectangle'
-
-    s.grabbed = false
-    s.wasDown = true
-    s.ox = 0
-    s.oy = 0
-
-    return setmetatable(s, slider)
-end
-
-function slider:update(mouseX, mouseY, mouseDown)
-    local x = mouseX or love.mouse.getX()
-    local y = mouseY or love.mouse.getY()
-    local down = love.mouse.isDown(1)
-    if mouseDown ~= nil then
-        down = mouseDown
-    end
-
-    local knobX = self.x
-    local knobY = self.y
-    if self.orientation == 'horizontal' then
-        knobX = self.x - self.length/2 + self.length * self.value
-    elseif self.orientation == 'vertical' then
-        knobY = self.y + self.length/2 - self.length * self.value
-    end
-
-    local ox = x - knobX
-    local oy = y - knobY
-
-    local dx = ox - self.ox
-    local dy = oy - self.oy
-
-    if down then
-        if self.grabbed then
-            if self.orientation == 'horizontal' then
-                self.value = self.value + dx / self.length
-            elseif self.orientation == 'vertical' then
-                self.value = self.value - dy / self.length
-            end
-        elseif (x > knobX - self.width/2 and x < knobX + self.width/2 and y > knobY - self.width/2 and y < knobY + self.width/2) and not self.wasDown then
-            self.ox = ox
-            self.oy = oy
-            self.grabbed = true
-        end
-    else
-        self.grabbed = false
-    end
-
-    self.value = math.max(0, math.min(1, self.value))
-
-    if self.setter ~= nil then
-        self.setter(self.min + self.value * (self.max - self.min))
-    end
-
-    self.wasDown = down
-end
-
-function slider:draw()
-    if self.track == 'rectangle' then
-        if self.orientation == 'horizontal' then
-            love.graphics.rectangle('line', self.x - self.length/2 - self.width/2, self.y - self.width/2, self.length + self.width, self.width)
-        elseif self.orientation == 'vertical' then
-            love.graphics.rectangle('line', self.x - self.width/2, self.y - self.length/2 - self.width/2, self.width, self.length + self.width)
-        end
-    elseif self.track == 'line' then
-        if self.orientation == 'horizontal' then
-            love.graphics.line(self.x - self.length/2, self.y, self.x + self.length/2, self.y)
-        elseif self.orientation == 'vertical' then
-            love.graphics.line(self.x, self.y - self.length/2, self.x, self.y + self.length/2)
-        end
-    elseif self.track == 'roundrect' then
-        if self.orientation == 'horizontal' then
-            love.graphics.rectangle('line', self.x - self.length/2 - self.width/2, self.y - self.width/2, self.length + self.width, self.width, self.width/2, self.width)
-        elseif self.orientation == 'vertical' then
-            love.graphics.rectangle('line', self.x - self.width/2, self.y - self.length/2 - self.width/2, self.width, self.length + self.width, self.width, self.width/2)
-        end
-    end
-
-    local knobX = self.x
-    local knobY = self.y
-    if self.orientation == 'horizontal' then
-        knobX = self.x - self.length/2 + self.length * self.value
-    elseif self.orientation == 'vertical' then
-        knobY = self.y + self.length/2 - self.length * self.value
-    end
-
-    if self.knob == 'rectangle' then
-        love.graphics.rectangle('fill', knobX - self.width/2, knobY - self.width/2, self.width, self.width)
-    elseif self.knob == 'circle' then
-        love.graphics.circle('fill', knobX, knobY, self.width/2)
-    end
-end
-
-function slider:getValue()
-    return self.min + self.value * (self.max - self.min)
-end

load/bgm.lua

@@ -47,7 +47,7 @@ function fadeoutBGM(time)
 end
 
 function resetBGMFadeout(time)
-	current_bgm:setVolume(config.bgm_volume)
+	current_bgm:setVolume(1)
 	fading_bgm = false
 	current_bgm:play()
 end
@@ -59,7 +59,7 @@ function processBGMFadeout(dt)
 			fadeout_time = 0
 			fading_bgm = false
 		end
-		current_bgm:setVolume(fadeout_time * config.bgm_volume / total_fadeout_time)
+		current_bgm:setVolume(fadeout_time / total_fadeout_time)
 	end
 end
 

load/bigint.lua

@@ -1,2 +0,0 @@
-bigint = require "libs.bigint.bigint"
-number_names = require "libs.bigint.named-powers-of-ten"

load/graphics.lua

@@ -1,95 +1,54 @@
 backgrounds = {
-	[0] = love.graphics.newImage("res/backgrounds/0.png"),
+	[0] = love.graphics.newImage("res/backgrounds/0-quantum-foam.png"),
-	love.graphics.newImage("res/backgrounds/100.png"),
+	love.graphics.newImage("res/backgrounds/100-big-bang.png"),
-	love.graphics.newImage("res/backgrounds/200.png"),
+	love.graphics.newImage("res/backgrounds/200-spiral-galaxy.png"),
-	love.graphics.newImage("res/backgrounds/300.png"),
+	love.graphics.newImage("res/backgrounds/300-sun-and-dust.png"),
-	love.graphics.newImage("res/backgrounds/400.png"),
+	love.graphics.newImage("res/backgrounds/400-earth-and-moon.png"),
-	love.graphics.newImage("res/backgrounds/500.png"),
+	love.graphics.newImage("res/backgrounds/500-cambrian-explosion.png"),
-	love.graphics.newImage("res/backgrounds/600.png"),
+	love.graphics.newImage("res/backgrounds/600-dinosaurs.png"),
-	love.graphics.newImage("res/backgrounds/700.png"),
+	love.graphics.newImage("res/backgrounds/700-asteroid.png"),
-	love.graphics.newImage("res/backgrounds/800.png"),
+	love.graphics.newImage("res/backgrounds/800-human-fire.png"),
-	love.graphics.newImage("res/backgrounds/900.png"),
+	love.graphics.newImage("res/backgrounds/900-early-civilization.png"),
-	love.graphics.newImage("res/backgrounds/1000.png"),
+	love.graphics.newImage("res/backgrounds/1000-vikings.png"),
-	love.graphics.newImage("res/backgrounds/1100.png"),
+	love.graphics.newImage("res/backgrounds/1100-crusades.png"),
-	love.graphics.newImage("res/backgrounds/1200.png"),
+	love.graphics.newImage("res/backgrounds/1200-genghis-khan.png"),
-	love.graphics.newImage("res/backgrounds/1300.png"),
+	love.graphics.newImage("res/backgrounds/1300-black-death.png"),
-	love.graphics.newImage("res/backgrounds/1400.png"),
+	love.graphics.newImage("res/backgrounds/1400-columbus-discovery.png"),
-	love.graphics.newImage("res/backgrounds/1500.png"),
+	love.graphics.newImage("res/backgrounds/1500-aztecas.png"),
-	love.graphics.newImage("res/backgrounds/1600.png"),
+	love.graphics.newImage("res/backgrounds/1600-telescope.png"),
-	love.graphics.newImage("res/backgrounds/1700.png"),
+	love.graphics.newImage("res/backgrounds/1700-american-revolution.png"),
-	love.graphics.newImage("res/backgrounds/1800.png"),
+	love.graphics.newImage("res/backgrounds/1800-railways.png"),
-	love.graphics.newImage("res/backgrounds/1900.png"),
+	love.graphics.newImage("res/backgrounds/1900-world-wide-web.png"),
-	title = love.graphics.newImage("res/backgrounds/title.png"),
+	title = love.graphics.newImage("res/backgrounds/title_v0.1.png"),
-	snow = love.graphics.newImage("res/backgrounds/snow.png"),
-	input_config = love.graphics.newImage("res/backgrounds/options-input.png"),
-	game_config = love.graphics.newImage("res/backgrounds/options-game.png"),
 }
 
 blocks = {
 	["2tie"] = {
-		R = love.graphics.newImage("res/img/s1.png"),
+		I = love.graphics.newImage("res/img/s1.png"),
-		O = love.graphics.newImage("res/img/s3.png"),
+		J = love.graphics.newImage("res/img/s4.png"),
-		Y = love.graphics.newImage("res/img/s7.png"),
+		L = love.graphics.newImage("res/img/s3.png"),
-		G = love.graphics.newImage("res/img/s6.png"),
+		O = love.graphics.newImage("res/img/s7.png"),
-		C = love.graphics.newImage("res/img/s2.png"),
+		S = love.graphics.newImage("res/img/s5.png"),
-		B = love.graphics.newImage("res/img/s4.png"),
+		T = love.graphics.newImage("res/img/s2.png"),
-		M = love.graphics.newImage("res/img/s5.png"),
+		Z = love.graphics.newImage("res/img/s6.png"),
 		F = love.graphics.newImage("res/img/s9.png"),
-		A = love.graphics.newImage("res/img/s8.png"),
+		G = love.graphics.newImage("res/img/s9.png"),
 		X = love.graphics.newImage("res/img/s9.png"),
 	},
 	["bone"] = {
-		R = love.graphics.newImage("res/img/bone.png"),
+		I = love.graphics.newImage("res/img/bone.png"),
+		J = love.graphics.newImage("res/img/bone.png"),
+		L = love.graphics.newImage("res/img/bone.png"),
 		O = love.graphics.newImage("res/img/bone.png"),
-		Y = love.graphics.newImage("res/img/bone.png"),
+		S = love.graphics.newImage("res/img/bone.png"),
-		G = love.graphics.newImage("res/img/bone.png"),
+		T = love.graphics.newImage("res/img/bone.png"),
-		C = love.graphics.newImage("res/img/bone.png"),
+		Z = love.graphics.newImage("res/img/bone.png"),
-		B = love.graphics.newImage("res/img/bone.png"),
-		M = love.graphics.newImage("res/img/bone.png"),
 		F = love.graphics.newImage("res/img/bone.png"),
-		A = love.graphics.newImage("res/img/bone.png"),
+		G = love.graphics.newImage("res/img/bone.png"),
 		X = love.graphics.newImage("res/img/bone.png"),
-	},
-	["gem"] = {
-		R = love.graphics.newImage("res/img/gem1.png"),
-		O = love.graphics.newImage("res/img/gem3.png"),
-		Y = love.graphics.newImage("res/img/gem7.png"),
-		G = love.graphics.newImage("res/img/gem6.png"),
-		C = love.graphics.newImage("res/img/gem2.png"),
-		B = love.graphics.newImage("res/img/gem4.png"),
-		M = love.graphics.newImage("res/img/gem5.png"),
-		F = love.graphics.newImage("res/img/gem9.png"),
-		A = love.graphics.newImage("res/img/gem9.png"),
-		X = love.graphics.newImage("res/img/gem9.png"),
-	},
-	["square"] = {
-		F = love.graphics.newImage("res/img/squares.png"),
-		Y = love.graphics.newImage("res/img/squareg.png"),
-		X = love.graphics.newImage("res/img/squares.png"),
 	}
 }
 
-ColourSchemes = {
-	Arika = {
-		I = "R",
-		L = "O",
-		J = "B",
-		S = "M",
-		Z = "G",
-		O = "Y",
-		T = "C",
-	},
-	TTC = {
-		I = "C",
-		L = "O",
-		J = "B",
-		S = "G",
-		Z = "R",
-		O = "Y",
-		T = "M",
-	},
-}
-
 for name, blockset in pairs(blocks) do
 	for shape, image in pairs(blockset) do
 		image:setFilter("nearest")
@@ -102,5 +61,4 @@ misc_graphics = {
 	go = love.graphics.newImage("res/img/go.png"),
 	select_mode = love.graphics.newImage("res/img/select_mode.png"),
 	strike = love.graphics.newImage("res/img/strike.png"),
-	santa = love.graphics.newImage("res/img/santa.png")
 }

load/rpc.lua

@@ -1,58 +0,0 @@
-print("Loading discord RPC...")
-DiscordRPC = {
-	loaded = false
-}
-local success, RPC = pcall(require, "libs.discordRPC")
-if success then
-	DiscordRPC.loaded = true
-	DiscordRPC.appId = "599778517789573120"
-
-	function RPC.ready(userId, username, discriminator, avatar)
-		print(string.format("Discord: ready (%s, %s, %s, %s)", userId, username, discriminator, avatar))
-	end
-
-	function RPC.disconnected(errorCode, message)
-		print(string.format("Discord: disconnected (%d: %s)", errorCode, message))
-	end
-
-	function RPC.errored(errorCode, message)
-		print(string.format("Discord: error (%d: %s)", errorCode, message))
-	end
-
-	function RPC.joinGame(joinSecret)
-		print(string.format("Discord: join (%s)", joinSecret))
-	end
-
-	function RPC.spectateGame(spectateSecret)
-		print(string.format("Discord: spectate (%s)", spectateSecret))
-	end
-
-	function RPC.joinRequest(userId, username, discriminator, avatar)
-		print(string.format("Discord: join request (%s, %s, %s, %s)", userId, username, discriminator, avatar))
-		RPC.respond(userId, "yes")
-	end
-
-	RPC.initialize(DiscordRPC.appId, true)
-	local now = os.time(os.date("*t"))
-	
-	DiscordRPC.RPC = RPC
-	print("DiscordRPC successfully loaded.")
-else
-	print("DiscordRPC failed to load!")
-	print(RPC)
-end
-
-DiscordRPC.presence = {
-		startTimestamp = now,
-		details = "Loading game...",
-		state = "",
-		largeImageKey = "icon2",
-		largeImageText = "Arcade Stacker",
-		smallImageKey = "",
-		smallImageText = ""
-}
-
-function DiscordRPC:update(newstuff)
-	for k, v in pairs(newstuff) do self.presence[k] = v end
-	if self.loaded then self.RPC.updatePresence(self.presence) end
-end

load/save.lua

@@ -13,31 +13,7 @@ function loadFromFile(filename)
 	return save_data[1]
 end
 
-function initConfig()
-	if not config.das then config.das = 10 end
-	if not config.arr then config.arr = 2 end
-	if not config.dcd then config.dcd = 0 end
-	if not config.sfx_volume then config.sfx_volume = 0.5 end
-	if not config.bgm_volume then config.bgm_volume = 0.5 end
 
-	if config.fullscreen == nil then config.fullscreen = false end
-	if config.secret == nil then config.secret = false end
-
-	if not config.gamesettings then config.gamesettings = {} end
-	for _, option in ipairs(GameConfigScene.options) do
-		if not config.gamesettings[option[1]] then
-			config.gamesettings[option[1]] = 1
-		end
-	end
-	
-	if not config.input then
-		scene = InputConfigScene()
-	else
-		if config.current_mode then current_mode = config.current_mode end
-		if config.current_ruleset then current_ruleset = config.current_ruleset end
-		scene = TitleScene()
-	end
-end
 
 function saveConfig()
 	binser.writeFile('config.sav', config)

load/sounds.lua

@@ -10,50 +10,20 @@ sounds = {
 	},
 	move = love.audio.newSource("res/se/move.wav", "static"),
 	bottom = love.audio.newSource("res/se/bottom.wav", "static"),
-	cursor = love.audio.newSource("res/se/cursor.wav", "static"),
-	cursor_lr = love.audio.newSource("res/se/cursor_lr.wav", "static"),
-	main_decide = love.audio.newSource("res/se/main_decide.wav", "static"),
-	mode_decide = love.audio.newSource("res/se/mode_decide.wav", "static"),
-	lock = love.audio.newSource("res/se/lock.wav", "static"),
-	hold = love.audio.newSource("res/se/hold.wav", "static"),
-	erase = love.audio.newSource("res/se/erase.wav", "static"),
-	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"),
-	-- a secret sound!
-	welcome = love.audio.newSource("res/se/welcomeToCambridge.wav", "static"),
 }
 
 function playSE(sound, subsound)
 	if subsound == nil then
-		sounds[sound]:setVolume(config.sfx_volume)
+		sounds[sound]:setVolume(0.1)
 		if sounds[sound]:isPlaying() then
 			sounds[sound]:stop()
 		end
 		sounds[sound]:play()
 	else
-		sounds[sound][subsound]:setVolume(config.sfx_volume)
+		sounds[sound][subsound]:setVolume(0.1)
 		if sounds[sound][subsound]:isPlaying() then
 			sounds[sound][subsound]:stop()
 		end
 		sounds[sound][subsound]:play()
 	end
 end
-
-function playSEOnce(sound, subsound)
-	if subsound == nil then
-		sounds[sound]:setVolume(config.sfx_volume)
-		if sounds[sound]:isPlaying() then
-			return
-		end
-		sounds[sound]:play()
-	else
-		sounds[sound][subsound]:setVolume(config.sfx_volume)
-		if sounds[sound][subsound]:isPlaying() then
-			return
-		end
-		sounds[sound][subsound]:play()
-	end
-end

load/version.lua

@@ -1 +0,0 @@
-version = "v0.3-beta5.1"

main.lua

@@ -1,58 +1,28 @@
 function love.load()
 	math.randomseed(os.time())
 	highscores = {}
-	require "load.rpc"
 	require "load.graphics"
 	require "load.fonts"
 	require "load.sounds"
 	require "load.bgm"
 	require "load.save"
-	require "load.bigint"
-	require "load.version"
 	loadSave()
 	require "scene"
-	
+	config["side_next"] = false
-	--config["side_next"] = false
+	config["reverse_rotate"] = true
-	--config["reverse_rotate"] = true
+	config["fullscreen"] = false
-	--config["das_last_key"] = false
+	config["das_last_key"] = false
-	--config["fullscreen"] = false
 
 	love.window.setMode(love.graphics.getWidth(), love.graphics.getHeight(), {resizable = true});
 
-    -- used for screenshots
+	if not config.input then
-    GLOBAL_CANVAS = love.graphics.newCanvas()
+		config.input = {}
-
+		scene = InputConfigScene()
-	-- init config
+	else
-	initConfig()
+		if config.current_mode then current_mode = config.current_mode end
-
+		if config.current_ruleset then current_ruleset = config.current_ruleset end
-	love.window.setFullscreen(config["fullscreen"])
+		scene = TitleScene()
-	if config.secret then playSE("welcome") end
-
-	-- import custom modules
-	initModules()
-end
-
-function initModules()
-	game_modes = {}
-	mode_list = love.filesystem.getDirectoryItems("tetris/modes")
-	for i=1,#mode_list do
-		if(mode_list[i] ~= "gamemode.lua" and mode_list[i] ~= "unrefactored_modes") then
-			game_modes[#game_modes+1] = require ("tetris.modes."..string.sub(mode_list[i],1,-5))
 	end
-	end
-	rulesets = {}
-	rule_list = love.filesystem.getDirectoryItems("tetris/rulesets")
-	for i=1,#rule_list do
-		if(rule_list[i] ~= "ruleset.lua" and rule_list[i] ~= "unrefactored_rulesets") then
-			rulesets[#rulesets+1] = require ("tetris.rulesets."..string.sub(rule_list[i],1,-5))
-		end
-	end
-	--sort mode/rule lists
-	local function padnum(d) return ("%03d%s"):format(#d, d) end
-	table.sort(game_modes, function(a,b)
-	return tostring(a.name):gsub("%d+",padnum) < tostring(b.name):gsub("%d+",padnum) end)
-	table.sort(rulesets, function(a,b)
-	return tostring(a.name):gsub("%d+",padnum) < tostring(b.name):gsub("%d+",padnum) end)
 end
 
 local TARGET_FPS = 60
@@ -94,9 +64,6 @@ function love.update(dt)
 end
 
 function love.draw()
-    love.graphics.setCanvas(GLOBAL_CANVAS)
-    love.graphics.clear()
-	
 	love.graphics.push()
 	
 	-- get offset matrix
@@ -112,199 +79,22 @@ function love.draw()
 
 	scene:render()
 	love.graphics.pop()
-    
-    love.graphics.setCanvas()
-    love.graphics.setColor(1,1,1,1)
-    love.graphics.draw(GLOBAL_CANVAS)
 end
 
-function love.keypressed(key, scancode)
+function love.keypressed(key, scancode, isrepeat)
 	-- global hotkeys
 	if scancode == "f4" then
 		config["fullscreen"] = not config["fullscreen"]
-		saveConfig()
 		love.window.setFullscreen(config["fullscreen"])
-	elseif scancode == "f2" and scene.title ~= "Input Config" and scene.title ~= "Game" then
-		scene = InputConfigScene()
-		switchBGM(nil)
-	-- secret sound playing :eyes:
-	elseif scancode == "f8" and scene.title == "Title" then
-		config.secret = not config.secret
-		saveConfig()
-		scene.restart_message = true
-		if config.secret then playSE("mode_decide")
-		else playSE("erase") end
-    -- f12 is reserved for saving screenshots
-    elseif scancode == "f12" then
-        local ss_name = os.date("ss/%Y-%m-%d_%H-%M-%S.png")
-		local info = love.filesystem.getInfo("ss")
-		if not info or info.type ~= "directory" then
-			love.filesystem.remove("ss")
-			love.filesystem.createDirectory("ss")
-		end
-        print("Saving screenshot as "..ss_name)
-        GLOBAL_CANVAS:newImageData():encode("png", ss_name)
-	-- function keys are reserved
-	elseif string.match(scancode, "^f[1-9]$") or string.match(scancode, "^f[1-9][0-9]+$") then
-		return	
-	-- escape is reserved for menu_back
-	elseif scancode == "escape" then
-		scene:onInputPress({input="menu_back", type="key", key=key, scancode=scancode})
-	-- pass any other key to the scene, with its configured mapping
 	else
-		local input_pressed = nil
+		scene:onKeyPress({key=key, scancode=scancode, isRepeat=isrepeat})
-		if config.input and config.input.keys then
-			input_pressed = config.input.keys[scancode]
-		end
-		scene:onInputPress({input=input_pressed, type="key", key=key, scancode=scancode})
-	end
-end
-
-function love.keyreleased(key, scancode)
-	-- escape is reserved for menu_back
-	if scancode == "escape" then
-		scene:onInputRelease({input="menu_back", type="key", key=key, scancode=scancode})
-	-- function keys are reserved
-	elseif string.match(scancode, "^f[1-9]$") or string.match(scancode, "^f[1-9][0-9]+$") then
-		return	
-	-- handle all other keys; tab is reserved, but the input config scene keeps it from getting configured as a game input, so pass tab to the scene here
-	else
-		local input_released = nil
-		if config.input and config.input.keys then
-			input_released = config.input.keys[scancode]
-		end
-		scene:onInputRelease({input=input_released, type="key", key=key, scancode=scancode})
-	end
-end
-
-function love.joystickpressed(joystick, button)
-	local input_pressed = nil
-	if
-		config.input and
-		config.input.joysticks and
-		config.input.joysticks[joystick:getName()] and
-		config.input.joysticks[joystick:getName()].buttons
-	then
-		input_pressed = config.input.joysticks[joystick:getName()].buttons[button]
-	end
-	scene:onInputPress({input=input_pressed, type="joybutton", name=joystick:getName(), button=button})
-end
-
-function love.joystickreleased(joystick, button)
-	local input_released = nil
-	if
-		config.input and
-		config.input.joysticks and
-		config.input.joysticks[joystick:getName()] and
-		config.input.joysticks[joystick:getName()].buttons
-	then
-		input_released = config.input.joysticks[joystick:getName()].buttons[button]
-	end
-	scene:onInputRelease({input=input_released, type="joybutton", name=joystick:getName(), button=button})
-end
-
-function love.joystickaxis(joystick, axis, value)
-	local input_pressed = nil
-	local positive_released = nil
-	local negative_released = nil
-	if
-		config.input and
-		config.input.joysticks and
-		config.input.joysticks[joystick:getName()] and
-		config.input.joysticks[joystick:getName()].axes and
-		config.input.joysticks[joystick:getName()].axes[axis] 
-	then
-		if math.abs(value) >= 1 then
-			input_pressed = config.input.joysticks[joystick:getName()].axes[axis][value >= 1 and "positive" or "negative"]
-		end
-		positive_released = config.input.joysticks[joystick:getName()].axes[axis].positive
-		negative_released = config.input.joysticks[joystick:getName()].axes[axis].negative
-	end
-	if math.abs(value) >= 1 then
-		scene:onInputPress({input=input_pressed, type="joyaxis", name=joystick:getName(), axis=axis, value=value})
-	else
-		scene:onInputRelease({input=positive_released, type="joyaxis", name=joystick:getName(), axis=axis, value=value})
-		scene:onInputRelease({input=negative_released, type="joyaxis", name=joystick:getName(), axis=axis, value=value})
-	end
-end
-
-local last_hat_direction = ""
-local directions = {
-	["u"] = "up",
-	["d"] = "down",
-	["l"] = "left",
-	["r"] = "right",
-}
-
-function love.joystickhat(joystick, hat, direction)
-	local input_pressed = nil
-	local has_hat = false
-	if
-		config.input and
-		config.input.joysticks and
-		config.input.joysticks[joystick:getName()] and
-		config.input.joysticks[joystick:getName()].hats and
-		config.input.joysticks[joystick:getName()].hats[hat]
-	then
-		if direction ~= "c" then
-			input_pressed = config.input.joysticks[joystick:getName()].hats[hat][direction]
-		end
-		has_hat = true
-	end
-	if input_pressed then
-		for i = 1, #direction do
-			local char = direction:sub(i, i)
-			local _, count = last_hat_direction:gsub(char, char)
-			if count == 0 then
-				scene:onInputPress({input=config.input.joysticks[joystick:getName()].hats[hat][char], type="joyhat", name=joystick:getName(), hat=hat, direction=char})
-			end
-		end
-		for i = 1, #last_hat_direction do
-			local char = last_hat_direction:sub(i, i)
-			local _, count = direction:gsub(char, char)
-			if count == 0 then
-				scene:onInputRelease({input=config.input.joysticks[joystick:getName()].hats[hat][char], type="joyhat", name=joystick:getName(), hat=hat, direction=char})
-			end
-		end
-		last_hat_direction = direction
-	elseif has_hat then
-		for i, direction in ipairs{"d", "l", "ld", "lu", "r", "rd", "ru", "u"} do
-			scene:onInputRelease({input=config.input.joysticks[joystick:getName()].hats[hat][direction], type="joyhat", name=joystick:getName(), hat=hat, direction=direction})
-		end
-		last_hat_direction = ""
-	elseif direction ~= "c" then
-		for i = 1, #direction do
-			local char = direction:sub(i, i)
-			local _, count = last_hat_direction:gsub(char, char)
-			if count == 0 then
-				scene:onInputPress({input=directions[char], type="joyhat", name=joystick:getName(), hat=hat, direction=char})
-			end
-		end
-		for i = 1, #last_hat_direction do
-			local char = last_hat_direction:sub(i, i)
-			local _, count = direction:gsub(char, char)
-			if count == 0 then
-				scene:onInputRelease({input=directions[char], type="joyhat", name=joystick:getName(), hat=hat, direction=char})
-			end
-		end
-		last_hat_direction = direction
-	else
-		for i, direction in ipairs{"d", "l", "ld", "lu", "r", "rd", "ru", "u"} do
-			scene:onInputRelease({input=nil, type="joyhat", name=joystick:getName(), hat=hat, direction=direction})
-		end
-		last_hat_direction = ""
 	end
 end
 
 function love.focus(f)
-	if f and (scene.title ~= "Game" or not scene.paused) then
+	if f then
 		resumeBGM()
 	else
 		pauseBGM()
 	end
 end
-
-function love.resize(w, h)
-    GLOBAL_CANVAS:release()
-    GLOBAL_CANVAS = love.graphics.newCanvas(w, h)
-end

package.bat

@@ -1,2 +0,0 @@
-tar -a -c -f cambridge.zip libs load res scene tetris conf.lua main.lua scene.lua funcs.lua
-rename cambridge.zip cambridge.love

release

@@ -4,6 +4,6 @@ mkdir dist/windows
 mkdir dist/win32
 cp cambridge.love dist/
 cat dist/windows/love.exe cambridge.love > dist/windows/cambridge.exe
-zip dist/cambridge-windows.zip dist/windows/* SOURCES.md LICENSE.md
+zip dist/cambridge-windows.zip dist/windows/* SOURCES.md LICENSE
 cat dist/win32/love.exe cambridge.love > dist/win32/cambridge.exe
-zip dist/cambridge-win32.zip dist/win32/* SOURCES.md LICENSE.md
+zip dist/cambridge-win32.zip dist/win32/* SOURCES.md LICENSE

release.bat

@@ -1,26 +0,0 @@
-call package.bat
-
-mkdir dist
-mkdir dist\windows
-mkdir dist\windows\libs
-mkdir dist\win32
-mkdir dist\win32\libs
-
-copy /b dist\windows\love.exe+cambridge.love dist\windows\cambridge.exe
-copy /b dist\win32\love.exe+cambridge.love dist\win32\cambridge.exe
-
-copy libs\discord-rpc.dll dist\windows\libs
-copy libs\discord-rpc.dll dist\win32\libs
-
-copy SOURCES.md dist\windows
-copy LICENSE.md dist\windows
-copy SOURCES.md dist\win32
-copy LICENSE.md dist\win32
-
-cd dist\windows
-tar -a -c -f ..\cambridge-windows.zip cambridge.exe *.dll libs *.md
-cd ..\..
-
-cd dist\win32
-tar -a -c -f ..\cambridge-win32.zip cambridge.exe *.dll libs *.md
-cd ..\..

scene.lua

@@ -5,17 +5,10 @@ Scene = Object:extend()
 function Scene:new() end
 function Scene:update() end
 function Scene:render() end
-function Scene:onInputPress() end
+function Scene:onKeyPress() end
-function Scene:onInputRelease() end
 
-ExitScene = require "scene.exit"
 GameScene = require "scene.game"
 ModeSelectScene = require "scene.mode_select"
-KeyConfigScene = require "scene.key_config"
-StickConfigScene = require "scene.stick_config"
 InputConfigScene = require "scene.input_config"
-GameConfigScene = require "scene.game_config"
+ConfigScene = require "scene.config"
-TuningScene = require "scene.tuning"
-SettingsScene = require "scene.settings"
-CreditsScene = require "scene.credits"
 TitleScene = require "scene.title"

scene/config.lua

@@ -17,7 +17,7 @@ function ConfigScene:changeOption(rel)
 	self.main_menu_state = (self.main_menu_state + len + rel - 1) % len + 1
 end
 
-function ConfigScene:onInputPress(e)
+function ConfigScene:onKeyPress(e)
 end
 
 return ConfigScene

scene/credits.lua

@@ -1,73 +0,0 @@
-local CreditsScene = Scene:extend()
-
-CreditsScene.title = "Credits"
-
-function CreditsScene:new()
-    self.frames = 0
-    switchBGM("credit_roll", "gm3")
-end
-
-function CreditsScene:update()
-    if love.window.hasFocus() then
-        self.frames = self.frames + 1
-    end
-    if self.frames >= 4200 then
-        playSE("mode_decide")
-        scene = TitleScene()
-        switchBGM(nil)
-    elseif self.frames == 3600 then
-        fadeoutBGM(2)
-    end
-end
-
-function CreditsScene:render()
-    love.graphics.setColor(1, 1, 1, 1)
-	love.graphics.draw(
-		backgrounds[19],
-		0, 0, 0,
-		0.5, 0.5
-    )
-
-    love.graphics.setFont(font_3x5_4)
-    love.graphics.print("Cambridge Credits", 320, 500 - self.frames / 2)
-    love.graphics.print("THANK YOU\nFOR PLAYING!", 320, math.max(1770 - self.frames / 2, 240))
-
-    love.graphics.setFont(font_3x5_3)
-    love.graphics.print("Game Developers", 320, 550 - self.frames / 2)
-    love.graphics.print("Project Heads", 320, 640 - self.frames / 2)
-    love.graphics.print("Other Game Developers", 320, 730 - self.frames / 2)
-    love.graphics.print("Special Thanks", 320, 950 - self.frames / 2)
-    love.graphics.print("- SashLilac / TS3 / Milla", 320, math.max(1850 - self.frames / 2, 320))
-
-    love.graphics.setFont(font_3x5_2)
-    love.graphics.print("Oshisaure\nJoe Zeng", 320, 590 - self.frames / 2)
-    love.graphics.print("Mizu\nHailey", 320, 680 - self.frames / 2)
-    love.graphics.print(
-        "Axel Fox - Multimino\nMine - Tetra Online\nDr Ocelot - Tetra Legends\n" ..
-        "Felicity / nightmareci - Shiromino\n2Tie - TGMsim\nPhoenix Flare - Master of Blocks\n" ..
-        "RayRay26 - Spirit Drop\nosk - TETR.IO\nMarkGamed7794 - Picoris 2",
-        320, 770 - self.frames / 2
-    )
-    love.graphics.print(
-        "RocketLanterns\nCylinderKnot\nHammrTime\nKirby703\nMattMayuga\nMyPasswordIsWeak\n" ..
-        "Nikki Karissa\noffwo\nsinefuse\nTetro48\nTimmSkiller\nuser74003\nAgentBasey\n" ..
-        "CheeZed_Fish\neightsixfivezero\nEricICX\ngizmo4487\nM1ssing0\n" ..
-        "pokemonfan1937\nSimon\nstratus\nZaptorZap\nArchina\nOliver\ncolour_thief\n" ..
-        "Caithness\nkdex\nzid\nsaphie\nSuper302\nAurora\nswitchpalacecorner\nKitaru\n" ..
-        "JBroms\nMany more I definitely missed!\n" ..
-        "The Absolute PLUS Discord\nTetra Legends Discord\nTetra Online Discord\n" ..
-        "Multimino Discord\nHard Drop Discord\nCambridge Discord\n" ..
-        "And to you, the player!",
-        320, 990 - self.frames / 2
-    )
-end
-
-function CreditsScene:onInputPress(e)
-    if e.input == "menu_decide" or e.scancode == "return" or
-       e.input == "menu_back" or e.scancode == "delete" or e.scancode == "backspace" then
-        scene = TitleScene()
-        switchBGM(nil)
-	end
-end
-
-return CreditsScene

scene/exit.lua

@@ -1,23 +0,0 @@
-local ExitScene = Scene:extend()
-require 'load.save'
-
-ExitScene.title = "Exit Game"
-
-function ExitScene:new()
-end
-
-function ExitScene:update()
-	love.event.quit()
-end
-
-function ExitScene:render()
-end
-
-function ExitScene:changeOption(rel)
-end
-
-function ExitScene:onInputPress(e)
-end
-
-return ExitScene
-

scene/game.lua

@@ -1,44 +1,29 @@
 local GameScene = Scene:extend()
-
-GameScene.title = "Game"
-
 require 'load.save'
 
-function GameScene:new(game_mode, ruleset, inputs)
+function GameScene:new(game_mode, ruleset)
-	self.retry_mode = game_mode
+	self.game = game_mode()
-	self.retry_ruleset = ruleset
+	self.ruleset = ruleset()
-	self.secret_inputs = inputs
-	self.game = game_mode(self.secret_inputs)
-	self.ruleset = ruleset(self.game)
 	self.game:initialize(self.ruleset)
-	self.inputs = {
-		left=false,
-		right=false,
-		up=false,
-		down=false,
-		rotate_left=false,
-		rotate_left2=false,
-		rotate_right=false,
-		rotate_right2=false,
-		rotate_180=false,
-		hold=false,
-	}
-	self.paused = false
-	DiscordRPC:update({
-		details = self.game.rpc_details,
-		state = self.game.name,
-	})
 end
 
 function GameScene:update()
-	if love.window.hasFocus() and not self.paused then
+	if love.window.hasFocus() then
-		local inputs = {}
+		self.game:update({
-		for input, value in pairs(self.inputs) do
+			left = love.keyboard.isScancodeDown(config.input.left),
-			inputs[input] = value
+			right = love.keyboard.isScancodeDown(config.input.right),
+			up = love.keyboard.isScancodeDown(config.input.up),
+			down = love.keyboard.isScancodeDown(config.input.down),
+			rotate_left = love.keyboard.isScancodeDown(config.input.rotate_left),
+			rotate_left2 = love.keyboard.isScancodeDown(config.input.rotate_left2),
+			rotate_right = love.keyboard.isScancodeDown(config.input.rotate_right),
+			rotate_right2 = love.keyboard.isScancodeDown(config.input.rotate_right2),
+			rotate_180 = love.keyboard.isScancodeDown(config.input.rotate_180),
+			hold = love.keyboard.isScancodeDown(config.input.hold),
+		}, self.ruleset)
 	end
-		self.game:update(inputs, self.ruleset)
+
 	self.game.grid:update()
-	end
 end
 
 function GameScene:render()
@@ -50,46 +35,16 @@ function GameScene:render()
 	)
 
 	-- game frame
-	if self.game.grid.width == 10 and self.game.grid.height == 24 then
 	love.graphics.draw(misc_graphics["frame"], 48, 64)
-	end
-	
 	love.graphics.setColor(0, 0, 0, 200)
-	love.graphics.rectangle(
+	love.graphics.rectangle("fill", 64, 80, 160, 320)
-		"fill", 64, 80,
-		16 * self.game.grid.width, 16 * (self.game.grid.height - 4)
-	)
-	
-	if self.game.grid.width ~= 10 or self.game.grid.height ~= 24 then
-		love.graphics.setColor(174/255, 83/255, 76/255, 1)
-		love.graphics.setLineWidth(8)
-		love.graphics.line(
-			60,76,
-			68+16*self.game.grid.width,76,
-			68+16*self.game.grid.width,84+16*(self.game.grid.height-4),
-			60,84+16*(self.game.grid.height-4),
-			60,76
-		)
-		love.graphics.setColor(203/255, 137/255, 111/255, 1)
-		love.graphics.setLineWidth(4)
-		love.graphics.line(
-			60,76,
-			68+16*self.game.grid.width,76,
-			68+16*self.game.grid.width,84+16*(self.game.grid.height-4),
-			60,84+16*(self.game.grid.height-4),
-			60,76
-		)
-		love.graphics.setLineWidth(1)
-	end
 
 	self.game:drawGrid()
-	if self.game.lcd > 0 then self.game:drawLineClearAnimation() end
 	self.game:drawPiece()
 	self.game:drawNextQueue(self.ruleset)
 	self.game:drawScoringInfo()
 
 	-- ready/go graphics
-
 	if self.game.ready_frames <= 100 and self.game.ready_frames > 52 then
 		love.graphics.draw(misc_graphics["ready"], 144 - 50, 240 - 14)
 	elseif self.game.ready_frames <= 50 and self.game.ready_frames > 2 then
@@ -98,47 +53,15 @@ function GameScene:render()
 
 	self.game:drawCustom()
 
-	love.graphics.setFont(font_3x5_2)
-	if config.gamesettings.display_gamemode == 1 then
-		love.graphics.printf(self.game.name .. " - " .. self.ruleset.name, 0, 460, 640, "left")
-	end
-
-	love.graphics.setFont(font_3x5_3)
-	if self.paused then love.graphics.print("PAUSED!", 80, 100) end
-
-	if self.game.completed then
-		self.game:onGameComplete()
-	elseif self.game.game_over then
-		self.game:onGameOver()
-	end
 end
 
-function GameScene:onInputPress(e)
+function GameScene:onKeyPress(e)
-	if (self.game.game_over or self.game.completed) and (e.input == "menu_decide" or e.input == "menu_back" or e.input == "retry") then
+	if (self.game.completed) and
+		e.scancode == "return" and e.isRepeat == false then
 		highscore_entry = self.game:getHighscoreData()
 		highscore_hash = self.game.hash .. "-" .. self.ruleset.hash
 		submitHighscore(highscore_hash, highscore_entry)
-		self.game:onExit()
-		scene = e.input == "retry" and GameScene(self.retry_mode, self.retry_ruleset, self.secret_inputs) or ModeSelectScene()
-	elseif e.input == "retry" then
-		switchBGM(nil)
-		self.game:onExit()
-		scene = GameScene(self.retry_mode, self.retry_ruleset, self.secret_inputs)
-	elseif e.input == "pause" and not (self.game.game_over or self.game.completed) then
-		self.paused = not self.paused
-		if self.paused then pauseBGM()
-		else resumeBGM() end
-	elseif e.input == "menu_back" then
-		self.game:onExit()
 		scene = ModeSelectScene()
-	elseif e.input and string.sub(e.input, 1, 5) ~= "menu_" then
-		self.inputs[e.input] = true
-	end
-end
-
-function GameScene:onInputRelease(e)
-	if e.input and string.sub(e.input, 1, 5) ~= "menu_" then
-		self.inputs[e.input] = false
 	end
 end
 

scene/game_config.lua

@@ -1,123 +0,0 @@
-local ConfigScene = Scene:extend()
-
-ConfigScene.title = "Game Settings"
-
-require 'load.save'
-require 'libs.simple-slider'
-
-ConfigScene.options = {
-	-- this serves as reference to what the options' values mean i guess?
-	-- Format: {name in config, displayed name, uses slider?, options OR slider name}
-	{"manlock", "Manual Locking", false, {"Per ruleset", "Per gamemode", "Harddrop", "Softdrop"}},
-	{"piece_colour", "Piece Colours", false, {"Per ruleset", "Arika", "TTC"}},
-	{"world_reverse", "A Button Rotation", false, {"Left", "Auto", "Right"}},
-	{"spawn_positions", "Spawn Positions", false, {"Per ruleset", "In field", "Out of field"}},
-	{"display_gamemode", "Display Gamemode", false, {"On", "Off"}},
-	{"das_last_key", "DAS Last Key", false, {"Off", "On"}},
-	{"smooth_movement", "Smooth Piece Drop", false, {"On", "Off"}},
-	{"synchroes_allowed", "Synchroes", false, {"Per ruleset", "On", "Off"}},
-	{"diagonal_input", "Diagonal Input", false, {"On", "Off"}},
-	{"buffer_lock", "Buffer Lock Inputs", false, {"On", "Off"}},
-	{"sfx_volume", "SFX", true, "sfxSlider"},
-	{"bgm_volume", "BGM", true, "bgmSlider"},
-}
-local optioncount = #ConfigScene.options
-
-function ConfigScene:new()
-	-- load current config
-	self.config = config.input
-	self.highlight = 1
-	
-	DiscordRPC:update({
-		details = "In menus",
-		state = "Changing game settings",
-	})
-
-	self.sfxSlider = newSlider(165, 400, 225, config.sfx_volume * 100, 0, 100, function(v) config.sfx_volume = v / 100 end, {width=20, knob="circle", track="roundrect"})
-	self.bgmSlider = newSlider(465, 400, 225, config.bgm_volume * 100, 0, 100, function(v) config.bgm_volume = v / 100 end, {width=20, knob="circle", track="roundrect"})
-end
-
-function ConfigScene:update()
-	self.sfxSlider:update()
-	self.bgmSlider:update()
-end
-
-function ConfigScene:render()
-	love.graphics.setColor(1, 1, 1, 1)
-	love.graphics.draw(
-		backgrounds["game_config"],
-		0, 0, 0,
-		0.5, 0.5
-	)
-
-	love.graphics.setFont(font_3x5_4)
-	love.graphics.print("GAME SETTINGS", 80, 40)
-	
-	--Lazy check to see if we're on the SFX or BGM slider. Probably will need to be rewritten if more options get added.
-	love.graphics.setColor(1, 1, 1, 0.5)
-	if not ConfigScene.options[self.highlight][3] then
-		love.graphics.rectangle("fill", 25, 98 + self.highlight * 20, 170, 22)
-	else
-		love.graphics.rectangle("fill", 65 + (1+self.highlight-#self.options) * 300, 342, 215, 33)
-	end
-	
-	love.graphics.setFont(font_3x5_2)
-	for i, option in ipairs(ConfigScene.options) do
-		if not option[3] then
-			love.graphics.setColor(1, 1, 1, 1)
-			love.graphics.printf(option[2], 40, 100 + i * 20, 150, "left")
-			for j, setting in ipairs(option[4]) do
-				love.graphics.setColor(1, 1, 1, config.gamesettings[option[1]] == j and 1 or 0.5)
-				love.graphics.printf(setting, 100 + 110 * j, 100 + i * 20, 100, "center")
-			end
-		end
-	end
-
-	love.graphics.setColor(1, 1, 1, 1)
-	love.graphics.setFont(font_3x5_3)
-	love.graphics.print("SFX Volume: " .. math.floor(self.sfxSlider:getValue()) .. "%", 75, 345)
-	love.graphics.print("BGM Volume: " .. math.floor(self.bgmSlider:getValue()) .. "%", 375, 345)
-
-	love.graphics.setColor(1, 1, 1, 0.75)
-	self.sfxSlider:draw()
-	self.bgmSlider:draw()
-end
-
-function ConfigScene:onInputPress(e)
-	if e.input == "menu_decide" or e.scancode == "return" then
-		playSE("mode_decide")
-		saveConfig()
-		scene = SettingsScene()
-	elseif e.input == "up" or e.scancode == "up" then
-		playSE("cursor")
-		self.highlight = Mod1(self.highlight-1, optioncount)
-	elseif e.input == "down" or e.scancode == "down" then
-		playSE("cursor")
-		self.highlight = Mod1(self.highlight+1, optioncount)
-	elseif e.input == "left" or e.scancode == "left" then
-		if not self.options[self.highlight][3] then
-			playSE("cursor_lr")
-			local option = ConfigScene.options[self.highlight]
-			config.gamesettings[option[1]] = Mod1(config.gamesettings[option[1]]-1, #option[4])
-		else
-			playSE("cursor")
-			sld = self[self.options[self.highlight][4]]
-			sld.value = math.max(sld.min, math.min(sld.max, (sld:getValue() - 5) / (sld.max - sld.min)))
-		end
-	elseif e.input == "right" or e.scancode == "right" then
-		if not self.options[self.highlight][3] then
-			playSE("cursor_lr")
-			local option = ConfigScene.options[self.highlight]
-			config.gamesettings[option[1]] = Mod1(config.gamesettings[option[1]]+1, #option[4])
-		else
-			playSE("cursor")
-			sld = self[self.options[self.highlight][4]]
-			sld.value = math.max(sld.min, math.min(sld.max, (sld:getValue() + 5) / (sld.max - sld.min)))--math.max(0, (math.floor(sld:getValue())+2)/(sld.max-sld.min))
-		end
-	elseif e.input == "menu_back" or e.scancode == "delete" or e.scancode == "backspace" then
-		loadSave()
-		scene = SettingsScene()
-	end
-end
-
-return ConfigScene

scene/input_config.lua

@@ -2,64 +2,60 @@ local ConfigScene = Scene:extend()
 
 ConfigScene.title = "Input Config"
 
-local menu_screens = {
+require 'load.save'
-    KeyConfigScene,
+
-    StickConfigScene
+local configurable_inputs = {
+	"left",
+    "right",
+    "up",
+    "down",
+	"rotate_left",
+	"rotate_left2",
+    "rotate_right",
+    "rotate_right2",
+    "rotate_180",
+    "hold",
 }
 
 function ConfigScene:new()
-    self.menu_state = 1
+	-- load current config
-    DiscordRPC:update({
+	self.config = config.input
-        details = "In menus",
+	self.input_state = 1
-        state = "Changing input config",
-    })
 end
 
-function ConfigScene:update() end
+function ConfigScene:update()
+end
 
 function ConfigScene:render()
-    love.graphics.setColor(1, 1, 1, 1)
-    love.graphics.draw(
-		backgrounds["input_config"],
-		0, 0, 0,
-		0.5, 0.5
-    )
-
-    love.graphics.setFont(font_3x5_4)
-    love.graphics.print("INPUT CONFIG", 80, 40)
-
 	love.graphics.setFont(font_3x5_2)
-    love.graphics.print("Which controls do you want to configure?", 80, 90)
+	for i, input in pairs(configurable_inputs) do
-
+		if config.input[input] then
-    love.graphics.setColor(1, 1, 1, 0.5)
+			love.graphics.printf(input, 40, 50 + i * 20, 200, "left")
-	love.graphics.rectangle("fill", 75, 118 + 50 * self.menu_state, 200, 33)
+			love.graphics.printf(
-
+				love.keyboard.getKeyFromScancode(config.input[input]) .. " (" .. config.input[input] .. ")",
-    love.graphics.setFont(font_3x5_3)
+				240, 50 + i * 20, 200, "left"
-	love.graphics.setColor(1, 1, 1, 1)
+			)
-	for i, screen in pairs(menu_screens) do
+		end
-		love.graphics.printf(screen.title, 80, 120 + 50 * i, 200, "left")
+	end
+	if self.input_state > table.getn(configurable_inputs) then
+		love.graphics.print("press enter to confirm, delete to retry")
+	else
+		love.graphics.print("press key for " .. configurable_inputs[self.input_state])
 	end
 end
 
-function ConfigScene:changeOption(rel)
+function ConfigScene:onKeyPress(e)
-	local len = table.getn(menu_screens)
+	if self.input_state > table.getn(configurable_inputs) then
-	self.menu_state = (self.menu_state + len + rel - 1) % len + 1
+		if e.scancode == "return" then
-end
+			-- save, then load next scene
-
+			saveConfig()
-function ConfigScene:onInputPress(e)
+			scene = TitleScene()
-	if e.input == "menu_decide" or e.scancode == "return" then
+		elseif e.scancode == "delete" or e.scancode == "backspace" then
-		playSE("main_decide")
+			self.input_state = 1
-		scene = menu_screens[self.menu_state]()
+		end
-	elseif e.input == "up" or e.scancode == "up" then
+	else
-		self:changeOption(-1)
+		config.input[configurable_inputs[self.input_state]] = e.scancode
-		playSE("cursor")
+		self.input_state = self.input_state + 1
-	elseif e.input == "down" or e.scancode == "down" then
-		self:changeOption(1)
-		playSE("cursor")
-	elseif config.input and (
-		e.input == "menu_back" or e.scancode == "backspace" or e.scancode == "delete"
-	) then
-		scene = SettingsScene()
 	end
 end