More game logic

Author: foxfirecodes

package-lock.json

@@ -7,8 +7,10 @@
   "author": "Rayzr522 <[email protected]>",
   "license": "MIT",
   "dependencies": {
+    "@types/common-tags": "^1.8.0",
     "@types/lodash": "^4.14.161",
     "@types/node": "^14.11.2",
+    "common-tags": "^1.8.0",
     "discord.js": "^12.3.1",
     "dotenv": "^8.2.0",
     "lodash": "^4.17.20"

package.json

@@ -1,18 +1,12 @@
-import { Snowflake, GuildMember, GuildChannel, TextChannel, Message } from 'discord.js'
-import { Arena, Game } from './types/game'
+import { Snowflake, Message } from 'discord.js'
+import { Invite, Game } from './types/game'
 import { createGame } from './logic/game'
 import { shuffle } from 'lodash'
 
-export type Invite = {
-    from: GuildMember
-    to: GuildMember
-    arena: Arena
-    channel: GuildChannel & TextChannel
-}
-
 export const GameManager = {
     games: [] as Game[],
     invites: [] as Invite[],
+
     findGame(id: Snowflake): Game | undefined {
         return this.games.find(game => game.players.some(player => player.user.id === id))
     },
@@ -41,11 +35,15 @@ export const GameManager = {
 
         const message = await invite.channel.send(':hourglass: Generating game, please wait...')
 
-        this.games.push(createGame({
+        const game = createGame({
             users: shuffle([invite.to, invite.from]),
             arena: invite.arena,
             message
-        }))
+        })
+
+        this.games.push(game)
+
+        await renderGame(game)
 
         return true
     }

src/gameManager.ts

@@ -1,4 +1,5 @@
-import { GuildMember, Message, ReactionEmoji } from 'discord.js'
+import { stripIndents } from 'common-tags'
+import { GuildMember, Message, MessageEmbed, ReactionEmoji } from 'discord.js'
 import { Arena, Game, Player } from '../types/game'
 
 export const createPlayer = (user: GuildMember): Player => ({
@@ -9,20 +10,42 @@ export const createPlayer = (user: GuildMember): Player => ({
 
 export const createGame = (options: {users: GuildMember[], arena: Arena, message: Message}): Game => ({
     players: options.users.map(createPlayer),
+    currentPlayer: 0,
     arena: options.arena,
     message: options.message,
 })
 
+export const getCurrentPlayers = (game: Game): [currentPlayer: Player, target: Player] => {
+    return [game.players[game.currentPlayer], game.players[(game.currentPlayer + 1) % 2]]
+}
+
+export const renderGame = async (game: Game): Promise<Game> => {
+    const [currentPlayer, target] = getCurrentPlayers(game)
+
+    await game.message.edit({
+        embed: new MessageEmbed()
+            .setColor(0X36393F)
+            .setDescription(stripIndents`
+                **${currentPlayer.user.toString()}'s turn**
+                ${currentPlayer.health} :heart:
+
+                **${target.user.toString()}: ${target.health} :heart:**
+            `)
+    })
+
+    return game
+}
+
 export const getCurrentPlayer = (game: Game): Player => game.players[0]
 
 export const handleReaction = (game: Game, reaction: ReactionEmoji): Game => {
-    const currentPlayer = game.players[0]
-    const target = game.players[1]
+    const [currentPlayer, target] = getCurrentPlayers(game)
 
     const newState = {
         ...game,
-        players: [...game.players.slice(1), game.players[0]]
+        currentPlayer: (game.currentPlayer + 1) % 2
     }
 
     return newState
 }
+

src/logic/game.ts

@@ -1,6 +1,13 @@
-import { Message, GuildMember } from 'discord.js'
+import { Message, GuildMember, GuildChannel, TextChannel } from 'discord.js'
 import { IntRange } from './utils'
 
+export type Invite = {
+    from: GuildMember
+    to: GuildMember
+    arena: Arena
+    channel: GuildChannel & TextChannel
+}
+
 export type Arena = {
     name: string
     background: string
@@ -27,6 +34,7 @@ export type Player = {
 
 export type Game = {
     players: Player[]
+    currentPlayer: number
     arena: Arena
     message: Message
 }