From f8f6c51913fe55d3e0ddef09cb7b800cfeeffc9b Mon Sep 17 00:00:00 2001
From: kek7198 <grayboy99@protonmail.com>
Date: Sat, 11 Dec 2021 00:25:26 -0600
Subject: [PATCH] fix

---
 files/templates/submission.html               | 32 ------------
 .../submission/SubmissionAwards.html          | 49 +++++++++++++++++--
 2 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/files/templates/submission.html b/files/templates/submission.html
index 0b87a36e62..b250d64500 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -36,38 +36,6 @@
 
 {% endif %}
 
-{% if p.award_count("shit") %}
-<script defer src="/assets/js/bugs.js?v=54"></script>
-{% set minbugs = 10*p.award_count("shit") if p.award_count("shit") < 3 else 20 %}
-{% set maxbugs = 20*p.award_count("shit") if p.award_count("shit") < 3 else 40 %}
-<script>
-	new BugController({
-		imageSprite: "/assets/images/fly-sprite.gif",
-		canDie: false,
-		minBugs: {{minbugs}},
-		maxBugs: {{maxbugs}},
-		mouseOver: "multiply"
-	});
-</script>
-{% endif %}
-
-
-{% if p.award_count("fireflies") %}
-<script defer src="/assets/js/fireflies.js?v=54"></script>
-{% set minbugs = 10*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 20 %}
-{% set maxbugs = 20*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 40 %}
-<script>
-	new BugController({
-		imageSprite: "/assets/images/fireflies.gif",
-		canDie: false,
-		minBugs: {{minbugs}},
-		maxBugs: {{maxbugs}},
-		mouseOver: "multiply"
-	});
-</script>
-{% endif %}
-
-
 <meta charset="utf-8" >
 <meta property="og:type" content="article" >
 
diff --git a/files/templates/submission/SubmissionAwards.html b/files/templates/submission/SubmissionAwards.html
index 49a23da0d2..0cd48fa4e8 100644
--- a/files/templates/submission/SubmissionAwards.html
+++ b/files/templates/submission/SubmissionAwards.html
@@ -1,9 +1,43 @@
-<!-- Awards -->
+<!-- Train award -->
 {% if p.award_count("train") %}
 {% include "/awards/Trains.html" %}
 {% endif %}
 
+<!-- Poop award -->
+{% if p.award_count("shit") %}
+<script defer src="/assets/js/bugs.js?v=54"></script>
+{% set minbugs = 10*p.award_count("shit") if p.award_count("shit") < 3 else 20 %}
+{% set maxbugs = 20*p.award_count("shit") if p.award_count("shit") < 3 else 40 %}
+<script>
+	new BugController({
+		imageSprite: "/assets/images/fly-sprite.gif",
+		canDie: false,
+		minBugs: {{minbugs}},
+		maxBugs: {{maxbugs}},
+		mouseOver: "multiply"
+	});
+</script>
+{% endif %}
+
+<!-- Fireflies award -->
+{% if p.award_count("fireflies") %}
+<script defer src="/assets/js/fireflies.js?v=54"></script>
+{% set minbugs = 10*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 20 %}
+{% set maxbugs = 20*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 40 %}
+<script>
+	new BugController({
+		imageSprite: "/assets/images/fireflies.gif",
+		canDie: false,
+		minBugs: {{minbugs}},
+		maxBugs: {{maxbugs}},
+		mouseOver: "multiply"
+	});
+</script>
+{% endif %}
+
 <!-- Christmas Awards -->
+
+<!-- Snow award -->
 {% if p.award_count("snow") %}
 {% include "/awards/Christmas/Snow.html" %}
 {% if p.award_count("snow") > 4 %}
@@ -12,11 +46,11 @@
 {% endif %}
 
 <!-- Javascript -->
+
+<!-- Snow award -->
 {% if p.award_count("snow") %}
-
 {% set snowCount = p.award_count("snow") if p.award_count("snow") < 5 else 5 %}
-
-<script>
+<script defer>
 	document.addEventListener('DOMContentLoaded', function(){
 		var script = document.createElement('script');
 		script.src = 'https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js';
@@ -83,3 +117,10 @@
 	});
 </script>
 {% endif %}
+
+<!-- Songs & Mariah award -->
+{% if p.award_count("mariah") %}
+	<script defer src="/assets/js/christmas/mariah.js?v=1"></script>
+{% else %}
+	<script defer src="/assets/js/christmas/playlist.js?v=1"></script>
+{% endif %}