From 994464cd7d91f3bf3876540defd0455dfb8146d0 Mon Sep 17 00:00:00 2001 From: James Kaplan Date: Fri, 10 May 2019 00:37:21 -0400 Subject: [PATCH 1/8] loops: labeling the lists --- loops/index.html | 2 ++ loops/lang/en-EN/game.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/loops/index.html b/loops/index.html index 503f4161..13f76266 100644 --- a/loops/index.html +++ b/loops/index.html @@ -212,6 +212,7 @@
+
@@ -220,6 +221,7 @@
+
diff --git a/loops/lang/en-EN/game.xml b/loops/lang/en-EN/game.xml index c7dba0a7..1d0a6fe9 100644 --- a/loops/lang/en-EN/game.xml +++ b/loops/lang/en-EN/game.xml @@ -678,6 +678,8 @@ Action Options Action Stories Action List + Active + Next Loadouts Date: Fri, 10 May 2019 00:54:54 -0400 Subject: [PATCH 2/8] loops: load active list button --- loops/driver.js | 9 +++++++++ loops/index.html | 3 ++- loops/lang/en-EN/game.xml | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/loops/driver.js b/loops/driver.js index 91e1d9be..7551a080 100644 --- a/loops/driver.js +++ b/loops/driver.js @@ -301,6 +301,15 @@ function clearList() { view.updateNextActions(); } +function loadActive() { + let newNext = []; + for(let i = 0; i < actions.current.length; i++) { + newNext.push({name:actions.current[i].name, disabled:false, loops:actions.current[i].loops}); + } + actions.next = newNext; + view.updateNextActions(); +} + function unlockTown(townNum) { if (!towns[townNum].unlocked()) { townsUnlocked.push(townNum); diff --git a/loops/index.html b/loops/index.html index 13f76266..d6db076f 100644 --- a/loops/index.html +++ b/loops/index.html @@ -262,7 +262,8 @@


-
+

+
diff --git a/loops/lang/en-EN/game.xml b/loops/lang/en-EN/game.xml index 1d0a6fe9..82c8976a 100644 --- a/loops/lang/en-EN/game.xml +++ b/loops/lang/en-EN/game.xml @@ -702,6 +702,7 @@ Save List Load Selected List Clear List + Load Active List You can find more stuff with higher %. Progress Total Found From fc06dff8af4f745b1a609f81850907801cd0486e Mon Sep 17 00:00:00 2001 From: James Kaplan Date: Fri, 10 May 2019 00:58:08 -0400 Subject: [PATCH 3/8] loops: codefactor --- loops/driver.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/loops/driver.js b/loops/driver.js index 7551a080..4c588813 100644 --- a/loops/driver.js +++ b/loops/driver.js @@ -302,9 +302,9 @@ function clearList() { } function loadActive() { - let newNext = []; - for(let i = 0; i < actions.current.length; i++) { - newNext.push({name:actions.current[i].name, disabled:false, loops:actions.current[i].loops}); + const newNext = []; + for (let i = 0; i < actions.current.length; i++) { + newNext.push({ name: actions.current[i].name, disabled: false, loops: actions.current[i].loops }); } actions.next = newNext; view.updateNextActions(); From 9679a0c84bf4bf5b87293596498ad22437f13041 Mon Sep 17 00:00:00 2001 From: James Kaplan Date: Fri, 10 May 2019 01:26:48 -0400 Subject: [PATCH 4/8] loops: double loadouts --- loops/driver.js | 2 +- loops/index.html | 16 ++++++++++++++++ loops/saving.js | 8 ++++---- loops/views/main.view.js | 4 ++-- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/loops/driver.js b/loops/driver.js index 4c588813..53b1b8b6 100644 --- a/loops/driver.js +++ b/loops/driver.js @@ -278,7 +278,7 @@ function saveList() { setTimeout(() => { document.getElementById("amountCustom").value = globalCustomInput; }, 1000); - for (let i = 0; i < 5; i++) { + for (let i = 0; i < loadouts.length - 1; i++) { document.getElementById(`load${i + 1}name`).textContent = loadoutnames[i]; } } diff --git a/loops/index.html b/loops/index.html index d6db076f..d457fe6d 100644 --- a/loops/index.html +++ b/loops/index.html @@ -260,6 +260,22 @@

+
6 +
+
+
7 +
+
+
8 +
+
+
9 +
+
+
0 +
+
+



diff --git a/loops/saving.js b/loops/saving.js index a0b9e9f3..9c4c1c1b 100644 --- a/loops/saving.js +++ b/loops/saving.js @@ -60,7 +60,7 @@ let guild = ""; let curLoadout = 0; let loadouts = []; -let loadoutnames = ["1", "2", "3", "4", "5"]; +let loadoutnames = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10"]; const skillList = ["Combat", "Magic", "Practical", "Alchemy", "Crafting", "Dark", "Chronomancy", "Pyromancy", "Restoration", "Spatiomancy"]; const skills = {}; const buffList = ["Ritual", "Imbuement", "Feast", "Aspirant"]; @@ -280,7 +280,7 @@ function load() { } } actions.nextLast = copyObject(actions.next); - loadouts = [[], [], [], [], [], []]; + loadouts = [[], [], [], [], [], [], [], [], [], [], []]; if (toLoad.loadouts) { for (let i = 0; i < toLoad.loadouts.length; i++) { if (!toLoad.loadouts[i]) { @@ -304,11 +304,11 @@ function load() { } } if (toLoad.loadoutnames) { - for (let i = 0; i < 5; i++) { + for (let i = 0; i < loadouts.length - 1; i++) { loadoutnames[i] = toLoad.loadoutnames[i]; } } else { - loadoutnames = ["1", "2", "3", "4", "5"]; + loadoutnames = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10"]; } curLoadout = toLoad.curLoadout; const elem = document.getElementById(`load${curLoadout}`); diff --git a/loops/views/main.view.js b/loops/views/main.view.js index 79cc6690..aa0b5f5c 100644 --- a/loops/views/main.view.js +++ b/loops/views/main.view.js @@ -603,7 +603,7 @@ function View() { }; this.updateLoadout = function(num) { - for (let i = 0; i < 6; i++) { + for (let i = 0; i < loadouts.length; i++) { const elem = document.getElementById(`load${i}`); if (elem) { addClassToDiv(elem, "unused"); @@ -616,7 +616,7 @@ function View() { }; this.updateLoadoutNames = function() { - for (let i = 0; i < 5; i++) { + for (let i = 0; i < loadouts.length-1; i++) { document.getElementById(`load${i + 1}name`).textContent = loadoutnames[i]; } }; From 4ca6051da4bff000cd98db4f371725915304dd81 Mon Sep 17 00:00:00 2001 From: James Kaplan Date: Fri, 10 May 2019 01:27:30 -0400 Subject: [PATCH 5/8] loops: codefactor --- loops/views/main.view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loops/views/main.view.js b/loops/views/main.view.js index aa0b5f5c..94f127ca 100644 --- a/loops/views/main.view.js +++ b/loops/views/main.view.js @@ -616,7 +616,7 @@ function View() { }; this.updateLoadoutNames = function() { - for (let i = 0; i < loadouts.length-1; i++) { + for (let i = 0; i < loadouts.length - 1; i++) { document.getElementById(`load${i + 1}name`).textContent = loadoutnames[i]; } }; From 5babd70a90dfa021e6716eb23105fbf9d35810f9 Mon Sep 17 00:00:00 2001 From: James Kaplan Date: Fri, 10 May 2019 16:14:42 -0400 Subject: [PATCH 6/8] loops: nextLast --- loops/driver.js | 1 + 1 file changed, 1 insertion(+) diff --git a/loops/driver.js b/loops/driver.js index 53b1b8b6..f8219f08 100644 --- a/loops/driver.js +++ b/loops/driver.js @@ -302,6 +302,7 @@ function clearList() { } function loadActive() { + actions.nextLast = copyArray(next); const newNext = []; for (let i = 0; i < actions.current.length; i++) { newNext.push({ name: actions.current[i].name, disabled: false, loops: actions.current[i].loops }); From 156e0a904977ec248eb7132b3fbb8633d67952c7 Mon Sep 17 00:00:00 2001 From: Nemoricus Date: Thu, 16 May 2019 22:09:27 -0400 Subject: [PATCH 7/8] Testing Commit --- loops/NOTES | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/loops/NOTES b/loops/NOTES index f89d1258..1167e08f 100644 --- a/loops/NOTES +++ b/loops/NOTES @@ -144,4 +144,6 @@ town 3 - guilds and stuff Build Boat Hire Crew Inspire Crew - Set Sail \ No newline at end of file + Set Sail + + Nemoricus Test \ No newline at end of file From 5fd174f8cea9eeebd698eeb5039583317d372a35 Mon Sep 17 00:00:00 2001 From: Nemoricus Date: Thu, 16 May 2019 22:15:58 -0400 Subject: [PATCH 8/8] Pull Request Test --- loops/NOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loops/NOTES b/loops/NOTES index 1167e08f..1a741085 100644 --- a/loops/NOTES +++ b/loops/NOTES @@ -146,4 +146,4 @@ town 3 - guilds and stuff Inspire Crew Set Sail - Nemoricus Test \ No newline at end of file + Nemoricus Test 2 \ No newline at end of file