Merge branch 'dev' into alpha

Toby222 · Jan 14, 2024 · 55bf9d3 · 55bf9d3
2 parents d77be5b + 692d8de
commit 55bf9d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/aspecttree.ts b/src/aspecttree.ts
@@ -217,7 +217,7 @@ SharkGame.AspectTree = {
 
         $.each(SharkGame.Aspects, (aspectId, aspectData) => {
             const reqref = tree.requirementReference[aspectId];
-            if (!reqref.revealed) return;
+            if (!reqref || !reqref.revealed) return;
 
             let basicText = "";
             let cantBuyText = "";

diff --git a/src/world.ts b/src/world.ts
@@ -48,8 +48,8 @@ SharkGame.World = {
 
         // enable resources allowed on the planet
         if (worldInfo.includedResources) {
-            SharkGame.ResourceMap.forEach((resource) => {
-                resource.exists = false;
+            SharkGame.ResourceMap.forEach((_resourceData, resourceName) => {
+                worldResources.get(resourceName).exists = false;
             });
             _.each(worldInfo.includedResources, (group) => {
                 if (sharkmisc.has(SharkGame.InternalCategories, group)) {