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 383023bf7467df999a2ec571dbd4ef98249f16c0..1375e4362062eb01adcd06f84e5fcfcd55c44d7f 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 @@ -25,6 +25,7 @@ editor.rereplace(r"<<if (.*?)>>", r"if \1 {") editor.rereplace(r"<<elseif (.*?)>>", r"} else if \(\1\) {") editor.rereplace(r"<<else>>", r"} else {") editor.rereplace(r"<</if>>", r"}") + #fix paren editor.rereplace(r"([ \n])if ([^\(].*) {", r"\1if \(\2\) {") editor.rereplace(r"([ \n])else if ([^\(].*) {", r"\1 else if \(\2\) {") @@ -32,7 +33,10 @@ editor.rereplace(r"([ \n])else if ([^\(].*) {", r"\1 else if \(\2\) {") # run can happen directly editor.rereplace(r"<<run (.*?)>>", r"\1;") -# Set: otherwise we are likely modifying the value +# Clean up unset +editor.rereplace(r"<<unset (.*)>>", r"delete \1;") + +# Set editor.rereplace(r"<<set (.*?)>>", r"$1;") #Switch @@ -52,6 +56,7 @@ 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}") @@ -91,6 +96,13 @@ editor.rereplace(r"_woman2", r"\${_woman2}") editor.rereplace(r"_Hers2", r"\${_Hers2}") editor.rereplace(r"_hers2", r"\${_hers2}") +#Headgirl gets fucked up in particular +editor.rereplace(r"\${He}adGirl", r"V.HeadGirl") +editor.rereplace(r"\${slave}", r"slave") +editor.rereplace(r"\${slave\.}", r"slave.") + #look for variables embedded in literals -editor.rereplace(r"( r.push[^;$]*?)(V\.[^ ,<'`]*)", r"\1${\2}") -editor.rereplace(r"( r.push[^;$]*?)(slave\.[^ ,<'`]*)", r"\1${\2}") \ No newline at end of file +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[^;]*?)( _[^ ,<'`]*)", r"\1${ \2}")