Skip to content

Commit 49ffee7

Browse files
hotabhotab
committed
Untypo;
1 parent 7ced818 commit 49ffee7

2 files changed

Lines changed: 78 additions & 78 deletions

File tree

‎src/Data/data.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -662,60 +662,60 @@
662662
"MFd3RCCoast": {
663663
"stratFilterCondition": "false"
664664
},
665-
"MFVarientd1d1d2Coast": {
665+
"MFVariantd1d1d2Coast": {
666666
"stratFilterCondition": "Active || Very-Active"
667667
},
668-
"MFVarientd1d1d3Coast": {
668+
"MFVariantd1d1d3Coast": {
669669
"stratFilterCondition": "Active || Very-Active"
670-
},
671-
"MFVarientd1d2d1Coast": {
670+
},
671+
"MFVariantd1d2d1Coast": {
672672
"stratFilterCondition": "Active || Very-Active"
673673
},
674-
"MFVarientd1d2d2Coast": {
674+
"MFVariantd1d2d2Coast": {
675675
"stratFilterCondition": "Active || Very-Active"
676676
},
677-
"MFVarientd2d1d1Coast": {
677+
"MFVariantd2d1d1Coast": {
678678
"stratFilterCondition": "Active || Very-Active"
679679
},
680-
"MFVarientd2d1d2Coast": {
680+
"MFVariantd2d1d2Coast": {
681681
"stratFilterCondition": "Active || Very-Active"
682682
},
683-
"MFVarientd2d1d3Coast": {
683+
"MFVariantd2d1d3Coast": {
684684
"stratFilterCondition": "Active || Very-Active"
685685
},
686-
"MFVarientd2d2d1Coast": {
686+
"MFVariantd2d2d1Coast": {
687687
"stratFilterCondition": "Active || Very-Active"
688688
},
689-
"MFVarientd2d2d3Coast": {
689+
"MFVariantd2d2d3Coast": {
690690
"stratFilterCondition": "Active || Very-Active"
691-
},
692-
"MFVarientd1d1d2RCCoast": {
691+
},
692+
"MFVariantd1d1d2RCCoast": {
693693
"stratFilterCondition": "false"
694694
},
695-
"MFVarientd1d1d3RCCoast": {
695+
"MFVariantd1d1d3RCCoast": {
696696
"stratFilterCondition": "false"
697-
},
698-
"MFVarientd1d2d1RCCoast": {
697+
},
698+
"MFVariantd1d2d1RCCoast": {
699699
"stratFilterCondition": "false"
700700
},
701-
"MFVarientd1d2d2RCCoast": {
701+
"MFVariantd1d2d2RCCoast": {
702702
"stratFilterCondition": "false"
703703
},
704-
"MFVarientd2d1d1RCCoast": {
704+
"MFVariantd2d1d1RCCoast": {
705705
"stratFilterCondition": "false"
706706
},
707-
"MFVarientd2d1d2RCCoast": {
707+
"MFVariantd2d1d2RCCoast": {
708708
"stratFilterCondition": "false"
709709
},
710-
"MFVarientd2d1d3RCCoast": {
710+
"MFVariantd2d1d3RCCoast": {
711711
"stratFilterCondition": "false"
712712
},
713-
"MFVarientd2d2d1RCCoast": {
713+
"MFVariantd2d2d1RCCoast": {
714714
"stratFilterCondition": "false"
715715
},
716-
"MFVarientd2d2d3RCCoast": {
716+
"MFVariantd2d2d3RCCoast": {
717717
"stratFilterCondition": "false"
718-
}
718+
}
719719
}
720720
},
721721
"BaP": {

‎src/Theories/CTs/MF.ts‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class mfSim extends theoryClass<theory> {
139139
...new Array(4).fill(() => true)
140140
];
141141
// Original MFd3Coast END
142-
142+
143143
// Original MFdRCCoast
144144
const activeStratRC: conditionFunction[] = [
145145
() => (this.variables[0].cost < (this.goalBundleCost - l10(2)) || this.stopReset) && ((this.variables[0].level < this.lastC1) && (this.variables[0].cost +l10(9.9) <= Math.min(this.variables[1].cost, this.variables[3].cost, this.variables[4].cost))),
@@ -150,7 +150,7 @@ class mfSim extends theoryClass<theory> {
150150
...new Array(4).fill(() => true)
151151
];
152152
// Original MFdRCCoast END
153-
153+
154154
// Original MFd2RCCoast
155155
const activeStrat2RC: conditionFunction[] = [
156156
() => (this.variables[0].cost < (this.goalBundleCost - l10(4/3)) || this.stopReset) && ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
@@ -174,7 +174,7 @@ class mfSim extends theoryClass<theory> {
174174
];
175175
// Original MFd3RCCoast END
176176

177-
// MFVarientd1d1d2Coast
177+
// MFVariantd1d1d2Coast
178178
const activeStrat112: conditionFunction[] = [
179179
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost +l10(9.9) <= Math.min(this.variables[1].cost, this.variables[3].cost, this.variables[4].cost))),
180180
() => true,
@@ -183,9 +183,9 @@ class mfSim extends theoryClass<theory> {
183183
() => this.variables[4].cost + l10(dPower[this.milestones[2]]) < Math.min(this.variables[1].cost + l10(2), this.variables[3].cost),
184184
...new Array(4).fill(() => true)
185185
];
186-
// MFVarientd1d1d2Coast END
186+
// MFVariantd1d1d2Coast END
187187

188-
// MFVarientd1d1d3Coast
188+
// MFVariantd1d1d3Coast
189189
const activeStrat113: conditionFunction[] = [
190190
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost +l10(9.9) <= Math.min(this.variables[1].cost, this.variables[3].cost, this.variables[4].cost))),
191191
() => true,
@@ -194,9 +194,9 @@ class mfSim extends theoryClass<theory> {
194194
() => this.variables[4].cost < Math.min(this.variables[3].cost + l10(0.6), this.variables[1].cost + l10(0.75)),
195195
...new Array(4).fill(() => true)
196196
];
197-
// MFVarientd1d1d3Coast END
197+
// MFVariantd1d1d3Coast END
198198

199-
// MFVarientd1d2d1Coast
199+
// MFVariantd1d2d1Coast
200200
const activeStrat121: conditionFunction[] = [
201201
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost +l10(9.9) <= Math.min(this.variables[1].cost, this.variables[3].cost, this.variables[4].cost))),
202202
() => true,
@@ -205,9 +205,9 @@ class mfSim extends theoryClass<theory> {
205205
() => this.variables[4].cost < Math.min(this.variables[1].cost, this.variables[3].cost),
206206
...new Array(4).fill(() => true)
207207
];
208-
// MFVarientd1d2d1Coast END
208+
// MFVariantd1d2d1Coast END
209209

210-
// MFVarientd1d2d2Coast
210+
// MFVariantd1d2d2Coast
211211
const activeStrat122: conditionFunction[] = [
212212
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost +l10(9.9) <= Math.min(this.variables[1].cost, this.variables[3].cost, this.variables[4].cost))),
213213
() => true,
@@ -216,9 +216,9 @@ class mfSim extends theoryClass<theory> {
216216
() => this.variables[4].cost + l10(dPower[this.milestones[2]]) < Math.min(this.variables[1].cost + l10(2), this.variables[3].cost),
217217
...new Array(4).fill(() => true)
218218
];
219-
// MFVarientd1d2d2Coast END
219+
// MFVariantd1d2d2Coast END
220220

221-
// MFVarientd2d1d1Coast
221+
// MFVariantd2d1d1Coast
222222
const activeStrat211: conditionFunction[] = [
223223
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
224224
() => true,
@@ -227,9 +227,9 @@ class mfSim extends theoryClass<theory> {
227227
() => this.variables[4].cost < Math.min(this.variables[1].cost, this.variables[3].cost),
228228
...new Array(4).fill(() => true)
229229
];
230-
// MFVarientd2d1d1Coast END
230+
// MFVariantd2d1d1Coast END
231231

232-
// MFVarientd2d1d2Coast
232+
// MFVariantd2d1d2Coast
233233
const activeStrat212: conditionFunction[] = [
234234
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
235235
() => true,
@@ -238,9 +238,9 @@ class mfSim extends theoryClass<theory> {
238238
() => this.variables[4].cost + l10(dPower[this.milestones[2]]) < Math.min(this.variables[1].cost + l10(2), this.variables[3].cost),
239239
...new Array(4).fill(() => true)
240240
];
241-
// MFVarientd2d1d2Coast END
241+
// MFVariantd2d1d2Coast END
242242

243-
// MFVarientd2d1d3Coast
243+
// MFVariantd2d1d3Coast
244244
const activeStrat213: conditionFunction[] = [
245245
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
246246
() => true,
@@ -249,9 +249,9 @@ class mfSim extends theoryClass<theory> {
249249
() => this.variables[4].cost < Math.min(this.variables[3].cost + l10(0.6), this.variables[1].cost + l10(0.75)),
250250
...new Array(4).fill(() => true)
251251
];
252-
// MFVarientd2d1d3Coast END
252+
// MFVariantd2d1d3Coast END
253253

254-
// MFVarientd2d2d1Coast
254+
// MFVariantd2d2d1Coast
255255
const activeStrat221: conditionFunction[] = [
256256
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
257257
() => true,
@@ -260,9 +260,9 @@ class mfSim extends theoryClass<theory> {
260260
() => this.variables[4].cost < Math.min(this.variables[1].cost, this.variables[3].cost),
261261
...new Array(4).fill(() => true)
262262
];
263-
// MFVarientd2d2d1Coast END
263+
// MFVariantd2d2d1Coast END
264264

265-
// MFVarientd2d2d3RCCoast
265+
// MFVariantd2d2d3RCCoast
266266
const activeStrat223: conditionFunction[] = [
267267
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
268268
() => true,
@@ -271,9 +271,9 @@ class mfSim extends theoryClass<theory> {
271271
() => this.variables[4].cost < Math.min(this.variables[3].cost + l10(0.6), this.variables[1].cost + l10(0.75)),
272272
...new Array(4).fill(() => true)
273273
];
274-
// MFVarientd2d2d3Coast END
274+
// MFVariantd2d2d3Coast END
275275

276-
// MFVarientd1d1d2RCCoast
276+
// MFVariantd1d1d2RCCoast
277277
const activeStrat112RC: conditionFunction[] = [
278278
() => (this.variables[0].cost < (this.goalBundleCost - l10(5)) || this.stopReset) && ((this.variables[0].level < this.lastC1) && (this.variables[0].cost +l10(9.9) <= Math.min(this.variables[1].cost, this.variables[3].cost, this.variables[4].cost))),
279279
() => true,
@@ -282,9 +282,9 @@ class mfSim extends theoryClass<theory> {
282282
() => this.variables[4].cost + l10(dPower[this.milestones[2]]) < Math.min(this.variables[1].cost + l10(2), this.variables[3].cost),
283283
...new Array(4).fill(() => true)
284284
];
285-
// MFVarientd1d1d2RCCoast END
285+
// MFVariantd1d1d2RCCoast END
286286

287-
// MFVarientd1d1d3RCCoast
287+
// MFVariantd1d1d3RCCoast
288288
const activeStrat113RC: conditionFunction[] = [
289289
() => (this.variables[0].cost < (this.goalBundleCost - l10(5)) || this.stopReset) && ((this.variables[0].level < this.lastC1) && (this.variables[0].cost +l10(9.9) <= Math.min(this.variables[1].cost, this.variables[3].cost, this.variables[4].cost))),
290290
() => true,
@@ -293,9 +293,9 @@ class mfSim extends theoryClass<theory> {
293293
() => this.variables[4].cost < Math.min(this.variables[3].cost + l10(0.6), this.variables[1].cost + l10(0.75)),
294294
...new Array(4).fill(() => true)
295295
];
296-
// MFVarientd1d1d3RCCoast END
296+
// MFVariantd1d1d3RCCoast END
297297

298-
// MFVarientd1d2d1RCCoast
298+
// MFVariantd1d2d1RCCoast
299299
const activeStrat121RC: conditionFunction[] = [
300300
() => (this.variables[0].cost < (this.goalBundleCost - l10(2)) || this.stopReset) && ((this.variables[0].level < this.lastC1) && (this.variables[0].cost +l10(9.9) <= Math.min(this.variables[1].cost, this.variables[3].cost, this.variables[4].cost))),
301301
() => true,
@@ -304,9 +304,9 @@ class mfSim extends theoryClass<theory> {
304304
() => this.variables[4].cost < Math.min(this.variables[1].cost, this.variables[3].cost),
305305
...new Array(4).fill(() => true)
306306
];
307-
// MFVarientd1d2d1RCCoast END
307+
// MFVariantd1d2d1RCCoast END
308308

309-
// MFVarientd1d2d2RCCoast
309+
// MFVariantd1d2d2RCCoast
310310
const activeStrat122RC: conditionFunction[] = [
311311
() => (this.variables[0].cost < (this.goalBundleCost - l10(2)) || this.stopReset) && ((this.variables[0].level < this.lastC1) && (this.variables[0].cost +l10(9.9) <= Math.min(this.variables[1].cost, this.variables[3].cost, this.variables[4].cost))),
312312
() => true,
@@ -315,9 +315,9 @@ class mfSim extends theoryClass<theory> {
315315
() => this.variables[4].cost + l10(dPower[this.milestones[2]]) < Math.min(this.variables[1].cost + l10(2), this.variables[3].cost),
316316
...new Array(4).fill(() => true)
317317
];
318-
// MFVarientd1d2d2RCCoast END
318+
// MFVariantd1d2d2RCCoast END
319319

320-
// MFVarientd2d1d1RCCoast
320+
// MFVariantd2d1d1RCCoast
321321
const activeStrat211RC: conditionFunction[] = [
322322
() => (this.variables[0].cost < (this.goalBundleCost - l10(4/3)) || this.stopReset) && ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
323323
() => true,
@@ -326,9 +326,9 @@ class mfSim extends theoryClass<theory> {
326326
() => this.variables[4].cost < Math.min(this.variables[1].cost, this.variables[3].cost),
327327
...new Array(4).fill(() => true)
328328
];
329-
// MFVarientd2d1d1RCCoast END
329+
// MFVariantd2d1d1RCCoast END
330330

331-
// MFVarientd2d1d2RCCoast
331+
// MFVariantd2d1d2RCCoast
332332
const activeStrat212RC: conditionFunction[] = [
333333
() => (this.variables[0].cost < (this.goalBundleCost - l10(4/3)) || this.stopReset) && ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
334334
() => true,
@@ -337,9 +337,9 @@ class mfSim extends theoryClass<theory> {
337337
() => this.variables[4].cost + l10(dPower[this.milestones[2]]) < Math.min(this.variables[1].cost + l10(2), this.variables[3].cost),
338338
...new Array(4).fill(() => true)
339339
];
340-
// MFVarientd2d1d2RCCoast END
340+
// MFVariantd2d1d2RCCoast END
341341

342-
// MFVarientd2d1d3RCCoast
342+
// MFVariantd2d1d3RCCoast
343343
const activeStrat213RC: conditionFunction[] = [
344344
() => (this.variables[0].cost < (this.goalBundleCost - l10(4/3)) || this.stopReset) && ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
345345
() => true,
@@ -348,9 +348,9 @@ class mfSim extends theoryClass<theory> {
348348
() => this.variables[4].cost < Math.min(this.variables[3].cost + l10(0.6), this.variables[1].cost + l10(0.75)),
349349
...new Array(4).fill(() => true)
350350
];
351-
// MFVarientd2d1d3RCCoast END
351+
// MFVariantd2d1d3RCCoast END
352352

353-
// MFVarientd2d2d1RCCoast
353+
// MFVariantd2d2d1RCCoast
354354
const activeStrat221RC: conditionFunction[] = [
355355
() => (this.variables[0].cost < (this.goalBundleCost - l10(4/3)) || this.stopReset) && ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
356356
() => true,
@@ -359,9 +359,9 @@ class mfSim extends theoryClass<theory> {
359359
() => this.variables[4].cost < Math.min(this.variables[1].cost, this.variables[3].cost),
360360
...new Array(4).fill(() => true)
361361
];
362-
// MFVarientd2d2d1RCCoast END
362+
// MFVariantd2d2d1RCCoast END
363363

364-
// MFVarientd2d2d3RCCoast
364+
// MFVariantd2d2d3RCCoast
365365
const activeStrat223RC: conditionFunction[] = [
366366
() => (this.variables[0].cost < (this.goalBundleCost - l10(4/3)) || this.stopReset) && ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
367367
() => true,
@@ -370,7 +370,7 @@ class mfSim extends theoryClass<theory> {
370370
() => this.variables[4].cost < Math.min(this.variables[3].cost + l10(0.6), this.variables[1].cost + l10(0.75)),
371371
...new Array(4).fill(() => true)
372372
];
373-
// MFVarientd2d2d3RCCoast END
373+
// MFVariantd2d2d3RCCoast END
374374

375375
const conditions: Record<stratType[theory], conditionFunction[]> = {
376376
MF: idleStrat,
@@ -386,24 +386,24 @@ class mfSim extends theoryClass<theory> {
386386
MFdRCCoast: activeStratRC,
387387
MFd2RCCoast: activeStrat2RC,
388388
MFd3RCCoast: activeStrat3RC,
389-
MFVarientd1d1d2Coast: activeStrat112,
390-
MFVarientd1d1d3Coast: activeStrat113,
391-
MFVarientd1d2d1Coast: activeStrat121,
392-
MFVarientd1d2d2Coast: activeStrat122,
393-
MFVarientd2d1d1Coast: activeStrat211,
394-
MFVarientd2d1d2Coast: activeStrat212,
395-
MFVarientd2d1d3Coast: activeStrat213,
396-
MFVarientd2d2d1Coast: activeStrat221,
397-
MFVarientd2d2d3Coast: activeStrat223,
398-
MFVarientd1d1d2RCCoast: activeStrat112RC,
399-
MFVarientd1d1d3RCCoast: activeStrat113RC,
400-
MFVarientd1d2d1RCCoast: activeStrat121RC,
401-
MFVarientd1d2d2RCCoast: activeStrat122RC,
402-
MFVarientd2d1d1RCCoast: activeStrat211RC,
403-
MFVarientd2d1d2RCCoast: activeStrat212RC,
404-
MFVarientd2d1d3RCCoast: activeStrat213RC,
405-
MFVarientd2d2d1RCCoast: activeStrat221RC,
406-
MFVarientd2d2d3RCCoast: activeStrat223RC,
389+
MFVariantd1d1d2Coast: activeStrat112,
390+
MFVariantd1d1d3Coast: activeStrat113,
391+
MFVariantd1d2d1Coast: activeStrat121,
392+
MFVariantd1d2d2Coast: activeStrat122,
393+
MFVariantd2d1d1Coast: activeStrat211,
394+
MFVariantd2d1d2Coast: activeStrat212,
395+
MFVariantd2d1d3Coast: activeStrat213,
396+
MFVariantd2d2d1Coast: activeStrat221,
397+
MFVariantd2d2d3Coast: activeStrat223,
398+
MFVariantd1d1d2RCCoast: activeStrat112RC,
399+
MFVariantd1d1d3RCCoast: activeStrat113RC,
400+
MFVariantd1d2d1RCCoast: activeStrat121RC,
401+
MFVariantd1d2d2RCCoast: activeStrat122RC,
402+
MFVariantd2d1d1RCCoast: activeStrat211RC,
403+
MFVariantd2d1d2RCCoast: activeStrat212RC,
404+
MFVariantd2d1d3RCCoast: activeStrat213RC,
405+
MFVariantd2d2d1RCCoast: activeStrat221RC,
406+
MFVariantd2d2d3RCCoast: activeStrat223RC,
407407
};
408408
return conditions[this.strat];
409409
}

0 commit comments

Comments
 (0)