Merge pull request #70 from x-team/GAMESHQ_New-Scoreboard

ccmoralesj · web-flow · commit 141d5b14e4a3 · 2023-03-21T22:18:47.000-05:00
🚀 GamesHQ: New TowerStatistics fields and display
diff --git a/src/games/consts/emojis.ts b/src/games/consts/emojis.ts
@@ -29,6 +29,7 @@ export const SAD_PARROT = ':sad-parrot:';
 export const FREE_AGENT_EMOJI = ':arena-hunter:';
 export const ARMOR_INVENTORY_EMOJI = ':shield:';
 export const WEAPON_INVENTORY_EMOJI = ':blaster:';
+export const WATCHMAN_EMOJI = ':watchman:';
 
 // ARENA BOSS EMOJIS
 export const BOSS_EMOJI = ':arena-boss:';
diff --git a/src/games/tower/repositories/tower/actions/admin/create-or-finish-game.ts b/src/games/tower/repositories/tower/actions/admin/create-or-finish-game.ts
@@ -3,6 +3,7 @@ import { Game } from '../../../../../../models';
 import { startTowerGame } from '../../../../../../models/TowerGame';
 import { findActiveRound } from '../../../../../../models/TowerRound';
 import { findTowerStatisticsByGame } from '../../../../../../models/TowerStatistics';
+import { ZERO } from '../../../../../consts/global';
 import type { GameResponse } from '../../../../../utils';
 import { adminAction, getGameError, getGameResponse } from '../../../../../utils';
 import { generateTowerEndGameConfirmationBlockKit } from '../../../../generators/gameplay';
@@ -145,7 +146,7 @@ export async function displayScoreboard(userRequesting: User) {
     if (!(activeTower instanceof Game)) {
       return activeTower as GameResponse;
     }
-    const stats = await findTowerStatisticsByGame(activeTower.id, transaction);
+    const stats = await findTowerStatisticsByGame(activeTower._tower?.id || ZERO, transaction);
     await publishTowerPublicMessage(towerCommandReply.adminDisplayScoreboard(activeTower, stats));
     return getGameResponse('Scoreboard displayed');
   });
diff --git a/src/games/tower/repositories/tower/actions/player/start-round.ts b/src/games/tower/repositories/tower/actions/player/start-round.ts
@@ -12,7 +12,10 @@ import {
 import { addRaidersToTowerFloorBattlefield } from '../../../../../../models/TowerRaider';
 import { startRound } from '../../../../../../models/TowerRound';
 import { findAllActionsByRound } from '../../../../../../models/TowerRoundAction';
-import { updateTowerAsCompleted } from '../../../../../../models/TowerStatistics';
+import {
+  updateTowerAsCompleted,
+  updateTowerAttempts,
+} from '../../../../../../models/TowerStatistics';
 import { ONE, TWO, ZERO } from '../../../../../consts/global';
 import type { SlackBlockKitLayoutElement } from '../../../../../model/SlackBlockKit';
 import type { GameResponse } from '../../../../../utils';
@@ -72,6 +75,14 @@ export async function startRoundCommand(userRequesting: User) {
       await publishTowerPublicMessage(
         towerCommandReply.raiderLoseTower(raider._user?.slackId!, towerFloor.number)
       );
+      const lastFloorVisited = towerFloor.number;
+      await updateTowerAttempts(
+        towerFloor._towerGameId,
+        raider._user?.id ?? ZERO,
+        lastFloorVisited,
+        raider._perks ?? [],
+        transaction
+      );
       const blockKit = generateReEnterTowerQuestionSection(towerCommandReply.raiderMustEnter());
       await theTowerNotifyEphemeral('', raider._user?.slackId!, raider._user?.slackId!, blockKit);
       return getGameResponse('');
@@ -101,16 +112,18 @@ export async function startRoundCommand(userRequesting: User) {
       );
     } else {
       await round.endRound(transaction);
-
       if (towerFloor.number === towerFloor._towerGame?.height) {
         await theTowerNotifyInPrivate(
           `${towerCommandReply.raiderWinsTower(raider._user?.slackId!)}\n\n` +
             `${towerCommandReply.finalStats(raider)}`,
           raider._user?.slackId!
         );
+        const lastFloorVisited = towerFloor.number;
         await updateTowerAsCompleted(
           towerFloor._towerGameId,
           raider._user?.id ?? ZERO,
+          lastFloorVisited,
+          raider._perks ?? [],
           transaction
         );
         // TOWER PRIZE
diff --git a/src/games/tower/repositories/tower/engine/helpers/evaluate-hunt-raiders.ts b/src/games/tower/repositories/tower/engine/helpers/evaluate-hunt-raiders.ts
@@ -3,6 +3,8 @@ import type { Transaction } from 'sequelize';
 
 import type { TowerRaider } from '../../../../../../models';
 import { perkImpactCalculator } from '../../../../../../models/Perk';
+import { findTowerFloorById } from '../../../../../../models/TowerFloor';
+import { updateLastHealth } from '../../../../../../models/TowerStatistics';
 import { ONE, TRAIT, ZERO } from '../../../../../consts/global';
 import { hasLuck } from '../../../../../utils';
 import type { HuntPlayerParams } from '../../../../consts';
@@ -88,13 +90,27 @@ export async function huntRaiders(
               await randomTargetRaider.useArmor(targetArmor, transaction);
             }
           }
-
+          const lastHealth = randomTargetRaider.health;
           await randomTargetRaider.damageAndHide(
             damageDealtDetails.newDamage ?? damageDealtDetails.originalDamage,
             isEveryoneVisible,
             transaction
           );
 
+          if (!randomTargetRaider.isAlive()) {
+            const towerFloor = await findTowerFloorById(
+              randomTargetRaider._currentTowerFloorBattlefield?._towerFloorId ?? ZERO,
+              true,
+              transaction
+            );
+            await updateLastHealth(
+              towerFloor?._towerGameId ?? ZERO,
+              randomTargetRaider._userId,
+              lastHealth,
+              transaction
+            );
+          }
+
           await randomTargetRaider.reloadFullInventory(transaction);
 
           const dealtDamageMessage = towerEngineReply.enemyDealtDamage(
diff --git a/src/games/tower/repositories/tower/replies.ts b/src/games/tower/repositories/tower/replies.ts
@@ -12,14 +12,14 @@ import type {
 import type { TOWER_ACTIONS_TYPE } from '../../../../models/TowerRoundAction';
 import {
   APPROVE_SIGN,
-  FREE_AGENT_EMOJI,
   FULL_HEALTH_HEART_EMOJI,
   HEALTH_KIT_EMOJI,
   INFINITY_GIF_EMOJI,
   INITIATIVE_EMOJI,
   NO_ENTRY_SIGN,
   PLAYER_HIDE_EMOJI,
   PLAYER_VISIBLE_EMOJI,
+  WATCHMAN_EMOJI,
 } from '../../../consts/emojis';
 import { SLACK_SPACE, TRAIT, ZERO } from '../../../consts/global';
 import {
@@ -61,9 +61,11 @@ function towerBasicScoreboard(towerStatistics: TowerStatistics[]) {
   return `${towerStatistics
     .map((raiderStats) => {
       return (
-        `<@${raiderStats._user?.slackId}>\t*=>*\t` +
-        `_${raiderStats.completed} *completed*_ ~ ` +
-        `_${raiderStats.attempts} *attempts*_`
+        ` ${WATCHMAN_EMOJI} <@${raiderStats._user?.slackId}> *[* ${raiderStats.lastHealth} ${FULL_HEALTH_HEART_EMOJI} *]*\t*=>*\t` +
+        `_*Reached to floor* ${raiderStats.lastFloorVisited}_  ` +
+        `_*~  ${raiderStats.perks} Perks*_\t` +
+        `_(${raiderStats.completed} *towers completed*)_`
+        // `_${raiderStats.attempts} *attempts*_`
       );
     })
     .join('\n')}`;
@@ -144,8 +146,7 @@ export const towerCommandReply = {
     `\n*The Tower: ${game.name} Stats*\n` +
     `\n${towerBasicScoreboard(gameStatistics)}\n` +
     `\n*Notation*\n` +
-    `> _house_emoji_ *|* _@raider_ *=>* _# of towers completed_ ~ _# of attempts_\n` +
-    `> ${FREE_AGENT_EMOJI} (Free Agent)`,
+    `> ${WATCHMAN_EMOJI} *|* _@raider_ *=>* _last floor visited_\t _(# of towers completed)_\n`,
   cancelEndGame: () =>
     `Ok, the tower is still open and active, nothing happened here, you can keep walking :cop:${randomSkinColor()}`,
   towerGatesInfo: (isOpen: boolean) => `The Tower Gates are ${isOpen ? '*open*' : '*closed*'}`,
diff --git a/src/games/tower/utils/leave-tower.ts b/src/games/tower/utils/leave-tower.ts
@@ -1,15 +1,33 @@
 import type { Transaction } from 'sequelize';
 
 import type { TowerRaider, TowerRound } from '../../../models';
+import { findTowerFloorById } from '../../../models/TowerFloor';
+import { updateTowerAsCompleted } from '../../../models/TowerStatistics';
 import { Ability } from '../../classes/GameAbilities';
+import { ZERO } from '../../consts/global';
 
 export async function leaveTower(
   { raider, round }: { raider: TowerRaider; round?: TowerRound | null },
   transaction: Transaction
 ) {
   if (round) {
+    const towerFloor = (await findTowerFloorById(
+      round._floorBattlefield?._towerFloorId!,
+      true,
+      transaction
+    ))!;
+    const lastFloorVisited = towerFloor.number;
+    await updateTowerAsCompleted(
+      towerFloor._towerGameId,
+      raider._user?.id ?? ZERO,
+      lastFloorVisited,
+      raider._perks ?? [],
+      transaction
+    );
+
     await round.endRound(transaction);
   }
+
   await raider.resetFullInventory(transaction);
   raider._towerFloorBattlefieldId = null;
   raider.abilitiesJSON = Ability.defaultProps();
diff --git a/src/models/TowerStatistics.ts b/src/models/TowerStatistics.ts
@@ -11,7 +11,7 @@ import {
 
 import { ONE, ZERO } from '../games/consts/global';
 
-import { User, TowerGame } from '.';
+import { User, TowerGame, Perk, PerkInventory } from '.';
 
 interface TowerStatisticsAttributes {
   attempts: number;
@@ -31,7 +31,7 @@ interface TowerStatisticsCreationAttributes {
   indexes: [
     {
       unique: true,
-      fields: ['_userId', '_gameId'],
+      fields: ['_userId', '_towerGameId'],
     },
   ],
 })
@@ -57,7 +57,7 @@ export class TowerStatistics
   declare _towerGameId: number;
 
   @BelongsTo(() => TowerGame, {
-    foreignKey: '_gameId',
+    foreignKey: '_towerGameId',
     onUpdate: 'CASCADE',
     onDelete: 'CASCADE',
   })
@@ -69,6 +69,15 @@ export class TowerStatistics
   @Column(DataType.INTEGER)
   declare completed: number;
 
+  @Column(DataType.INTEGER)
+  declare lastFloorVisited: number;
+
+  @Column(DataType.INTEGER)
+  declare lastHealth: number;
+
+  @Column(DataType.INTEGER)
+  declare perks: number;
+
   static associations: {
     _user: Association<TowerStatistics, User>;
     _towerGame: Association<TowerStatistics, TowerGame>;
@@ -109,9 +118,18 @@ export async function findOrCreateTowerStatistics(
   return towerStatistics.reload({ transaction });
 }
 
+function calculatePerkNumber(perks: Array<Perk & { PerkInventory: PerkInventory }>) {
+  return perks.reduce(
+    (totalPerks, { PerkInventory: { quantity } }) => totalPerks + (quantity ?? ZERO),
+    ZERO
+  );
+}
+
 export async function updateTowerAsCompleted(
   gameId: number,
   userId: number,
+  lastFloorVisited: number,
+  perks: Array<Perk & { PerkInventory: PerkInventory }>,
   transaction?: Transaction
 ) {
   const towerStats = await TowerStatistics.findOne({
@@ -122,7 +140,11 @@ export async function updateTowerAsCompleted(
     transaction,
   });
   if (towerStats) {
+    const perksNumber = calculatePerkNumber(perks);
     await towerStats.increment({ completed: 1 }, { transaction });
+    towerStats.lastFloorVisited = lastFloorVisited;
+    towerStats.perks = perksNumber;
+    await towerStats.save({ transaction });
   }
 }
 
@@ -132,6 +154,9 @@ export function findTowerStatisticsByGame(gameId: number, transaction: Transacti
       _towerGameId: gameId,
     },
     order: [
+      ['lastFloorVisited', 'DESC'],
+      ['lastHealth', 'DESC'],
+      ['perks', 'ASC'],
       ['completed', 'DESC'],
       ['attempts', 'ASC'],
     ],
@@ -147,6 +172,8 @@ export function findTowerStatisticsByGame(gameId: number, transaction: Transacti
 export async function updateTowerAttempts(
   gameId: number,
   userId: number,
+  lastFloorVisited: number,
+  perks: Array<Perk & { PerkInventory: PerkInventory }>,
   transaction?: Transaction
 ) {
   const towerStats = await TowerStatistics.findOne({
@@ -157,6 +184,31 @@ export async function updateTowerAttempts(
     transaction,
   });
   if (towerStats) {
+    const perksNumber = calculatePerkNumber(perks);
     await towerStats.increment({ attempts: 1 }, { transaction });
+    towerStats.lastFloorVisited = lastFloorVisited;
+    towerStats.perks = perksNumber;
+    await towerStats.save({ transaction });
+  }
+}
+
+export async function updateLastHealth(
+  gameId: number,
+  userId: number,
+  lastHealth: number,
+  transaction?: Transaction
+) {
+  const towerStats = await TowerStatistics.findOne({
+    where: {
+      _userId: userId,
+      _towerGameId: gameId,
+    },
+    transaction,
+  });
+  if (towerStats) {
+    console.log('============================================');
+    console.log('Here ', lastHealth);
+    towerStats.lastHealth = lastHealth;
+    await towerStats.save({ transaction });
   }
 }
