Merge pull request #35 from wizguin/develop

1.11.0-beta

Author: wizguin

README.md

@@ -46,12 +46,6 @@ npm install
 npm run dev
 ```
 
-* Running [Phaser Editor](https://phasereditor2d.com/) for scene editing.
-
-```console
-npm run editor
-```
-
 * Building the client for production. Production files can be found in "/dist".
 
 ```console

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "yukon",
-  "version": "1.10.0-beta",
+  "version": "1.11.0-beta",
   "scripts": {
     "dev": "webpack serve",
     "build": "webpack --mode production --env obfuscate=false",
@@ -17,23 +17,23 @@
   },
   "homepage": "https://github.com/wizguin/yukon#readme",
   "devDependencies": {
-    "@babel/core": "^7.24.3",
-    "@babel/preset-env": "^7.24.3",
-    "babel-loader": "^9.1.3",
+    "@babel/core": "^7.28.3",
+    "@babel/preset-env": "^7.28.3",
+    "babel-loader": "^9.2.1",
     "compression-webpack-plugin": "^10.0.0",
-    "core-js": "^3.36.1",
+    "core-js": "^3.45.1",
     "css-loader": "^7.1.2",
     "howler": "^2.2.4",
-    "html-webpack-plugin": "^5.6.0",
-    "javascript-obfuscator": "^4.1.0",
+    "html-webpack-plugin": "^5.6.4",
+    "javascript-obfuscator": "^4.1.1",
     "phasereditor2d-launcher": "^3.67.0",
     "phasereditor2d-ninepatch-plugin": "^1.2.0",
-    "socket.io-client": "^4.7.5",
-    "source-map": "^0.7.4",
+    "socket.io-client": "^4.8.1",
+    "source-map": "^0.7.6",
     "style-loader": "^4.0.0",
-    "webpack": "^5.91.0",
+    "webpack": "^5.101.3",
     "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^4.15.2",
+    "webpack-dev-server": "^5.2.2",
     "webpack-obfuscator": "^3.5.1"
   }
 }

package.json

@@ -1,4 +1,11 @@
+import './patches/patches'
+
 import Boot from '@engine/boot/Boot'
+import InterfaceController from '@engine/interface/InterfaceController'
+import MemoryManager from '@engine/memory/MemoryManager'
+import RuffleController from '@engine/ruffle/RuffleController'
+import WorldController from '@engine/world/WorldController'
+
 import Network from '@engine/network/Network'
 import registerNinePatchContainerFactory from '@engine/utils/ninepatch/registerNinePatchContainerFactory'
 import SoundManager from '@engine/sound/SoundManager'
@@ -25,6 +32,13 @@ export default class Game extends Phaser.Game {
 
         registerNinePatchContainerFactory()
 
+        // Add initial scenes
+        this.scene.add('InterfaceController', InterfaceController)
+        this.scene.add('MemoryManager', MemoryManager)
+        this.scene.add('RuffleController', RuffleController)
+        this.scene.add('WorldController', WorldController)
+
+        // Start boot
         this.scene.add('Boot', Boot, true)
     }
 

src/Game.js

@@ -1,7 +1,4 @@
 import fonts from './fonts'
-import igloos from './igloos'
-import rooms from './rooms'
-import widgets from './widgets'
 
 import SoundFileFactory from '@engine/sound/SoundFileFactory'
 
@@ -57,14 +54,6 @@ const game = {
 
     crumbs: {
         fonts: fonts,
-
-        scenes: {
-            igloos: igloos,
-            rooms: rooms
-        },
-
-        widgets: widgets,
-
         frameColor: 0x2e3440,
         iglooIdOffset: 2000
     },