Merge pull request #15 from wizguin/develop

1.7.0-beta
wizguin · Nov 17, 2023 · f5b13b6 · f5b13b6
2 parents 6deff57 + c12ac17
commit f5b13b6
Show file tree

Hide file tree

Showing 44 changed files with 3,602 additions and 760 deletions.
diff --git a/assets/styles/fonts.css b/assets/styles/fonts.css
@@ -64,3 +64,8 @@
     font-weight: bold;
     src: url('../fonts/CCFaceFront Bold Italic.woff2');
 }
+
+@font-face {
+    font-family: 'CPLCD';
+    src: url('../fonts/CPLCD.woff2');
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yukon",
-  "version": "1.6.0-beta",
+  "version": "1.7.0-beta",
   "scripts": {
     "dev": "webpack serve",
     "editor": "phasereditor2d-launcher -project . -max-number-files 5000",

diff --git a/src/data/fonts.js b/src/data/fonts.js
@@ -7,7 +7,8 @@ const fonts = {
             'Burbank Big Regular:n7',
             'Burbank Small:n4,n7',
             'CCComiccrazy:n4,n7',
-            'CCFaceFront:n4,i7'
+            'CCFaceFront:n4,i7',
+            'CPLCD:n4'
         ],
         urls: [
             'assets/styles/fonts.css'

diff --git a/src/data/rooms.js b/src/data/rooms.js
@@ -144,6 +144,10 @@ const rooms = {
     998: {
         key: 'CardJitsu',
         scene: require('@rooms/../games/card/CardJitsu').default
+    },
+    999: {
+        key: 'Sled',
+        scene: require('@rooms/../games/sled/Sled').default
     }
 }
 

diff --git a/src/engine/loaders/BaseLoader.js b/src/engine/loaders/BaseLoader.js
@@ -4,6 +4,8 @@ export default class BaseLoader extends Phaser.Loader.LoaderPlugin {
         super(scene)
 
         this.globalLoadQueue = scene.world.globalLoadQueue
+
+        this.on('loaderror', this.onLoadError, this)
     }
 
     get crumbs() {
@@ -36,12 +38,12 @@ export default class BaseLoader extends Phaser.Loader.LoaderPlugin {
         return parseInt(last)
     }
 
-    attachErrorListener() {
-        this.on('loaderror', this.onLoadError, this)
-    }
-
     onLoadError(file) {
+        if (file.key in this.globalLoadQueue) {
+            this.off(`filecomplete-${file.type}-${file.key}`)
 
+            delete this.globalLoadQueue[file.key]
+        }
     }
 
     checkComplete(type, key, callback = () => {}) {

diff --git a/src/engine/loaders/ClothingLoader.js b/src/engine/loaders/ClothingLoader.js
@@ -71,7 +71,7 @@ export default class ClothingLoader extends BaseLoader {
     }
 
     loadSecretFrames(secretFrames, slot, item) {
-        this.framesLoader.loadFrames(secretFrames, () => {
+        this.framesLoader.loadFrames(item, secretFrames, () => {
             this.addItem(slot, item)
         })
     }

diff --git a/src/engine/loaders/GridViewLoader.js b/src/engine/loaders/GridViewLoader.js
@@ -10,8 +10,6 @@ export default class GridViewLoader extends BaseLoader {
 
         this.filter
         this.page
-
-        this.attachErrorListener()
     }
 
     get baseURL() {
@@ -94,6 +92,8 @@ export default class GridViewLoader extends BaseLoader {
     }
 
     onLoadError(file) {
+        super.onLoadError(file)
+
         if (!this.gridView.visible) {
             return
         }

diff --git a/src/engine/loaders/InventoryLoader.js b/src/engine/loaders/InventoryLoader.js
@@ -15,8 +15,6 @@ export default class InventoryLoader extends BaseLoader {
 
         this.baseURL = '/assets/media/clothing/icon/120/'
         this.keyPrefix = 'clothing/icon/120/'
-
-        this.attachErrorListener()
     }
 
     loadPage(page) {
@@ -80,6 +78,8 @@ export default class InventoryLoader extends BaseLoader {
     }
 
     onLoadError(file) {
+        super.onLoadError(file)
+
         let item = this.getKeyId(file.key)
 
         this.addIcon(item, 'main', 'x-icon')
@@ -97,6 +97,10 @@ export default class InventoryLoader extends BaseLoader {
             return
         }
 
+        if (slot.item) {
+            slot.item.destroy()
+        }
+
         if (slot.spinner) {
             slot.spinner.destroy()
         }

diff --git a/src/engine/loaders/SecretFramesLoader.js b/src/engine/loaders/SecretFramesLoader.js
@@ -8,34 +8,46 @@ export default class SecretFramesLoader extends BaseLoader {
 
         this.baseURL = '/assets/media/penguin/actions/'
         this.keyPrefix = 'secret_frames/'
+
+        // Track current items loading
+        this.currentItems = {}
     }
 
-    loadFrames(frames, callback) {
-        for (let frame of frames) {
-            this.loadFrame(frame)
+    loadFrames(itemId, frames, callback) {
+        if (itemId in this.currentItems) {
+            return
         }
 
-        if (this.list.size == 0) {
-            return callback()
-        }
+        this.currentItems[itemId] = { remaining: frames.length, callback: callback }
 
-        this.once('complete', () => callback())
+        for (let frame of frames) {
+            this.loadFrame(frame, itemId)
+        }
 
         this.start()
     }
 
-    loadFrame(frame) {
-        let key = this.getKey(frame)
+    loadFrame(frame, itemId) {
+        const key = this.getKey(frame)
 
-        if (this.checkComplete('json', key)) {
+        if (this.checkComplete('json', key, () => {
+            this.onFrameComplete(itemId)
+        })) {
             return
         }
 
         this.multiatlas(key, `${frame}.json`)
     }
 
-    loadComplete() {
-        super.loadComplete()
+    onFrameComplete(itemId) {
+        this.currentItems[itemId].remaining--
+
+        if (this.currentItems[itemId].remaining < 1) {
+            // All frames loaded for item
+            this.currentItems[itemId].callback()
+
+            delete this.currentItems[itemId]
+        }
     }
 
 }
diff --git a/src/engine/network/plugins/plugins/Waddle.js b/src/engine/network/plugins/plugins/Waddle.js
@@ -22,7 +22,7 @@ export default class Waddle extends Plugin {
 
     updateWaddle(args) {
         if (this.world.room.isReady) {
-            this.interface.main.waddle.updateWaddle(args.waddle, args.seat, args.username)
+            this.world.room.updateWaddle(args.waddle, args.seat, args.username)
         }
     }
 

diff --git a/src/engine/ruffle/RuffleController.js b/src/engine/ruffle/RuffleController.js
@@ -82,8 +82,6 @@ export default class RuffleController extends BaseScene {
 
         this.container.visible = false
         this.stopMusic()
-
-        this.world.client.sendJoinLastRoom()
     }
 
     getKeys() {

diff --git a/src/engine/world/WorldController.js b/src/engine/world/WorldController.js
@@ -16,6 +16,8 @@ export default class WorldController extends BaseScene {
         this.secretFramesCache = {}
 
         this.globalLoadQueue = {}
+
+        this.worldTimeZone = 'America/Los_Angeles'
     }
 
     create() {
@@ -108,4 +110,8 @@ export default class WorldController extends BaseScene {
         return this.crumbs.colors[id - 1] || this.crumbs.colors[0]
     }
 
+    getWorldTime() {
+        return new Date(new Date().toLocaleString('en-US', { timeZone: this.worldTimeZone }))
+    }
+
 }
diff --git a/src/engine/world/penguin/ClientController.js b/src/engine/world/penguin/ClientController.js
@@ -23,6 +23,7 @@ export default class ClientController {
 
         this.lastRoom
         this.activeSeat
+        this.lastSledId
 
         // Item inventory
         this.slots = ['color', 'head', 'face', 'neck', 'body', 'hand', 'feet', 'flag', 'photo', 'award']
@@ -242,12 +243,14 @@ export default class ClientController {
     }
 
     sendJoinLastRoom() {
-        if (this.world.lastRoom) {
-            let room = this.crumbs.scenes.rooms[this.world.lastRoom]
+        if (!this.world.lastRoom || this.world.room && this.world.lastRoom === this.world.room.id) {
+            return
+        }
 
-            if (room) {
-                this.sendJoinRoom(this.world.lastRoom, room.key, room.x, room.y, 80)
-            }
+        const room = this.crumbs.scenes.rooms[this.world.lastRoom]
+
+        if (room) {
+            this.sendJoinRoom(this.world.lastRoom, room.key, room.x, room.y, 80)
         }
     }
 

diff --git a/src/engine/world/penguin/ClientPenguin.js b/src/engine/world/penguin/ClientPenguin.js
@@ -54,6 +54,8 @@ export default class ClientPenguin extends Penguin {
         if (path) {
             this.addMoveTween(path)
             this.network.send('send_position', { x: path.target.x, y: path.target.y })
+
+            this.scene.events.emit('move_start', { x: x, y: y })
         }
     }
 
@@ -62,6 +64,8 @@ export default class ClientPenguin extends Penguin {
 
         super.onMoveComplete()
         this.isTrigger()
+
+        this.scene.events.emit('move_end')
     }
 
     isTrigger() {

diff --git a/src/scenes/components/Zone.js b/src/scenes/components/Zone.js
@@ -39,7 +39,10 @@ export default class Zone extends SimpleButton {
     start() {
         this.gameObject.visible = false
 
-        let zone = this.scene.add.zone(this.gameObject.x, this.gameObject.y, this.gameObject.width, this.gameObject.height)
+        const x = this.getX(this.gameObject)
+        const y = this.getY(this.gameObject)
+
+        const zone = this.scene.add.zone(x, y, this.gameObject.width, this.gameObject.height)
         zone.isButton = true
         zone.angle = this.gameObject.angle
 
@@ -54,6 +57,28 @@ export default class Zone extends SimpleButton {
         this.gameObject.zone = zone
     }
 
+    getX(gameObject) {
+        if (!gameObject.parentContainer) {
+            return gameObject.x
+        }
+
+        // Get global coordinates of gameObject
+        const matrix = gameObject.getWorldTransformMatrix()
+
+        return matrix.getX(0, 0)
+    }
+
+    getY(gameObject) {
+        if (!gameObject.parentContainer) {
+            return gameObject.y
+        }
+
+        // Get global coordinates of gameObject
+        const matrix = gameObject.getWorldTransformMatrix()
+
+        return matrix.getY(0, 0)
+    }
+
     /* END-USER-CODE */
 }
 

diff --git a/src/scenes/games/sled/ClientSledPlayer.js b/src/scenes/games/sled/ClientSledPlayer.js
@@ -0,0 +1,89 @@
+import SledPlayer from './SledPlayer'
+
+
+export default class ClientSledPlayer extends SledPlayer {
+
+    constructor(scene, x, y) {
+        super(scene, x, y)
+
+        scene.input.keyboard.on('keydown-UP', this.onMoveUpKey, this)
+        scene.input.keyboard.on('keydown-RIGHT', this.onMoveUpKey, this)
+        scene.input.keyboard.on('keydown-DOWN', this.onMoveDownKey, this)
+        scene.input.keyboard.on('keydown-LEFT', this.onMoveDownKey, this)
+    }
+
+    get canMove() {
+        return this.started && !this.isCrashed && !this.isFinished
+    }
+
+    get isGameXUpdated() {
+        return this.gameX !== this.lastGameX
+    }
+
+    setPlayer(playerData, index) {
+        super.setPlayer(playerData, index)
+
+        this.icon.setFrame('progress/icon_2')
+    }
+
+    onMoveUpKey() {
+        if (!this.canMove) {
+            return
+        }
+
+        this.moveUp()
+
+        if (this.isGameXUpdated) {
+            this.sendMove(1)
+        }
+    }
+
+    onMoveDownKey() {
+        if (!this.canMove) {
+            return
+        }
+
+        this.moveDown()
+
+        if (this.isGameXUpdated) {
+            this.sendMove(2)
+        }
+    }
+
+    checkMap() {
+        if (this.map === 220 && !this.isCrashed) {
+            this.startCrash()
+            this.sendCrash()
+        }
+
+        if (this.map === 240) {
+            this.startBoost()
+            this.sendBoost()
+        }
+
+        super.checkMap()
+    }
+
+    endFinish() {
+        super.endFinish()
+
+        this.sendFinished()
+    }
+
+    sendMove(move) {
+        this.network.send('send_move', { move: move })
+    }
+
+    sendCrash() {
+        this.sendMove(3)
+    }
+
+    sendBoost() {
+        this.sendMove(4)
+    }
+
+    sendFinished() {
+        this.sendMove(5)
+    }
+
+}