No more player/router context

src/Gang/ui/EquipmentsSubpage.tsx

@@ -19,7 +19,7 @@ import { GangMemberUpgrade } from "../GangMemberUpgrade";
 import { Money } from "../../ui/React/Money";
 import { GangMember } from "../GangMember";
 import { UpgradeType } from "../data/upgrades";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
 import { Settings } from "../../Settings/Settings";
 import { StatsRow } from "../../ui/React/StatsRow";
 
@@ -30,11 +30,10 @@ interface INextRevealProps {
 
 function NextReveal(props: INextRevealProps): React.ReactElement {
   const gang = useGang();
-  const player = use.Player();
   const upgrades = Object.keys(GangMemberUpgrades)
     .filter((upgName: string) => {
       const upg = GangMemberUpgrades[upgName];
-      if (player.money > gang.getUpgradeCost(upg)) return false;
+      if (Player.money > gang.getUpgradeCost(upg)) return false;
       if (upg.type !== props.type) return false;
       if (props.upgrades.includes(upgName)) return false;
       return true;
@@ -68,9 +67,8 @@ interface IUpgradeButtonProps {
 
 function UpgradeButton(props: IUpgradeButtonProps): React.ReactElement {
   const gang = useGang();
-  const player = use.Player();
   function onClick(): void {
-    props.member.buyUpgrade(props.upg, player, gang);
+    props.member.buyUpgrade(props.upg);
     props.rerender();
   }
   return (
@@ -91,7 +89,6 @@ interface IPanelProps {
 
 function GangMemberUpgradePanel(props: IPanelProps): React.ReactElement {
   const gang = useGang();
-  const player = use.Player();
   const setRerender = useState(false)[1];
   const [currentCategory, setCurrentCategory] = useState("Weapons");
 
@@ -103,7 +100,7 @@ function GangMemberUpgradePanel(props: IPanelProps): React.ReactElement {
     return Object.keys(GangMemberUpgrades)
       .filter((upgName: string) => {
         const upg = GangMemberUpgrades[upgName];
-        if (player.money < gang.getUpgradeCost(upg)) return false;
+        if (Player.money < gang.getUpgradeCost(upg)) return false;
         if (upg.type !== type) return false;
         if (list.includes(upgName)) return false;
         return true;

src/Gang/ui/GangRoot.tsx

@@ -5,17 +5,16 @@ import React, { useState, useEffect } from "react";
 import { ManagementSubpage } from "./ManagementSubpage";
 import { TerritorySubpage } from "./TerritorySubpage";
 import { EquipmentsSubpage } from "./EquipmentsSubpage";
-import { use } from "../../ui/Context";
+import { Player } from "../../Player";
 import { Context } from "./Context";
 
 import Tabs from "@mui/material/Tabs";
 import Tab from "@mui/material/Tab";
 
 export function GangRoot(): React.ReactElement {
-  const player = use.Player();
   const gang = (function () {
-    if (player.gang === null) throw new Error("Gang should not be null");
-    return player.gang;
+    if (Player.gang === null) throw new Error("Gang should not be null");
+    return Player.gang;
   })();
   const [value, setValue] = React.useState(0);