From aa698fb56e5ae8eb468c98ad157685ba853eacb6 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Thu, 27 Sep 2018 01:12:16 -0400
Subject: [PATCH] More fixes to custom code cheats
---
src/cheats/PCCheatMenuCheatDatatypeCleanup.tw | 10 +++++++---
src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw | 10 +++++++---
src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw | 10 +++++++---
src/uncategorized/storyCaption.tw | 10 +++++++---
4 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw b/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw
index 006df17db6a..745aa833e23 100644
--- a/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw
+++ b/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw
@@ -7,9 +7,13 @@
<<goto "Manage Personal Affairs">>
<</if>>
-<<set $customEvalCode = "(" + $customEvalCode + ")">>
-<<if typeof eval($customEvalCode) === "function">>
- <<run eval($customEvalCode)($tempSlave)>>
+<<if $customEvalCode>>
+ <<if $customEvalCode.charAt(0) != "(">>
+ <<set $customEvalCode = "(" + $customEvalCode + ")">>
+ <</if>>
+ <<if typeof eval($customEvalCode) === "function">>
+ <<run (eval($customEvalCode))($tempSlave)>>
+ <</if>>
<</if>>
<<unset $customEvalCode>>
diff --git a/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw b/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw
index 10855313698..19a9987a726 100644
--- a/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw
+++ b/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw
@@ -2,9 +2,13 @@
<<set $nextButton = "Continue", $nextLink = "Manage Arcology">>
-<<set $customEvalCode = "(" + $customEvalCode + ")">>
-<<if typeof eval($customEvalCode) === "function">>
- <<run eval($customEvalCode)($arcologies[0])>>
+<<if $customEvalCode>>
+ <<if $customEvalCode.charAt(0) != "(">>
+ <<set $customEvalCode = "(" + $customEvalCode + ")">>
+ <</if>>
+ <<if typeof eval($customEvalCode) === "function">>
+ <<run (eval($customEvalCode))($arcologies[0])>>
+ <</if>>
<</if>>
<<unset $customEvalCode>>
diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
index 606ec83d74a..2c4f5ed6e4e 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
@@ -7,9 +7,13 @@
<<goto "Slave Interact">>
<</if>>
-<<set $customEvalCode = "(" + $customEvalCode + ")">>
-<<if typeof eval($customEvalCode) === "function">>
- <<run eval($customEvalCode)($tempSlave)>>
+<<if $customEvalCode>>
+ <<if $customEvalCode.charAt(0) != "(">>
+ <<set $customEvalCode = "(" + $customEvalCode + ")">>
+ <</if>>
+ <<if typeof eval($customEvalCode) === "function">>
+ <<run (eval($customEvalCode))($tempSlave)>>
+ <</if>>
<</if>>
<<unset $customEvalCode>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index fa7dd420747..72446a72775 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -653,9 +653,13 @@
<br>
<<textarea "_customEvalCode" "">>
<<link "Run Custom Function">>
- <<set _customEvalCode = "(" + _customEvalCode + ")">>
- <<if typeof eval(_customEvalCode) === "function">>
- <<run eval(_customEvalCode)()>>
+ <<if _customEvalCode>>
+ <<if _customEvalCode.charAt(0) != "(">>
+ <<set _customEvalCode = "(" + _customEvalCode + ")">>
+ <</if>>
+ <<if typeof eval(_customEvalCode) === "function">>
+ <<run (eval(_customEvalCode))()>>
+ <</if>>
<</if>>
<<goto _Pass>>
<</link>>
--
GitLab