From eb378f558f3a54507d7195fc1113bccc0ca5c531 Mon Sep 17 00:00:00 2001 From: kajfik Date: Tue, 13 Aug 2024 00:32:19 +0200 Subject: [PATCH] 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> --- src/components/tabs/automator/AutomatorBlocks.vue | 2 +- src/core/automator/automator-codemirror.js | 1 + src/core/automator/lexer.js | 4 ++++ src/core/secret-formula/reality/automator.js | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/tabs/automator/AutomatorBlocks.vue b/src/components/tabs/automator/AutomatorBlocks.vue index 5a4d6d0f9..1aa7ea713 100644 --- a/src/components/tabs/automator/AutomatorBlocks.vue +++ b/src/components/tabs/automator/AutomatorBlocks.vue @@ -33,7 +33,7 @@ const AUTOMATOR_BLOCKS_COMPARISON_OPERATORS = ["<", ">", ">=", "<="]; const AUTOMATOR_BLOCKS_COMPARISON_CURRENCIES = [ "AM", "IP", "EP", "RM", "INFINITIES", "BANKED INFINITIES", "ETERNITIES", "REALITIES", "PENDING IP", "PENDING EP", "PENDING TP", "PENDING RM", "PENDING GLYPH LEVEL", - "DT", "TP", "RG", "REP", "TT", "TOTAL TT", "TOTAL COMPLETIONS", "PENDING COMPLETIONS", + "DT", "TP", "RG", "REP", "TT", "TOTAL TT", "SPENT TT", "TOTAL COMPLETIONS", "PENDING COMPLETIONS", "EC1 COMPLETIONS", "EC2 COMPLETIONS", "EC3 COMPLETIONS", "EC4 COMPLETIONS", "EC5 COMPLETIONS", "EC6 COMPLETIONS", "EC7 COMPLETIONS", "EC8 COMPLETIONS", "EC9 COMPLETIONS", "EC10 COMPLETIONS", "EC11 COMPLETIONS", "EC12 COMPLETIONS", diff --git a/src/core/automator/automator-codemirror.js b/src/core/automator/automator-codemirror.js index 4b460ad7c..d0b2f357f 100644 --- a/src/core/automator/automator-codemirror.js +++ b/src/core/automator/automator-codemirror.js @@ -158,6 +158,7 @@ CodeMirror.defineSimpleMode("automato", { { regex: /x[\t ]+highest(\s|$)/ui, token: "variable-2" }, { regex: /pending[\t ]+(completions|ip|ep|tp|rm|glyph[\t ]+level)(\s|$)/ui, token: "variable-2" }, { regex: /total[\t ]+(completions|tt|space theorems)(\s|$)/ui, token: "variable-2" }, + { regex: /spent[\t ]+tt(\s|$)/ui, token: "variable-2" }, { regex: /filter[ \t]+score/ui, token: "variable-2" }, { regex: /ec(1[0-2]|[1-9])[\t ]+completions(\s|$)/ui, token: "variable-2" }, { regex: /(am|ip|ep|all)(\s|$)/ui, token: "variable-2" }, diff --git a/src/core/automator/lexer.js b/src/core/automator/lexer.js index e27db426f..8a932c5c2 100644 --- a/src/core/automator/lexer.js +++ b/src/core/automator/lexer.js @@ -159,6 +159,10 @@ createInCategory(AutomatorCurrency, "TotalTT", /total[ \t]+tt/i, { $autocomplete: "total TT", $getter: () => player.timestudy.theorem.plus(TimeTheorems.calculateTimeStudiesCost()), }); +createInCategory(AutomatorCurrency, "SpentTT", /spent[ \t]+tt/i, { + $autocomplete: "spent TT", + $getter: () => new Decimal(GameCache.currentStudyTree.value.spentTheorems[0]), +}); createInCategory(AutomatorCurrency, "TotalCompletions", /total[ \t]+completions/i, { $autocomplete: "total completions", diff --git a/src/core/secret-formula/reality/automator.js b/src/core/secret-formula/reality/automator.js index c5228fcc4..18648abbd 100644 --- a/src/core/secret-formula/reality/automator.js +++ b/src/core/secret-formula/reality/automator.js @@ -538,6 +538,7 @@ export const automator = { rep - Current Replicanti amount
tt - Current Time Theorem amount
total tt - TOTAL Time Theorems, includes all forms of generated TT and any spent on Studies
+ spent tt - Time Theorems currently spent on all Time Studies
total completions - Total completions of all Eternity Challenges
pending completions - Total completions of current EC at Eternity
ecX completions - Amount of EC completions for a certain EC (eg. "ec6 completions")