diff --git a/SOURCES.md b/SOURCES.md index 6851c4e..9e527a0 100644 --- a/SOURCES.md +++ b/SOURCES.md @@ -8,7 +8,7 @@ Some of the assets are used without proper licenses. We aim to have fully licens Backgrounds ----------- -1. Title: "Motus Glacies." Contributed by Daniel "Explo" McCarthy. +1. Title: Original picrute found on the Wikipedia article for Cambridge 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 diff --git a/load/graphics.lua b/load/graphics.lua index b79fc74..00d5d4b 100644 --- a/load/graphics.lua +++ b/load/graphics.lua @@ -1,27 +1,27 @@ backgrounds = { - [0] = love.graphics.newImage("res/backgrounds/0-quantum-foam.png"), - love.graphics.newImage("res/backgrounds/100-big-bang.png"), - love.graphics.newImage("res/backgrounds/200-spiral-galaxy.png"), - love.graphics.newImage("res/backgrounds/300-sun-and-dust.png"), - love.graphics.newImage("res/backgrounds/400-earth-and-moon.png"), - love.graphics.newImage("res/backgrounds/500-cambrian-explosion.png"), - love.graphics.newImage("res/backgrounds/600-dinosaurs.png"), - love.graphics.newImage("res/backgrounds/700-asteroid.png"), - love.graphics.newImage("res/backgrounds/800-human-fire.png"), - love.graphics.newImage("res/backgrounds/900-early-civilization.png"), - love.graphics.newImage("res/backgrounds/1000-vikings.png"), - love.graphics.newImage("res/backgrounds/1100-crusades.png"), - love.graphics.newImage("res/backgrounds/1200-genghis-khan.png"), - love.graphics.newImage("res/backgrounds/1300-black-death.png"), - love.graphics.newImage("res/backgrounds/1400-columbus-discovery.png"), - love.graphics.newImage("res/backgrounds/1500-aztecas.png"), - love.graphics.newImage("res/backgrounds/1600-telescope.png"), - love.graphics.newImage("res/backgrounds/1700-american-revolution.png"), - love.graphics.newImage("res/backgrounds/1800-railways.png"), - love.graphics.newImage("res/backgrounds/1900-world-wide-web.png"), - title = love.graphics.newImage("res/backgrounds/title_v0.1.png"), - input_config = love.graphics.newImage("res/backgrounds/options-pcb.png"), - game_config = love.graphics.newImage("res/backgrounds/options-gears.png"), + [0] = love.graphics.newImage("res/backgrounds/0.png"), + love.graphics.newImage("res/backgrounds/100.png"), + love.graphics.newImage("res/backgrounds/200.png"), + love.graphics.newImage("res/backgrounds/300.png"), + love.graphics.newImage("res/backgrounds/400.png"), + love.graphics.newImage("res/backgrounds/500.png"), + love.graphics.newImage("res/backgrounds/600.png"), + love.graphics.newImage("res/backgrounds/700.png"), + love.graphics.newImage("res/backgrounds/800.png"), + love.graphics.newImage("res/backgrounds/900.png"), + love.graphics.newImage("res/backgrounds/1000.png"), + love.graphics.newImage("res/backgrounds/1100.png"), + love.graphics.newImage("res/backgrounds/1200.png"), + love.graphics.newImage("res/backgrounds/1300.png"), + love.graphics.newImage("res/backgrounds/1400.png"), + love.graphics.newImage("res/backgrounds/1500.png"), + love.graphics.newImage("res/backgrounds/1600.png"), + love.graphics.newImage("res/backgrounds/1700.png"), + love.graphics.newImage("res/backgrounds/1800.png"), + love.graphics.newImage("res/backgrounds/1900.png"), + title = love.graphics.newImage("res/backgrounds/title.png"), + input_config = love.graphics.newImage("res/backgrounds/options-input.png"), + game_config = love.graphics.newImage("res/backgrounds/options-game.png"), } blocks = { @@ -33,6 +33,8 @@ blocks = { C = love.graphics.newImage("res/img/s2.png"), B = love.graphics.newImage("res/img/s4.png"), M = love.graphics.newImage("res/img/s5.png"), + F = love.graphics.newImage("res/img/s9.png"), + A = love.graphics.newImage("res/img/s8.png"), X = love.graphics.newImage("res/img/s9.png"), }, ["bone"] = { @@ -43,29 +45,31 @@ blocks = { C = 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"), X = love.graphics.newImage("res/img/bone.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", - }, + 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 @@ -80,4 +84,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"), -} +} \ No newline at end of file diff --git a/res/backgrounds/0-quantum-foam.png b/res/backgrounds/0.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/0-quantum-foam.png rename to res/backgrounds/0.png diff --git a/res/backgrounds/100-big-bang.png b/res/backgrounds/100.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/100-big-bang.png rename to res/backgrounds/100.png diff --git a/res/backgrounds/1000-vikings.png b/res/backgrounds/1000.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/1000-vikings.png rename to res/backgrounds/1000.png diff --git a/res/backgrounds/1100-crusades.png b/res/backgrounds/1100.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/1100-crusades.png rename to res/backgrounds/1100.png diff --git a/res/backgrounds/1200-genghis-khan.png b/res/backgrounds/1200.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/1200-genghis-khan.png rename to res/backgrounds/1200.png diff --git a/res/backgrounds/1300-black-death.png b/res/backgrounds/1300.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/1300-black-death.png rename to res/backgrounds/1300.png diff --git a/res/backgrounds/1400-columbus-discovery.png b/res/backgrounds/1400.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/1400-columbus-discovery.png rename to res/backgrounds/1400.png diff --git a/res/backgrounds/1500-aztecas.png b/res/backgrounds/1500.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/1500-aztecas.png rename to res/backgrounds/1500.png diff --git a/res/backgrounds/1600-telescope.png b/res/backgrounds/1600.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/1600-telescope.png rename to res/backgrounds/1600.png diff --git a/res/backgrounds/1700-american-revolution.png b/res/backgrounds/1700.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/1700-american-revolution.png rename to res/backgrounds/1700.png diff --git a/res/backgrounds/1800-railways.png b/res/backgrounds/1800.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/1800-railways.png rename to res/backgrounds/1800.png diff --git a/res/backgrounds/1900-world-wide-web.png b/res/backgrounds/1900.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/1900-world-wide-web.png rename to res/backgrounds/1900.png diff --git a/res/backgrounds/200-spiral-galaxy.png b/res/backgrounds/200.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/200-spiral-galaxy.png rename to res/backgrounds/200.png diff --git a/res/backgrounds/300-sun-and-dust.png b/res/backgrounds/300.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/300-sun-and-dust.png rename to res/backgrounds/300.png diff --git a/res/backgrounds/400-earth-and-moon.png b/res/backgrounds/400.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/400-earth-and-moon.png rename to res/backgrounds/400.png diff --git a/res/backgrounds/500-cambrian-explosion.png b/res/backgrounds/500.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/500-cambrian-explosion.png rename to res/backgrounds/500.png diff --git a/res/backgrounds/600-dinosaurs.png b/res/backgrounds/600.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/600-dinosaurs.png rename to res/backgrounds/600.png diff --git a/res/backgrounds/700-asteroid.png b/res/backgrounds/700.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/700-asteroid.png rename to res/backgrounds/700.png diff --git a/res/backgrounds/800-human-fire.png b/res/backgrounds/800.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/800-human-fire.png rename to res/backgrounds/800.png diff --git a/res/backgrounds/900-early-civilization.png b/res/backgrounds/900.png old mode 100755 new mode 100644 similarity index 100% rename from res/backgrounds/900-early-civilization.png rename to res/backgrounds/900.png diff --git a/res/backgrounds/options-gears.png b/res/backgrounds/options-game.png similarity index 100% rename from res/backgrounds/options-gears.png rename to res/backgrounds/options-game.png diff --git a/res/backgrounds/options-pcb.png b/res/backgrounds/options-input.png similarity index 100% rename from res/backgrounds/options-pcb.png rename to res/backgrounds/options-input.png diff --git a/res/backgrounds/title_v0.1.png b/res/backgrounds/title.png similarity index 100% rename from res/backgrounds/title_v0.1.png rename to res/backgrounds/title.png