From 4b88a71d04dd8566b3832e827ac066d2cd4e2175 Mon Sep 17 00:00:00 2001
From: Auric Vente <mprops@protonmail.com>
Date: Sat, 27 Jul 2024 21:02:10 -0600
Subject: [PATCH] Mods

---
 cromulant/game.py       | 32 +++++++++++++++++++-------------
 cromulant/main.py       |  1 +
 cromulant/manifest.json |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/cromulant/game.py b/cromulant/game.py
index ed21147..eeae396 100644
--- a/cromulant/game.py
+++ b/cromulant/game.py
@@ -150,22 +150,14 @@ class Game:
     def add_item(item: QWidget) -> None:
         from .filter import Filter
 
-        fade = Game.started and Args.fade
+        animation: QPropertyAnimation | None = None
 
-        if fade:
-            opacity_effect = QGraphicsOpacityEffect(item)
-            item.setGraphicsEffect(opacity_effect)
-            animation = QPropertyAnimation(opacity_effect, b"opacity")
-            animation.setDuration(Config.fade_duration)
-            animation.setStartValue(0)
-            animation.setEndValue(1)
-            animation.setEasingCurve(QEasingCurve.InOutQuad)
-            animation.finished.connect(lambda: Game.animations.remove(animation))
-            Game.animations.append(animation)
+        if Game.started and Args.fade:
+            animation = Game.add_fade(item)
 
         Window.view.insertWidget(0, item)
 
-        if fade:
+        if animation:
             animation.start()
 
         while Window.view.count() > Config.max_updates:
@@ -367,7 +359,6 @@ class Game:
 
     @staticmethod
     def start_loop() -> None:
-        Game.started = True
         Game.timer.stop()
         speed = Settings.speed
 
@@ -456,11 +447,13 @@ class Game:
         size = int(data["size"].split(" ")[0])
 
         Game.started = False
+        Game.timer.stop()
         Window.clear_view()
         Ants.populate(size)
         Window.to_top()
         Game.intro()
         Game.start_loop()
+        Game.started = True
 
     @staticmethod
     def update_size() -> None:
@@ -611,3 +604,16 @@ class Game:
             Filter.clear()
         else:
             Filter.set_value(ant.name)
+
+    @staticmethod
+    def add_fade(item: QWidget) -> QPropertyAnimation:
+        opacity = QGraphicsOpacityEffect(item)
+        item.setGraphicsEffect(opacity)
+        animation = QPropertyAnimation(opacity, b"opacity")
+        animation.setDuration(Config.fade_duration)
+        animation.setStartValue(0)
+        animation.setEndValue(1)
+        animation.setEasingCurve(QEasingCurve.InOutQuad)
+        animation.finished.connect(lambda: Game.animations.remove(animation))
+        Game.animations.append(animation)
+        return animation
diff --git a/cromulant/main.py b/cromulant/main.py
index 0fd3391..1b439a1 100644
--- a/cromulant/main.py
+++ b/cromulant/main.py
@@ -48,6 +48,7 @@ def main() -> None:
     Filter.prepare()
     Game.prepare()
     Game.start_loop()
+    Game.started = True
     Window.start()
 
 
diff --git a/cromulant/manifest.json b/cromulant/manifest.json
index bb98d2a..fc0a9ef 100644
--- a/cromulant/manifest.json
+++ b/cromulant/manifest.json
@@ -1,5 +1,5 @@
 {
-    "version": "3.4.0",
+    "version": "3.5.0",
     "title": "Cromulant",
     "program": "cromulant",
     "author": "madprops",