Merge pull request #110 from tiny-devs/dev

Release 0.6.0

Author: diguifi

client/public/bundle.js

@@ -92,6 +92,9 @@ <h3 id="coins">Gold: 0</h3>
             <h3 id="atk-text">atk: 0</h3>
             <h3 id="def-text">def: 0</h3>
           </div>
+          <div id="exit">
+            <input type="button" value="exit" id="exit-btn"></input>
+          </div>
         </div>
       </div>
     </div>
@@ -132,6 +135,7 @@ <h3 id="def-text">def: 0</h3>
       }
 
       #chat-message {
+        margin-top: 15px;
         width: 70%;
       }
 

client/public/index.html

@@ -120,6 +120,13 @@ export class SpritesLayer {
         })
     }
 
+    updatePlayerId(oldId: string, newId: string) {
+        const index = this.players.findIndex((x) => x.id === oldId)
+        if (index != -1) {
+            this.players[index].id = newId
+        }
+    }
+
     getPlayerById(id: string) {
         return this.players.find((x) => x.id === id)
     }

client/src/board/layers/SpritesLayer.ts

@@ -25,7 +25,12 @@ export enum Command {
     Message = 17,
     Dialog = 18,
     Rank = 19,
-    Chat = 20
+    Chat = 20,
+    Save = 21,
+    Load = 22,
+    UpdatePlayerId = 23,
+    Exit = 24,
+    EraseSave = 25
 }
 
 export enum Rooms {

client/src/models/Enums.ts

@@ -0,0 +1,82 @@
+import { ItemsIds } from "../models/Enums"
+
+export class ParseLoad {
+    public id: string
+    public hp: number
+    public maxHp: number
+    public attack: number
+    public defense: number
+    public level: number
+    public xp: number
+    public xpNeeded: number
+    public itemsIds: ItemsIds[]
+    public gearHead: ItemsIds | null
+    public gearTorso: ItemsIds | null
+    public gearLegs: ItemsIds | null
+    public gearWeapon: ItemsIds | null
+
+    constructor(data: string) {
+        const parsedData = this.parseString(data)
+
+        this.id = parsedData[0][1]
+        this.hp = +parsedData[0][2]
+        this.maxHp = +parsedData[0][3]
+        this.attack = +parsedData[0][4]
+        this.defense = +parsedData[0][5]
+        this.level = +parsedData[0][6]
+        this.xp = +parsedData[0][7]
+        this.xpNeeded = +parsedData[0][8]
+
+        this.itemsIds = parsedData[1]
+
+        if (parsedData[2][0] != -1) {
+            this.gearHead = parsedData[2][0]
+        } else {
+            this.gearHead = null
+        }
+        if (parsedData[2][1] != -1) {
+            this.gearTorso = parsedData[2][1]
+        } else {
+            this.gearTorso = null
+        }
+        if (parsedData[2][2] != -1) {
+            this.gearLegs = parsedData[2][2]
+        } else {
+            this.gearLegs = null
+        }
+        if (parsedData[2][3] != -1) {
+            this.gearWeapon = parsedData[2][3]
+        } else {
+            this.gearWeapon = null
+        }
+    }
+
+    private parseString(eventDataString: string): any[][] {
+        const allData = eventDataString.split('@')
+
+        const statsData = allData[0].split(',')
+
+        let itemsData = []
+        if (allData[1]) {
+            const itemsDataStrings = allData[1].split(',')
+            for (const itemId of itemsDataStrings) {
+                if (itemId != '') {
+                    itemsData.push(+itemId)
+                }
+            }
+        }
+
+        let gearData = []
+        if (allData[2]) {
+            for (let i=2; i<6;i++) {
+                if (allData[i] != 'empty') {
+                    gearData.push(+allData[i])
+                } else {
+                    gearData.push(-1)
+                }
+            }
+        }
+
+        return [statsData,itemsData,gearData]
+    }
+}

client/src/parser/ParseLoad.ts

@@ -0,0 +1,15 @@
+export class ParsePlayerIdUpdate {
+    public oldId: string
+    public newId: string
+
+    constructor(data: string) {
+        const playerIdData = this.parseString(data)
+
+        this.oldId = playerIdData[1]
+        this.newId = playerIdData[2]
+    }
+
+    private parseString(eventDataString: string) {
+        return eventDataString.split(',')
+    }
+}

client/src/parser/ParsePlayerIdUpdate.ts

@@ -0,0 +1,13 @@
+export class ParseSave {
+    public playerDataHex: string
+
+    constructor(data: string) {
+        const saveData = this.parseString(data)
+
+        this.playerDataHex = saveData[1]
+    }
+
+    private parseString(eventDataString: string) {
+        return eventDataString.split(',')
+    }
+}

client/src/parser/ParseSave.ts

@@ -19,6 +19,9 @@ import { ParseMessage } from './ParseMessage'
 import { ParseRank } from './ParseRank'
 import { ParseDialog } from './ParseDialog'
 import { ParseChat } from './ParseChat'
+import { ParseSave } from './ParseSave'
+import { ParseLoad } from './ParseLoad'
+import { ParsePlayerIdUpdate } from './ParsePlayerIdUpdate'
 
 export class Parser {
     private client: Client
@@ -83,6 +86,21 @@ export class Parser {
                 case Command.Chat:
                     this.parseChat(data)
                     break
+                case Command.Save:
+                    this.parseSave(data)
+                    break
+                case Command.Load:
+                    this.parseLoad(data)
+                    break
+                case Command.UpdatePlayerId:
+                    this.parseIdUpdate(data)
+                    break
+                case Command.Exit:
+                    this.parseExit(data)
+                    break
+                case Command.EraseSave:
+                    this.client.resetPlayerData()
+                    break
                 case Command.Error:
                     this.parseError(data)
                     break
@@ -221,4 +239,28 @@ export class Parser {
 
         this.client.displayChat(chatData.message, chatData.playerId)
     }
+
+    private parseSave(data: string) {
+        const saveData = new ParseSave(data)
+
+        this.client.savePlayerData(saveData.playerDataHex)
+    }
+
+    private parseLoad(data: string) {
+        const loadData = new ParseLoad(data)
+
+        this.client.loadPlayerData(loadData)
+    }
+
+    private parseExit(data: string) {
+        const saveData = new ParseSave(data)
+
+        this.client.exitConfirmed(saveData.playerDataHex)
+    }
+
+    private parseIdUpdate(data: string) {
+        const updateIdData = new ParsePlayerIdUpdate(data)
+
+        this.client.updatePlayerId(updateIdData)
+    }
 }