mjsmagalhaes compliance

Appearance improvements from MJ

MakeQSP.bat

@@ -1,2 +1,2 @@
-py -3 txtmerge.py locations glife.txt
+python -3 txtmerge.py locations glife.txt
 txt2gam.exe glife.txt glife.qsp

glife-notepad++

@@ -1,10 +1,9 @@
 <NotepadPlus>
     <Project name="GLife">
-        <Folder name="location">
+        <Folder name="locations">
             <File name="locations\agentned" />
             <File name="locations\albdin" />
             <File name="locations\AlbFatherQW" />
-            <File name="locations\AlbFatherQW.bak" />
             <File name="locations\albinaEv" />
             <File name="locations\albinahome" />
             <File name="locations\albinaporog" />
@@ -12,9 +11,12 @@
             <File name="locations\AlbStarsEnd" />
             <File name="locations\alex" />
             <File name="locations\alexgang" />
+            <File name="locations\allea" />
             <File name="locations\Alphabet" />
             <File name="locations\alterStart" />
+            <File name="locations\altPRE" />
             <File name="locations\amrul" />
+            <File name="locations\AnalPR" />
             <File name="locations\andrey" />
             <File name="locations\anekdot" />
             <File name="locations\annafrends" />
@@ -22,9 +24,10 @@
             <File name="locations\annafrendtoilet" />
             <File name="locations\artemEv" />
             <File name="locations\artemev2" />
+            <File name="locations\artemEv3" />
             <File name="locations\artemhome" />
-            <File name="locations\artemhome2" />
             <File name="locations\artgar" />
+            <File name="locations\artstudia" />
             <File name="locations\arturdin" />
             <File name="locations\arturend" />
             <File name="locations\arturHome" />
@@ -42,7 +45,6 @@
             <File name="locations\authors2" />
             <File name="locations\authors3" />
             <File name="locations\Autofight" />
-            <File name="locations\automatics" />
             <File name="locations\autosalonF" />
             <File name="locations\autoservisF" />
             <File name="locations\autotraidF" />
@@ -57,24 +59,28 @@
             <File name="locations\BDman" />
             <File name="locations\BDsex" />
             <File name="locations\BDSM" />
+            <File name="locations\BDSM_Club" />
             <File name="locations\bed" />
             <File name="locations\bed1" />
             <File name="locations\bed2" />
-            <File name="locations\bedPar" />
             <File name="locations\bedr" />
+            <File name="locations\bedr2x" />
             <File name="locations\bedrPar" />
             <File name="locations\bedrPar2" />
-            <File name="locations\befKik" />
             <File name="locations\before" />
             <File name="locations\beforeFW" />
             <File name="locations\beg" />
             <File name="locations\beg1" />
             <File name="locations\begin" />
             <File name="locations\begin1" />
+            <File name="locations\belgang" />
+            <File name="locations\belpicknick" />
+            <File name="locations\BelSex" />
             <File name="locations\billiard" />
             <File name="locations\billsvid" />
             <File name="locations\blackjack" />
             <File name="locations\bldzh" />
+            <File name="locations\blowPR" />
             <File name="locations\BMloc" />
             <File name="locations\BMloc1" />
             <File name="locations\BMloc2" />
@@ -105,11 +111,13 @@
             <File name="locations\cafe2" />
             <File name="locations\cafe3" />
             <File name="locations\card" />
+            <File name="locations\cardgame_durak" />
             <File name="locations\cards" />
             <File name="locations\carF" />
             <File name="locations\carF1" />
             <File name="locations\casino" />
             <File name="locations\cfnm" />
+            <File name="locations\chessplay" />
             <File name="locations\cikl" />
             <File name="locations\clener" />
             <File name="locations\clothing" />
@@ -121,6 +129,9 @@
             <File name="locations\croupier1" />
             <File name="locations\croupier2" />
             <File name="locations\cumreaction" />
+            <File name="locations\cum_arrcheat" />
+            <File name="locations\cum_cleanup" />
+            <File name="locations\Cum_Manage" />
             <File name="locations\dachain" />
             <File name="locations\dachamy" />
             <File name="locations\dachaogr" />
@@ -138,27 +149,37 @@
             <File name="locations\DanceWhore8" />
             <File name="locations\dangeon" />
             <File name="locations\defence" />
-            <File name="locations\dexcheats" />
+            <File name="locations\dibodi" />
             <File name="locations\dima" />
             <File name="locations\dimaGoHome" />
             <File name="locations\dimaGoHome2" />
             <File name="locations\dimaHome" />
             <File name="locations\dimaRudeEv" />
+            <File name="locations\DimkaWarning" />
             <File name="locations\din2" />
             <File name="locations\dina" />
             <File name="locations\dinam" />
             <File name="locations\dinBoroda" />
             <File name="locations\dinfather" />
+            <File name="locations\dinmother" />
             <File name="locations\dinnpc" />
+            <File name="locations\dinParty" />
             <File name="locations\dinSex" />
             <File name="locations\dinSex2" />
+            <File name="locations\dinsexFX" />
             <File name="locations\dinsexgivi" />
+            <File name="locations\dinsister" />
             <File name="locations\din_bad" />
+            <File name="locations\din_pav" />
+            <File name="locations\din_van" />
             <File name="locations\divan" />
             <File name="locations\dk" />
             <File name="locations\dom_gor" />
             <File name="locations\dorm" />
+            <File name="locations\dort" />
             <File name="locations\down" />
+            <File name="locations\dvor" />
+            <File name="locations\dvorik" />
             <File name="locations\elevator" />
             <File name="locations\ender" />
             <File name="locations\enderKik" />
@@ -180,6 +201,7 @@
             <File name="locations\fbHouse" />
             <File name="locations\fbSex" />
             <File name="locations\FedorEv" />
+            <File name="locations\femcyc" />
             <File name="locations\fight" />
             <File name="locations\fight1" />
             <File name="locations\fight2" />
@@ -193,7 +215,6 @@
             <File name="locations\FightStat" />
             <File name="locations\film" />
             <File name="locations\fit" />
-            <File name="locations\fitgirl" />
             <File name="locations\foto" />
             <File name="locations\frot" />
             <File name="locations\FSfight" />
@@ -217,28 +238,28 @@
             <File name="locations\gdk" />
             <File name="locations\gdkbibl" />
             <File name="locations\gdkin" />
+            <File name="locations\gdkkru" />
             <File name="locations\gdksport" />
             <File name="locations\generation" />
             <File name="locations\gevent" />
             <File name="locations\gkafe" />
             <File name="locations\gKristinaZv" />
+            <File name="locations\glake" />
+            <File name="locations\gLakeNude" />
             <File name="locations\Gnpc" />
             <File name="locations\Gnpc2" />
             <File name="locations\goplust" />
             <File name="locations\gopnew" />
             <File name="locations\gopnik_house" />
+            <File name="locations\gopsex" />
             <File name="locations\gopskver" />
             <File name="locations\gopwho" />
             <File name="locations\gorodok" />
             <File name="locations\gor_exh" />
             <File name="locations\gor_mirror" />
-            <File name="locations\Gotel" />
-            <File name="locations\Goteladmin" />
-            <File name="locations\Gotelroom" />
             <File name="locations\gpoli" />
             <File name="locations\Gpornmark" />
             <File name="locations\graveyard" />
-            <File name="locations\Gresep" />
             <File name="locations\Grinok" />
             <File name="locations\gschool" />
             <File name="locations\gschool2" />
@@ -250,6 +271,11 @@
             <File name="locations\hall" />
             <File name="locations\headwaiter" />
             <File name="locations\hotel" />
+            <File name="locations\HotelAdmin" />
+            <File name="locations\HotelHole" />
+            <File name="locations\HotelRoom" />
+            <File name="locations\HotelWork" />
+            <File name="locations\hotel_resep" />
             <File name="locations\house" />
             <File name="locations\housecall" />
             <File name="locations\housezal" />
@@ -265,12 +291,14 @@
             <File name="locations\initKik" />
             <File name="locations\init_music" />
             <File name="locations\inputProcessing" />
+            <File name="locations\ira" />
             <File name="locations\IrinaRoom" />
             <File name="locations\IvanEv" />
             <File name="locations\ivanRoom" />
             <File name="locations\izdevat" />
             <File name="locations\JuliaMilGo" />
             <File name="locations\JuliaMilHome" />
+            <File name="locations\JuliaMilVhod" />
             <File name="locations\kafe" />
             <File name="locations\kafedinamic" />
             <File name="locations\kafeend" />
@@ -289,6 +317,7 @@
             <File name="locations\KatjaHome" />
             <File name="locations\KatjaHomeDin" />
             <File name="locations\KatjaHomeTalk" />
+            <File name="locations\Katja_Tanga" />
             <File name="locations\Katlake" />
             <File name="locations\katspalnya" />
             <File name="locations\kavkazkafe" />
@@ -318,33 +347,58 @@
             <File name="locations\kinosvid" />
             <File name="locations\kisameQW" />
             <File name="locations\kitchen" />
+            <File name="locations\kit_din" />
             <File name="locations\klofdomhouse" />
             <File name="locations\klofdomhouse1" />
             <File name="locations\Komp" />
+            <File name="locations\kompMFC" />
+            <File name="locations\kompMFCtwo" />
+            <File name="locations\koncepod" />
+            <File name="locations\koncepod1" />
             <File name="locations\korr" />
+            <File name="locations\korr2x" />
             <File name="locations\korrPar" />
             <File name="locations\kotovEv" />
             <File name="locations\kotovSex" />
             <File name="locations\kotovtalker" />
             <File name="locations\krol" />
+            <File name="locations\kruchess" />
+            <File name="locations\krupo" />
             <File name="locations\krutishi" />
             <File name="locations\kuhr" />
+            <File name="locations\kuhr2x" />
             <File name="locations\kuhrPar" />
             <File name="locations\kutuzka" />
             <File name="locations\Kwlake1" />
             <File name="locations\Kwlake2" />
             <File name="locations\lab" />
+            <File name="locations\lager" />
             <File name="locations\lake" />
+            <File name="locations\LakeBoyDy" />
+            <File name="locations\LakeBoyZ" />
             <File name="locations\lakecafe" />
             <File name="locations\laketoilet" />
+            <File name="locations\larek" />
+            <File name="locations\LariskaGo" />
+            <File name="locations\LariskaHome" />
+            <File name="locations\LariskaStart" />
+            <File name="locations\LBZhouse" />
             <File name="locations\LCporn" />
             <File name="locations\LCwork" />
+            <File name="locations\lena" />
             <File name="locations\lesbidomhouse" />
+            <File name="locations\lesbidomhouse1" />
             <File name="locations\lezbsex" />
+            <File name="locations\liam" />
+            <File name="locations\liamel" />
+            <File name="locations\liames" />
             <File name="locations\loadg" />
             <File name="locations\LOCA" />
             <File name="locations\locmansion" />
             <File name="locations\love" />
+            <File name="locations\lug" />
+            <File name="locations\luzhayka" />
+            <File name="locations\MagEncounterFairy" />
             <File name="locations\magik" />
             <File name="locations\mainQW" />
             <File name="locations\Mall" />
@@ -362,10 +416,9 @@
             <File name="locations\Menu.Destroy" />
             <File name="locations\Menu.Info" />
             <File name="locations\Menu.Time" />
+            <File name="locations\Menu.Treatment" />
             <File name="locations\MenuLoc" />
             <File name="locations\MenuMainLoc" />
-            <File name="locations\menu_helper" />
-            <File name="locations\menu_options" />
             <File name="locations\metro" />
             <File name="locations\Military" />
             <File name="locations\MiroslavaHome" />
@@ -376,7 +429,9 @@
             <File name="locations\motel" />
             <File name="locations\mother" />
             <File name="locations\motherkafeboss" />
+            <File name="locations\motherQW" />
             <File name="locations\mqroom" />
+            <File name="locations\musorkaexh" />
             <File name="locations\namecreator" />
             <File name="locations\namer" />
             <File name="locations\namer1" />
@@ -384,10 +439,12 @@
             <File name="locations\nastja" />
             <File name="locations\NatBelGo" />
             <File name="locations\NatBelHome" />
+            <File name="locations\NatBelVhod" />
             <File name="locations\NewCloShop" />
             <File name="locations\nill" />
             <File name="locations\nogorslut" />
             <File name="locations\Nord" />
+            <File name="locations\NormPR" />
             <File name="locations\npc" />
             <File name="locations\npcview" />
             <File name="locations\Nudelake" />
@@ -411,8 +468,12 @@
             <File name="locations\parkivent" />
             <File name="locations\ParkKafe" />
             <File name="locations\parkM" />
+            <File name="locations\parks" />
             <File name="locations\parksvid" />
             <File name="locations\party" />
+            <File name="locations\party_boy" />
+            <File name="locations\party_boys" />
+            <File name="locations\party_girls" />
             <File name="locations\paysex" />
             <File name="locations\Peterroom" />
             <File name="locations\pharmacy" />
@@ -431,6 +492,8 @@
             <File name="locations\podezdM" />
             <File name="locations\podrsex" />
             <File name="locations\podval_rape" />
+            <File name="locations\pod_ezd" />
+            <File name="locations\pod_whore" />
             <File name="locations\poli" />
             <File name="locations\police" />
             <File name="locations\popu" />
@@ -440,6 +503,9 @@
             <File name="locations\preg" />
             <File name="locations\priziv" />
             <File name="locations\Prostitute" />
+            <File name="locations\prut" />
+            <File name="locations\prut2" />
+            <File name="locations\psiklin" />
             <File name="locations\ptu_dush" />
             <File name="locations\qjob" />
             <File name="locations\qwBarPolet" />
@@ -456,10 +522,11 @@
             <File name="locations\qwmeet2" />
             <File name="locations\qwmeet3" />
             <File name="locations\qwpaluba" />
-            <File name="locations\rack" />
             <File name="locations\rate" />
             <File name="locations\ratinglist" />
             <File name="locations\razrKik" />
+            <File name="locations\reks" />
+            <File name="locations\repinRiver" />
             <File name="locations\restaurant" />
             <File name="locations\restoran" />
             <File name="locations\restoranM" />
@@ -469,6 +536,7 @@
             <File name="locations\rinwork" />
             <File name="locations\road" />
             <File name="locations\roadPRE" />
+            <File name="locations\roma" />
             <File name="locations\roomPRE" />
             <File name="locations\roulette" />
             <File name="locations\RoundEnd" />
@@ -479,17 +547,18 @@
             <File name="locations\sauna" />
             <File name="locations\sauna2" />
             <File name="locations\saunabed" />
-            <File name="locations\saunabud" />
             <File name="locations\saunaroom" />
             <File name="locations\saunawhore" />
             <File name="locations\saunawork" />
             <File name="locations\saveg" />
+            <File name="locations\sbReksHome" />
             <File name="locations\scale.table" />
             <File name="locations\seeparentsex" />
             <File name="locations\seeporn" />
             <File name="locations\selfplay" />
-            <File name="locations\selfPorno" />
             <File name="locations\sell_young_clothes" />
+            <File name="locations\Serge_kuh" />
+            <File name="locations\Serge_Shulgin" />
             <File name="locations\sex" />
             <File name="locations\sexdvanadva" />
             <File name="locations\sexdvoe" />
@@ -505,12 +574,18 @@
             <File name="locations\SgrupDisco" />
             <File name="locations\shop" />
             <File name="locations\shopdacha" />
+            <File name="locations\shulgabath" />
+            <File name="locations\shulgabed" />
+            <File name="locations\shulgahall" />
+            <File name="locations\shulgahome" />
+            <File name="locations\shulgakuh" />
+            <File name="locations\shulga_room" />
             <File name="locations\sister" />
-            <File name="locations\sisterprogulka" />
             <File name="locations\sisterQW" />
             <File name="locations\sistersleep" />
-            <File name="locations\sistersobir" />
+            <File name="locations\sister_party" />
             <File name="locations\sitr" />
+            <File name="locations\sitr2x" />
             <File name="locations\sitrPar" />
             <File name="locations\skverdin" />
             <File name="locations\sleepPRE" />
@@ -521,6 +596,7 @@
             <File name="locations\spalnya" />
             <File name="locations\spell" />
             <File name="locations\sportShop" />
+            <File name="locations\spusk" />
             <File name="locations\starenie" />
             <File name="locations\start" />
             <File name="locations\StasQW" />
@@ -529,6 +605,7 @@
             <File name="locations\statBat" />
             <File name="locations\statPRE" />
             <File name="locations\stihi" />
+            <File name="locations\stkafe" />
             <File name="locations\stol" />
             <File name="locations\stolPar" />
             <File name="locations\street" />
@@ -545,6 +622,8 @@
             <File name="locations\svidboy" />
             <File name="locations\tanhouse" />
             <File name="locations\tanroom" />
+            <File name="locations\tanvanr" />
+            <File name="locations\taxi" />
             <File name="locations\tboyopr" />
             <File name="locations\telefon" />
             <File name="locations\Terminal" />
@@ -558,13 +637,21 @@
             <File name="locations\torgcentr" />
             <File name="locations\torgpred" />
             <File name="locations\trashplace" />
+            <File name="locations\trFatherMisha" />
             <File name="locations\TV" />
             <File name="locations\tvPar" />
+            <File name="locations\ugel" />
+            <File name="locations\ugol" />
+            <File name="locations\ugol1" />
             <File name="locations\univer" />
+            <File name="locations\univer_din" />
             <File name="locations\vann" />
             <File name="locations\vanr" />
+            <File name="locations\vanr2x" />
             <File name="locations\vanrPar" />
             <File name="locations\vecher" />
+            <File name="locations\venta" />
+            <File name="locations\Vika" />
             <File name="locations\vipclub" />
             <File name="locations\Vnlake1" />
             <File name="locations\Vnlake2" />
@@ -575,10 +662,20 @@
             <File name="locations\vokzal" />
             <File name="locations\vokzalG" />
             <File name="locations\vokzalGin" />
+            <File name="locations\vokzalholle" />
+            <File name="locations\vokzalper" />
+            <File name="locations\vokzalperG" />
+            <File name="locations\vokzaltoilet" />
             <File name="locations\vokzaltorg" />
             <File name="locations\volAndGev" />
             <File name="locations\volley" />
+            <File name="locations\VolleyTrenCentr" />
+            <File name="locations\VolleyTrenerSpeak" />
             <File name="locations\Voltrener" />
+            <File name="locations\Voltrenersex" />
+            <File name="locations\VoltrenerSexShower" />
+            <File name="locations\Voltrener_din" />
+            <File name="locations\webcam_site" />
             <File name="locations\WorkHosp" />
             <File name="locations\worksalon" />
             <File name="locations\yarik" />
@@ -600,13 +697,13 @@
             <File name="locations\yzal" />
             <File name="locations\zaprF" />
             <File name="locations\zoomagazine" />
+            <File name="locations\zsoft_gopskverGorSlut" />
             <File name="locations\_buy_item" />
             <File name="locations\_buy_single_item" />
             <File name="locations\_clothing_image" />
             <File name="locations\_clothing_name" />
             <File name="locations\_face_image" />
             <File name="locations\_menu_addoldmenu" />
-            <File name="locations\_menu_automatica" />
             <File name="locations\_menu_autosave" />
             <File name="locations\_menu_avariya" />
             <File name="locations\_menu_bloknot" />
@@ -614,14 +711,12 @@
             <File name="locations\_menu_cheat" />
             <File name="locations\_menu_clothes" />
             <File name="locations\_menu_descrip" />
-            <File name="locations\_menu_dex_cheat" />
             <File name="locations\_menu_face" />
-            <File name="locations\_menu_helper" />
             <File name="locations\_menu_magic" />
             <File name="locations\_menu_mobila" />
             <File name="locations\_menu_obnovit" />
-            <File name="locations\_menu_options" />
             <File name="locations\_menu_pirs" />
+            <File name="locations\_menu_reputation" />
             <File name="locations\_menu_skills" />
             <File name="locations\_menu_statistika" />
             <File name="locations\_menu_tattoos" />
@@ -629,4 +724,4 @@
             <File name="locations\_stock_item" />
         </Folder>
     </Project>
-</NotepadPlus>
+</NotepadPlus>

locations/indik

@@ -1,32 +1,36 @@
+
 # indik
+a = ARGS[1]
+a1 = ARGS[2]
+
 if $ARGS[0] = '1':
-	if a >= 100 : $ind = '<font color="green"> ██████████ <<a1>></font>'
-	if a < 100 and a >= 90 :$ind = '<font color="green"> █████████_ <<a1>></font>'
-	if a < 90 and a >= 80 :$ind = '<font color="green"> ████████__ <<a1>></font>'
-	if a < 80 and a >= 70 :$ind = '<font color="green"> ███████___ <<a1>></font>'
-	if a < 70 and a >= 60 :$ind = '<font color="blue"> ██████____ <<a1>></font>'
-	if a < 60 and a >= 50 :$ind = '<font color="blue"> █████_____ <<a1>></font>'
-	if a < 50 and a >= 40 :$ind = '<font color="blue"> ████______ <<a1>></font>'
-	if a < 40 and a >= 30 :$ind = '<font color="red"> ███_______ <<a1>></font>'
-	if a < 30 and a >= 20 :$ind = '<font color="red"> ██________ <<a1>></font>'
-	if a < 20 and a >= 10 :$ind = '<font color="red"> █_________ <<a1>></font>'
-	if a < 10 and a >= 1 : $ind = '<font color="red"> ▓_________ <<a1>></font>'
-	if a <= 0 : $ind = '<font color="red"> __________ <<a1>></font>'
+	if a >= 100 : $ind = '<font face="Lucida Console" color="green"> ██████████ <<a1>></font>'
+	if a < 100 and a >= 90: $ind = '<font face="Lucida Console" color="green"> █████████_ <<a1>></font>'
+	if a < 90 and a >= 80: $ind = '<font face="Lucida Console" color="green"> ████████__ <<a1>></font>'
+	if a < 80 and a >= 70: $ind = '<font face="Lucida Console" color="green"> ███████___ <<a1>></font>'
+	if a < 70 and a >= 60: $ind = '<font face="Lucida Console" color="blue"> ██████____ <<a1>></font>'
+	if a < 60 and a >= 50: $ind = '<font face="Lucida Console" color="blue"> █████_____ <<a1>></font>'
+	if a < 50 and a >= 40: $ind = '<font face="Lucida Console" color="blue"> ████______ <<a1>></font>'
+	if a < 40 and a >= 30: $ind = '<font face="Lucida Console" color="red"> ███_______ <<a1>></font>'
+	if a < 30 and a >= 20: $ind = '<font face="Lucida Console" color="red"> ██________ <<a1>></font>'
+	if a < 20 and a >= 10: $ind = '<font face="Lucida Console" color="red"> █_________ <<a1>></font>'
+	if a < 10 and a >= 1: $ind = '<font face="Lucida Console" color="red"> ▓_________ <<a1>></font>'
+	if a <= 0 : $ind = '<font face="Lucida Console" color="red"> __________ <<a1>></font>'
 end
 
 if $ARGS[0] = '2':
-	if a >= 100 : $ind = '<font color="red"> ██████████ </font>'
-	if a < 100 and a >= 90 :$ind = '<font color="red"> █████████_ </font>'
-	if a < 90 and a >= 80 :$ind = '<font color="red"> ████████__ </font>'
-	if a < 80 and a >= 70 :$ind = '<font color="orange"> ███████___ </font>'
-	if a < 70 and a >= 60 :$ind = '<font color="orange"> ██████____ </font>'
-	if a < 60 and a >= 50 :$ind = '<font color="yellow"> █████_____ </font>'
-	if a < 50 and a >= 40 :$ind = '<font color="yellow"> ████______ </font>'
-	if a < 40 and a >= 30 :$ind = '<font color="green"> ███_______ </font>'
-	if a < 30 and a >= 20 :$ind = '<font color="green"> ██________ </font>'
-	if a < 20 and a >= 10 :$ind = '<font color="blue"> █_________ </font>'
-	if a < 10 and a >= 1 : $ind = '<font color="blue"> ▓_________ </font>'
-	if a <= 0 : $ind = '<font color="blue"> __________ </font>'
+	if a >= 100 : $ind = '<font face="Lucida Console" color="red"> ██████████ </font>'
+	if a < 100 and a >= 90: $ind = '<font face="Lucida Console" color="red"> █████████_ <<a1>></font>'
+	if a < 90 and a >= 80: $ind = '<font face="Lucida Console" color="red"> ████████__ <<a1>></font>'
+	if a < 80 and a >= 70: $ind = '<font face="Lucida Console" color="orange"> ███████___ <<a1>></font>'
+	if a < 70 and a >= 60: $ind = '<font face="Lucida Console" color="orange"> ██████____ <<a1>></font>'
+	if a < 60 and a >= 50: $ind = '<font face="Lucida Console" color="yellow"> █████_____ <<a1>></font>'
+	if a < 50 and a >= 40: $ind = '<font face="Lucida Console" color="yellow"> ████______ <<a1>></font>'
+	if a < 40 and a >= 30: $ind = '<font face="Lucida Console" color="green"> ███_______ <<a1>></font>'
+	if a < 30 and a >= 20: $ind = '<font face="Lucida Console" color="green"> ██________ <<a1>></font>'
+	if a < 20 and a >= 10: $ind = '<font face="Lucida Console" color="blue"> █_________ <<a1>></font>'
+	if a < 10 and a >= 1 : $ind = '<font face="Lucida Console" color="blue"> ▓_________ <<a1>></font>'
+	if a <= 0 : $ind = '<font face="Lucida Console" color="blue"> __________ <<a1>></font>'
 end
 
 --- indik ---------------------------------

locations/onobjsel

@@ -154,7 +154,7 @@ $objskills = {
 		if Suspeh >= 60 and Suspeh < 70:pl 'You are the typical average student. You''re good in the fields you like, but can''t be bothered with the rest.'
 		if Suspeh >= 50 and Suspeh < 60:pl 'You''re not very good in school, you wish you could be somewhere else and your grades show it.'
 		if Suspeh >= 40 and Suspeh < 50:pl 'You are not cut out for school, you skip out most of the time. You wonder how you''re going to manage to get passing grades.'
-		if Suspeh < 40:pl 'You are the class nitwit. You''re still not sure how you got this far in the first place.'
+		if Suspeh < 40:pl 'You are th class nitwit. You''re still not sure how you got this far in the first place.'
 
 		if schoolprogul > 1:pl 'Absenteeism in school - <<schoolprogul>> days'
 	end
@@ -375,7 +375,7 @@ $reputation = {
 		elseif GorSlut = 6:
 			pl 'In Pavlovsky you are known as a prostitute who will take money for the most extreme sex acts.'
 		else
-			pl'In Pavlovo you of considered a decent girl with a good reputation '
+			pl'In Pavlovo you are considered a decent girl with a good reputation.'
 		end
 	nl
 	end
@@ -391,7 +391,7 @@ $reputation = {
 		elseif motherKnowSpravka > 0:
 			pl'Your mother knows that you are sexually active.'
 		else
-			pl'Your mother thinks that you are a virgin'
+			pl'Your mother thinks that you are a virgin.'
 		end
 		if evgenQW = 4 and brotherSex = 1:
 			pl'Your brother thinks you are a total whore.'

locations/start

@@ -155,8 +155,6 @@ vshrinkdays = 6
 ashrink = 1
 ashrinkdays = 3
 
-GameUpdate = 1
-update_2014_08_28 = 1
 act '<center><b>Start</b></center>':
 	cla
 	gt 'begin','real_character'

locations/stat

@@ -402,15 +402,7 @@ mannamax = (intel * magik) + magik * 100 + vital * 10 + rikudo
 
 
 ! WD: totminut fix ~ Calculates total minutes since NYE 2000
-!! old calc added the value of the variable 'minut'
-!! not the number of minutes passed since last update
-!'
-if nminut ! minut:
-	!!totminut playing time in minutes
-	totminut += minut
-	nminut = minut
-end
-'!
+
 if nminut ! minut:
 	! Zero totminut will be at New Years Eve of 2015
 
@@ -621,23 +613,6 @@ if hour >= 24:
 		vidage += 1
 	end
 
-	! WD: Piecing arousal is bit broken as only fires at midnight is more horny than previous night
-	! WD: Moved out of daily to enod of time
-	!'
-	if horny > hornyStat:
-		hornyStat = horny
-		if pirsA > 0:horny += 1
-		if pirsB > 0:horny += 1
-		if pirsC > 0:horny += 1
-		if pirsD > 0:horny += 1
-		if pirsE > 0:horny += 1
-		if pirsF > 0:horny += 5
-		if pirsG > 0:horny += 5
-		if pirsN > 0:horny += 1
-	end
-
-	if horny < hornyStat:hornyStat = horny
-	'!
 	!!!!!!!!!!!!!!!
 	!!!generation!!!
 	!!!!!!!!!!!!!!!
@@ -882,13 +857,6 @@ else
 	if day > 30:day -= 30 & month += 1
 end
 
-!'
-if day > 30:
-	day -= 30
-	month += 1
-end
-'!
-
 if day = 0:day = 1
 
 if week > 7:
@@ -1285,8 +1253,6 @@ end
 !!!!!!!!!!!!!!!!!!!!!
 !!!Beginning Description!!!
 !!!!!!!!!!!!!!!!!!!!!
-!!pl 'time <b><<hour>></b> hours <b><<$nilmin>><<minut>></b> minutes'
-!!pl 'At_The_Moment <<day>> <<$month>> <<year>>year, <<$week>>.'
 
 if hour < 10:
 	if minut > 9 :
@@ -1301,6 +1267,7 @@ else
 		pl '<b> <<hour>>:0<<minut>></b> <<$week>> <<day>> <<$mons>> <<year>>'
 	end
 end
+pl
 
 pl '<b><<money>></b> rubles in your purse.'
 if karta > 0:pl '<b><<karta>></b> rubles in your bank account.'
@@ -1312,17 +1279,7 @@ if birthday = day and birthmonth = month:pl '<b>Today is your birthday.</b>'
 
 pl '<b><<$manna>></b>'
 
-if horny >= 50:
-	if horny < 90 and tanga = 1:
-		pl'<font color = #DB7093>You are a little nervous, feeling nice between your legs <a href="exec:view''images/picb/briefs1.jpg''">itchy</a> from arousal.</font>'
-	elseif horny < 90 and tanga = 0:
-		pl'<font color = #DB7093>You are a little nervous, feeling nice between your legs <a href="exec:view''images/picb/briefs1a.jpg''">itchy</a> from arousal.</font>'
-	elseif tanga = 1:
-		pl'<font color = #FF1493>You feel that between your legs you are <a href="exec:view''images/picb/briefs2.jpg''">soaked</a> from your juices.</font>'
-	else
-		pl'<font color = #FF1493>You feel that between your legs you are <a href="exec:view''images/picb/briefs2a.jpg''">soaked</a> from your juices.</font>' 
-	end
-end
+if fairycurse >= daystart: horny = 90
 
 if ETOmenu = 1:
 	pl '<b><<$health>></b>'
@@ -1331,40 +1288,41 @@ if ETOmenu = 1:
 	pl '<b><<$water>></b>'
 	pl '<b><<$son>></b>'
 else
-	a = horny
-	!!a1 = horny
-	gs 'indik', '2'
+	gs 'indik', '2', horny, horny
 	pl '<<$ind>> Arousal'
+
 	healthmax = (vital * 10 + stren * 5)
-	a = health * 100 / healthmax
-	a1 = health
-	gs 'indik', '1'
+	gs 'indik', '1', health * 100 / healthmax, health
 	pl '<<$ind>> Health'
+
 	willpowermax = intel * 5 + will * 5
-	a = willpower * 100 / willpowermax
-	a1 = willpower
-	gs 'indik', '1'
+	gs 'indik', '1', willpower * 100 / willpowermax, willpower
 	pl '<<$ind>> Willpower'
-	a = manna * 100 / mannamax
-	a1 = manna
-	gs 'indik', '1'
+
+	gs 'indik', '1', manna * 100 / mannamax, manna
 	pl '<<$ind>> Mood'
-	a = energy * 4
-	a1 = energy
-	gs 'indik', '1'
+
+	gs 'indik', '1', energy * 4, energy
 	pl '<<$ind>> Hunger'
 
-	a = water * 5
-	a1 = water
-	gs 'indik', '1'
+	gs 'indik', '1', water * 5, water
 	pl '<<$ind>> Thirst'
-	a = son * 4
-	a1 = son
-	gs 'indik', '1'
+
+	gs 'indik', '1', son * 4, son
 	pl '<<$ind>> Sleep'
 end
 
-if fairycurse >= daystart: horny = 90
+if horny >= 50:
+	if horny < 90 and tanga = 1:
+		pl'<font color = #DB7093>You are a little nervous, feeling nice between your legs <a href="exec:view''images/picb/briefs1.jpg''">itchy</a> from arousal.</font>'
+	elseif horny < 90 and tanga = 0:
+		pl'<font color = #DB7093>You are a little nervous, feeling nice between your legs <a href="exec:view''images/picb/briefs1a.jpg''">itchy</a> from arousal.</font>'
+	elseif tanga = 1:
+		pl'<font color = #FF1493>You feel that between your legs you are <a href="exec:view''images/picb/briefs2.jpg''">soaked</a> from your juices.</font>'
+	else
+		pl'<font color = #FF1493>You feel that between your legs you are <a href="exec:view''images/picb/briefs2a.jpg''">soaked</a> from your juices.</font>' 
+	end
+end
 
 $smoker = {
 	siga -= 1
@@ -1397,23 +1355,23 @@ elseif CondomToggle = 0 and Sprezik > 0:
 	Sprezik = 0
 end
 
-if $mud ! '':pl '<font color="green"><b><<$mud>></b></font>'
-if siga <= 0 and smoker >= 20:pl '<font color="red"><b>You have run out of cigarettes.</b></font>'
+if $mud ! '':pl '<font color="green"><b><<$mud>></b></font>.'
+if siga <= 0 and smoker >= 20:pl '<font color="red"><b>You have run out of cigarettes.</b></font>' & pl
 
 if smokeNeed > 0 and siga > 0 and smoker >= 20:
-	pl '<a href="exec:dynamic $smoker"><font color="red"><b>You want to smoke. You have <<siga>> cigarettes left</b></font></a>'
+	pl '<a href="exec:dynamic $smoker"><font color="red"><b>You want to smoke. You have <<siga>> cigarettes left.</b></font></a>'
 elseif siga > 0 and smoker >= 20:
-	pl '<a href="exec:dynamic $smoker"><font color="blue"><b>You have <<siga>> cigarettes left</b></font></a>'
+	pl '<a href="exec:dynamic $smoker"><font color="blue"><b>You have <<siga>> cigarettes left.</b></font></a>'
 end
 
 if siga > 0 and smoker < 20:
 	if smokeHour = hour and smokeday = day and smokeminut >= minut:
 	else
-		pl'<a href="exec:dynamic $smoker"><font color = blue><b>You have <<siga>> cigarettes</b></font></a>'
+		pl'<a href="exec:dynamic $smoker"><font color = blue><b>You have <<siga>> cigarettes.</b></font></a>'
 	end
 end
 
-if smokeHour = hour and smokeday = day and smokeminut >= minut:pl '<font color="green">You are smoking a cigarette</font>'
+if smokeHour = hour and smokeday = day and smokeminut >= minut:pl '<font color="green">You are smoking a cigarette.</font>'
 
 if pirs_pain_ton = 1:
 	pl '<font color="red">Your tongue is uncomfortable and it is a little swollen.</font>'
@@ -1426,6 +1384,7 @@ end
 if nippain > 0:pl '<font color="red"><b><<$nippain>></b></font>'
 if painpub > 0:pl '<font color="red"><b><<$painpub>></b></font>'
 if opPRE = 0:pl '<<$mop>> and your hair is <<$hapri>>.'
+
 if sweat = 1:
 	pl '<font color="brown">You''re sweating.</font>'
 elseif sweat = 2:
@@ -1436,6 +1395,8 @@ elseif sweat > 3:
 	pl '<b><font color="red">You really stink.</font></b>'
 end
 
+if sweat = 0: pl
+
 if cyccustom = 0:
 	temp[1] = daystart-daylastperiod
 	pl 'It has been <<temp[1]>> days since you last had a period.'