wordbots · AlexNisnevich · Apr 2, 2023 · Apr 2, 2023 · Apr 2, 2023 · Apr 2, 2023
diff --git a/src/common/components/card/CardStat.tsx b/src/common/components/card/CardStat.tsx
@@ -65,7 +65,7 @@ export default class CardStat extends React.Component<CardStatProps> {
       textDecoration: 'line-through'
     };
 
-    if (current && current !== base) {
+    if (isNumber(current) && current !== base) {
       return (
         <span style={{ position: 'relative' }}>
           <span style={baseStatStyle}>

diff --git a/src/common/components/game/Deck.tsx b/src/common/components/game/Deck.tsx
@@ -15,8 +15,8 @@ export default class Deck extends React.Component<DeckProps> {
     if (deck.length > 0) {
       return (
         <Tooltip
-          text={`${deck.length} Cards`}
-          style={{fontFamily: '"Carter One", "Carter One-fallback"'}}
+          text={`${deck.length} ${deck.length === 1 ? 'card' : 'cards'}`}
+          style={{ fontFamily: '"Carter One", "Carter One-fallback"' }}
         >
           <CardBack deckLength={deck.length} />
         </Tooltip>

diff --git a/src/common/components/game/GameArea.tsx b/src/common/components/game/GameArea.tsx
@@ -273,6 +273,7 @@ export default class GameArea extends React.Component<GameAreaProps, GameAreaSta
       return (
         <Chat
           inGame
+          inSandbox={isSandbox}
           fullscreen={screenfull.isFullscreen}
           open={chatOpen}
           compact={compactControls}

diff --git a/src/common/components/game/Sfx.tsx b/src/common/components/game/Sfx.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { inBrowser, isFlagSet } from '../../util/browser';
+import { inBrowser, isFlagSet, setFlagIfUnset } from '../../util/browser';
 
 const Sound = inBrowser() ? require('react-sound').default : null;
 const soundManager = inBrowser() ? require('soundmanager2/script/soundmanager2-nodebug').soundManager : null;
@@ -17,6 +17,9 @@ interface SfxState {
 // hacky workaround to the fact that sfxQueue is actually mutable for card execution reasons
 let CURRENT_SFX_QUEUE_LENGTH = 0;
 
+// Default sound to true
+setFlagIfUnset('sound', true);
+
 export default class Sfx extends React.Component<SfxProps, SfxState> {
   public state = {
     idx: 0

diff --git a/src/common/components/play/Chat.tsx b/src/common/components/play/Chat.tsx
@@ -21,6 +21,7 @@ interface ChatProps {
   roomName: string | null
   messages: w.ChatMessage[]
   inGame?: boolean
+  inSandbox?: boolean
   open?: boolean
   compact?: boolean
   fullscreen?: boolean
@@ -40,14 +41,17 @@ interface ChatState {
 }
 
 export default class Chat extends React.Component<ChatProps, ChatState> {
-  public state = {
-    chatFieldValue: '',
-    optionsVisible: false,
-    showServerMsgs: true,
-    showGameMsgs: true,
-    showChatMsgs: true,
-    enableDebugMode: false
-  };
+  constructor(props: ChatProps) {
+    super(props);
+    this.state = {
+      chatFieldValue: '',
+      optionsVisible: !!props.inSandbox,
+      showServerMsgs: true,
+      showGameMsgs: true,
+      showChatMsgs: true,
+      enableDebugMode: !!props.inSandbox
+    };
+  }
 
   private chatRef: HTMLDivElement | null = null;
 
@@ -209,7 +213,7 @@ export default class Chat extends React.Component<ChatProps, ChatState> {
   }
 
   private renderOpenChat(): JSX.Element {
-    const { compact, header, inGame, messages, roomName, toggleChat } = this.props;
+    const { compact, header, inGame, inSandbox, messages, roomName, toggleChat } = this.props;
     const { optionsVisible, enableDebugMode } = this.state;
     const chatTitle = inGame ? 'Chat' : (roomName || 'Lobby');
 
@@ -265,7 +269,7 @@ export default class Chat extends React.Component<ChatProps, ChatState> {
               style={{ justifyContent: 'space-between', margin: '-12px 0', width: '100%' }}
             />
             <FormControlLabel
-              control={<Switch color="primary" onChange={this.toggleDebugMode} />}
+              control={<Switch defaultChecked={inSandbox} color="primary" onChange={this.toggleDebugMode} />}
               label="Enable debug mode ⚠"
               labelPlacement="start"
               style={{ justifyContent: 'space-between', margin: '-12px 0', width: '100%' }}

diff --git a/src/common/containers/GameAreaContainer.tsx b/src/common/containers/GameAreaContainer.tsx
@@ -257,8 +257,8 @@ export class GameAreaContainer extends React.Component<GameAreaContainerProps, G
   }
 
   private get shouldWarnBeforeLeavingPage(): boolean {
-    const { gameOver, isSpectator } = this.props;
-    return !gameOver && !isSpectator;
+    const { gameOver, isPractice, isSandbox, isSpectator, isTutorial } = this.props;
+    return !gameOver && !isSpectator && !isPractice && !isTutorial && !isSandbox;
   }
 
   private urlMatchesGameMode = (mode: string) => this.props.location.pathname.startsWith(urlForGameMode(mode));

diff --git a/src/common/types.d.ts b/src/common/types.d.ts
@@ -260,7 +260,7 @@ export interface GameState {
   executionStackDepth: number
   gameFormat: Format
   memory: Record<string, unknown>
-  objectsDestroyedThisTurn: Record<string, HexId>  // object id -> last hex id
+  objectsDestroyedThisTurn: Record<string, [HexId, PlayerColor]>  // object id -> (last hex id, player color)
   options: GameOptions
   player: PlayerColor | 'neither'
   players: PerPlayer<PlayerInGameState>

diff --git a/src/common/util/browser.tsx b/src/common/util/browser.tsx
@@ -105,6 +105,12 @@ export function toggleFlag(flag: string, value?: boolean): void {
   saveToLocalStorage(flag, value !== undefined ? value.toString() : isFlagSet(flag) ? 'false' : 'true');
 }
 
+export function setFlagIfUnset(flag: string, value: boolean): void {
+  if (!isFlagSet(flag)) {
+    toggleFlag(flag, value);
+  }
+}
+
 /** Return the #gameArea element, falling back to the body element if it can't be found. */
 export function getGameAreaNode(): HTMLElement {
   return document.querySelector('#gameArea') || document.body;

diff --git a/src/common/util/game.ts b/src/common/util/game.ts
@@ -73,6 +73,9 @@ export function ownerOf(state: w.GameState, object: w.Object): w.PlayerInGameSta
     return state.players.blue;
   } else if (some(state.players.orange.objectsOnBoard, ['id', object.id])) {
     return state.players.orange;
+  } else if (state.objectsDestroyedThisTurn[object.id]) {
+    const [, ownerColor] = state.objectsDestroyedThisTurn[object.id];
+    return state.players[ownerColor];
   }
 }
 
@@ -291,7 +294,7 @@ export function allHexIds(): w.HexId[] {
 
 /** Get the hex id corresponding to the given object, if any. */
 export function getHex(state: w.GameState, object: w.Object): w.HexId | undefined {
-  return findKey(allObjectsOnBoard(state), ['id', object.id]) || state.objectsDestroyedThisTurn[object.id];
+  return findKey(allObjectsOnBoard(state), ['id', object.id]) || state.objectsDestroyedThisTurn[object.id]?.[0];
 }
 
 /** Given a Hex, return all adjacent Hexes on the board. */
@@ -762,7 +765,7 @@ export function removeObjectFromBoard(state: w.GameState, object: w.Object, hex:
   // Unapply any abilities that this object had.
   object.abilities.forEach((ability) => unapplyAbility(state, ability));
 
-  state.objectsDestroyedThisTurn[object.id] = hex;
+  state.objectsDestroyedThisTurn[object.id] = [hex, ownerName];
 
   state = applyAbilities(state);
   state = checkVictoryConditions(state);

diff --git a/src/common/vocabulary/abilities.ts b/src/common/vocabulary/abilities.ts
@@ -86,7 +86,7 @@ export function abilities(state: w.GameState): Record<string, w.Returns<Omit<w.P
           target.temporaryStatAdjustments = { attack: [], health: [], speed: [], cost: [] };
         }
 
-        target.temporaryStatAdjustments[att] = target.temporaryStatAdjustments[att]!.concat({
+        target.temporaryStatAdjustments[att] = (target.temporaryStatAdjustments[att] || []).concat({
           aid,
           // Convert func to string so that we can serialize this temporaryStatAdjustment if necessary
           // (e.g. to reveal a card from the server).

diff --git a/src/common/vocabulary/targets.ts b/src/common/vocabulary/targets.ts
@@ -37,6 +37,9 @@ export default function targets(state: w.GameState, currentObject: w.Object | nu
       } else {
         return { type: 'cards', entries: [state.it] } as w.CardInHandCollection;
       }
+    } else if (state.currentEntryInCollection && g.isObject(state.currentEntryInCollection)) {
+      // behave properly when iterating over objects
+      return { type: 'objects', entries: [state.currentEntryInCollection] } as w.ObjectCollection;
     } else {
       /* istanbul ignore next: this is a fallback that should be rarely hit */
       return { type: 'objects', entries: [] } as w.ObjectCollection;

diff --git a/test/vocabulary/targets.spec.ts b/test/vocabulary/targets.spec.ts
@@ -23,6 +23,24 @@ describe('[vocabulary.targets]', () => {
     });
   });
 
+  describe('it', () => {
+    it('can fall back to the current iteratee when there are no other candidates', () => {
+      let state = getDefaultState();
+      state = playObject(state, 'orange', cards.friendlyRiotShieldCard, '3,-1,-2');  // 2/6/3
+
+      const loadBalancerCard = action(
+        "Set each robot's attack equal to its health. Set each robot's speed equal to its health",
+        [
+          "(function () { actions['setAttribute'](objectsMatchingConditions('robot', []), 'attack', \"(function () { return attributeValue(targets['it'](), 'health'); })\"); })",
+          "(function () { actions['setAttribute'](objectsMatchingConditions('robot', []), 'speed', \"(function () { return attributeValue(targets['it'](), 'health'); })\"); })"
+        ]
+      );
+      state = playEvent(state, 'orange', loadBalancerCard);
+      expect(queryObjectAttribute(state, '3,-1,-2', 'attack')).toEqual(6);
+      expect(queryObjectAttribute(state, '3,-1,-2', 'speed')).toEqual(6);
+    });
+  });
+
   describe('that', () => {
     // TODO: "Whenever this robot attacks a robot, destroy that robot."