Merge pull request #38 from chrislayco/rank-players

players are ranked by loss amount
keldaanCommunity · Feb 19, 2022 · 3d19418 · 3d19418
2 parents 9cf7fba + ebd617d
commit 3d19418
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/app/models/colyseus-models/player.js b/app/models/colyseus-models/player.js
@@ -103,7 +103,7 @@ schema.defineTypes(Player, {
   synergies: Synergies,
   itemsProposition: ['string'],
   money: 'uint8',
-  life: 'uint8',
+  life: 'int8',
   shopLocked: 'boolean',
   streak: 'uint8',
   interest: 'uint8',

diff --git a/app/rooms/commands/game-commands.js b/app/rooms/commands/game-commands.js
@@ -449,18 +449,31 @@ class OnUpdatePhaseCommand extends Command {
   }
 
   rankPlayers() {
-    const rankArray = [];
+    const rankArray = []
     this.state.players.forEach((player, key) => {
-      if (player.alive) {
-        rankArray.push({id: player.id, life: player.life});
+      if(!player.alive){
+        return
       }
+
+      rankArray.push({
+        id: player.id, 
+        life: player.life,
+        level: player.experienceManager.level
+      });
     });
-    rankArray.sort(function(a, b) {
-      return b.life - a.life;
-    });
+
+    const sortPlayers = (a, b) => {
+      let diff = b.life - a.life
+      if(diff == 0){
+        diff = b.level - a.level
+      }
+      return diff
+    }
+
+    rankArray.sort(sortPlayers)
+
     rankArray.forEach((rankPlayer, index)=>{
       this.state.players.get(rankPlayer.id).rank = index + 1;
-      this.state.players.get(rankPlayer.id).exp = XP_PLACE[index];
     });
   }
 
@@ -471,7 +484,7 @@ class OnUpdatePhaseCommand extends Command {
         const currentResult = player.getCurrentBattleResult()
 
         if(currentResult == BATTLE_RESULT.DEFEAT || currentResult == BATTLE_RESULT.DRAW){
-          player.life = Math.max(0, player.life - this.computePlayerDamage(player.simulation.redTeam, player.experienceManager.level, this.state.stageLevel));
+          player.life = player.life - this.computePlayerDamage(player.simulation.redTeam, player.experienceManager.level, this.state.stageLevel)
         }
         player.addBattleResult(player.opponentName, currentResult, player.opponentAvatar, isPVE);
       }
@@ -527,6 +540,7 @@ class OnUpdatePhaseCommand extends Command {
   checkDeath() {
     this.state.players.forEach((player, key) => {
       if (player.life <= 0) {
+        player.life = 0
         player.alive = false;
       }
     });