Skip to content

Commit eb378f5

Browse files
kajfikHirame1
andauthored
Add "spent tt" currency to automator (#3455)
* Added "spent tt" currency to automator * Add syntax highlight for new keyword --------- Co-authored-by: Hirame1 <56225774+Hirame1@users.noreply.github.com>
1 parent aeaa7a3 commit eb378f5

4 files changed

Lines changed: 7 additions & 1 deletion

File tree

src/components/tabs/automator/AutomatorBlocks.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const AUTOMATOR_BLOCKS_COMPARISON_OPERATORS = ["<", ">", ">=", "<="];
3333
const AUTOMATOR_BLOCKS_COMPARISON_CURRENCIES = [
3434
"AM", "IP", "EP", "RM", "INFINITIES", "BANKED INFINITIES", "ETERNITIES", "REALITIES",
3535
"PENDING IP", "PENDING EP", "PENDING TP", "PENDING RM", "PENDING GLYPH LEVEL",
36-
"DT", "TP", "RG", "REP", "TT", "TOTAL TT", "TOTAL COMPLETIONS", "PENDING COMPLETIONS",
36+
"DT", "TP", "RG", "REP", "TT", "TOTAL TT", "SPENT TT", "TOTAL COMPLETIONS", "PENDING COMPLETIONS",
3737
"EC1 COMPLETIONS", "EC2 COMPLETIONS", "EC3 COMPLETIONS", "EC4 COMPLETIONS",
3838
"EC5 COMPLETIONS", "EC6 COMPLETIONS", "EC7 COMPLETIONS", "EC8 COMPLETIONS",
3939
"EC9 COMPLETIONS", "EC10 COMPLETIONS", "EC11 COMPLETIONS", "EC12 COMPLETIONS",

src/core/automator/automator-codemirror.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ CodeMirror.defineSimpleMode("automato", {
158158
{ regex: /x[\t ]+highest(\s|$)/ui, token: "variable-2" },
159159
{ regex: /pending[\t ]+(completions|ip|ep|tp|rm|glyph[\t ]+level)(\s|$)/ui, token: "variable-2" },
160160
{ regex: /total[\t ]+(completions|tt|space theorems)(\s|$)/ui, token: "variable-2" },
161+
{ regex: /spent[\t ]+tt(\s|$)/ui, token: "variable-2" },
161162
{ regex: /filter[ \t]+score/ui, token: "variable-2" },
162163
{ regex: /ec(1[0-2]|[1-9])[\t ]+completions(\s|$)/ui, token: "variable-2" },
163164
{ regex: /(am|ip|ep|all)(\s|$)/ui, token: "variable-2" },

src/core/automator/lexer.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,10 @@ createInCategory(AutomatorCurrency, "TotalTT", /total[ \t]+tt/i, {
159159
$autocomplete: "total TT",
160160
$getter: () => player.timestudy.theorem.plus(TimeTheorems.calculateTimeStudiesCost()),
161161
});
162+
createInCategory(AutomatorCurrency, "SpentTT", /spent[ \t]+tt/i, {
163+
$autocomplete: "spent TT",
164+
$getter: () => new Decimal(GameCache.currentStudyTree.value.spentTheorems[0]),
165+
});
162166

163167
createInCategory(AutomatorCurrency, "TotalCompletions", /total[ \t]+completions/i, {
164168
$autocomplete: "total completions",

src/core/secret-formula/reality/automator.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,7 @@ export const automator = {
538538
<b>rep</b> - Current Replicanti amount <br>
539539
<b>tt</b> - Current Time Theorem amount <br>
540540
<b>total tt</b> - TOTAL Time Theorems, includes all forms of generated TT and any spent on Studies <br>
541+
<b>spent tt</b> - Time Theorems currently spent on all Time Studies <br>
541542
<b>total completions</b> - Total completions of all Eternity Challenges <br>
542543
<b>pending completions</b> - Total completions of current EC at Eternity <br>
543544
<b>ec<u>X</u> completions</b> - Amount of EC completions for a certain EC (eg. "ec6 completions")<br>

0 commit comments

Comments
 (0)