Merge pull request #11 from wizguin/develop

1.10.0-beta
wizguin · Oct 6, 2024 · a73f9bd · a73f9bd
2 parents 5cc0f5f + 4e36ada
commit a73f9bd
Show file tree

Hide file tree

Showing 4 changed files with 149 additions and 2 deletions.
diff --git a/data/rooms.json b/data/rooms.json
@@ -55,6 +55,14 @@
         "game": 0,
         "spawn": 1
     },
+    {
+        "id": 210,
+        "name": "sport",
+        "member": 0,
+        "maxUsers": 80,
+        "game": 0,
+        "spawn": 0
+    },
     {
         "id": 220,
         "name": "lodge",
@@ -143,6 +151,14 @@
         "game": 0,
         "spawn": 0
     },
+    {
+        "id": 803,
+        "name": "agent",
+        "member": 0,
+        "maxUsers": 80,
+        "game": 0,
+        "spawn": 0
+    },
     {
         "id": 805,
         "name": "berg",
@@ -223,6 +239,22 @@
         "game": 1,
         "spawn": 0
     },
+    {
+        "id": 907,
+        "name": "mission1",
+        "member": 0,
+        "maxUsers": 80,
+        "game": 1,
+        "spawn": 0
+    },
+    {
+        "id": 908,
+        "name": "mission2",
+        "member": 0,
+        "maxUsers": 80,
+        "game": 1,
+        "spawn": 0
+    },
     {
         "id": 909,
         "name": "thinice",
@@ -231,6 +263,14 @@
         "game": 1,
         "spawn": 0
     },
+    {
+        "id": 911,
+        "name": "mission3",
+        "member": 0,
+        "maxUsers": 80,
+        "game": 1,
+        "spawn": 0
+    },
     {
         "id": 912,
         "name": "waves",
@@ -239,6 +279,30 @@
         "game": 1,
         "spawn": 0
     },
+    {
+        "id": 913,
+        "name": "mission4",
+        "member": 0,
+        "maxUsers": 80,
+        "game": 1,
+        "spawn": 0
+    },
+    {
+        "id": 914,
+        "name": "mission5",
+        "member": 0,
+        "maxUsers": 80,
+        "game": 1,
+        "spawn": 0
+    },
+    {
+        "id": 915,
+        "name": "mission6",
+        "member": 0,
+        "maxUsers": 80,
+        "game": 1,
+        "spawn": 0
+    },
     {
         "id": 916,
         "name": "sub",
@@ -247,6 +311,46 @@
         "game": 1,
         "spawn": 0
     },
+    {
+        "id": 920,
+        "name": "mission7",
+        "member": 0,
+        "maxUsers": 80,
+        "game": 1,
+        "spawn": 0
+    },
+    {
+        "id": 921,
+        "name": "mission8",
+        "member": 0,
+        "maxUsers": 80,
+        "game": 1,
+        "spawn": 0
+    },
+    {
+        "id": 922,
+        "name": "mission9",
+        "member": 0,
+        "maxUsers": 80,
+        "game": 1,
+        "spawn": 0
+    },
+    {
+        "id": 923,
+        "name": "mission10",
+        "member": 0,
+        "maxUsers": 80,
+        "game": 1,
+        "spawn": 0
+    },
+    {
+        "id": 927,
+        "name": "mission11",
+        "member": 0,
+        "maxUsers": 80,
+        "game": 1,
+        "spawn": 0
+    },
     {
         "id": 951,
         "name": "sensei",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yukon-server",
-  "version": "1.9.0-beta",
+  "version": "1.10.0-beta",
   "description": "A server for https://github.com/wizguin/yukon",
   "scripts": {
     "dev": "babel-watch ./src/World.js Login Blizzard",

diff --git a/src/plugin/plugins/game/Chat.js b/src/plugin/plugins/game/Chat.js
@@ -11,7 +11,9 @@ export default class Chat extends GamePlugin {
         this.events = {
             'send_message': this.sendMessage,
             'send_safe': this.sendSafe,
-            'send_emote': this.sendEmote
+            'send_emote': this.sendEmote,
+            'send_joke': this.sendJoke,
+            'send_tour': this.sendTour
         }
 
         this.commands = {
@@ -82,6 +84,34 @@ export default class Chat extends GamePlugin {
         user.room.send(user, 'send_emote', { id: user.id, emote: args.emote }, [user], true)
     }
 
+    sendJoke(args, user) {
+        if (!hasProps(args, 'joke')) {
+            return
+        }
+
+        if (!isNumber(args.joke)) {
+            return
+        }
+
+        user.room.send(user, 'send_joke', { id: user.id, joke: args.joke }, [user], true)
+    }
+
+    sendTour(args, user) {
+        if (!hasProps(args, 'roomId')) {
+            return
+        }
+
+        if (!isNumber(args.roomId)) {
+            return
+        }
+
+        if (args.roomId !== user.room.id) {
+            return
+        }
+
+        user.room.send(user, 'send_tour', { id: user.id, roomId: args.roomId }, [user], true)
+    }
+
     // Commands
 
     bindCommands() {

diff --git a/src/plugin/plugins/game/Item.js b/src/plugin/plugins/game/Item.js
@@ -1,6 +1,11 @@
 import GamePlugin from '@plugin/GamePlugin'
 
 
+const tourItem = 428
+const tourPostcard = 126
+const agentItem = 800
+const agentPostcard = 127
+
 export default class Item extends GamePlugin {
 
     constructor(handler) {
@@ -40,6 +45,14 @@ export default class Item extends GamePlugin {
         const slot = this.db.slots[item.type - 1]
         user.inventory.add(args.item)
 
+        if (args.item === tourItem) {
+            user.addSystemMail(tourPostcard)
+        }
+
+        if (args.item === agentItem) {
+            user.addSystemMail(agentPostcard)
+        }
+
         user.updateCoins(-item.cost)
         user.send('add_item', { item: args.item, name: item.name, slot: slot, coins: user.coins })
     }