Merge pull request #933 from bitpredator/dev

chore: removed Christmas loading screen + code rebuild

server-data/resources/[bpt_addons]/bpt_loadscreen/index.html

@@ -19,11 +19,6 @@
             <img src="img/ARROW_DOWN.png" width="1.75%">
             <span class="menu-text">VOLUME DOWN</span>
         </div>
-        <div class="music-change">
-            <img src="img/ARROW_LEFT.png" width="1.75%">
-            <img src="img/ARROW_RIGHT.png" width="1.75%">
-            <span class="menu-text">CHANGE MUSIC</span>
-        </div>
         <div class="space">
             <img src="img/SPACE.png" width="4%">
             <span class="menu-text" id="text">MUTE</span>
@@ -33,12 +28,10 @@
     <div class="discord">
         <a href="https://discord.gg/ksGfNvDEfq" target="_blank" rel="noopener noreferrer" onclick="window.invokeNative('openUrl', 'https://discord.gg/nunBYPBWFF');"><img src="img/Discord.png"></a>
     </div>
-
     <div class="website">
         <a href="https://bptdevelopment1.statuspage.io/" target="_blank" rel="noopener noreferrer" onclick="window.invokeNative('openUrl', 'https://bptdevelopment1.statuspage.io/');"><img src="img/Site.png"></a>
     </div>
 
-
     <div id="circleG">
         <div class="shaded-text">JOINING SERVER</div>
         <div id="circleG_1" class="circleG"></div>
@@ -55,10 +48,10 @@
 </div>
 
     <div class="video-background video-container noselect">
-        <iframe width="150%" height="150%" src="https://www.youtube.com/embed/g6_2bc9BrV0?controls=0&amp;showinfo=0&amp;rel=0&amp;autoplay=1&amp;loop=1&amp;mute=1" frameborder="0"></iframe>
+        <iframe width="150%" height="150%" src="https://www.youtube.com/embed/ECCWwo6CsUg?controls=0&amp;showinfo=0&amp;rel=0&amp;autoplay=1&amp;loop=1&amp;mute=1" frameborder="0"></iframe>
     </div>
 
-    <audio id="loading" src="song/christmas1.mp3" autoplay="true" hidden="true" loop="true"></audio>
+    <audio id="loading" src="song/intro.mp3" autoplay="true" hidden="true" loop="true"></audio>
     <div class="background">
         <div class="img-center">
         </div>

server-data/resources/[bpt_addons]/bpt_loadscreen/script/main.js

@@ -3,19 +3,6 @@
 function getRandomSongNumber() {
 	return random = Math.floor(Math.random() * 3) + 1;
 }
-// Function for getting random number between 1 and 3 for song choose
-
-// Function for setting a random song
-function setNewSong() {
-	if (random == 1) {
-		document.getElementById('loading').src = 'song/christmas1.mp3';
-	}
-	else if (random == 2) {
-		document.getElementById('loading').src = 'song/christmas2.mp3';
-	}
-
-}
-// Function for setting a random song
 
 // Function for random song select on page loaded
 document.addEventListener('DOMContentLoaded', function() {
@@ -40,48 +27,6 @@ window.addEventListener('keyup', function(e) {
 		vid.volume = Math.max(vid.volume - 0.025, 0);
 	};
 });
-// Function for lower or higher up sound in background, its working function in script but its not noted in text//
-
-const mutetext = document.getElementById('text');
-
-window.addEventListener('keyup', function(event) {
-	// eslint-disable-next-line no-inline-comments
-	if (event.which == 37) { // ArrowLEFT
-		if (document.getElementById('loading').src.endsWith('christmas2.mp3')) {
-			document.getElementById('loading').src = 'song/christmas1.mp3';
-
-		}
-		else if (document.getElementById('loading').src.endsWith('christmas1.mp3')) {
-			document.getElementById('loading').src = 'song/song3.mp3';
-
-		}
-		else if (document.getElementById('loading').src.endsWith('song3.mp3')) {
-			document.getElementById('loading').src = 'song/christmas2.mp3';
-		}
-		document.getElementById('loading').play();
-		mutetext.innerHTML = 'MUTE';
-	}
-
-	// eslint-disable-next-line no-inline-comments
-	if (event.which == 39) { // ArrowRIGHT
-		if (document.getElementById('loading').src.endsWith('christmas2.mp3')) {
-			document.getElementById('loading').src = 'song/song3.mp3';
-
-		}
-		else if (document.getElementById('loading').src.endsWith('song3.mp3')) {
-			document.getElementById('loading').src = 'song/christmas1.mp3';
-
-		}
-		else if (document.getElementById('loading').src.endsWith('christmas1.mp3')) {
-			document.getElementById('loading').src = 'song/christmas2.mp3';
-
-		}
-		document.getElementById('loading').play();
-		mutetext.innerHTML = 'MUTE';
-	}
-
-});
-
 
 // Function for pause and play music in background//
 const audio = document.querySelector('audio');