Silver Withdraw

client/src/Backend/GameLogic/GameManager.ts

@@ -2442,9 +2442,6 @@ class GameManager extends EventEmitter {
         if (!planet) {
           throw new Error('tried to withdraw silver from an unknown planet');
         }
-        if (planet.planetType !== PlanetType.TRADING_POST) {
-          throw new Error('can only withdraw silver from spacetime rips');
-        }
         if (planet.owner !== this.account) {
           throw new Error('can only withdraw silver from a planet you own');
         }

client/src/Backend/GameLogic/GameUIManager.ts

@@ -398,16 +398,6 @@ class GameUIManager extends EventEmitter {
   }
 
   public withdrawSilver(locationId: LocationId, amount: number) {
-    const dontShowWarningStorageKey = `${this.getAccount()?.toLowerCase()}-withdrawnWarningAcked`;
-
-    if (localStorage.getItem(dontShowWarningStorageKey) !== 'true') {
-      localStorage.setItem(dontShowWarningStorageKey, 'true');
-      const confirmationText =
-        `Are you sure you want withdraw this silver? Once you withdraw it, you ` +
-        `cannot deposit it again. Your withdrawn silver amount will be added to your score. You'll only see this warning once!`;
-      if (!confirm(confirmationText)) return;
-    }
-
     this.gameManager.withdrawSilver(locationId, amount);
   }
 

client/src/Frontend/Components/CapturePlanetButton.tsx

@@ -117,68 +117,67 @@ export function CapturePlanetButton({
     gameManager.capturePlanet(planetWrapper.value.locationId);
   }, [gameManager, planetWrapper]);
 
+  if (!shouldShow) return <></>;
   return (
-    <StyledRow>
-      {shouldShow && (
-        <>
-          {shouldShowInvade && (
-            <MaybeShortcutButton
-              className='button'
-              size='stretch'
-              active={invading}
-              disabled={!invadable || invading}
-              onClick={invade}
-              onShortcutPressed={invade}
-              shortcutKey={INVADE}
-              shortcutText={INVADE}
+    shouldShow && (
+      <StyledRow>
+        {shouldShowInvade && (
+          <MaybeShortcutButton
+            className='button'
+            size='stretch'
+            active={invading}
+            disabled={!invadable || invading}
+            onClick={invade}
+            onShortcutPressed={invade}
+            shortcutKey={INVADE}
+            shortcutText={INVADE}
+          >
+            <TooltipTrigger
+              style={{ width: '100%', textAlign: 'center' }}
+              name={TooltipName.Empty}
+              extraContent={<>Invade this planet. </>}
             >
-              <TooltipTrigger
-                style={{ width: '100%', textAlign: 'center' }}
-                name={TooltipName.Empty}
-                extraContent={<>Invade this planet. </>}
-              >
-                {invading ? <LoadingSpinner initialText={'Invading...'} /> : 'Invade'}
-              </TooltipTrigger>
-            </MaybeShortcutButton>
-          )}
-
-          {shouldShowCapture && (
-            <ShortcutBtn
-              className='button'
-              size='stretch'
-              active={capturing}
-              disabled={!capturable || capturing}
-              onClick={capture}
-              onShortcutPressed={capture}
-              shortcutKey={INVADE}
-              shortcutText={INVADE}
+              {invading ? <LoadingSpinner initialText={'Invading...'} /> : 'Invade'}
+            </TooltipTrigger>
+          </MaybeShortcutButton>
+        )}
+
+        {shouldShowCapture && (
+          <ShortcutBtn
+            className='button'
+            size='stretch'
+            active={capturing}
+            disabled={!capturable || capturing}
+            onClick={capture}
+            onShortcutPressed={capture}
+            shortcutKey={INVADE}
+            shortcutText={INVADE}
+          >
+            <TooltipTrigger
+              style={{ width: '100%', textAlign: 'center' }}
+              name={TooltipName.Empty}
+              extraContent={
+                <>
+                  <Green>
+                    Capture this planet for score!{' '}
+                    {!!blocksLeft && blocksLeft >= 0 && (
+                      <>
+                        You must wait <White>{blocksLeft}</White> blocks until you can capture this
+                        planet.
+                      </>
+                    )}
+                    {!planetHasEnoughEnergy && (
+                      <Red>The planet requires above 80% energy before you can capture it.</Red>
+                    )}
+                  </Green>
+                </>
+              }
             >
-              <TooltipTrigger
-                style={{ width: '100%', textAlign: 'center' }}
-                name={TooltipName.Empty}
-                extraContent={
-                  <>
-                    <Green>
-                      Capture this planet for score!{' '}
-                      {!!blocksLeft && blocksLeft >= 0 && (
-                        <>
-                          You must wait <White>{blocksLeft}</White> blocks until you can capture
-                          this planet.
-                        </>
-                      )}
-                      {!planetHasEnoughEnergy && (
-                        <Red>The planet requires above 80% energy before you can capture it.</Red>
-                      )}
-                    </Green>
-                  </>
-                }
-              >
-                {capturing ? <LoadingSpinner initialText={'Capturing...'} /> : 'Capture!'}
-              </TooltipTrigger>
-            </ShortcutBtn>
-          )}
-        </>
-      )}
-    </StyledRow>
+              {capturing ? <LoadingSpinner initialText={'Capturing...'} /> : 'Capture!'}
+            </TooltipTrigger>
+          </ShortcutBtn>
+        )}
+      </StyledRow>
+    )
   );
 }

client/src/Frontend/Components/OpenPaneButtons.tsx

@@ -133,7 +133,7 @@ export function OpenPlanetInfoButton({
   return (
     <OpenPaneButton
       modal={modal}
-      title='Info'
+      title='More Info'
       shortcut={TOGGLE_PLANET_INFO_PANE}
       element={() => <PlanetInfoPane initialPlanetId={planetId} />}
       helpContent={PlanetInfoHelpContent()}

client/src/Frontend/Panes/PlanetContextPane.tsx

@@ -6,8 +6,6 @@ import { CapturePlanetButton } from '../Components/CapturePlanetButton';
 import { VerticalSplit } from '../Components/CoreUI';
 import { MineArtifactButton } from '../Components/MineArtifactButton';
 import {
-  OpenBroadcastPaneButton,
-  OpenHatPaneButton,
   OpenManagePlanetInventoryButton,
   OpenPlanetInfoButton,
   OpenUpgradeDetailsPaneButton,
@@ -53,15 +51,10 @@ function PlanetContextPaneContent({
   }
 
   let upgradeRow = null;
-  if (!p?.destroyed && owned) {
+  if (!p?.destroyed && owned && p?.planetType == PlanetType.PLANET) {
     upgradeRow = <OpenUpgradeDetailsPaneButton modal={modal} planetId={p?.locationId} />;
   }
 
-  let hatRow = null;
-  if (!p?.destroyed && owned) {
-    hatRow = <OpenHatPaneButton modal={modal} planetId={p?.locationId} />;
-  }
-
   let withdrawRow = null;
   if (!p?.destroyed && owned && p?.planetType === PlanetType.TRADING_POST) {
     withdrawRow = <WithdrawSilver wrapper={planet} />;
@@ -86,12 +79,10 @@ function PlanetContextPaneContent({
       <VerticalSplit>
         <>
           {upgradeRow}
-          <OpenBroadcastPaneButton modal={modal} planetId={p?.locationId} />
           <OpenPlanetInfoButton modal={modal} planetId={p?.locationId} />
         </>
         <>
           <OpenManagePlanetInventoryButton modal={modal} planetId={p?.locationId} />
-          {hatRow}
         </>
       </VerticalSplit>
       {withdrawRow}

client/src/Frontend/Utils/ShortcutConstants.ts

@@ -14,6 +14,7 @@ export const TOGGLE_TRANSACTIONS_PANE = "'";
 export const TOGGLE_PLANET_INVENTORY_PANE = 's';
 export const TOGGLE_HAT_PANE = 'x';
 export const TOGGLE_ABANDON = 'r';
+export const TOGGLE_WITHDRAW = ']';
 export const INVADE = 'y';
 export const MINE_ARTIFACT = 'f';
 export const TOGGLE_BROADCAST_PANE = 'z';

client/src/Frontend/Views/ArtifactRow.tsx

@@ -104,18 +104,25 @@ export function SelectArtifactRow({
   artifacts: Artifact[];
 }) {
   return (
-    <RowWrapper>
-      {artifacts.length > 0 &&
-        artifacts.map((a) => (
-          <span key={a.id}>
-            <ArtifactThumb
-              artifact={a}
-              selectedArtifact={selectedArtifact}
-              onArtifactChange={onArtifactChange}
-            />
-            <Spacer width={4} />
-          </span>
-        ))}
-    </RowWrapper>
+    <div
+      style={{
+        display: 'flex',
+        justifyContent: 'space-between',
+      }}
+    >
+      <RowWrapper>
+        {artifacts.length > 0 &&
+          artifacts.map((a) => (
+            <span key={a.id}>
+              <ArtifactThumb
+                artifact={a}
+                selectedArtifact={selectedArtifact}
+                onArtifactChange={onArtifactChange}
+              />
+              <Spacer width={4} />
+            </span>
+          ))}
+      </RowWrapper>
+    </div>
   );
 }