From eef04ebf057425269cd63c6f45d304b7ab4a09fe Mon Sep 17 00:00:00 2001
From: Mizu <40831463+Rexxt@users.noreply.github.com>
Date: Wed, 11 Nov 2020 17:42:48 +0100
Subject: [PATCH] Update graphic names and SOURCES.md

---
 SOURCES.md                                    |   2 +-
 load/graphics.lua                             |  88 +++++++++---------
 res/backgrounds/{0-quantum-foam.png => 0.png} | Bin
 res/backgrounds/{100-big-bang.png => 100.png} | Bin
 .../{1000-vikings.png => 1000.png}            | Bin
 .../{1100-crusades.png => 1100.png}           | Bin
 .../{1200-genghis-khan.png => 1200.png}       | Bin
 .../{1300-black-death.png => 1300.png}        | Bin
 .../{1400-columbus-discovery.png => 1400.png} | Bin
 .../{1500-aztecas.png => 1500.png}            | Bin
 .../{1600-telescope.png => 1600.png}          | Bin
 ...{1700-american-revolution.png => 1700.png} | Bin
 .../{1800-railways.png => 1800.png}           | Bin
 .../{1900-world-wide-web.png => 1900.png}     | Bin
 .../{200-spiral-galaxy.png => 200.png}        | Bin
 .../{300-sun-and-dust.png => 300.png}         | Bin
 .../{400-earth-and-moon.png => 400.png}       | Bin
 .../{500-cambrian-explosion.png => 500.png}   | Bin
 .../{600-dinosaurs.png => 600.png}            | Bin
 res/backgrounds/{700-asteroid.png => 700.png} | Bin
 .../{800-human-fire.png => 800.png}           | Bin
 .../{900-early-civilization.png => 900.png}   | Bin
 .../{options-gears.png => options-game.png}   | Bin
 .../{options-pcb.png => options-input.png}    | Bin
 res/backgrounds/{title_v0.1.png => title.png} | Bin
 25 files changed, 47 insertions(+), 43 deletions(-)
 rename res/backgrounds/{0-quantum-foam.png => 0.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{100-big-bang.png => 100.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{1000-vikings.png => 1000.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{1100-crusades.png => 1100.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{1200-genghis-khan.png => 1200.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{1300-black-death.png => 1300.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{1400-columbus-discovery.png => 1400.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{1500-aztecas.png => 1500.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{1600-telescope.png => 1600.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{1700-american-revolution.png => 1700.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{1800-railways.png => 1800.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{1900-world-wide-web.png => 1900.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{200-spiral-galaxy.png => 200.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{300-sun-and-dust.png => 300.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{400-earth-and-moon.png => 400.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{500-cambrian-explosion.png => 500.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{600-dinosaurs.png => 600.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{700-asteroid.png => 700.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{800-human-fire.png => 800.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{900-early-civilization.png => 900.png} (100%)
 mode change 100755 => 100644
 rename res/backgrounds/{options-gears.png => options-game.png} (100%)
 rename res/backgrounds/{options-pcb.png => options-input.png} (100%)
 rename res/backgrounds/{title_v0.1.png => title.png} (100%)

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