TypeScript UNO #4825
TypeScript UNO #4825
Conversation
chat-plugins/uno.js
Outdated
| @@ -29,6 +29,14 @@ const textColors = { | |||
|
|
|||
| const textShadow = 'text-shadow: 1px 0px black, -1px 0px black, 0px -1px black, 0px 1px black, 2px -2px black;'; | |||
|
|
|||
| /** @typedef {'Green' | 'Yellow' | 'Red' | 'Blue' | 'Black'} Color */ | |||
| /** @typedef {{value: string, color: Color | string, changedColor?: Color, name: string}} Card */ | |||
There was a problem hiding this comment.
I assume color should always be a color as defined above and not any string.
chat-plugins/uno.js
Outdated
| class UnoGame extends Rooms.RoomGame { | ||
| /** | ||
| * @param {ChatRoom} room | ||
| * @param {number | string} cap |
There was a problem hiding this comment.
Would probably be best to just support a string or number, not both.
chat-plugins/uno.js
Outdated
| this.playerCap = cap; | ||
| /** @type {boolean} */ |
There was a problem hiding this comment.
Already supported in Rooms#RoomGame
chat-plugins/uno.js
Outdated
| this.gameid = 'uno'; | ||
| /** @type {string} */ |
There was a problem hiding this comment.
Both of these are already supported in Rooms#RoomGame, no need to re-type them
chat-plugins/uno.js
Outdated
| @@ -163,39 +217,47 @@ class UNOgame extends Rooms.RoomGame { | |||
| this.players[user.userid].userid = user.userid; | |||
| if (this.awaitUno && this.awaitUno === oldUserid) this.awaitUno = user.userid; | |||
|
|
|||
| if (this.currentPlayer && this.currentPlayer === oldUserid) this.currentPlayer = user.userid; | |||
| if (this.currentPlayerid && this.currentPlayerid === oldUserid) this.currentPlayerid = user.userid; | |||
There was a problem hiding this comment.
You shouldnt need to check if currentPlayerid is falsey, they should both be strings and a simple compare check should work (which your already doing).
There was a problem hiding this comment.
Yeah this was when currentPlayer still defaulted to null and i forgot to remove null checks
chat-plugins/uno.js
Outdated
| @@ -394,31 +487,47 @@ class UNOgame extends Rooms.RoomGame { | |||
| this.nextTurn(); | |||
| } | |||
|
|
|||
| /** | |||
| * @param {UnoGamePlayer} user | |||
| * @param {number | string} count | |||
There was a problem hiding this comment.
Id try to handle only one type
chat-plugins/uno.js
Outdated
|
|
||
| let player = this.players[user.userid]; | ||
| player.hand.push(...drawnCards); | ||
| player.sendRoom(`|raw|You have drawn the following card${Chat.plural(drawnCards)}: ${drawnCards.map(card => `<span style="color: ${textColors[card.color]}">${card.name}</span>`).join(', ')}.`); | ||
| return drawnCards; | ||
| } | ||
|
|
||
| /** | ||
| * @param {string | number} count |
There was a problem hiding this comment.
same here (try to handle only 1 type)
chat-plugins/uno.js
Outdated
| room.game.timer = setTimeout(() => { | ||
| room.game.eliminate(room.game.currentPlayer); | ||
| game.maxTime = amount; | ||
| if (game.timer) { |
There was a problem hiding this comment.
Not exactly sure whats happening here as I dont see any code thats setting the timer if it was not set previously, maybe this is one of the things typescript caught (timer was set to a non timer truthy value maybe).
|
i addressed everything |
|
bump |
|
Sorry for the delay, was not aware I was OK to merge this myself. |
No description provided.