splitting locations correctly, and changed {Processing} to not have parens

glife.qproj

@@ -7,14 +7,14 @@
     <Location name="begin1"/>
     <Location name="onobjsel"/>
     <Location name="scale.table"/>
-    <Folder name="System">
+    <Folder name="Техлоки - System">
       <Location name="counter"/>
       <Location name="loadg"/>
       <Location name="LOCA"/>
       <Location name="saveg"/>
       <Location name="inputProcessing"/>
     </Folder>
-    <Folder name="Stats">
+    <Folder name="Статы - Stats">
       <Location name="cikl"/>
       <Location name="body"/>
       <Location name="dina"/>
@@ -35,10 +35,10 @@
       <Location name="kid"/>
       <Location name="subkid"/>
     </Folder>
-    <Folder name="Alternative">
+    <Folder name="Альтернатива - Alternative">
       <Location name="alterStart"/>
     </Folder>
-    <Folder name="Quests">
+    <Folder name="Квесты - Quests">
       <Location name="event"/>
       <Location name="frot"/>
       <Location name="kisameQW"/>
@@ -49,14 +49,14 @@
       <Location name="cafe3"/>
       <Location name="ParkKafe"/>
     </Folder>
-    <Folder name="Prehistory">
+    <Folder name="Предистория - Prehistory">
       <Location name="roomPRE"/>
       <Location name="roadPRE"/>
       <Location name="otelPRE"/>
       <Location name="karinPRE"/>
       <Location name="sleepPRE"/>
     </Folder>
-    <Folder name="Combat">
+    <Folder name="Боевка - Combat">
       <Location name="fight"/>
       <Location name="strelba"/>
       <Location name="before"/>
@@ -83,7 +83,7 @@
       <Location name="enderKik"/>
       <Location name="razrKik"/>
     </Folder>
-    <Folder name="Home Street Locations">
+    <Folder name="Локации - Home Street / Locations">
       <Location name="bobka"/>
       <Location name="clener"/>
       <Location name="dima"/>
@@ -116,7 +116,7 @@
       <Location name="street"/>
       <Location name="trashplace"/>
     </Folder>
-    <Folder name="Trade Representative">
+    <Folder name="Торговый Представитель - Trade Representative">
       <Location name="torgpred"/>
       <Location name="StasQW"/>
       <Location name="StasSex"/>
@@ -168,11 +168,11 @@
       <Location name="worksalon"/>
       <Location name="zal"/>
     </Folder>
-    <Folder name="Wardrobe">
+    <Folder name="Шкаф - Wardrobe">
       <Location name="loker"/>
       <Location name="loker2"/>
     </Folder>
-    <Folder name="Apartment">
+    <Folder name="Квартира - Apartment">
       <Location name="bedr"/>
       <Location name="sitr"/>
       <Location name="vanr"/>
@@ -180,7 +180,7 @@
       <Location name="korr"/>
       <Location name="housecall"/>
     </Folder>
-    <Folder name="Parent's Apartment">
+    <Folder name="Квартира родителей - Parent's Apartment">
       <Location name="bedrPar"/>
       <Location name="bedrPar2"/>
       <Location name="sitrPar"/>
@@ -209,12 +209,12 @@
       <Location name="Sgrup"/>
       <Location name="SgrupDisco"/>
     </Folder>
-    <Folder name="Generator">
+    <Folder name="Генератор - Generator">
       <Location name="annafrends"/>
       <Location name="annafrends2"/>
       <Location name="annafrendtoilet"/>
     </Folder>
-    <Folder name="Town">
+    <Folder name="Городок - Town">
       <Location name="AlbFatherQW"/>
       <Location name="albinaEv"/>
       <Location name="artemEv"/>
@@ -256,14 +256,14 @@
       <Location name="volley"/>
       <Location name="Voltrener"/>
     </Folder>
-    <Folder name="pets">
+    <Folder name="питомцы - pets">
       <Location name="soba"/>
       <Location name="krol"/>
       <Location name="popu"/>
       <Location name="qwlocdog"/>
       <Location name="RimmaSexQW"/>
     </Folder>
-    <Folder name="Furniture">
+    <Folder name="Мебель - Furniture">
       <Location name="bed"/>
       <Location name="bed1"/>
       <Location name="bed2"/>
@@ -277,7 +277,7 @@
       <Location name="TV"/>
       <Location name="vann"/>
     </Folder>
-    <Folder name="Encounter Generator">
+    <Folder name="ГенераторВстреч - Encounter Generator">
       <Location name="meet"/>
       <Location name="restoranM"/>
       <Location name="kafeM"/>
@@ -290,7 +290,7 @@
       <Location name="love"/>
       <Location name="brosok"/>
     </Folder>
-    <Folder name="City Center">
+    <Folder name="Центр - City Center">
       <Location name="down"/>
       <Location name="agentned"/>
       <Location name="bank"/>
@@ -327,7 +327,7 @@
       <Location name="zoomagazine"/>
       <Location name="budgetclothes"/>
     </Folder>
-    <Folder name="City North">
+    <Folder name="Север - City North">
       <Location name="Nord"/>
       <Location name="Terminal"/>
       <Location name="ivanRoom"/>
@@ -346,7 +346,7 @@
       <Location name="obekt2"/>
       <Location name="dangeon"/>
     </Folder>
-    <Folder name="North Road">
+    <Folder name="Дорога - North Road">
       <Location name="dachain"/>
       <Location name="dachamy"/>
       <Location name="dachaogr"/>
@@ -358,7 +358,7 @@
       <Location name="road"/>
       <Location name="youplace"/>
     </Folder>
-    <Folder name="Mansion">
+    <Folder name="Особняк - Mansion">
       <Location name="ybass"/>
       <Location name="yban"/>
       <Location name="ymans"/>
@@ -379,7 +379,7 @@
       <Location name="pornstudio"/>
       <Location name="pf"/>
     </Folder>
-    <Folder name="boys">
+    <Folder name="парняги - boys">
       <Location name="BDman"/>
       <Location name="BDsex"/>
       <Location name="boy"/>
@@ -388,15 +388,15 @@
       <Location name="svi"/>
       <Location name="svidan"/>
     </Folder>
-    <Folder name="University">
+    <Folder name="Универ - University">
       <Location name="Alphabet"/>
       <Location name="party"/>
     </Folder>
-    <Folder name="Market">
+    <Folder name="Выдрать отсюда плюхи">
       <Location name="Market"/>
       <Location name="club2"/>
     </Folder>
-    <Folder name="Game 1">
+    <Folder name="Игра - Game 1">
       <Location name="KGstart"/>
       <Location name="KGOLgame"/>
       <Location name="KGOLenemy"/>
@@ -404,7 +404,7 @@
       <Location name="KGOLfight"/>
       <Location name="KGOLexpa"/>
     </Folder>
-    <Folder name="Game 2">
+    <Folder name="Игра2 - Game 2">
       <Location name="KGDstart"/>
       <Location name="KGDgame"/>
       <Location name="KGDexp"/>
@@ -412,20 +412,20 @@
       <Location name="KGDfight"/>
       <Location name="KGDparty"/>
     </Folder>
-    <Folder name="Game 3">
+    <Folder name="Игра3 - Game 3">
       <Location name="KGZstart"/>
       <Location name="KGZgame"/>
       <Location name="KGZdyn"/>
       <Location name="KGZfight"/>
     </Folder>
-    <Folder name="Game 4">
+    <Folder name="Игра4 - Game 4">
       <Location name="FSstart"/>
       <Location name="FSgame"/>
       <Location name="FSstat"/>
       <Location name="FSfight"/>
       <Location name="FSroom"/>
     </Folder>
-    <Folder name="Youth Shop">
+    <Folder name="КисКиска - Youth Shop">
       <Location name="young_shop"/>
       <Location name="sell_young_clothes"/>
       <Location name="andrey"/>
@@ -433,7 +433,7 @@
       <Location name="goplust"/>
       <Location name="gopwho"/>
     </Folder>
-    <Folder name="Engine">
+    <Folder name="Машины - Engine">
       <Location name="avtonorm"/>
       <Location name="avt"/>
       <Location name="avb"/>
@@ -444,7 +444,7 @@
       <Location name="carF"/>
       <Location name="carF1"/>
     </Folder>
-    <Folder name="Quest">
+    <Folder name="Квест - Quest">
       <Location name="qwBarPolet"/>
       <Location name="qwbereg"/>
       <Location name="qwbereg2"/>
@@ -459,13 +459,13 @@
       <Location name="qwmeet3"/>
       <Location name="qwpaluba"/>
     </Folder>
-    <Folder name="Prostitution">
+    <Folder name="Проституция - Prostitution">
       <Location name="AnalPR"/>
       <Location name="blowPR"/>
       <Location name="NormPR"/>
       <Location name="Prostitute"/>
     </Folder>
-    <Folder name="Menu">
+    <Folder name="Меню - Menu">
       <Location name="Menu.Info"/>
       <Location name="Menu.Create"/>
       <Location name="Menu.Add"/>
@@ -476,14 +476,14 @@
       <Location name="Menu.Chosen"/>
       <Location name="Menu.Time"/>
       <Location name="Menu.Destroy"/>
-      <Location name="Menu.{Processing}"/>
+      <Location name="Menu.Processing"/>
     </Folder>
-    <Folder name="Casino">
+    <Folder name="Казино - Casino">
       <Location name="casino"/>
       <Location name="mqroom"/>
-      <Location name="avt1"/>
-      <Location name="avt2"/>
-      <Location name="avt3"/>
+      <Location name="authors1"/>
+      <Location name="authors2"/>
+      <Location name="authors3"/>
       <Location name="amrul"/>
       <Location name="bar"/>
       <Location name="bldzh"/>
@@ -492,16 +492,16 @@
       <Location name="igrkart2"/>
       <Location name="kazvar"/>
       <Location name="croupier"/>
-      <Location name="krupe1"/>
-      <Location name="krupe2"/>
+      <Location name="croupier1"/>
+      <Location name="croupier2"/>
       <Location name="elevator"/>
-      <Location name="Mariya1"/>
+      <Location name="Maria1"/>
       <Location name="headwaiter"/>
       <Location name="number1"/>
       <Location name="number2"/>
       <Location name="number3"/>
       <Location name="number4"/>
-      <Location name="RESULTS"/>
+      <Location name="results"/>
       <Location name="restaurant"/>
       <Location name="roulette"/>
       <Location name="rate"/>
@@ -511,7 +511,7 @@
       <Location name="cards"/>
       <Location name="Hall"/>
     </Folder>
-    <Folder name="Game Menu">
+    <Folder name="Игровое Меню - Game Menu">
       <Location name="$menu_skills"/>
       <Location name="$menu_descrip"/>
       <Location name="$menu_statistika"/>
@@ -533,7 +533,7 @@
       <Location name="$menu_options"/>
       <Location name="menu_options"/>
     </Folder>
-    <Folder name="Misc">
+    <Folder name="Разное - Misc">
       <Location name="beg"/>
       <Location name="beg1"/>
       <Location name="dinam"/>

locations/Menu.Add

@@ -17,7 +17,7 @@ if $ARGS[2] <> '':$ARGS[2] = ':' + replace($ARGS[2], '''', '''''')
 if $ARGS[3] <> '':$ARGS[3] = replace($ARGS[3], '''', '''''')
 !!----------
 dynamic "
-	$<<$ARGS[0]>>[] = '<<$ARGS[1]>>Menu.{Processing}<<$ARGS[2]>>'
+	$<<$ARGS[0]>>[] = '<<$ARGS[1]>>Menu.Processing<<$ARGS[2]>>'
 	$<<$ARGS[0]>>_parameters[str(arrsize('<<$ARGS[0]>>'))+'_Z'] = '<<$ARGS[1]>>'
 	$<<$ARGS[0]>>_parameters[str(arrsize('<<$ARGS[0]>>'))+'_F'] = '<<$ARGS[3]>>'
 "

locations/_menu_addoldmenu

@@ -0,0 +1,4 @@
+# $menu_addoldmenu
+	dynamic $objoldmenu
+--- $menu_addoldmenu ---------------------------------
+

locations/_menu_automatica

@@ -0,0 +1,5 @@
+# $menu_automatica
+	gs 'automatics'
+	dynamic $automatica
+--- $menu_automatica ---------------------------------
+

locations/_menu_avariya

@@ -0,0 +1,4 @@
+# $menu_avariya
+	dynamic $objavariya
+--- $menu_avariya ---------------------------------
+

locations/_menu_bloknot

@@ -0,0 +1,4 @@
+# $menu_bloknot
+	dynamic $objbloknot
+--- $menu_bloknot ---------------------------------
+

locations/_menu_body

@@ -0,0 +1,5 @@
+# $menu_body
+dynamic $objbody
+
+--- $menu_body ---------------------------------
+

locations/_menu_clothes

@@ -0,0 +1,5 @@
+# $menu_clothes
+dynamic $objclothes
+
+--- $menu_clothes ---------------------------------
+

locations/_menu_descrip

@@ -0,0 +1,5 @@
+# $menu_descrip
+dynamic $objdescrip
+
+--- $menu_descrip ---------------------------------
+

locations/_menu_dex_cheat

@@ -0,0 +1,4 @@
+# $menu_dex_cheat
+dynamic $dex_cheat
+--- $menu_dex_cheat ---------------------------------
+

locations/_menu_face

@@ -0,0 +1,5 @@
+# $menu_face
+dynamic $objface
+
+--- $menu_face ---------------------------------
+

locations/_menu_helper

@@ -0,0 +1,4 @@
+# $menu_helper
+	gs 'menu_helper'
+	dynamic $helper_start
+--- $menu_helper ---------------------------------

locations/_menu_magic

@@ -0,0 +1,5 @@
+# $menu_magic
+dynamic $objmagic
+
+--- $menu_magic ---------------------------------
+

locations/_menu_mobila

@@ -0,0 +1,5 @@
+# $menu_mobila
+dynamic $objmobila
+
+--- $menu_mobila ---------------------------------
+

locations/_menu_obnovit

@@ -0,0 +1,5 @@
+# $menu_obnovit
+	gs 'stat'
+
+--- $menu_obnovit ---------------------------------
+

locations/_menu_options

@@ -0,0 +1,4 @@
+# $menu_options
+gs 'menu_options'
+dynamic $options_start
+--- $menu_options ---------------------------------

locations/_menu_pirs

@@ -0,0 +1,5 @@
+# $menu_pirs
+dynamic $objpirsing
+
+--- $menu_pirs ---------------------------------
+

locations/_menu_skills

@@ -0,0 +1,5 @@
+# $menu_skills
+dynamic $objskills
+
+--- $menu_skills ---------------------------------
+

locations/_menu_statistika

@@ -0,0 +1,5 @@
+# $menu_statistika
+dynamic $objstatistika
+
+--- $menu_statistika ---------------------------------
+

locations/_menu_tattoos

@@ -0,0 +1,5 @@
+# $menu_tattoos
+dynamic $objtattoos
+
+--- $menu_tattoos ---------------------------------
+

txtsplit.py

@@ -26,9 +26,9 @@ counter = 1
 
 oname = None
 firstline = ifile.readline().replace(u'\ufeff','')
-match = re.search(ur'^#\s\$?([_.\w]+)$', firstline)
+match = re.search(ur'^#\s(\$?[_.\w]+)$', firstline)
 if match:
-    oname = os.path.join(odir, match.group(1))
+    oname = os.path.join(odir, match.group(1).replace("$","_") )
     counter += 1
 assert oname, "file is in the wrong format, must start with a location name"
 
@@ -36,10 +36,10 @@ ofile = io.open(oname, 'w', encoding='utf-8')
 ofile.write(firstline)
 
 for line in ifile:
-    match = re.search(ur'^#\s\$?([_.\w]+)$', line)
+    match = re.search(ur'^#\s(\$?[_.\w]+)$', line)
     if match:
         ofile.close()
-        oname = os.path.join(odir, match.group(1))
+        oname = os.path.join(odir, match.group(1).replace("$","_") )
         counter += 1
         ofile = io.open(oname, 'w', encoding='utf-8')
     ofile.write(line)