mirrors/seafoam
1
0
Fork 0
mirror of https://github.com/DoomKitty87/seafoam.git synced 2024-12-28 16:06:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

added ability to gen single gem of all types

Browse source
This commit is contained in:
DoomKitty87 2023-08-28 16:29:45 -07:00
parent e18581b9ac
commit 3ab46fa3bd
6 changed files with 50 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
web-app/seafoam/src-tauri/assets/amberpads.json Normal file
View file

File diff suppressed because one or more lines are too long

1
web-app/seafoam/src-tauri/assets/amethystpads.json Normal file
View file

File diff suppressed because one or more lines are too long

1
web-app/seafoam/src-tauri/assets/jade.json Normal file
View file

File diff suppressed because one or more lines are too long

1
web-app/seafoam/src-tauri/assets/sapphirepads.json Normal file
View file

File diff suppressed because one or more lines are too long

1
web-app/seafoam/src-tauri/assets/topazpads.json Normal file
View file

File diff suppressed because one or more lines are too long

57
web-app/seafoam/src/index.html
View file

@ -40,7 +40,25 @@
<label class="mfbox" for="nodens">Ignore density (Manual/Bomb mining)</label> <label class="mfbox" for="nodens">Ignore density (Manual/Bomb mining)</label>
<br> <br>
<input class="mfbox" type="checkbox" id="rubyonly"> <input class="mfbox" type="checkbox" id="rubyonly">
<label class="mfbox" for="rubyonly">Ruby only (Manual)</label> <label class="mfbox" for="rubyonly">Single gem (Manual)</label>
<h3 class="infodesc">Below only applies if Single gem is checked.</h3>
<input class="priorityform" id="ruby" type="radio" value="ruby" name="gemtype" checked>
<label class="priorityform" for="ruby">Ruby</label>
<br>
<input class="priorityform" id="sapphire" type="radio" value="sapphire" name="gemtype">
<label class="priorityform" for="sapphire">Sapphire</label>
<br>
<input class="priorityform" id="amber" type="radio" value="amber" name="gemtype">
<label class="priorityform" for="amber">Amber</label>
<br>
<input class="priorityform" id="jade" type="radio" value="jade" name="gemtype">
<label class="priorityform" for="jade">Jade</label>
<br>
<input class="priorityform" id="amethyst" type="radio" value="amethyst" name="gemtype">
<label class="priorityform" for="amethyst">Amethyst</label>
<br>
<input class="priorityform" id="topaz" type="radio" value="topaz" name="gemtype">
<label class="priorityform" for="topaz">Topaz</label>
</form> </form>
</div> </div>
<div class="nextbutton"> <div class="nextbutton">
@ -370,7 +388,7 @@
pathOutput += "]"; pathOutput += "]";
document.getElementById("oreout").innerHTML = pathOutput; document.getElementById("oreout").innerHTML = pathOutput;
} }
async function generateRoute(sector, allowedOOB, priority, waypointCount, angleEnable, angle22, angle33, mfOnly, checkingLOS, ignoreDens, minPadDist, rubyOnly) { async function generateRoute(sector, allowedOOB, priority, waypointCount, angleEnable, angle22, angle33, mfOnly, checkingLOS, ignoreDens, minPadDist, oneGemOnly, gemType) {
const angle3 = Math.min(angle33, 360 - angle33); const angle3 = Math.min(angle33, 360 - angle33);
const angle2 = Math.min(angle22, 360 - angle22); const angle2 = Math.min(angle22, 360 - angle22);
allowedOOB = parseInt(allowedOOB); allowedOOB = parseInt(allowedOOB);
@ -379,21 +397,21 @@
const readTextFile = window.__TAURI__.fs.readTextFile; const readTextFile = window.__TAURI__.fs.readTextFile;
const resolveResource = window.__TAURI__.path.resolveResource; const resolveResource = window.__TAURI__.path.resolveResource;
var padPath; var padPath;
if (rubyOnly) { if (oneGemOnly) {
console.log("Ruby Only"); console.log("Single Gem");
ignoreDens = true; ignoreDens = true;
angleEnable = false; angleEnable = false;
checkingLOS = false; checkingLOS = false;
priority = "tp"; priority = "tp";
} }
if (rubyOnly) padPath = await resolveResource('assets/rubypads.json'); if (oneGemOnly) padPath = await resolveResource('assets/' + gemType + 'pads.json');
else padPath = await resolveResource('assets/pads.json') else padPath = await resolveResource('assets/pads.json')
const overallPads = []; const overallPads = [];
const gemDensities = []; const gemDensities = [];
// Loading etherwarp pad coordinates // Loading etherwarp pad coordinates
const padFile = await readTextFile(padPath); const padFile = await readTextFile(padPath);
const padData = JSON.parse(padFile); const padData = JSON.parse(padFile);
if (!rubyOnly) { if (!oneGemOnly) {
for (const pad of padData) { for (const pad of padData) {
overallPads.push(parseInt(pad.x), parseInt(pad.y), parseInt(pad.z)); overallPads.push(parseInt(pad.x), parseInt(pad.y), parseInt(pad.z));
gemDensities.push(parseInt(pad.density)); gemDensities.push(parseInt(pad.density));
@ -516,7 +534,8 @@
console.log(sectors[sector][0] + allowedOOB, sectors[sector][2] - allowedOOB, sectors[sector][1] - allowedOOB, sectors[sector][3] + allowedOOB) console.log(sectors[sector][0] + allowedOOB, sectors[sector][2] - allowedOOB, sectors[sector][1] - allowedOOB, sectors[sector][3] + allowedOOB)
for (var i = 0; i < overallPads.length / 3; i++) { for (var i = 0; i < overallPads.length / 3; i++) {
if (overallPads[i * 3] <= sectors[sector][0] + allowedOOB && overallPads[i * 3] > sectors[sector][2] - allowedOOB && overallPads[i * 3 + 2] >= sectors[sector][1] - allowedOOB && overallPads[i * 3 + 2] < sectors[sector][3] + allowedOOB) { if (overallPads[i * 3] <= sectors[sector][0] + allowedOOB && overallPads[i * 3] > sectors[sector][2] - allowedOOB && overallPads[i * 3 + 2] >= sectors[sector][1] - allowedOOB && overallPads[i * 3 + 2] < sectors[sector][3] + allowedOOB) {
if (mfOnly && overallPads[i * 3 + 1] >= 64) continue; if (mfOnly && !oneGemOnly && overallPads[i * 3 + 1] >= 64) continue;
if (mfOnly && oneGemOnly && overallPads[i * 3 + 1] >= 66) continue;
padCoords.push(overallPads[i * 3]); padCoords.push(overallPads[i * 3]);
padCoords.push(overallPads[i * 3 + 1]); padCoords.push(overallPads[i * 3 + 1]);
padCoords.push(overallPads[i * 3 + 2]); padCoords.push(overallPads[i * 3 + 2]);
@ -577,7 +596,7 @@
var lowestWeight = Infinity; var lowestWeight = Infinity;
for (var j = 0; j < weightChart.length; j++) { for (var j = 0; j < weightChart.length; j++) {
if (rubyOnly && j == i && path.length < desiredPathLength) continue; if (oneGemOnly && j == i && path.length < desiredPathLength) continue;
if (j == i && path.length == 6) continue; if (j == i && path.length == 6) continue;
if (padCoords[j * 3] == path[path.length - 3] && padCoords[j * 3 + 1] == path[path.length - 2] && padCoords[j * 3 + 2] == path[path.length - 1]) { if (padCoords[j * 3] == path[path.length - 3] && padCoords[j * 3 + 1] == path[path.length - 2] && padCoords[j * 3 + 2] == path[path.length - 1]) {
weightChart[j] = Infinity; weightChart[j] = Infinity;
@ -666,7 +685,7 @@
avgDist += Math.sqrt(Math.pow(path[path.length - 3] - path[0], 2) + Math.pow(path[j * 3 + 1] + 2 - path[1], 2) + Math.pow(path[path.length - 1] - path[2], 2)); avgDist += Math.sqrt(Math.pow(path[path.length - 3] - path[0], 2) + Math.pow(path[j * 3 + 1] + 2 - path[1], 2) + Math.pow(path[path.length - 1] - path[2], 2));
avgDist /= path.length / 3 + 1; avgDist /= path.length / 3 + 1;
density /= path.length / 3; density /= path.length / 3;
if (rubyOnly) { if (oneGemOnly) {
if (avgDist < lowestAvgDist && desiredPathLength - desiredPathLength / 5 <= path.length / 3) { if (avgDist < lowestAvgDist && desiredPathLength - desiredPathLength / 5 <= path.length / 3) {
//console.log("Found Lowest"); //console.log("Found Lowest");
lowestAvgDist = avgDist; lowestAvgDist = avgDist;
@ -732,7 +751,8 @@
var angleEnable = false; var angleEnable = false;
var angle22 = 0; var angle22 = 0;
var angle33 = 0; var angle33 = 0;
var rubyOnly = false; var oneGemOnly = false;
var gemType = "ruby";
document.getElementById("menua1").style.opacity = 1; document.getElementById("menua1").style.opacity = 1;
document.getElementById("menua1").style.display = "flex"; document.getElementById("menua1").style.display = "flex";
@ -749,7 +769,7 @@
selectedSquareDiv.style.backgroundColor = "#edbdc2"; selectedSquareDiv.style.backgroundColor = "#edbdc2";
} }
function getRoute() { function getRoute() {
var output = generateRoute(activeSquareIndex, allowedOOB, priority, waypointNumber, angleEnable, angle22, angle33, mfOnly, checkingLOS, noDens, minPadDist, rubyOnly); var output = generateRoute(activeSquareIndex, allowedOOB, priority, waypointNumber, angleEnable, angle22, angle33, mfOnly, checkingLOS, noDens, minPadDist, oneGemOnly, gemType);
} }
function genOre() { function genOre() {
var oreType; var oreType;
@ -832,7 +852,20 @@
if (currentStep == 1) { if (currentStep == 1) {
mfOnly = document.getElementById("mfbox").checked; mfOnly = document.getElementById("mfbox").checked;
noDens = document.getElementById("nodens").checked; noDens = document.getElementById("nodens").checked;
rubyOnly = document.getElementById("rubyonly").checked; oneGemOnly = document.getElementById("rubyonly").checked;
if (document.getElementById("ruby").checked) {
gemType = "ruby";
} else if (document.getElementById("sapphire").checked) {
gemType = "sapphire";
} else if (document.getElementById("amber").checked) {
gemType = "amber";
} else if (document.getElementById("jade").checked) {
gemType = "jade";
} else if (document.getElementById("amethyst").checked) {
gemType = "amethyst";
} else if (document.getElementById("topaz").checked) {
gemType = "topaz";
}
} }
if (currentStep == 2) waypointNumber = document.getElementById("wpform").value; if (currentStep == 2) waypointNumber = document.getElementById("wpform").value;
if (currentStep == 3) { if (currentStep == 3) {