Merge branch 'codergautam:main' into main

.eslintrc.js

@@ -11,10 +11,6 @@ module.exports = {
 	},
 	"ignorePatterns": ["dist/*.js", "public/joystick.js", "public/textplus.js"],
 	"rules": {
-		"linebreak-style": [
-			"error",
-			"unix"
-		],
 		"quotes": [
 			"error",
 			"double"

classes/AiPlayer.js

@@ -15,7 +15,7 @@ class AiPlayer extends Player {
 
         super(id,  aiName);
         this.ai = true;
-        this.zombie = Math.random() > .5;
+        this.zombie = false;
         if(this.zombie) {
           this.name = "A Zombie";
           this.coins = 0;

cosmetics.json

@@ -7,14 +7,6 @@
             "price": 0,
             "description": "The default skin"
         },
-        {
-            "name": "pumpkin",
-            "displayName": "Pumpkin",
-            "url": "/assets/images/pumpkinPlayer.png",
-            "price": 0,
-            "original": 52500,
-            "description": "Very spooky..."
-        },
         {
             "name": "yinyang",
             "displayName": "Yin Yang",
@@ -358,6 +350,13 @@
             "price": 50000,
             "description": "Heal.. or Stab..."
         },
+        {
+            "name": "pumpkin",
+            "displayName": "Pumpkin",
+            "url": "/assets/images/pumpkinPlayer.png",
+            "price": 52500,
+            "description": "Very spooky..."
+        },
         {
             "name": "floral",
             "displayName": "Floral",
@@ -1225,6 +1224,6 @@
             "url": "/assets/images/dragonPlayer.png",
             "price": 50000000,
             "description": "The king of the skies... and swords."
-        },
+        }
     ]
 }

src/OpenScene.js

@@ -162,7 +162,9 @@ var progress = 1 - (remainder / total);
         this.load.audio("chestHit", "/assets/sound/chesthit.wav");
 
 
-        this.load.image("opening", "/assets/images/openingFall.png");
+        // this.load.image("opening", "/assets/images/openingFall.png");
+        this.load.image("opening", "/assets/images/opening.png");
+
         this.load.html("title", "/title.html");
         this.load.html("promo", "/promo.html");
         this.load.html("login", "/login.html");

src/index.html

@@ -14,7 +14,6 @@
   <meta name="viewport" id="viewport"
     content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" />
 
-
   <!-- Icons, stylesheets -->
   <link rel="manifest" href="manifest.json" />
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css"

src/promo.html

@@ -2,27 +2,15 @@
   <h1>
     What's new?
   </h1>
-  <h2>Last update: Oct 7 2023</h2>
-  <ul>
-    <li>
-      Tip: Disable AntiAliasing in Settings for high fps.
-    </li>
-     <li>
-       <h3 style="color: cyan; font-style: italic;">It's<a href="https://iogames.forum/t/introducing-the-autumn-update/13113?u=gautam" style="color: orange; text-decoration: underline;" target="_blank">AUTUMN in swordbattle.io</a></h3>
-
-    </li>
-    <li>
-      <strong style="color: white;">Announcing Swordbattle.io V2.0! <a href="https://forum.codergautam.dev/t/announcing-swordbattle-v2-0/2484?u=gautam" style="color: aqua;" target="_blank">( read more )</a></strong>
-<br/>
+  <h2>Last update: Nov 23 2023</h2>
+
+  <iframe width="380" height="190" src="https://www.youtube.com/embed/iPQ7iZYWqBY?si=XZu8G04qUuJVsBnx" style="position: static; width: 380px; height: 210px;" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
 <br/>
-
-
-    </li>
-  </ul>
   <a class="primary-link" target="_blank"
     href="https://forum.codergautam.dev/t/how-to-make-your-own-swordbattle-io-skin/585">
     Create your own skins!</a>
   <br />
 
+
   <button name="close" class="modal-close-button"><span>Close</span></button>
 </div>