Merge branch 'main' of https://github.com/Talishar/Talishar-FE

Talishar · May 7, 2024 · f64eb1e · f64eb1e
2 parents c4b2161 + 2d7c258
commit f64eb1e
Show file tree

Hide file tree

Showing 123 changed files with 152 additions and 90 deletions.
diff --git a/public/cardimages/CBThePlagueHive.webp b/public/cardimages/CBThePlagueHive.webp
diff --git a/public/cardimages/MST001.webp b/public/cardimages/MST001.webp
diff --git a/public/cardimages/MST002.webp b/public/cardimages/MST002.webp
diff --git a/public/cardimages/MST010.webp b/public/cardimages/MST010.webp
diff --git a/public/cardimages/MST025.webp b/public/cardimages/MST025.webp
diff --git a/public/cardimages/MST026.webp b/public/cardimages/MST026.webp
diff --git a/public/cardimages/MST032.webp b/public/cardimages/MST032.webp
diff --git a/public/cardimages/MST046.webp b/public/cardimages/MST046.webp
diff --git a/public/cardimages/MST047.webp b/public/cardimages/MST047.webp
diff --git a/public/cardimages/MST053.webp b/public/cardimages/MST053.webp
diff --git a/public/cardimages/MST080.webp b/public/cardimages/MST080.webp
diff --git a/public/cardimages/MST087.webp b/public/cardimages/MST087.webp
diff --git a/public/cardimages/MST088.webp b/public/cardimages/MST088.webp
diff --git a/public/cardimages/MST089.webp b/public/cardimages/MST089.webp
diff --git a/public/cardimages/MST090.webp b/public/cardimages/MST090.webp
diff --git a/public/cardimages/MST095.webp b/public/cardimages/MST095.webp
diff --git a/public/cardimages/MST096.webp b/public/cardimages/MST096.webp
diff --git a/public/cardimages/MST097.webp b/public/cardimages/MST097.webp
diff --git a/public/cardimages/MST098.webp b/public/cardimages/MST098.webp
diff --git a/public/cardimages/MST099.webp b/public/cardimages/MST099.webp
diff --git a/public/cardimages/MST100.webp b/public/cardimages/MST100.webp
diff --git a/public/cardimages/MST101.webp b/public/cardimages/MST101.webp
diff --git a/public/cardimages/MST102.webp b/public/cardimages/MST102.webp
diff --git a/public/cardimages/MST225.webp b/public/cardimages/MST225.webp
diff --git a/public/cardimages/MST226.webp b/public/cardimages/MST226.webp
diff --git a/public/cardimages/MST232.webp b/public/cardimages/MST232.webp
diff --git a/public/cardimages/MST233.webp b/public/cardimages/MST233.webp
diff --git a/public/cardimages/MST453.webp b/public/cardimages/MST453.webp
diff --git a/public/cardimages/MST495.webp b/public/cardimages/MST495.webp
diff --git a/public/cardimages/WTR092-T.webp b/public/cardimages/WTR092-T.webp
diff --git a/public/cardimages/WTR098-T.webp b/public/cardimages/WTR098-T.webp
diff --git a/public/cardimages/WTR099-T.webp b/public/cardimages/WTR099-T.webp
diff --git a/public/cardimages/WTR100-T.webp b/public/cardimages/WTR100-T.webp
diff --git a/public/cardimages/WTR172-T.webp b/public/cardimages/WTR172-T.webp
diff --git a/public/cardsquares/BLOODDEBT.webp b/public/cardsquares/BLOODDEBT.webp
diff --git a/public/cardsquares/CBThePlagueHive.webp b/public/cardsquares/CBThePlagueHive.webp
diff --git a/public/cardsquares/MST001.webp b/public/cardsquares/MST001.webp
diff --git a/public/cardsquares/MST002.webp b/public/cardsquares/MST002.webp
diff --git a/public/cardsquares/MST010.webp b/public/cardsquares/MST010.webp
diff --git a/public/cardsquares/MST025.webp b/public/cardsquares/MST025.webp
diff --git a/public/cardsquares/MST026.webp b/public/cardsquares/MST026.webp
diff --git a/public/cardsquares/MST032.webp b/public/cardsquares/MST032.webp
diff --git a/public/cardsquares/MST046.webp b/public/cardsquares/MST046.webp
diff --git a/public/cardsquares/MST047.webp b/public/cardsquares/MST047.webp
diff --git a/public/cardsquares/MST053.webp b/public/cardsquares/MST053.webp
diff --git a/public/cardsquares/MST080.webp b/public/cardsquares/MST080.webp
diff --git a/public/cardsquares/MST087.webp b/public/cardsquares/MST087.webp
diff --git a/public/cardsquares/MST088.webp b/public/cardsquares/MST088.webp
diff --git a/public/cardsquares/MST089.webp b/public/cardsquares/MST089.webp
diff --git a/public/cardsquares/MST090.webp b/public/cardsquares/MST090.webp
diff --git a/public/cardsquares/MST095.webp b/public/cardsquares/MST095.webp
diff --git a/public/cardsquares/MST096.webp b/public/cardsquares/MST096.webp
diff --git a/public/cardsquares/MST097.webp b/public/cardsquares/MST097.webp
diff --git a/public/cardsquares/MST098.webp b/public/cardsquares/MST098.webp
diff --git a/public/cardsquares/MST099.webp b/public/cardsquares/MST099.webp
diff --git a/public/cardsquares/MST100.webp b/public/cardsquares/MST100.webp
diff --git a/public/cardsquares/MST101.webp b/public/cardsquares/MST101.webp
diff --git a/public/cardsquares/MST102.webp b/public/cardsquares/MST102.webp
diff --git a/public/cardsquares/MST225.webp b/public/cardsquares/MST225.webp
diff --git a/public/cardsquares/MST226.webp b/public/cardsquares/MST226.webp
diff --git a/public/cardsquares/MST232.webp b/public/cardsquares/MST232.webp
diff --git a/public/cardsquares/MST233.webp b/public/cardsquares/MST233.webp
diff --git a/public/cardsquares/MST453.webp b/public/cardsquares/MST453.webp
diff --git a/public/cardsquares/MST495.webp b/public/cardsquares/MST495.webp
diff --git a/public/cardsquares/WTR092-T.webp b/public/cardsquares/WTR092-T.webp
diff --git a/public/cardsquares/WTR172-T.webp b/public/cardsquares/WTR172-T.webp
diff --git a/public/crops/MST001_cropped.png b/public/crops/MST001_cropped.png
diff --git a/public/crops/MST002_cropped.png b/public/crops/MST002_cropped.png
diff --git a/public/crops/MST010_cropped.png b/public/crops/MST010_cropped.png
diff --git a/public/crops/MST025_cropped.png b/public/crops/MST025_cropped.png
diff --git a/public/crops/MST026_cropped.png b/public/crops/MST026_cropped.png
diff --git a/public/crops/MST032_cropped.png b/public/crops/MST032_cropped.png
diff --git a/public/crops/MST046_cropped.png b/public/crops/MST046_cropped.png
diff --git a/public/crops/MST047_cropped.png b/public/crops/MST047_cropped.png
diff --git a/public/crops/MST053_cropped.png b/public/crops/MST053_cropped.png
diff --git a/public/crops/MST080_cropped.png b/public/crops/MST080_cropped.png
diff --git a/public/crops/MST087_cropped.png b/public/crops/MST087_cropped.png
diff --git a/public/crops/MST088_cropped.png b/public/crops/MST088_cropped.png
diff --git a/public/crops/MST089_cropped.png b/public/crops/MST089_cropped.png
diff --git a/public/crops/MST090_cropped.png b/public/crops/MST090_cropped.png
diff --git a/public/crops/MST095_cropped.png b/public/crops/MST095_cropped.png
diff --git a/public/crops/MST096_cropped.png b/public/crops/MST096_cropped.png
diff --git a/public/crops/MST097_cropped.png b/public/crops/MST097_cropped.png
diff --git a/public/crops/MST098_cropped.png b/public/crops/MST098_cropped.png
diff --git a/public/crops/MST099_cropped.png b/public/crops/MST099_cropped.png
diff --git a/public/crops/MST100_cropped.png b/public/crops/MST100_cropped.png
diff --git a/public/crops/MST101_cropped.png b/public/crops/MST101_cropped.png
diff --git a/public/crops/MST102_cropped.png b/public/crops/MST102_cropped.png
diff --git a/public/crops/MST225_cropped.png b/public/crops/MST225_cropped.png
diff --git a/public/crops/MST226_cropped.png b/public/crops/MST226_cropped.png
diff --git a/public/crops/MST232_cropped.png b/public/crops/MST232_cropped.png
diff --git a/public/crops/MST233_cropped.png b/public/crops/MST233_cropped.png
diff --git a/public/crops/MST453_cropped.png b/public/crops/MST453_cropped.png
diff --git a/public/crops/WTR092-T_cropped.png b/public/crops/WTR092-T_cropped.png
diff --git a/public/crops/WTR098-T_cropped.png b/public/crops/WTR098-T_cropped.png
diff --git a/public/crops/WTR099-T_cropped.png b/public/crops/WTR099-T_cropped.png
diff --git a/public/crops/WTR100-T_cropped.png b/public/crops/WTR100-T_cropped.png
diff --git a/public/crops/WTR172-T_cropped.png b/public/crops/WTR172-T_cropped.png
diff --git a/src/app/ParseGameState.ts b/src/app/ParseGameState.ts
@@ -122,7 +122,7 @@ function ParseEquipment(input: any) {
 
 export default function ParseGameState(input: any) {
   const result: GameState = {
-    gameInfo: { gameID: 0, playerID: 0, authKey: '', isPrivate: false },
+    gameInfo: { gameID: 0, playerID: 0, authKey: '', isPrivateLobby: false },
     gameDynamicInfo: {},
     playerOne: {},
     playerTwo: {},

diff --git a/src/features/GameStaticInfo.ts b/src/features/GameStaticInfo.ts
@@ -2,7 +2,7 @@ export default interface GameStaticInfo {
   gameID: number;
   playerID: number;
   authKey: string;
-  isPrivate: boolean;
+  isPrivateLobby: boolean;
   roguelikeGameID?: number;
   altArts?: AltArt[];
   isRoguelike?: boolean;

diff --git a/src/features/game/GameSlice.ts b/src/features/game/GameSlice.ts
@@ -479,8 +479,8 @@ export const gameSlice = createSlice({
       state.isUpdateInProgress = false;
       state.isPlayerInputInProgress = false;
 
-      state.gameInfo.isPrivate =
-        action.payload.isPrivateLobby ?? state.gameInfo.isPrivate;
+      state.gameInfo.isPrivateLobby =
+        action.payload.isPrivateLobby ?? state.gameInfo.isPrivateLobby;
       state.gameDynamicInfo.lastUpdate = action.payload.lastUpdate;
       state.chatLog = action.payload.gameLog?.split('<br>');
       state.playerTwo.Name = action.payload.theirName;

diff --git a/src/features/options/cardBacks.ts b/src/features/options/cardBacks.ts
@@ -77,7 +77,8 @@ export const CARD_BACK = {
   '75': 'CBColdFoilControl',
   '76': 'CBDailyFab',
   '77': 'CBRighteousGaming',
-  '78': 'CBRighteousGaming2'
+  '78': 'CBRighteousGaming2',
+  '79': 'CBThePlagueHive'
 } as { [key: string]: string };
 
 export const PLAYMATS = {

diff --git a/src/interface/API/GetLobbyInfo.php.ts b/src/interface/API/GetLobbyInfo.php.ts
@@ -26,6 +26,7 @@ export interface Deck {
   quiverSB?: Weapon[];
   handsSB: Weapon[];
   demiHero?: string[];
+  modular?: string[];
   cardDictionary?: CardData[];
 }
 

diff --git a/src/routes/game/components/elements/cardPopUp/CardPopUp.tsx b/src/routes/game/components/elements/cardPopUp/CardPopUp.tsx
@@ -28,7 +28,7 @@ export default function CardPopUp({
   const [windowWidth, windowHeight] = useWindowDimensions();
 
   const handleMouseEnter = () => {
-    if (ref.current === null || isHidden === true || cardNumber === "ENDSTEP" || cardNumber === "ENDTURN" || cardNumber === "RESUMETURN" || cardNumber === "PHANTASM" || cardNumber === "MIRAGE" || cardNumber === "FINALIZECHAINLINK" || cardNumber === "DEFENDSTEP" || cardNumber == "ATTACKSTEP" || cardNumber == "CardBack" || cardNumber == "NONE00") {
+    if (ref.current === null || isHidden === true || cardNumber === "ENDSTEP" || cardNumber === "ENDTURN" || cardNumber === "RESUMETURN" || cardNumber === "PHANTASM" || cardNumber === "MIRAGE" || cardNumber === "FINALIZECHAINLINK" || cardNumber === "DEFENDSTEP" || cardNumber == "ATTACKSTEP" || cardNumber == "CardBack" || cardNumber == "NONE00" || cardNumber == "BLOODDEBT") {
       return;
     }
     const rect = ref.current.getBoundingClientRect();

diff --git a/src/routes/game/components/elements/chainLinkSummary/ChainLinkSummary.tsx b/src/routes/game/components/elements/chainLinkSummary/ChainLinkSummary.tsx
@@ -143,7 +143,7 @@ const ChainLinkSummary = ({
             <h3 className={styles.title}>{'Chain Link Summary'}</h3>
           </div>
           <div className={styles.cardListCloseIcon} onClick={closeCardList}>
-            <FaTimes title="close dialog" />
+            <FaTimes title="Close Dialog" />
           </div>
         </div>
         {content}

diff --git a/src/routes/game/components/elements/chatBox/ChatBox.tsx b/src/routes/game/components/elements/chatBox/ChatBox.tsx
@@ -49,8 +49,8 @@ export default function ChatBox() {
     })
     .map((message) => {
       return message
-        .replace('Player 1', `<b>${amIPlayerOne ? myName : oppName}</b>`)
-        .replace('Player 2', `<b>${amIPlayerOne ? oppName : myName}</b>`);
+        .replace('Player 1', `<b>${amIPlayerOne ? myName.substring(0, 15) : oppName.substring(0, 15)}</b>`)
+        .replace('Player 2', `<b>${amIPlayerOne ? oppName.substring(0, 15) : myName.substring(0, 15)}</b>`);
     });
 
   useEffect(() => {

diff --git a/src/routes/game/components/elements/chatInput/ChatInput.module.css b/src/routes/game/components/elements/chatInput/ChatInput.module.css
@@ -36,14 +36,15 @@
 .quickChatButton {
   display: grid;
   grid-template-columns: 1fr 1fr;
-  gap: 1em;
+  gap: 0.5em;
 }
 
 .quickChatButton button {
   font-size: 0.85em;
   font-weight: 550;
-  padding: 0;
+  padding: 0.3em;
   margin: 0;
+  margin-top: 0.1rem;
 }
 
 .popOver {

diff --git a/src/routes/game/components/elements/endGameScreen/EndGameScreen.module.css b/src/routes/game/components/elements/endGameScreen/EndGameScreen.module.css
@@ -16,6 +16,11 @@
 .fullLog {
   overflow-y: scroll;
   font-size: medium;
+  -moz-user-select: text;
+  -khtml-user-select: text;
+  -webkit-user-select: text;
+  -ms-user-select: text;
+  user-select: text;
 }
 
 .cardListBox.reduced {

diff --git a/src/routes/game/components/elements/menu/OptionsMenuToggle/OptionsMenuToggle.tsx b/src/routes/game/components/elements/menu/OptionsMenuToggle/OptionsMenuToggle.tsx
@@ -31,7 +31,7 @@ function OptionsMenuToggle() {
         aria-label="Toggle main menu"
         title="Options Menu"
         onClick={() => toggleMenu()}
-        data-tooltip="Options Menu"
+        data-tooltip="Settings Menu"
         data-placement="bottom"
       >
         <GiHamburgerMenu aria-hidden="true" fontSize={'1.75em'} />

diff --git a/src/routes/game/components/elements/optionsMenu/OptionsMenu.tsx b/src/routes/game/components/elements/optionsMenu/OptionsMenu.tsx
@@ -18,15 +18,15 @@ import OptionsSettings from './OptionsSettings';
 import { shallowEqual } from 'react-redux';
 
 const OptionsContent = () => {
-  const { gameID, playerID, isPrivate } = useAppSelector(
+  const { gameID, playerID, isPrivateLobby } = useAppSelector(
     getGameInfo,
     shallowEqual
   );
   const dispatch = useAppDispatch();
   const navigate = useNavigate();
   const [allowSpectator, setAllowSpectator] = useState(false);
 
-  const gameURL = `http://fe.talishar.net/game/play/${gameID}`;
+  const gameURL = `http://talishar.net/game/play/${gameID}`;
 
   const clickCloseOptionsHandler = () => {
     dispatch(closeOptionsMenu());
@@ -38,11 +38,11 @@ const OptionsContent = () => {
     dispatch(submitButton({ button: { mode: PROCESS_INPUT.CONCEDE_GAME } }));
   };
 
-  const clickPlayLegacyHandler = async (e: React.MouseEvent) => {
+/*   const clickPlayLegacyHandler = async (e: React.MouseEvent) => {
     e.preventDefault;
     await screenfull.exit();
     window.location.href = `https://legacy.talishar.net/game/NextTurn4.php?gameName=${gameID}&playerID=${playerID}`;
-  };
+  }; */
 
   // going to main menu means you concede the game
   const handleClickMainMenuButton = async (e: React.MouseEvent) => {
@@ -108,16 +108,13 @@ const OptionsContent = () => {
         <OptionsSettings />
       </div>
       <div className={styles.column}>
-        <h3>Navigation</h3>
+        <h3>General</h3>
         <div className={styles.buttonColumn}>
-          <button className={styles.buttonDiv} onClick={clickPlayLegacyHandler}>
-            Legacy Talishar Client
-          </button>
           <button
             className={styles.buttonDiv}
             onClick={handleClickMainMenuButton}
           >
-            Home Page
+            Homepage
           </button>
           {playerID !== 3 && ( // If not a spectator then can change options
             <>
@@ -141,7 +138,14 @@ const OptionsContent = () => {
               >
                 Report Player
               </button>
-              <button
+            </>
+          )}
+        </div>
+        <h3>Gamestate Correction</h3>
+        <div className={styles.buttonColumn}>
+          {playerID !== 3 && ( // If not a spectator then can change options
+            <>
+               <button
                 className={styles.buttonDiv}
                 onClick={clickUndoButtonHandler}
               >
@@ -164,7 +168,7 @@ const OptionsContent = () => {
         </div>
         <h3>Invite Spectators</h3>
         <div className={styles.buttonColumn}>
-          {isPrivate && allowSpectator ? (
+          {isPrivateLobby && !allowSpectator ? (
             <>
               <button
                 style={{ marginTop: '0.5em' }}
@@ -214,15 +218,15 @@ export default function OptionsMenu() {
         >
           <div className={styles.optionsTitleContainer}>
             <hgroup className={styles.optionsTitle}>
-              <h2 className={styles.title}>Main Options</h2>
+              <h2 className={styles.title}>Settings Menu</h2>
               <h4></h4>
             </hgroup>
             <div
               className={styles.optionsMenuCloseIcon}
               onClick={closeOptions}
               data-testid="close-button"
             >
-              <FaTimes title="close options menu" />
+              <FaTimes title="Close Settings Menu" />
             </div>
           </div>
           <OptionsContent />

diff --git a/src/routes/game/components/elements/optionsMenu/OptionsSettings/OptionsSettings.tsx b/src/routes/game/components/elements/optionsMenu/OptionsSettings/OptionsSettings.tsx
@@ -183,7 +183,7 @@ const OptionsSettings = () => {
         </fieldset>
         <fieldset>
           <legend>
-            <strong>Skip overrides</strong>
+            <strong>Skip Overrides</strong>
           </legend>
           <label className={styles.optionLabel}>
             <input
@@ -331,7 +331,7 @@ const OptionsSettings = () => {
                 })
               }
             />
-            Enable Manual Mode (for board state corrections)
+            Enable Manual Mode
           </label>
           <label className={styles.optionLabel}>
             <input

diff --git a/src/routes/game/components/elements/playerInputPopUp/PlayerInputPopUp.tsx b/src/routes/game/components/elements/playerInputPopUp/PlayerInputPopUp.tsx
@@ -131,7 +131,7 @@ export default function PlayerInputPopUp() {
         </div>
         {inputPopUp.popup?.canClose ? (
           <div className={styles.inputPopUpCloseIcon} onClick={onPassTurn}>
-            <FaTimes title="close popup" />
+            <FaTimes title="Close Popup" />
           </div>
         ) : null}
       </div>

diff --git a/src/routes/game/components/elements/playerName/PlayerName.tsx b/src/routes/game/components/elements/playerName/PlayerName.tsx
@@ -51,7 +51,7 @@ export default function PlayerName(player: Player) {
           title="I am a patron of PvtVoid!"
         />
       ) : null}
-      {playerName}
+      {playerName?.substring(0, 30)}
     </div>
   );
 }
diff --git a/src/routes/game/components/zones/cardListZone/CardListZone.tsx b/src/routes/game/components/zones/cardListZone/CardListZone.tsx
@@ -45,7 +45,7 @@ export const CardListZone = () => {
               <h3 className={styles.title}>{cardList?.name}</h3>
             </div>
             <div className={styles.cardListCloseIcon} onClick={closeCardList}>
-              <FaTimes title="close dialog" />
+              <FaTimes title="Close Dialog" />
             </div>
           </div>
           {cardList?.apiCall ? (

diff --git a/src/routes/game/create/CreateGame.module.css b/src/routes/game/create/CreateGame.module.css
@@ -16,6 +16,11 @@
   color: red;
 }
 
+.disclaimer {
+  padding: 1px;
+  text-align: center;
+}
+
 .button {
   color: var(--primary-inverse);
   margin-top: 32px;
@@ -27,5 +32,5 @@
 }
 
 .formContainer > h3 {
-  margin-bottom: 0.75em;
+  margin-bottom: 0.5em;
 }
diff --git a/src/routes/game/create/CreateGame.tsx b/src/routes/game/create/CreateGame.tsx
@@ -115,14 +115,17 @@ const CreateGame = () => {
     <div>
       <article className={styles.formContainer}>
         <h3>Create New Game</h3>
+{/*         <p className={styles.fieldError}>
+          <FaExclamationCircle /> Warning - In 1h at 11:00 AM CET a push for the new MST keyword <b>Cloaked</b> will be pushed to the live servers. The games in progress will crash and new games will be required.
+          </p> */}
         <p>
-          <small>
-            Talishar is an open-source, fan-made platform not associated with
-            LSS. It may not be a completely accurate representation of the Rules
-            as Written. If you have questions about interactions or rulings,
-            please contact the judge community for clarification.
-          </small>
-        </p>
+            <small className={styles.disclaimer}>
+              Talishar is an open-source, fan-made platform not associated with
+              LSS. It may not be a completely accurate representation of the Rules
+              as written. If you have questions about interactions or rulings,
+              please contact the judge community for clarification.
+            </small>
+          </p>
         <form onSubmit={handleSubmit(onSubmit)}>
           <div className={styles.formInner}>
             {isLoggedIn && !isLoading && (
@@ -160,7 +163,7 @@ const CreateGame = () => {
             />
             <fieldset>
               <label>
-                Deck Link:
+                Deck Link
                 <input
                   type="text"
                   id="fabdb"
@@ -264,8 +267,8 @@ const CreateGame = () => {
                   }
                 />
                 Single Player 🤖
+                <div>&nbsp;</div>
               </label>
-
               {isLoggedIn && (isPatron == "1") && (
                 <label>
                   AI Deck

diff --git a/src/routes/game/lobby/Lobby.module.css b/src/routes/game/lobby/Lobby.module.css
@@ -19,10 +19,10 @@
 }
 
 .smallButton {
-  gap: 1em;
+  gap: 0.5em;
   font-size: 0.85em;
   font-weight: 550;
-  padding: 0;
+  padding: 0.3em;
   margin: 0;
 }