Skip to content

Commit b5e2140

Browse files
hotabhotab
committed
T6 black market strats;
1 parent 49ffee7 commit b5e2140

2 files changed

Lines changed: 103 additions & 37 deletions

File tree

‎src/Data/data.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,36 @@
265265
"T6SnaxIdleRecoveryCoast": {
266266
"stratFilterCondition": "false"
267267
},
268+
"T6SnaxIdleRecoveryM1": {
269+
"stratFilterCondition": "false"
270+
},
271+
"T6SnaxIdleRecoveryM1Coast": {
272+
"stratFilterCondition": "false"
273+
},
274+
"T6SnaxIdleRecoveryM2": {
275+
"stratFilterCondition": "false"
276+
},
277+
"T6SnaxIdleRecoveryM2Coast": {
278+
"stratFilterCondition": "false"
279+
},
280+
"T6SnaxIdleRecoveryM3": {
281+
"stratFilterCondition": "false"
282+
},
283+
"T6SnaxIdleRecoveryM3Coast": {
284+
"stratFilterCondition": "false"
285+
},
286+
"T6SnaxIdleRecoveryM4": {
287+
"stratFilterCondition": "false"
288+
},
289+
"T6SnaxIdleRecoveryM4Coast": {
290+
"stratFilterCondition": "false"
291+
},
292+
"T6SnaxIdleRecoveryM5": {
293+
"stratFilterCondition": "false"
294+
},
295+
"T6SnaxIdleRecoveryM5Coast": {
296+
"stratFilterCondition": "false"
297+
},
268298
"T6C3d": {
269299
"stratFilterCondition": "(Active || Very-Active) && rho < 25"
270300
},

‎src/Theories/T1-T8/T6.ts‎

Lines changed: 73 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -51,45 +51,16 @@ class t6Sim extends theoryClass<theory> {
5151
stopC12: [number, number, boolean];
5252

5353
getBuyingConditions(): conditionFunction[] {
54-
const conditions: Record<stratType[theory], (boolean | conditionFunction)[]> = {
55-
T6: [true, true, true, true, true, true, true, true, true],
56-
T6C3: [true, true, true, true, () => this.variables[6].level == 0, () => this.variables[6].level == 0, true, false, false],
57-
T6C4: [true, true, true, true, false, false, false, true, false],
58-
T6C125: [true, true, true, true, true, true, false, false, true],
59-
T6C12: [true, true, true, true, true, true, false, false, false],
60-
T6C5: [true, true, true, true, false, false, false, false, true],
61-
T6C5Coast: [
62-
() => this.variables[0].shouldBuy,
63-
true,
64-
() => this.variables[2].shouldBuy,
65-
true,
66-
false,
67-
false,
68-
false,
69-
false,
70-
true
71-
],
72-
T6Snax: [true, true, true, true, () => this.stopC12[2], () => this.stopC12[2], false, false, true],
73-
T6SnaxCoast: [
74-
() => this.variables[0].shouldBuy,
75-
true,
76-
() => this.variables[2].shouldBuy,
77-
true,
78-
() => this.stopC12[2],
79-
() => this.stopC12[2],
80-
false,
81-
false,
82-
true
83-
],
84-
T6SnaxIdleRecovery: [
54+
const t6SnaxIdleRecoveryMaker = (start_point: number = 0): (boolean | conditionFunction)[] => {
55+
return [
8556
() => {
86-
if (this.lastPub >= this.maxRho) return true;
57+
if (this.lastPub - start_point >= this.maxRho) return true;
8758
return this.variables[0].cost + l10(7 + (this.variables[0].level % 10))
8859
< Math.min(this.variables[1].cost, this.variables[3].cost, this.milestones[2] > 0 ? this.variables[8].cost : Infinity);
8960
},
9061
true,
9162
() => {
92-
if (this.lastPub >= this.maxRho) return true;
63+
if (this.lastPub - start_point >= this.maxRho) return true;
9364
return this.variables[2].cost + l10(5)
9465
< Math.min(this.variables[1].cost, this.variables[3].cost, this.milestones[2] > 0 ? this.variables[8].cost : Infinity)
9566
},
@@ -99,18 +70,20 @@ class t6Sim extends theoryClass<theory> {
9970
false,
10071
false,
10172
true,
102-
],
103-
T6SnaxIdleRecoveryCoast: [
73+
]
74+
}
75+
const t6SnaxIdleRecoveryCoastMaker = (start_point: number = 0): (boolean | conditionFunction)[] => {
76+
return [
10477
() => {
10578
if (!this.variables[0].shouldBuy) return false;
106-
if (this.lastPub >= this.maxRho) return true;
79+
if (this.lastPub - start_point >= this.maxRho) return true;
10780
return this.variables[0].cost + l10(7 + (this.variables[0].level % 10))
10881
< Math.min(this.variables[1].cost, this.variables[3].cost, this.milestones[2] > 0 ? this.variables[8].cost : Infinity);
10982
},
11083
true,
11184
() => {
11285
if (!this.variables[2].shouldBuy) return false;
113-
if (this.lastPub >= this.maxRho) return true;
86+
if (this.lastPub - start_point >= this.maxRho) return true;
11487
return this.variables[2].cost + l10(5)
11588
< Math.min(this.variables[1].cost, this.variables[3].cost, this.milestones[2] > 0 ? this.variables[8].cost : Infinity)
11689
},
@@ -120,7 +93,50 @@ class t6Sim extends theoryClass<theory> {
12093
false,
12194
false,
12295
true,
96+
]
97+
}
98+
const conditions: Record<stratType[theory], (boolean | conditionFunction)[]> = {
99+
T6: [true, true, true, true, true, true, true, true, true],
100+
T6C3: [true, true, true, true, () => this.variables[6].level == 0, () => this.variables[6].level == 0, true, false, false],
101+
T6C4: [true, true, true, true, false, false, false, true, false],
102+
T6C125: [true, true, true, true, true, true, false, false, true],
103+
T6C12: [true, true, true, true, true, true, false, false, false],
104+
T6C5: [true, true, true, true, false, false, false, false, true],
105+
T6C5Coast: [
106+
() => this.variables[0].shouldBuy,
107+
true,
108+
() => this.variables[2].shouldBuy,
109+
true,
110+
false,
111+
false,
112+
false,
113+
false,
114+
true
115+
],
116+
T6Snax: [true, true, true, true, () => this.stopC12[2], () => this.stopC12[2], false, false, true],
117+
T6SnaxCoast: [
118+
() => this.variables[0].shouldBuy,
119+
true,
120+
() => this.variables[2].shouldBuy,
121+
true,
122+
() => this.stopC12[2],
123+
() => this.stopC12[2],
124+
false,
125+
false,
126+
true
123127
],
128+
T6SnaxIdleRecovery: t6SnaxIdleRecoveryMaker(0),
129+
T6SnaxIdleRecoveryCoast: t6SnaxIdleRecoveryCoastMaker(0),
130+
T6SnaxIdleRecoveryM1: t6SnaxIdleRecoveryMaker(1),
131+
T6SnaxIdleRecoveryM1Coast: t6SnaxIdleRecoveryCoastMaker(1),
132+
T6SnaxIdleRecoveryM2: t6SnaxIdleRecoveryMaker(2),
133+
T6SnaxIdleRecoveryM2Coast: t6SnaxIdleRecoveryCoastMaker(2),
134+
T6SnaxIdleRecoveryM3: t6SnaxIdleRecoveryMaker(3),
135+
T6SnaxIdleRecoveryM3Coast: t6SnaxIdleRecoveryCoastMaker(3),
136+
T6SnaxIdleRecoveryM4: t6SnaxIdleRecoveryMaker(4),
137+
T6SnaxIdleRecoveryM4Coast: t6SnaxIdleRecoveryCoastMaker(4),
138+
T6SnaxIdleRecoveryM5: t6SnaxIdleRecoveryMaker(5),
139+
T6SnaxIdleRecoveryM5Coast: t6SnaxIdleRecoveryCoastMaker(5),
124140
T6C3d: [
125141
() => this.variables[0].cost + l10(3) < Math.min(this.variables[1].cost, this.milestones[0] > 0 ? this.variables[3].cost : Infinity, this.variables[6].cost),
126142
true,
@@ -280,6 +296,26 @@ class t6Sim extends theoryClass<theory> {
280296
return [0, 3, 2];
281297
case "T6SnaxIdleRecoveryCoast":
282298
return [0, 3, 2];
299+
case "T6SnaxIdleRecoveryM1":
300+
return [0, 3, 2];
301+
case "T6SnaxIdleRecoveryM1Coast":
302+
return [0, 3, 2];
303+
case "T6SnaxIdleRecoveryM2":
304+
return [0, 3, 2];
305+
case "T6SnaxIdleRecoveryM2Coast":
306+
return [0, 3, 2];
307+
case "T6SnaxIdleRecoveryM3":
308+
return [0, 3, 2];
309+
case "T6SnaxIdleRecoveryM3Coast":
310+
return [0, 3, 2];
311+
case "T6SnaxIdleRecoveryM4":
312+
return [0, 3, 2];
313+
case "T6SnaxIdleRecoveryM4Coast":
314+
return [0, 3, 2];
315+
case "T6SnaxIdleRecoveryM5":
316+
return [0, 3, 2];
317+
case "T6SnaxIdleRecoveryM5Coast":
318+
return [0, 3, 2];
283319
case "T6C3d":
284320
return [0];
285321
case "T6C4d":

0 commit comments

Comments
 (0)