diff --git a/.eslintrc.js b/.eslintrc.js index 79641730..3136d06b 100644 --- a/.eslintrc.js +++ b/.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" diff --git a/assets/images/background.jpeg b/assets/images/background.jpeg index bd939a09..f4c7fb0e 100644 Binary files a/assets/images/background.jpeg and b/assets/images/background.jpeg differ diff --git a/assets/images/bush.png b/assets/images/bush.png index 289094f2..5a447f05 100644 Binary files a/assets/images/bush.png and b/assets/images/bush.png differ diff --git a/classes/AiPlayer.js b/classes/AiPlayer.js index 118e77dd..ce33227e 100644 --- a/classes/AiPlayer.js +++ b/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; diff --git a/cosmetics.json b/cosmetics.json index 9255f24f..0b00e9e7 100644 --- a/cosmetics.json +++ b/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." - }, + } ] } diff --git a/src/OpenScene.js b/src/OpenScene.js index 4671fa99..fb61a803 100644 --- a/src/OpenScene.js +++ b/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"); diff --git a/src/index.html b/src/index.html index 3de43874..0421077e 100644 --- a/src/index.html +++ b/src/index.html @@ -14,7 +14,6 @@ - What's new? -

Last update: Oct 7 2023

- Create your own skins!
+