diff --git a/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw b/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw index 006df17db6a958b2373143cc019a2872f4bee62d..745aa833e236ce626bcaf4251f2b4f80793f6bfe 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 108553136987b2c29e178a9937a958a17e9d83fb..19a9987a726c9f844b9c79470971a7cfc6e034d9 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 606ec83d74af1630fc4e316c40d2c4658101a03e..2c4f5ed6e4eb59bbea9b151a48d39ebe1871c9ac 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 fa7dd4207470e9411c64ba36ed11c25459b5a62f..72446a727758930ef7d86c76a43b6074d62b9694 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>>