Version 1.1: new scene, some refactoring

11 files changed, 112 insertions, 17 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..4d59cbc
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,10 @@
+
+# OpenGUIlion change log
+
+## Version 1.1 - 20220917
+- [NEW] Scene: "state of emergency".
+- [UPD] Some refactoring and new variables.
+
+## Version 1.0 - 20220914
+
+- [NEW] First public version, including five scenes: "case resolution", "lost", "intruder alert", "mental toxicity" and "phase 01 to 17".
diff --git a/README.md b/README.md
index 6bf2c97..844a4c9 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 
-# OpenGUIlion v1.0
+# About OpenGUIlion
 
 OpenGUIlion is a very basic application written in Python that only does one thing: it shows non-interactive, animated GUIs from the "Evangelion" franchise.
 
@@ -10,9 +10,9 @@ OpenGUIlion is a very basic application written in Python that only does one thi
 
 ## Requirements
 
-To run OpenGUIlion you need Python 3 with PyGame and PIL available. Most distros already include them.
+To run OpenGUIlion you need Python 3 with PyGame and PIL available. Some distros already include them, but in case yours doesn't you can easily install them through `pip`.
 
-You also need some fonts that must be placed under the `/openguilion/fonts/` folder and cannot be included in the repo for copyright reasons. How to get them is up to you and I will not provide further instructions nor direct downloads.
+You also need some extra fonts that must be placed under the `/openguilion/fonts/` folder and cannot be included in the repo for copyright reasons, whereas others can. How to get the copyrighted fonts is up to you and I will not provide further instructions nor direct downloads.
 
 - Obtain "Helvetica Narrow Bold Regular" and name it `helvet.ttf`.
 - Obtain "Helvetica Bold" and name it `helvetb.ttf`.
@@ -41,8 +41,10 @@ This software is distributed under a [GPL 3.0 license](https://opensource.org/li
 
 ## Disclaimer
 
-All names are trademarks of their respective owners and are use here under fair use.
+All names are trademarks of their respective owners and are used here under fair use.
 
 - "Evangelion" is a trademark of Gainax Corporation and Khara Inc.
 - "Helvetica" is a trademark of Monotype Imaging Inc.
 - "ITC Matisse®" is a trademark of Monotype ITC Inc.
+
+Sinkin Sans is used under an [Apache License](https://www.fontsquirrel.com/license/sinkin-sans).
diff --git a/openguilion.py b/openguilion.py
index 05b1fa7..2449d8d 100644
--- a/openguilion.py
+++ b/openguilion.py
@@ -4,6 +4,7 @@ from openguilion.caseResolution import *
 from openguilion.phase01To17 import *
 from openguilion.lost import *
 from openguilion.mentalToxicity import *
+from openguilion.stateEmergency import *
 
 def main():
 	running = True
@@ -12,7 +13,7 @@ def main():
 	curTime = startDate
 	animIndex = 0
 	animTime = 0
-	animations = [intruderAlert, caseResolution, mentalToxicity, lost, phase01To17]
+	animations = [stateEmergency, intruderAlert, caseResolution, mentalToxicity, lost, phase01To17]
 
 	while running:
 		for event in pygame.event.get():
diff --git a/openguilion/caseResolution.py b/openguilion/caseResolution.py
index 1404911..353fdee 100644
--- a/openguilion/caseResolution.py
+++ b/openguilion/caseResolution.py
@@ -112,8 +112,8 @@ def caseResolution(animTime):
 	pil_image = Image.frombytes("RGBA", (_.w, _.h), pil_string_image)
 	draw = ImageDraw.Draw(pil_image)
 	blurred = pil_image.filter(ImageFilter.BoxBlur(3))
-	py_text = pygame.image.fromstring(blurred.tobytes(), blurred.size, blurred.mode)
-	_.screen.blit(py_text, (0, 0, 0, 0))
+	blurred = pygame.image.fromstring(blurred.tobytes(), blurred.size, blurred.mode)
+	_.screen.blit(blurred, (0, 0, 0, 0))
 	_.screen.blit(surfaceCaseResolution, (0, 0))
 
 	if animTime >= 5:
diff --git a/openguilion/fonts/sinkin.ttf b/openguilion/fonts/sinkin.ttf
new file mode 100644
index 0000000..4b85cc8
--- /dev/null
+++ b/openguilion/fonts/sinkin.ttf
diff --git a/openguilion/intruderAlert.py b/openguilion/intruderAlert.py
index aebb3eb..d7c4aed 100644
--- a/openguilion/intruderAlert.py
+++ b/openguilion/intruderAlert.py
@@ -96,9 +96,9 @@ def intruderAlert(animTime):
 	pil_image = Image.frombytes("RGBA", (_.w, _.h), pil_string_image)
 	draw = ImageDraw.Draw(pil_image)
 	blurred = pil_image.filter(ImageFilter.BoxBlur(10))
-	py_text = pygame.image.fromstring(blurred.tobytes(), blurred.size, blurred.mode)
-	py_text.set_alpha(192)
-	surfaceIntruderAlert.blit(py_text, (0, 0, 0, 0))
+	blurred = pygame.image.fromstring(blurred.tobytes(), blurred.size, blurred.mode)
+	blurred.set_alpha(192)
+	surfaceIntruderAlert.blit(blurred, (0, 0, 0, 0))
 	surfaceIntruderAlert.blit(surfaceIntruderAlertOver, (0, 0))
 
 	_.screen.blit(surfaceIntruderAlert, (0, 0))
diff --git a/openguilion/lost.py b/openguilion/lost.py
index be0c35b..56fc1f9 100644
--- a/openguilion/lost.py
+++ b/openguilion/lost.py
@@ -25,8 +25,8 @@ def lost(animTime):
 	pil_image = Image.frombytes("RGBA", (_.w, _.h), pil_string_image)
 	draw = ImageDraw.Draw(pil_image)
 	blurred = pil_image.filter(ImageFilter.BoxBlur(3))
-	py_text = pygame.image.fromstring(blurred.tobytes(), blurred.size, blurred.mode)
-	_.screen.blit(py_text, (0, 0, 0, 0))
+	blurred = pygame.image.fromstring(blurred.tobytes(), blurred.size, blurred.mode)
+	_.screen.blit(blurred, (0, 0, 0, 0))
 	_.screen.blit(surfaceLost, (0, 0))
 
 	if animTime >= 5:
diff --git a/openguilion/mentalToxicity.py b/openguilion/mentalToxicity.py
index 01c61ea..052e21f 100644
--- a/openguilion/mentalToxicity.py
+++ b/openguilion/mentalToxicity.py
@@ -103,8 +103,8 @@ def mentalToxicity(animTime):
 	pil_image = Image.frombytes("RGBA", (_.w, _.h), pil_string_image)
 	draw = ImageDraw.Draw(pil_image)
 	blurred = pil_image.filter(ImageFilter.BoxBlur(5))
-	py_text = pygame.image.fromstring(blurred.tobytes(), blurred.size, blurred.mode)
-	_.screen.blit(py_text, (0, 0, 0, 0))
+	blurred = pygame.image.fromstring(blurred.tobytes(), blurred.size, blurred.mode)
+	_.screen.blit(blurred, (0, 0, 0, 0))
 	_.screen.blit(surfaceMentalToxicity, (0, 0))
 
 	if animTime >= 5:
diff --git a/openguilion/openguilionCommon.py b/openguilion/openguilionCommon.py
index cc5d697..e4be930 100644
--- a/openguilion/openguilionCommon.py
+++ b/openguilion/openguilionCommon.py
@@ -5,8 +5,11 @@ import pygame
 import pygame.freetype
 from pygame.locals import *
 
+appName = "OpenGUIlion"
+appVersion = "v1.1"
+
 pygame.init()
-pygame.display.set_caption("Zankokuna tenshi no Python")
+pygame.display.set_caption(appName + " " + appVersion)
 w, h = 1024, 512
 screen = pygame.display.set_mode((w, h), 32, pygame.NOFRAME)
 
@@ -14,6 +17,7 @@ fontHelv      = pygame.font.Font('./openguilion/fonts/helvet.ttf', 60)
 fontHelvGiant = pygame.font.Font('./openguilion/fonts/helvet.ttf', 600)
 fontHelvB     = pygame.font.Font('./openguilion/fonts/helvetb.ttf', 60)
 fontMatisse   = pygame.font.Font('./openguilion/fonts/matisse.ttf', 60)
+fontSinkin    = pygame.font.Font('./openguilion/fonts/sinkin.ttf', 200)
 
 # Test vars
 textX = 100
diff --git a/openguilion/phase01To17.py b/openguilion/phase01To17.py
index 9a457aa..3856481 100644
--- a/openguilion/phase01To17.py
+++ b/openguilion/phase01To17.py
@@ -103,8 +103,8 @@ def phase01To17(animTime):
 	pil_image = Image.frombytes("RGBA", (_.w, _.h), pil_string_image)
 	draw = ImageDraw.Draw(pil_image)
 	blurred = pil_image.filter(ImageFilter.BoxBlur(3))
-	py_text = pygame.image.fromstring(blurred.tobytes(), blurred.size, blurred.mode)
-	_.screen.blit(py_text, (0, 0, 0, 0))
+	blurred = pygame.image.fromstring(blurred.tobytes(), blurred.size, blurred.mode)
+	_.screen.blit(blurred, (0, 0, 0, 0))
 	_.screen.blit(surfacePhase01to17, (0, 0))
 
 	if animTime >= 10:
diff --git a/openguilion/stateEmergency.py b/openguilion/stateEmergency.py
new file mode 100644
index 0000000..1a199c9
--- /dev/null
+++ b/openguilion/stateEmergency.py
@@ -0,0 +1,78 @@
+from . import openguilionCommon as _
+from PIL import Image, ImageDraw, ImageFont, ImageFilter, ImageChops
+import pygame
+
+# SURFACES
+surfaceStateEmergency = pygame.Surface((_.w, _.h), pygame.SRCALPHA, 32)
+surfaceStateEmergencyBG = pygame.Surface((_.w, _.h), pygame.SRCALPHA, 32)
+surfaceStateEmergencyBGRects = pygame.Surface((_.w, _.h), pygame.SRCALPHA, 32)
+surfaceStateEmergencyOver = pygame.Surface((_.w, _.h), pygame.SRCALPHA, 32)
+
+# STATIC SCENE COMPOSITION
+imgStateEm   = _.fontMatisse.render("非常事態", True, (212, 19, 13)).convert_alpha()
+imgStateEm   = pygame.transform.smoothscale(imgStateEm, (round(imgStateEm.get_size()[0] * 2), round(imgStateEm.get_size()[1] * 1.5)))
+imgEmergency = _.fontSinkin.render("EMERGENCY", True, (228, 114, 0)).convert_alpha()
+imgEmergency = pygame.transform.smoothscale(imgEmergency, (round(imgEmergency.get_size()[0] * 0.55), round(imgEmergency.get_size()[1] * 0.7)))
+
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((43, 0), (113, 0), (0, 113), (0, 43)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((26, 159), (185, 0), (255, 0), (96, 159)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((168, 159), (327, 0), (397, 0), (238, 159)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((310, 159), (469, 0), (554, 0), (713, 159), (643, 159), (512, 28), (511, 28), (380, 159)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((452, 159), (511, 100), (512, 100), (571, 159)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((626, 0), (696, 0), (855, 159), (785, 159)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((768, 0), (838, 0), (997, 159), (927, 159)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((910, 0), (980, 0), (1023, 43), (1023, 113)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((0, 352), (40, 352), (0, 392)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((0, 464), (112, 352), (182, 352), (23, 511), (0, 511)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((254, 352), (324, 352), (165, 511), (95,511)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((396, 352), (466, 352), (307, 511), (237, 511)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((379, 511), (511, 379), (512, 379), (644, 511), (574, 511), (512, 449), (511, 449), (449, 511)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((557, 352), (627, 352), (786, 511), (716, 511)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((699, 352), (769, 352), (928, 511), (858, 511)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((841, 352), (911, 352), (1023, 464), (1023, 511), (1000, 511)))
+pygame.draw.polygon(surfaceStateEmergencyBG, (212, 19, 13), ((983, 352), (1023, 352), (1023, 392)))
+pygame.draw.rect(surfaceStateEmergencyBG, (0, 0, 0), (512 - imgStateEm.get_size()[0] / 2 - 40, 35, imgStateEm.get_size()[0] + 80, imgStateEm.get_size()[1] + 20))
+pygame.draw.rect(surfaceStateEmergencyBG, (0, 0, 0), (512 - imgStateEm.get_size()[0] / 2 - 40, _.h - 55 - imgStateEm.get_size()[1], imgStateEm.get_size()[0] + 80, imgStateEm.get_size()[1] + 20))
+
+surfaceStateEmergencyBG.blit(imgStateEm, (512 - imgStateEm.get_size()[0] / 2, 45))
+surfaceStateEmergencyBG.blit(imgStateEm, (512 - imgStateEm.get_size()[0] / 2, _.h - 45 - imgStateEm.get_size()[1]))
+
+
+pygame.draw.rect(surfaceStateEmergencyBGRects, (228, 114, 0), (512 - imgStateEm.get_size()[0] / 2 - 35, 40, 20, imgStateEm.get_size()[1] + 10))
+pygame.draw.rect(surfaceStateEmergencyBGRects, (228, 114, 0), (512 + imgStateEm.get_size()[0] / 2 + 15, 40, 20, imgStateEm.get_size()[1] + 10))
+pygame.draw.rect(surfaceStateEmergencyBGRects, (228, 114, 0), (512 - imgStateEm.get_size()[0] / 2 - 35, _.h - 50 - imgStateEm.get_size()[1], 20, imgStateEm.get_size()[1] + 10))
+pygame.draw.rect(surfaceStateEmergencyBGRects, (228, 114, 0), (512 + imgStateEm.get_size()[0] / 2 + 15, _.h - 50 - imgStateEm.get_size()[1], 20, imgStateEm.get_size()[1] + 10))
+
+def stateEmergency(animTime):
+	_.screen.fill((0, 0, 0))
+	surfaceStateEmergency.fill((0, 0, 0, 0))
+
+	offsetEmergency = (-animTime * 500) % (imgEmergency.get_size()[0] + 350) - _.w
+	while offsetEmergency < _.w:
+		surfaceStateEmergency.blit(imgEmergency, (offsetEmergency, 180))
+		offsetEmergency += (imgEmergency.get_size()[0] + 350)
+	pygame.draw.rect(surfaceStateEmergency, (212, 19, 13), (0, 321, _.w, 10))
+
+	blinkTimeline = (animTime * 1000) % 500
+	if blinkTimeline <= 250:
+		surfaceStateEmergencyBG.set_alpha(255)
+		surfaceStateEmergencyBGRects.set_alpha(255 - max(0, 255 - round((blinkTimeline - 200) / 250 * 255)))
+	else:
+		surfaceStateEmergencyBG.set_alpha(max(0, 255 - round((blinkTimeline - 200) / 250 * 255)))
+		surfaceStateEmergencyBGRects.set_alpha(255)
+
+	pil_string_image = pygame.image.tostring(surfaceStateEmergency, "RGBA", False)
+	pil_image = Image.frombytes("RGBA", (_.w, _.h), pil_string_image)
+	draw = ImageDraw.Draw(pil_image)
+	blurred = pil_image.filter(ImageFilter.BoxBlur(6))
+	blurred = pygame.image.fromstring(blurred.tobytes(), blurred.size, blurred.mode)
+	_.screen.blit(blurred, (0, 0, 0, 0))
+	surfaceStateEmergency.blit(surfaceStateEmergencyBG, (0, 0))
+	surfaceStateEmergency.blit(surfaceStateEmergencyBGRects, (0, 0))
+	surfaceStateEmergency.blit(surfaceStateEmergencyOver, (0, 0))
+
+	_.screen.blit(surfaceStateEmergency, (0, 0))
+
+	if animTime >= 5:
+		return True
+	return False
\ No newline at end of file