diff --git a/devTools/Script to convert SC to JS/SC to JS 1.py b/devTools/Script to convert SC to JS/SC to JS 1.py index c571e01920820287b5c97d8182763616c29ad137..baa14313d8526833de3a6ed5f6cfe410f296669c 100644 --- a/devTools/Script to convert SC to JS/SC to JS 1.py +++ b/devTools/Script to convert SC to JS/SC to JS 1.py @@ -56,7 +56,6 @@ editor.rereplace(r"%/", r"*/") # JS editor.rereplace(r" == ", r" === ") editor.rereplace(r" != ", r" !== ") -editor.rereplace(r"_S\.", r"S.") #fix pronouns editor.rereplace(r"V\.Hers", r"\${Hers}") @@ -99,9 +98,12 @@ editor.rereplace(r"_hers2", r"\${_hers2}") #look for variables embedded in literals editor.rereplace(r"( r.push[^;]*?)(V\.[^ ,<'`]*)", r"\1${\2}") editor.rereplace(r"( r.push[^;]*?)(slave\.[^ ,<'`]*)", r"\1${\2}") -editor.rereplace(r"( r.push[^;]*?)(S\.[^ ,<'`]*)", r"\1${\2}") +editor.rereplace(r"( r.push[^;]*?)(_S\.[^ ,<'`]*)", r"\1${\2}") editor.rereplace(r"( r.push[^;]*?)( _[^ ,<'`]*)", r"\1${ \2}") +#Delay fixing _S to simplify detection if it's embedded. +editor.rereplace(r"_S\.", r"S.") + #Cleanup editor.rereplace(r"\${He}adGirl", r"V.HeadGirl") editor.rereplace(r"\.}", r"}.")