Merge branch 'exclude-locations' into s8-tournament

Author: wooferzfg

src/services/__snapshots__/logic-tweaks.test.js.snap

@@ -2489,7 +2489,7 @@ exports[`LogicTweaks applyTweaks when no options are set updates the locations 1
       "types": "Short Sidequest",
     },
     "Chu Jelly Juice Shop - Give 15 Blue Chu Jelly": {
-      "need": "Blue Chu Jelly x15",
+      "need": "(Spoils Bag & Blue Chu Jelly x15) | Can Obtain 15 Blue Chu Jelly",
       "originalItem": "Blue Potion",
       "types": "Spoils Trading, Long Sidequest",
     },

src/services/__snapshots__/tracker-controller.test.js.snap

@@ -2140,6 +2140,10 @@ describe('LogicCalculation', () => {
   describe('blue chus', () => {
     beforeEach(() => {
       fullSetup();
+
+      logic = new LogicCalculation(
+        logic.state().incrementItem('Spoils Bag'),
+      );
     });
 
     describe('when the player has no blue chus', () => {
@@ -2173,6 +2177,27 @@ describe('LogicCalculation', () => {
       });
     });
 
+    describe('when the player is able to obtain 15 blue chus', () => {
+      beforeEach(() => {
+        logic = new LogicCalculation(
+          logic.state().decrementItem('Deku Leaf'),
+        );
+      });
+
+      test('blue chus location is available', () => {
+        const isBlueChusLocationAvailable = logic.isLocationAvailable(
+          'Windfall Island',
+          'Chu Jelly Juice Shop - Give 15 Blue Chu Jelly',
+        );
+        expect(isBlueChusLocationAvailable).toEqual(true);
+      });
+
+      test('blue chu count is 0', () => {
+        const blueChuCount = logic.state().getItemValue(LogicHelper.BLUE_CHU_JELLY_COUNT_ITEM);
+        expect(blueChuCount).toEqual(0);
+      });
+    });
+
     describe('when the player collects 15 blue chus', () => {
       beforeEach(() => {
         logic = new LogicCalculation(
@@ -2207,6 +2232,27 @@ describe('LogicCalculation', () => {
         const blueChuCount = logic.state().getItemValue(LogicHelper.BLUE_CHU_JELLY_COUNT_ITEM);
         expect(blueChuCount).toEqual(15);
       });
+
+      describe('when the player does not have spoils bag', () => {
+        beforeEach(() => {
+          logic = new LogicCalculation(
+            logic.state().decrementItem('Spoils Bag'),
+          );
+        });
+
+        test('blue chus location is unavailable', () => {
+          const isBlueChusLocationAvailable = logic.isLocationAvailable(
+            'Windfall Island',
+            'Chu Jelly Juice Shop - Give 15 Blue Chu Jelly',
+          );
+          expect(isBlueChusLocationAvailable).toEqual(false);
+        });
+
+        test('blue chu count is 15', () => {
+          const blueChuCount = logic.state().getItemValue(LogicHelper.BLUE_CHU_JELLY_COUNT_ITEM);
+          expect(blueChuCount).toEqual(15);
+        });
+      });
     });
   });
 });

src/services/logic-calculation.test.js

@@ -86,11 +86,17 @@ class LogicTweaks {
   }
 
   static #updateBlueChuJelly() {
+    const originalRequirement = Locations.getLocation(
+      LogicHelper.ISLANDS.WINDFALL_ISLAND,
+      'Chu Jelly Juice Shop - Give 15 Blue Chu Jelly',
+      Locations.KEYS.NEED,
+    );
+
     Locations.setLocation(
       LogicHelper.ISLANDS.WINDFALL_ISLAND,
       'Chu Jelly Juice Shop - Give 15 Blue Chu Jelly',
       Locations.KEYS.NEED,
-      `${LogicHelper.BLUE_CHU_JELLY_COUNT_ITEM} x${LogicHelper.BLUE_CHU_JELLY_COUNT_REQUIRED}`,
+      `(${LogicHelper.ITEMS.SPOILS_BAG} & ${LogicHelper.BLUE_CHU_JELLY_COUNT_ITEM} x${LogicHelper.BLUE_CHU_JELLY_COUNT_REQUIRED}) | ${originalRequirement}`,
     );
   }
 

src/services/logic-tweaks.js

@@ -13,7 +13,7 @@ module.exports = (env, argv) => {
   const isProduction = argv.mode === 'production';
 
   const commitHash = execSync('git rev-parse --short HEAD').toString();
-  const date = moment.utc().format('YYYY-MM-DD kk:mm:ss');
+  const date = moment.utc().format('YYYY-MM-DD HH:mm:ss');
 
   const faviconsWebpackPluginSettings = {
     logo: path.resolve('src/images/icon.png'),