Skip to content

Strat Addition and Removal #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
LEBaldy wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Strat Addition and Removal #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0df9e05
initial commit
LEBaldy Jul 4, 2026
81b7f0c
Finish T8 strat routing
LEBaldy Jul 9, 2026
7625a77
re-enable coast strats
LEBaldy Jul 9, 2026
f1f036d
Final Cleanup and Strat Splitting
LEBaldy Jul 10, 2026
bed7945
Removal of T8M1 and T8M3 strategies
LEBaldy Jul 10, 2026
7325e20
Merge branch 'master' into t8-2-milestones
MathisSinet Jul 10, 2026
312a34a
Re-added different c5 ratio for solarswap + renamed identifiers
MathisSinet Jul 10, 2026
86bc123
Removed pre-e50 singleMS
MathisSinet Jul 10, 2026
af8c0ec
Merge branch 'master' into t8-low-milestones
LEBaldy Jul 10, 2026
21927d8
Add additional Strats
LEBaldy Jul 11, 2026
36cf242
Add additional Strats
LEBaldy Jul 13, 2026
7dcc136
correct typo
LEBaldy Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 33 additions & 27 deletions src/Data/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,65 +412,71 @@
"T8Coast": {
"stratFilterCondition": "Semi-Idle && ((rho >= 20 && rho < 52) || rho >= 220)"
},
"T8noC3": {
"T8NoC3": {
"stratFilterCondition": "Idle && ((rho < 40) || (rho >=50 && rho < 80) || (rho >= 160 && rho < 220))"
},
"T8noC3Coast": {
"T8NoC3Coast": {
"stratFilterCondition": "Semi-Idle && ((rho < 40) || (rho >=50 && rho < 80))"
},
"T8noC5": {
"T8NoC5": {
"stratFilterCondition": "(Idle || Semi-Idle) && rho >= 160 && rho < 220"
},
"T8noC5Coast": {
"T8NoC5Coast": {
"stratFilterCondition": "Semi-Idle && rho >= 160 && rho < 220"
},
"T8noC35": {
"T8NoC35": {
"stratFilterCondition": "(Idle || Semi-Idle) && rho >= 80 && rho < 160"
},
"T8noC35Coast": {
"T8NoC35Coast": {
"stratFilterCondition": "Semi-Idle && rho >= 80 && rho < 160"
},
"T8Snax": {
"stratFilterCondition": "Semi-Idle && (rho < 160 || rho >= 220)"
},
"T8noC3d": {
"stratFilterCondition": "(Active || Very-Active) && ((rho < 40) || (rho >= 50 && rho < 80) || (rho >= 160 && rho < 220))"
"T8NoC3d": {
"stratFilterCondition": "(Active || Very-Active) && ((rho >= 8 && rho < 40) || (rho >= 50 && rho < 80))"
},
"T8noC3dCoast": {
"stratFilterCondition": "(Active || Very-Active) && ((rho < 40) || (rho >= 50 && rho < 80) || (rho >= 160 && rho < 220))"
"T8NoC3d2": {
"stratFilterCondition": "((Active || Very-Active) && ((rho < 8) || (rho >=20 && rho < 40) || (rho >= 160 && rho < 180))) || (Active && rho >= 160 && rho < 220)"
},
"T8noC3dSingleMS0": {
"stratFilterCondition": "(Active || Very-Active) && (rho >= 50 && rho < 59)"
"T8NoC3dCoast": {
"stratFilterCondition": "((Active || Very-Active) && ((rho >= 8 && rho < 40) || (rho >= 50 && rho < 80))) || (Active && rho >= 160 && rho < 220)"
},
"T8noC3dSingleMS2": {
"stratFilterCondition": "(Active || Very-Active) && (rho >= 55 && rho < 76)"
"T8NoC3d2Coast": {
"stratFilterCondition": "((Active || Very-Active) && ((rho < 8) || (rho >=20 && rho < 40) || (rho >= 160 && rho < 180))) || (Active && rho >= 160 && rho < 220)"
},
"T8noC3dSingleMS0Coast": {
"T8NoC3dSingleMS0Coast": {
"stratFilterCondition": "(Active || Very-Active) && (rho >= 50 && rho < 59)"
},
"T8noC3dSingleMS2Coast": {
"T8NoC3dSingleMS2Coast": {
"stratFilterCondition": "(Active || Very-Active) && (rho >= 55 && rho < 76)"
},
"T8noC5d": {
"stratFilterCondition": "(Active || Very-Active) && rho >= 160 && rho < 220"
"T8NoC5dCoast": {
"stratFilterCondition": "(Active && rho >= 160 && rho < 220) || (Very-Active && rho >= 160 && rho < 180)"
},
"T8noC5dCoast": {
"stratFilterCondition": "(Active || Very-Active) && rho >= 160 && rho < 220"
"T8NoC35d": {
"stratFilterCondition": "(Active || Very-Active) && rho >= 72 && rho < 160"
},
"T8noC35d": {
"T8PlayNoC35": {
"stratFilterCondition": "(Active || Very-Active) && rho >= 72 && rho < 160"
},
"T8noC35dCoast": {
"T8NoC35dCoast": {
"stratFilterCondition": "(Active || Very-Active) && rho >= 72 && rho < 160"
},
"T8PlayCoast": {
"stratFilterCondition": "Active && ((rho >= 20 && rho < 52) || (rho >= 220))"
"T8PlayNoC35Coast": {
"stratFilterCondition": "(Active || Very-Active) && rho >= 72 && rho < 160"
},
"T8PlaySolarswap": {
"stratFilterCondition": "Very-Active && ((rho >= 40 && rho < 52) || (rho >= 155))"
"T8PlayCoast": {
"stratFilterCondition": "(Active && ((rho >= 20 && rho < 52) || (rho >= 220))) || (Very-Active && rho >=20 && rho < 40)"
},
"T8PlaySolarswapCoast": {
"stratFilterCondition": "Very-Active && ((rho >= 40 && rho < 52) || (rho >= 155))"
"stratFilterCondition": "Very-Active && ((rho >= 40 && rho < 52) || (rho >= 220))"
},
"T8PlayNoC5SolarswapCoast": {
"stratFilterCondition": "Very-Active && rho >= 160 && rho < 220"
},
"T8PlayNoC3SolarswapCoast": {
"stratFilterCondition": "Very-Active && rho >= 160 && rho < 220"
}
}
},
Expand Down
156 changes: 111 additions & 45 deletions src/Theories/T1-T8/T8.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ const singleMSPoints = [
].toSorted((a,b) => a - b),
Array.from({length: 104-53+1}, (_, lvl) => l10(1e2) + (l10(2) * (1.15 * Math.log2(5))) * (lvl + 53))
];
const orphanCoastStrats = [
"T8NoC3dSingleMS0Coast",
"T8NoC3dSingleMS2Coast",
"T8PlayCoast",
"T8PlaySolarswapCoast",
"T8PlayNoC3SolarswapCoast",
"T8PlayNoC5SolarswapCoast",
"T8NoC5dCoast"
];

export default async function t8(data: theoryData): Promise<simResult> {
async function getResult (
Expand All @@ -26,7 +35,7 @@ export default async function t8(data: theoryData): Promise<simResult> {
}
else {
let data2: theoryData = JSON.parse(JSON.stringify(data));
if (data2.strat !== "T8PlayCoast") data2.strat = data2.strat.replace("Coast", "");
if (!orphanCoastStrats.includes(data2.strat)) data2.strat = data2.strat.replace("Coast", "");
const sim1 = new t8Sim(data2, singleMSPoint);
const res1 = await sim1.simulate();
const lastC1 = getLastLevel("c1", res1.boughtVars);
Expand All @@ -45,8 +54,8 @@ export default async function t8(data: theoryData): Promise<simResult> {
}

let result: simResult = defaultResult();
// T8noC3dSingleMS
if (data.strat.includes("T8noC3dSingleMS")) {
// T8NoC3dSingleMS
if (data.strat.includes("T8NoC3dSingleMS")) {
const singleMSVariant = Number(data.strat.slice(data.strat.indexOf("SingleMS")+8).slice(0, 1));
// Only Swap points within e5 of recovery (except M2 before e57)
for (const singleMSPoint of singleMSPoints[singleMSVariant/2].filter(
Expand All @@ -61,6 +70,13 @@ export default async function t8(data: theoryData): Promise<simResult> {
result = getBestResult(result, await getResult(data, singleMSPoint));
if (result.pubRho < singleMSPoint) break;
}
// If result is outside of the bounds of the SingleMS, then properly handle the blank output.
if (result.strat === "Result undefined") {
result.theory = data.theory;
result.sigma = data.sigma;
result.lastPub = data.rho;
result.strat = data.strat;
}
}
else {
result = await getResult(data);
Expand Down Expand Up @@ -124,68 +140,116 @@ class t8Sim extends theoryClass<theory> {
true,
() => this.curMult < 2.3
];

const noC3dStrat = [() => this.variables[0].cost + 1 < Math.min(this.variables[1].cost, this.variables[3].cost), true, false, true, true];
const noC3d2Strat = [
() => this.variables[0].cost + 1 < Math.min(this.variables[1].cost, this.variables[3].cost),
true,
false,
true,
() => this.variables[4].cost + l10(4) < Math.min(this.variables[1].cost, this.variables[3].cost)
];
const noC3dCoastStrat = [
() => this.variables[0].shouldBuy && (this.variables[0].cost + 1 < Math.min(this.variables[1].cost, this.variables[3].cost)),
true,
false,
true,
() => this.variables[4].shouldBuy
];
const noC5dStrat = [() => this.variables[0].cost + 1 < Math.min(this.variables[1].cost, this.variables[3].cost), true, true, true, false];
const noC3d2CoastStrat = [
() => this.variables[0].shouldBuy && (this.variables[0].cost + l10(8) < Math.min(this.variables[1].cost, this.variables[3].cost)),
true,
false,
true,
() => this.variables[4].shouldBuy && (this.variables[4].cost + l10(2.5) < Math.min(this.variables[1].cost, this.variables[3].cost)),
];

const noC5dCoastStrat = [
() => this.variables[0].shouldBuy && (this.variables[0].cost + 1 < Math.min(this.variables[1].cost, this.variables[3].cost)),
true,
() => this.variables[4].shouldBuy,
() => this.variables[2].shouldBuy && (this.variables[2].cost + l10(2.5) < Math.min(this.variables[1].cost, this.variables[3].cost)),
true,
false
];

const noC35dStrat = [() => this.variables[0].cost + 1 < Math.min(this.variables[1].cost, this.variables[3].cost), true, false, true, false];
const noC35dCoastStrat = [
() => this.variables[0].shouldBuy && (this.variables[0].cost + 1 < Math.min(this.variables[1].cost, this.variables[3].cost)),
true,
false,
true,
false,
];

const playCoastStrat = [
() => this.variables[0].shouldBuy && (this.variables[0].cost + l10(5 + 0.5 * (this.variables[0].level % 10)) < Math.min(this.variables[1].cost, this.variables[3].cost)),
true,
() => this.variables[2].shouldBuy && (this.variables[2].cost + l10(2.5) < Math.min(this.variables[1].cost, this.variables[3].cost)),
true,
() => this.variables[4].shouldBuy && (this.variables[4].cost + l10(4) < Math.min(this.variables[1].cost, this.variables[3].cost)),
];
const playSolarswapStrat = [
const playNoC5CoastStrat = [
() => this.variables[0].shouldBuy && (this.variables[0].cost + l10(5 + 0.5 * (this.variables[0].level % 10)) < Math.min(this.variables[1].cost, this.variables[3].cost)),
true,
() => this.variables[2].shouldBuy && (this.variables[2].cost + l10(2.5) < Math.min(this.variables[1].cost, this.variables[3].cost)),
true,
false,
];
const playNoC35Strat = [
() => this.variables[0].cost + l10(5 + 0.5 * (this.variables[0].level % 10)) < Math.min(this.variables[1].cost, this.variables[3].cost),
true,
() => this.variables[2].cost + l10(2.5) < Math.min(this.variables[1].cost, this.variables[3].cost),
false,
true,
false,
];
const playNoC35CoastStrat = [
() => this.variables[0].shouldBuy && (this.variables[0].cost + l10(5 + 0.5 * (this.variables[0].level % 10)) < Math.min(this.variables[1].cost, this.variables[3].cost)),
true,
false,
true,
() => this.variables[4].cost + l10(2.5) < Math.min(this.variables[1].cost, this.variables[3].cost),
false,
];

const playSolarswapCoastStrat = [
() => this.variables[0].shouldBuy && (this.variables[0].cost + l10(5 + 0.5 * (this.variables[0].level % 10)) < Math.min(this.variables[1].cost, this.variables[3].cost)),
true,
() => this.variables[2].shouldBuy && (this.variables[2].cost + l10(2.5) < Math.min(this.variables[1].cost, this.variables[3].cost)),
true,
() => this.variables[4].shouldBuy && (this.variables[4].cost + l10(2.5) < Math.min(this.variables[1].cost, this.variables[3].cost)),
];
const playNoC3SolarswapCoastStrat = [
() => this.variables[0].shouldBuy && (this.variables[0].cost + l10(5 + 0.5 * (this.variables[0].level % 10)) < Math.min(this.variables[1].cost, this.variables[3].cost)),
true,
false,
true,
() => this.variables[4].shouldBuy && (this.variables[4].cost + l10(2.5) < Math.min(this.variables[1].cost, this.variables[3].cost)),
];

const conditions: Record<stratType[theory], (boolean | conditionFunction)[]> = {
T8: idleStrat,
T8Coast: idleCoastStrat,
T8noC3: noC3Strat,
T8noC3Coast: noC3CoastStrat,
T8noC5: noC5Strat,
T8noC5Coast: noC5CoastStrat,
T8noC35: noC35Strat,
T8noC35Coast: noC35CoastStrat,
T8NoC3: noC3Strat,
T8NoC3Coast: noC3CoastStrat,
T8NoC5: noC5Strat,
T8NoC5Coast: noC5CoastStrat,
T8NoC35: noC35Strat,
T8NoC35Coast: noC35CoastStrat,
T8Snax: snaxStrat,
T8noC3d: noC3dStrat,
T8noC3dCoast: noC3dCoastStrat,
T8noC3dSingleMS0: noC3dStrat,
T8noC3dSingleMS2: noC3dStrat,
T8noC3dSingleMS0Coast: noC3dCoastStrat,
T8noC3dSingleMS2Coast: noC3dCoastStrat,
T8noC5d: noC5dStrat,
T8noC5dCoast: noC5dCoastStrat,
T8noC35d: noC35dStrat,
T8noC35dCoast: noC35dStrat,
T8NoC3d: noC3dStrat,
T8NoC3d2: noC3d2Strat,
T8NoC3dCoast: noC3dCoastStrat,
T8NoC3d2Coast: noC3d2CoastStrat,
T8NoC3dSingleMS0Coast: noC3dCoastStrat,
T8NoC3dSingleMS2Coast: noC3dCoastStrat,
T8NoC5dCoast: noC5dCoastStrat,
T8NoC35d: noC35dStrat,
T8PlayNoC35: playNoC35Strat,
T8NoC35dCoast: noC35dCoastStrat,
T8PlayNoC35Coast: playNoC35CoastStrat,
T8PlayCoast: playCoastStrat,
T8PlaySolarswap: playSolarswapStrat,
T8PlaySolarswapCoast: playSolarswapCoastStrat
T8PlayNoC5SolarswapCoast: playNoC5CoastStrat,
T8PlaySolarswapCoast: playSolarswapCoastStrat,
T8PlayNoC3SolarswapCoast: playNoC3SolarswapCoastStrat,
};
return toCallables(conditions[this.strat]);
}
Expand All @@ -196,25 +260,27 @@ class t8Sim extends theoryClass<theory> {
getMilestonePriority(): number[] {
const milestoneCount = Math.min(11, Math.floor(Math.max(this.lastPub, this.maxRho) / 20));
switch (this.strat) {
case "T8noC3":
case "T8noC3Coast":
case "T8noC3dCoast":
case "T8noC3d": return Math.max(this.maxRho, this.lastPub) < 50 ? [0] : [3, 0, 2];
case "T8noC3dSingleMS0Coast":
case "T8noC3dSingleMS0": return this.maxRho < this.singleMSPoint ? [0, 3, 2] : [3, 0, 2];
case "T8noC3dSingleMS2Coast":
case "T8noC3dSingleMS2": return this.maxRho < this.singleMSPoint ? [2, 0, 3] : [3, 0, 2];
case "T8noC5":
case "T8noC5Coast":
case "T8noC5dCoast":
case "T8noC5d": return [0, 2, 1];
case "T8noC35":
case "T8noC35Coast":
case "T8noC35dCoast":
case "T8noC35d": return [2, 0];
case "T8NoC3":
case "T8NoC3Coast":
case "T8NoC3d2":
case "T8NoC3d2Coast":
case "T8NoC3d":
case "T8NoC3dCoast": return Math.max(this.maxRho, this.lastPub) < 50 ? [0] : [3, 0, 2];
case "T8NoC3dSingleMS0Coast": return this.maxRho < this.singleMSPoint ? [0, 3, 2] : [3, 0, 2];
case "T8NoC3dSingleMS2Coast": return this.maxRho < this.singleMSPoint ? [2, 0, 3] : [3, 0, 2];
case "T8NoC5":
case "T8NoC5Coast":
case "T8NoC5dCoast": return [0, 2, 1];
case "T8NoC35":
case "T8NoC35Coast":
case "T8NoC35d":
case "T8PlayNoC35":
case "T8PlayNoC35Coast":
case "T8NoC35dCoast": return [2, 0];
case "T8PlayCoast": return milestoneCount < 4 ? [0, 3] : [2, 0, 3, 1];
case "T8PlaySolarswap":
case "T8PlaySolarswapCoast": return milestoneCount < 4 ? [0, 3] : [0, 2, 3, 1];
case "T8PlayNoC3SolarswapCoast": return [0, 2, 3];
case "T8PlayNoC5SolarswapCoast": return [0, 2, 1];
}

if (milestoneCount < 3) return [0];
Expand Down Expand Up @@ -317,10 +383,10 @@ class t8Sim extends theoryClass<theory> {
}
if (this.strat.includes("Coast")) {
stratExtra += this.variables[0].prepareExtraForCap(getLastLevel("c1", this.boughtVars));
if (!this.strat.includes("noC3") && !this.strat.includes("noC35")) {
if (!this.strat.includes("NoC3") && !this.strat.includes("NoC35")) {
stratExtra += this.variables[2].prepareExtraForCap(getLastLevel("c3", this.boughtVars));
}
if (!this.strat.includes("noC5") && !this.strat.includes("noC35")) {
if (!this.strat.includes("NoC5") && !this.strat.includes("NoC35")) {
stratExtra += this.variables[4].prepareExtraForCap(getLastLevel("c5", this.boughtVars));
}
}
Expand Down