Merge pull request #335 from TwoAbove/fix-spell-select

Fixed missed vite transition mistakes
TwoAbove · Feb 2, 2024 · a16aec6 · a16aec6
2 parents 927aaf6 + c1b161e
commit a16aec6
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 8 deletions.
diff --git a/src/components/Compute/Compute/Compute.tsx b/src/components/Compute/Compute/Compute.tsx
@@ -36,7 +36,7 @@ const Compute = () => {
     const newComputeSocket = new ComputeSocket({
       url: computeUrl,
       sessionToken: noitoolSessionToken,
-      version: process.env.REACT_APP_VERSION!,
+      version: APP_VERSION,
       seedSolver,
       onUpdate: () => {
         setConnected(newComputeSocket.connected);

diff --git a/src/components/Compute/Console/Console.tsx b/src/components/Compute/Console/Console.tsx
@@ -106,7 +106,7 @@ const ComputeConsole = () => {
     const newComputeSocket = new ComputeSocket({
       url: computeUrl,
       sessionToken: noitoolSessionToken,
-      version: process.env.REACT_APP_VERSION!,
+      version: APP_VERSION,
       onUpdate: () => {
         setConnected(newComputeSocket.connected);
       },

diff --git a/src/components/SearchSeeds/SearchContext.tsx b/src/components/SearchSeeds/SearchContext.tsx
@@ -431,7 +431,7 @@ const SearchContextProvider: FC<SearchContextProviderProps> = ({ children }) =>
     const newComputeSocket = new ComputeSocket({
       url: window.location.host,
       sessionToken: Cookies.get("noitoolSessionToken"),
-      version: process.env.REACT_APP_VERSION!,
+      version: APP_VERSION,
       onUpdate: () => {
         setClusterConnected(newComputeSocket.connected);
       },

diff --git a/src/components/SpellSelect.tsx b/src/components/SpellSelect.tsx
@@ -83,7 +83,7 @@ const SpellSelect: FC<ISpellSelectProps> = ({
           selected.length > 0 && (
             <Row sm={8} className="p-3 justify-content-start align-items-center row-cols-auto">
               {selected.map(s => {
-                const spell = gameInfoProvider!.providers.spells[s];
+                const spell = gameInfoProvider!.providers.spells.spells[s];
                 return (
                   <Col className="p-0 m-1" key={spell.id}>
                     <Clickable useHover onClick={() => handleSelectedClicked(spell.id)}>

diff --git a/src/services/SeedInfo/infoHandler/InfoProviders/Wand.ts b/src/services/SeedInfo/infoHandler/InfoProviders/Wand.ts
@@ -1,7 +1,9 @@
 import D from "decimal.js";
 
+import { IRule } from "../IRule";
 import { InfoProvider } from "./Base";
 import { IRandom } from "../../random";
+import { between } from "../../../helpers";
 
 export enum ACTION_TYPE {
   PROJECTILE = 0,
@@ -613,7 +615,66 @@ export class WandInfoProvider extends InfoProvider {
     };
   }
 
-  test() {
+  test(rule: IRule<IWandRule>): boolean {
+    if (!rule.val) {
+      return true;
+    }
+
+    const generatedWand = this.provide(
+      rule.params.x,
+      rule.params.y,
+      rule.params.cost,
+      rule.params.level,
+      rule.params.force_unshuffle,
+      rule.params.unshufflePerk,
+    );
+
+    for (const [k, v] of Object.entries(rule.val.gun)) {
+      if (!between(generatedWand.gun[k], v[0], v[1])) {
+        return false;
+      }
+    }
+
+    if (rule.val.cards && rule.val.cards.length) {
+      for (const card of rule.val.cards) {
+        if (!generatedWand.cards.cards.includes(card)) {
+          return false;
+        }
+      }
+    }
+
+    if (rule.val.permanentCard && rule.val.permanentCard !== generatedWand.cards.permanentCard) {
+      return false;
+    }
+
     return true;
   }
 }
+
+export interface IWandRule {
+  params: {
+    x: number;
+    y: number;
+    cost: number;
+    level: number;
+    force_unshuffle: boolean;
+    unshufflePerk: boolean;
+  };
+  gun: {
+    cost?: [number, number];
+    deck_capacity?: [number, number];
+    actions_per_round?: [number, number];
+    reload_time?: [number, number];
+    shuffle_deck_when_empty?: [number, number];
+    fire_rate_wait?: [number, number];
+    spread_degrees?: [number, number];
+    speed_multiplier?: [number, number];
+    prob_unshuffle?: [number, number];
+    prob_draw_many?: [number, number];
+    mana_charge_speed?: [number, number];
+    mana_max?: [number, number];
+    force_unshuffle?: [number, number];
+  };
+  cards?: string[];
+  permanentCard?: string;
+}
diff --git a/src/services/db.ts b/src/services/db.ts
@@ -164,7 +164,7 @@ export class NoitaDB extends Dexie {
               }),
             ),
           },
-          madeUsingVersion: process.env.REACT_APP_VERSION!,
+          madeUsingVersion: APP_VERSION,
           createdAt: new Date(),
           updatedAt: new Date(),
         });
@@ -310,7 +310,7 @@ async function populate() {
         }),
       ),
     },
-    madeUsingVersion: process.env.REACT_APP_VERSION!,
+    madeUsingVersion: APP_VERSION,
     createdAt: new Date(),
     updatedAt: new Date(),
   });
@@ -347,7 +347,7 @@ export async function newSearch(): Promise<string> {
         }),
       ),
     },
-    madeUsingVersion: process.env.REACT_APP_VERSION!,
+    madeUsingVersion: APP_VERSION,
     createdAt: new Date(),
     updatedAt: new Date(),
   });