Update blue chus location to use blue chu count

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": "Can Obtain 15 Blue Chu Jelly",
+      "need": "Blue Chu Jelly x15",
       "originalItem": "Blue Potion",
       "types": "Spoils Trading, Long Sidequest",
     },

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

@@ -2111,4 +2111,77 @@ describe('LogicCalculation', () => {
       });
     });
   });
+
+  describe('blue chus', () => {
+    beforeEach(() => {
+      fullSetup();
+    });
+
+    describe('when the player has no blue chus', () => {
+      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);
+      });
+    });
+
+    describe('when the player collects 1 blue chu', () => {
+      beforeEach(() => {
+        logic = new LogicCalculation(
+          logic.state().incrementItem('Second Blue Chu Near Chest'),
+        );
+      });
+
+      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 1', () => {
+        const blueChuCount = logic.state().getItemValue(LogicHelper.BLUE_CHU_JELLY_COUNT_ITEM);
+        expect(blueChuCount).toEqual(1);
+      });
+    });
+
+    describe('when the player collects 15 blue chus', () => {
+      beforeEach(() => {
+        logic = new LogicCalculation(
+          logic.state()
+            .incrementItem('Blue Chu Underneath Boulder')
+            .incrementItem('Blue Chu Near Northern Fairy Tree')
+            .incrementItem('First Blue Chu Near Chest')
+            .incrementItem('Blue Chu on High Ledge')
+            .incrementItem('Blue Chu on Highest Point')
+            .incrementItem('Blue Chu Near Southern Fairy Tree')
+            .incrementItem('Blue Chu on Highest Isle')
+            .incrementItem('Blue Chu Near Second Hole at Night')
+            .incrementItem('Blue Chu Near Peak Chest')
+            .incrementItem('Blue Chu Near Cave Entrance')
+            .incrementItem('Blue Chu Atop Northeast Statue')
+            .incrementItem('Blue Chu Near Western Fairy Tree')
+            .incrementItem('Blue Chu Near Final Rock Spire')
+            .incrementItem('Blue Chu Near Wooden Sign')
+            .incrementItem('Second Blue Chu Near Chest'),
+        );
+      });
+
+      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 15', () => {
+        const blueChuCount = logic.state().getItemValue(LogicHelper.BLUE_CHU_JELLY_COUNT_ITEM);
+        expect(blueChuCount).toEqual(15);
+      });
+    });
+  });
 });

src/services/logic-calculation.test.js

@@ -141,7 +141,7 @@ class LogicHelper {
     TRIFORCE: 'Triforce',
   };
 
-  static BLUE_CHUS_REQUIREMENT = 15;
+  static BLUE_CHU_JELLY_COUNT_REQUIRED = 15;
 
   static BLUE_CHU_JELLY_COUNT_ITEM = 'Blue Chu Jelly';
 
@@ -342,7 +342,7 @@ class LogicHelper {
   }
 
   static parseItemCountRequirement(requirement) {
-    const itemCountRequirementMatch = requirement.match(/((?:\w|\s)+) x(\d)/);
+    const itemCountRequirementMatch = requirement.match(/((?:\w|\s)+) x(\d+)/);
 
     if (itemCountRequirementMatch) {
       return {

src/services/logic-helper.js

@@ -50,6 +50,7 @@ class LogicTweaks {
   static #updateLocations() {
     this.#addDefeatGanondorf();
     this.#updateTingleStatueReward();
+    this.#updateBlueChuJelly();
     this.#updateSunkenTriforceTypes();
     this.applyHasAccessedLocationTweaksForLocations();
   }
@@ -80,6 +81,15 @@ class LogicTweaks {
     );
   }
 
+  static #updateBlueChuJelly() {
+    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}`,
+    );
+  }
+
   static #updateSunkenTriforceTypes() {
     if (Settings.getOptionValue(Permalink.OPTIONS.RANDOMIZE_CHARTS)) {
       return;

src/services/logic-tweaks.js

@@ -86,8 +86,8 @@ class ItemsTable extends React.PureComponent {
       return null;
     }
     const image = _.get(Images.IMAGES, ['BLUE_CHU_JELLY_COUNT']);
-    const count = trackerState.getItemValue(LogicHelper.ITEMS.BLUE_CHU_JELLY);
-    const textClass = count >= LogicHelper.BLUE_CHUS_REQUIREMENT ? 'chu-text-gold' : 'chu-text-white';
+    const count = trackerState.getItemValue(LogicHelper.BLUE_CHU_JELLY_COUNT_ITEM);
+    const textClass = count >= LogicHelper.BLUE_CHU_JELLY_COUNT_REQUIRED ? 'chu-text-gold' : 'chu-text-white';
     return (
       <div className="chu-count-container">
         <Item
@@ -96,7 +96,7 @@ class ItemsTable extends React.PureComponent {
           images={image}
           incrementItem={() => {}}
           itemCount={0}
-          itemName={`Blue Chu Jelly (${count}/${LogicHelper.BLUE_CHUS_REQUIREMENT})`}
+          itemName={`Blue Chu Jelly (${count}/${LogicHelper.BLUE_CHU_JELLY_COUNT_REQUIRED})`}
           locations={[]}
           setSelectedItem={this.setSelectedItem}
           spheres={spheres}