Update to use master branch

wooferzfg · Apr 9, 2024 · 1efc3b3 · 1efc3b3
1 parent 7f94daf
commit 1efc3b3
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/scripts/verify-logic.js b/scripts/verify-logic.js
@@ -133,7 +133,7 @@ const verifyLogicForSettings = async (permalink) => {
 };
 
 const script = async () => {
-  await verifyLogicForSettings('MS4xMS4wAEEASRBQGQAA+wLoAgAAAAAAAAAAAAI='); // no starting items
+  await verifyLogicForSettings('bWFzdGVyAEEASRBQGQAA+wLoAgAAAAAAAAAAAAI='); // no starting items
   await verifyLogicForSettings(Permalink.DEFAULT_PERMALINK);
 };
 

diff --git a/src/data/test-save-data.json b/src/data/test-save-data.json
diff --git a/src/services/__snapshots__/permalink.test.js.snap b/src/services/__snapshots__/permalink.test.js.snap
@@ -127,7 +127,7 @@ exports[`Permalink DEFAULT_PERMALINK returns the default options 1`] = `
   "swift_sail": true,
   "sword_mode": "Start with Hero's Sword",
   "trap_chests": false,
-  "version": "1.11.0",
+  "version": "master",
 }
 `;
 
@@ -323,7 +323,7 @@ exports[`Permalink decode decodes a permalink 1`] = `
   "remove_music": false,
   "required_bosses": true,
   "reveal_full_sea_chart": true,
-  "seed_name": "yeet",
+  "seed_name": "seed",
   "skip_rematch_bosses": true,
   "starting_gear": {
     "Bait Bag": 0,
@@ -391,6 +391,6 @@ exports[`Permalink decode decodes a permalink 1`] = `
   "swift_sail": true,
   "sword_mode": "No Starting Sword",
   "trap_chests": false,
-  "version": "1.11.0",
+  "version": "master",
 }
 `;
diff --git a/src/services/__snapshots__/settings.test.js.snap b/src/services/__snapshots__/settings.test.js.snap
@@ -224,7 +224,7 @@ exports[`Settings initializeFromPermalink default settings initializes the optio
   "swift_sail": true,
   "sword_mode": "Start with Hero's Sword",
   "trap_chests": false,
-  "version": "1.11.0",
+  "version": "master",
 }
 `;
 

diff --git a/src/services/__snapshots__/tracker-controller.test.js.snap b/src/services/__snapshots__/tracker-controller.test.js.snap
diff --git a/src/services/permalink.js b/src/services/permalink.js
@@ -28,7 +28,7 @@ class Permalink {
     [this.OPTIONS.SWORD_MODE]: SWORD_MODE_OPTIONS,
   };
 
-  static DEFAULT_PERMALINK = 'MS4xMS4wAEEASRBQGAAA+wLoEgAAAAAIAAQBAAI=';
+  static DEFAULT_PERMALINK = 'bWFzdGVyAEEASRBQGAAA+wLoEgAAAAAIAAQBAAI=';
 
   static decode(permalinkString) {
     const binaryString = BinaryString.fromBase64(permalinkString);

diff --git a/src/services/permalink.test.js b/src/services/permalink.test.js
@@ -35,7 +35,7 @@ describe('Permalink', () => {
 
   describe('decode', () => {
     test('decodes a permalink', () => {
-      const options = Permalink.decode('MS4xMS4wAHllZXQASRBQHcBG+wLoggEAAAAAAALAJAI=');
+      const options = Permalink.decode('bWFzdGVyAHNlZWQASRBQHcBG+wLoggEAAAAAAALAJAI=');
 
       expect(options).toMatchSnapshot();
     });
@@ -59,7 +59,7 @@ describe('Permalink', () => {
     let permalink;
 
     beforeEach(() => {
-      permalink = 'MS4xMS4wAHllZXQASRBQHcBG+wLoggEAAAAAAALAJAI=';
+      permalink = 'bWFzdGVyAHNlZWQASRBQHcBG+wLoggEAAAAAAALAJAI=';
       options = Permalink.decode(permalink);
     });
 

diff --git a/src/services/settings.test.js b/src/services/settings.test.js
@@ -17,7 +17,7 @@ describe('Settings', () => {
       });
 
       test('initializes the version', () => {
-        expect(Settings.version).toEqual('1.11.0');
+        expect(Settings.version).toEqual('master'); // TODO: change to 1.11.0
       });
 
       test('initializes the starting gear', () => {
@@ -67,7 +67,7 @@ describe('Settings', () => {
 
     describe('all flags set', () => {
       beforeEach(() => {
-        Settings.initializeFromPermalink('MS4xMS4wAHllZXQA//9/GAAA+wLoEgAAAAAIAAQBAAI=');
+        Settings.initializeFromPermalink('bWFzdGVyAHNlZWQA//9/GAAA+wLoEgAAAAAIAAQBAAI=');
       });
 
       test('initializes all the flags', () => {
@@ -78,7 +78,7 @@ describe('Settings', () => {
 
     describe('all starting gear set', () => {
       beforeEach(() => {
-        Settings.initializeFromPermalink('MS4xMS4wAHllZXQASRBQGAAA+wLo+v//////v6suAAI=');
+        Settings.initializeFromPermalink('bWFzdGVyAHNlZWQASRBQGAAA+wLo+v//////v6suAAI=');
       });
 
       test('initializes the starting gear', () => {
@@ -89,7 +89,7 @@ describe('Settings', () => {
     describe('only sunken triforce enabled', () => {
       describe('when charts are not randomized', () => {
         beforeEach(() => {
-          Settings.initializeFromPermalink('MS4xMS4wAHllZXQAAAAEGAAA+wLoEgAAAAAIAAQBAAI=');
+          Settings.initializeFromPermalink('bWFzdGVyAHNlZWQAAAAEGAAA+wLoEgAAAAAIAAQBAAI=');
         });
 
         test('initializes the flags', () => {
@@ -101,7 +101,7 @@ describe('Settings', () => {
 
       describe('when charts are randomized', () => {
         beforeEach(() => {
-          Settings.initializeFromPermalink('MS4xMS4wAHllZXQAAAAEGACA+wLoEgAAAAAIAAQBAAI=');
+          Settings.initializeFromPermalink('bWFzdGVyAHNlZWQAAAAEGACA+wLoEgAAAAAIAAQBAAI=');
         });
 
         test('initializes the flags', () => {