diff --git a/README.md b/README.md index 6276be694..56be7af69 100644 --- a/README.md +++ b/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 diff --git a/agot-bg-game-server/public/images/tides-of-battle-cards/fortification.png b/agot-bg-game-server/public/images/tides-of-battle-cards/fortification.png new file mode 100644 index 000000000..128bc8cca Binary files /dev/null and b/agot-bg-game-server/public/images/tides-of-battle-cards/fortification.png differ diff --git a/agot-bg-game-server/public/images/tides-of-battle-cards/skull.png b/agot-bg-game-server/public/images/tides-of-battle-cards/skull.png new file mode 100644 index 000000000..42820395c Binary files /dev/null and b/agot-bg-game-server/public/images/tides-of-battle-cards/skull.png differ diff --git a/agot-bg-game-server/public/images/tides-of-battle-cards/sword.png b/agot-bg-game-server/public/images/tides-of-battle-cards/sword.png new file mode 100644 index 000000000..48d5c1886 Binary files /dev/null and b/agot-bg-game-server/public/images/tides-of-battle-cards/sword.png differ diff --git a/agot-bg-game-server/public/images/tides-of-battle-cards/three.png b/agot-bg-game-server/public/images/tides-of-battle-cards/three.png new file mode 100644 index 000000000..97ad38d10 Binary files /dev/null and b/agot-bg-game-server/public/images/tides-of-battle-cards/three.png differ diff --git a/agot-bg-game-server/public/images/tides-of-battle-cards/two.png b/agot-bg-game-server/public/images/tides-of-battle-cards/two.png new file mode 100644 index 000000000..96a7c0fdd Binary files /dev/null and b/agot-bg-game-server/public/images/tides-of-battle-cards/two.png differ diff --git a/agot-bg-game-server/public/images/tides-of-battle-cards/zero.png b/agot-bg-game-server/public/images/tides-of-battle-cards/zero.png new file mode 100644 index 000000000..bfb699467 Binary files /dev/null and b/agot-bg-game-server/public/images/tides-of-battle-cards/zero.png differ diff --git a/agot-bg-game-server/src/client/GameLogListComponent.tsx b/agot-bg-game-server/src/client/GameLogListComponent.tsx index f5a7367d1..9a1545129 100644 --- a/agot-bg-game-server/src/client/GameLogListComponent.tsx +++ b/agot-bg-game-server/src/client/GameLogListComponent.tsx @@ -605,7 +605,7 @@ export default class GameLogListComponent extends Component - Mace Tyrell: Casualties were prevented by Robb Stark. + Mace Tyrell: Casualties were prevented by The Blackfish. ; case "mace-tyrell-no-footman-available": diff --git a/agot-bg-game-server/src/client/IngameComponent.tsx b/agot-bg-game-server/src/client/IngameComponent.tsx index 2135bd325..3509963c9 100644 --- a/agot-bg-game-server/src/client/IngameComponent.tsx +++ b/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 { {tracker.map((h, i) => ( -
-
+
{stars && i < this.game.starredOrderRestrictions.length && ( _.range(0, this.game.starredOrderRestrictions[i]).map(i => ( diff --git a/agot-bg-game-server/src/client/game-state-panel/utils/InfluenceIconComponent.tsx b/agot-bg-game-server/src/client/game-state-panel/utils/InfluenceIconComponent.tsx new file mode 100644 index 000000000..dee8f227c --- /dev/null +++ b/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 { + render(): ReactNode { + return ( + + {this.props.house.name} + + } + placement="bottom" + > +
+
+
+ ); + } +} diff --git a/agot-bg-game-server/src/common/ingame-game-state/westeros-game-state/wildlings-attack-game-state/WildlingsAttackGameState.ts b/agot-bg-game-server/src/common/ingame-game-state/westeros-game-state/wildlings-attack-game-state/WildlingsAttackGameState.ts index fe8501cd5..fe2fc18a2 100644 --- a/agot-bg-game-server/src/common/ingame-game-state/westeros-game-state/wildlings-attack-game-state/WildlingsAttackGameState.ts +++ b/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