Merge branch 'fix-order-in-python' into 'pregmod-master'

fix order in python

See merge request pregmodfan/fc-pregmod!7651

devTools/Script to convert SC to JS/SC to JS 1.py

@@ -96,13 +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}")
 editor.rereplace(r"(	r.push[^;]*?)(S\.[^ ,<'`]*)", r"\1${\2}")
 editor.rereplace(r"(	r.push[^;]*?)( _[^ ,<'`]*)", r"\1${ \2}")
+
+#Cleanup
+editor.rereplace(r"\${He}adGirl", r"V.HeadGirl")
+editor.rereplace(r"\${slave}", r"slave")
+editor.rereplace(r"\${slave\.}", r"slave.")
\ No newline at end of file