Merge branch 'master' into v1.5-branch

README.md

@@ -24,7 +24,7 @@ There a multiple ways to run the code, depending on what components on what you
 Requires `NodeJS` and `yarn`. Install the dependencies and initialize the environment variables by executing:
 
 ```bash
-cp agot-bg-game-server/
+cd agot-bg-game-server/
 yarn install
 yarn run generate-json-schemas
 cp .env.dev.local .env

agot-bg-game-server/src/client/GameLogListComponent.tsx

@@ -605,7 +605,7 @@ export default class GameLogListComponent extends Component<GameLogListComponent
                 house = this.game.houses.get(data.house);
 
                 return <>
-                    <strong>Mace Tyrell</strong>: Casualties were prevented by <strong>Robb Stark</strong>.
+                    <strong>Mace Tyrell</strong>: Casualties were prevented by <strong>The Blackfish</strong>.
                 </>;
 
             case "mace-tyrell-no-footman-available":

agot-bg-game-server/src/client/IngameComponent.tsx

@@ -49,6 +49,7 @@ import Tab from "react-bootstrap/Tab";
 import ChatComponent from "./chat-client/ChatComponent";
 import {HouseCardState} from "../common/ingame-game-state/game-data-structure/house-card/HouseCard";
 import HouseCardBackComponent from "./game-state-panel/utils/HouseCardBackComponent";
+import InfluenceIconComponent from "./game-state-panel/utils/InfluenceIconComponent";
 import Dropdown from "react-bootstrap/Dropdown";
 import User from "../server/User";
 import Player from "../common/ingame-game-state/Player";
@@ -163,9 +164,9 @@ export default class IngameComponent extends Component<IngameComponentProps> {
                                                 </Col>
                                                 {tracker.map((h, i) => (
                                                     <Col xs="auto" key={h.id}>
-                                                        <div className="influence-icon hover-weak-outline"
-                                                             style={{backgroundImage: `url(${houseInfluenceImages.get(h.id)})`}}>
-                                                        </div>
+                                                        <InfluenceIconComponent
+                                                            house={h}
+                                                        />
                                                         <div className="tracker-star-container">
                                                             {stars && i < this.game.starredOrderRestrictions.length && (
                                                                 _.range(0, this.game.starredOrderRestrictions[i]).map(i => (

agot-bg-game-server/src/client/game-state-panel/utils/InfluenceIconComponent.tsx

@@ -0,0 +1,29 @@
+import {Component, default as React, ReactNode} from "react";
+import {observer} from "mobx-react";
+import Tooltip from "react-bootstrap/Tooltip";
+import houseInfluenceImages from "../../houseInfluenceImages";
+import OverlayTrigger from "react-bootstrap/OverlayTrigger";
+import House from "../../../common/ingame-game-state/game-data-structure/House";
+
+interface InfluenceIconComponentProps {
+    house: House;
+}
+
+@observer
+export default class InfluenceIconComponent extends Component<InfluenceIconComponentProps> {
+    render(): ReactNode {
+        return (
+            <OverlayTrigger overlay={
+                    <Tooltip id="influence-icon">
+                        <b>{this.props.house.name}</b>
+                    </Tooltip>
+                }
+                placement="bottom"
+            >
+                <div className="influence-icon hover-weak-outline"
+                    style={{backgroundImage: `url(${houseInfluenceImages.get(this.props.house.id)})`}}>
+                </div>
+            </OverlayTrigger>
+        );
+    }
+}

agot-bg-game-server/src/common/ingame-game-state/westeros-game-state/wildlings-attack-game-state/WildlingsAttackGameState.ts

@@ -229,7 +229,7 @@ export default class WildlingsAttackGameState extends GameState<WesterosGameStat
         if (this.nightsWatchWon) {
             this.game.wildlingStrength = 0;
         } else {
-            this.game.wildlingStrength = Math.max(0, this.game.wildlingStrength - 2);
+            this.game.wildlingStrength = Math.max(0, this.game.wildlingStrength - 4);
         }
         this.entireGame.broadcastToClients({
             type: "change-wildling-strength",