Merge remote-tracking branch 'KingOfSweden/V1.1.3-Patches' into V1.1.3-Patches

* KingOfSweden/V1.1.3-Patches:
  Fixed nude check on bike
  Minor adjustment to mirror text.
  Improve mirror text
  Assorted minor cleanup
  Add instructions to Windows users in Readme.md
  Fix Artem interaction
  Fix AlbFatherQW '" entries
  Add Windows Bat file to generate gfile.qsp

MakeQSP.bat

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

README.md

@@ -10,6 +10,10 @@ Girl Life (ЭТО) [English Community Version] - github edition
 * commit your changes
 * push and/or send a pull request
 
+## Quick start (for Windows machines)
+* Double click the MakeQSP.bat
+* Enjoy :)
+
 ## What exactly is all this?
 In an effort to make editing the text of Girl Life easier, I set up this repo. This is based on the english community version. There are two branches: `master` and `releases`. On the `master` branch I will keep my version of the game as I make edits, merge pull requests, etc. while the `releases` is where you'd get things that you expect to actually work.
 

locations/artemEv

@@ -30,12 +30,12 @@ $din_artem_leghump = {
 		horny += 10
 		hump += 1
 
-		if npcSex[2] = 0:npcSex[2] = 1 & guy += 1
+		if npcSex[2] = 0: npcSex[2] = 1 & guy += 1
 
 		leghumpArtem += 1
 		dom += 1
 		dick = 16
-		cumfrot = 0 !!he removes all cum from the players clothes after orgasming
+		cumfrot = 0 & !!he removes all cum from the players clothes after orgasming
 		artempower -= 1
 		gs 'stat'
 		'<center><img src="images/qwest/alter/Ev/artomHump.jpg"></center>'
@@ -46,6 +46,7 @@ $din_artem_leghump = {
 		else
 			act 'Further':artemhomemark = 1 & minut += 5 & gt 'artemhome'
 			act 'Go home':artemhomemark = 0 & minut += 15 & gt 'gorodok'
+		end
 	end
 }
 
@@ -542,9 +543,9 @@ $din_artem_lern = {
 				end
 			end
 		end
-		if (artQW = 3 or artQW = 20) and artomkissday ! daystart and (GorSlut < 2 or artemblag = 1):
+		
+		if (artQW = 3 or artQW = 20) and artemkissday ! daystart and (GorSlut < 2 or artemblag = 1):
 			'After training with Artem, he leaned toward your face, what would kiss you.'
-
 			dynamic $artomKiss
 		end
 	end
@@ -555,7 +556,7 @@ $artomKiss = {
 		cls
 		horny += 10
 		minut += 5
-		artomkissday = daystart
+		artemkissday = daystart
 
 		if GorSlut >= 2 and artemblag = 0:
 			cla
@@ -571,11 +572,11 @@ $artomKiss = {
 
 		if artemtimes >= 20 and leghumpArtom = 0:
 			'Artem muttered sheepishly. "Svetulya. I want you so much, maybe we could... well you know... You can touch your ass?"'
-			dynamic $din_artom_leghump
+			dynamic $din_artem_leghump
 		elseif leghumpArtom >= 1:
 			'Artem said shyly. "Svetulya, you are such a wonderful. I enjoyed it so much last time. Can we play one more time?"'
-			dynamic $din_artom_leghump
-			dynamic $din_artom_leghump2
+			dynamic $din_artem_leghump
+			dynamic $din_artem_leghump2
 		end
 
 		if artQW = 3:
@@ -601,9 +602,9 @@ $artomKiss = {
 
 					if lernHome > 0:
 						dynamic $din_artom_lern
-					else
-						act 'Escape':artemhomemark = 0 & minut += 15 & gt'gorodok'
 					end
+					
+					act 'Escape':artemhomemark = 0 & minut += 15 & gt'gorodok'
 				end
 			elseif horny >= 50:
 				act 'Jerk off Artem':
@@ -620,9 +621,9 @@ $artomKiss = {
 
 					if lernHome > 0:
 						dynamic $din_artom_lern
-					else
-						act 'Escape':artemhomemark = 0 & minut += 15 & gt'gorodok'
 					end
+					
+					act 'Escape':artemhomemark = 0 & minut += 15 & gt'gorodok'
 				end
 			end
 		end

locations/gadriver

@@ -3,8 +3,8 @@ $metka = $ARGS[0]
 $loc = $CURLOC
 
 clr
-gs'stat'
-gs'time'
+gs 'stat'
+gs 'time'
 
 '<center><H4>River Zmeyavka</H4></center>'
 
@@ -27,14 +27,14 @@ temp = RAND(0,20)
 if temp = 0 and hour >= 6 and hour < 22 and month >= 5 and month <= 9 and sunWeather = 1:'On the banks spread their fishing rods <a href="exec: dynamic $fishers ">local fishermen</a>.'
 if temp = 1 and hour < 5 and month >= 5 and month <= 9 and miragopQW >= 20:'Right next to the path leading to the river, is completely naked <a href="exec: dynamic $mirapunish ">Mira</a>, crucified between two trees...'
 
-act 'to the beach':minut += 5 & gt'Gadriver', 'Gadbitch'
-act 'In the village':minut += 20 & mirainriver = 0 & gt'gadukino'
+act 'To the beach':minut += 5 & gt 'Gadriver', 'Gadbitch'
+act 'To the village':minut += 20 & mirainriver = 0 & gt 'gadukino'
 
 if $ARGS[0] = 'Gadbitch':
 	cla
 	clr
 	*clr
-	gs'stat'
+	gs 'stat'
 
 	'<center><H4>Village beach</H4></center>'
 
@@ -48,7 +48,7 @@ if $ARGS[0] = 'Gadbitch':
 		'<center><img src="images/qwest/gadukino/river/Gadbitch_night.jpg"></center>'
 	end
 
-	'A small country beach, where you can somehow sunbathe and swim.'
+	'A small country beach, where you can sunbathe and swim.'
 	if mirainriver = 1:temp = RAND(0,20)
 	if mirainriver = 1 and temp < 10:'On the beach sunning razomlevshie<a href="exec: dynamic $mirameadow ">Mira</a>.'
 	if mirainriver = 1 and temp >= 10:'The river splashing fun <a href="exec: dynamic $mirameadow ">Mira</a>.'
@@ -56,7 +56,7 @@ if $ARGS[0] = 'Gadbitch':
 	if temper >= 20 and month >= 5 and month <= 9:
 
 		if bikini > 0:
-			act 'bathe':
+			act 'Bathe':
 				cla
 				*clr
 				cumpussy = 0
@@ -68,9 +68,9 @@ if $ARGS[0] = 'Gadbitch':
 				minut += 30
 				sweat = -3
 				manna += 5
-				willpower = willpower + 5
-				if stren < 30:stren = stren + 1
-				if hour >= 22 and hour <= 6:
+				willpower += 5
+				if stren < 30:stren += 1
+				if hour >= 22 or hour <= 6:
 					'<center><img src="images/qwest/gadukino/river/GadRiverSwim_night.jpg"></center>'
 					'You iskupnulis in the creek, feeling the refreshing and invigorating water.'
 				else
@@ -82,10 +82,10 @@ if $ARGS[0] = 'Gadbitch':
 						'You iskupnulis in the creek, feeling the refreshing and invigorating water.'
 					end
 				end
-				act 'Get out of the water':minut += 5 & gt'Gadriver', 'Gadbitch'
+				act 'Get out of the water':minut += 5 & gt 'Gadriver', 'Gadbitch'
 			end
 		else
-			act 'bathe nude':
+			act 'Bathe nude':
 				cla
 				*clr
 				cumpussy = 0
@@ -98,7 +98,7 @@ if $ARGS[0] = 'Gadbitch':
 				sweat = -3
 				manna += 5
 				willpower += 5
-				if stren < 30:stren = stren + 1
+				if stren < 30:stren += 1
 				if hour >= 22 and hour <= 6:
 					'<center><img src="images/qwest/gadukino/river/watergirls1.jpg"></center>'
 					'You stripped naked and quickly iskupnulis in the creek, feeling the refreshing and invigorating water.'
@@ -113,7 +113,7 @@ if $ARGS[0] = 'Gadbitch':
 						'You stripped naked and quickly iskupnulis in the creek, feeling the refreshing and invigorating water.'
 					end
 				end
-				act 'Get out of the water':minut += 5 & gt'Gadriver', 'Gadbitch'
+				act 'Get out of the water':minut += 5 & gt 'Gadriver', 'Gadbitch'
 			end
 		end
 		if hour >= 8 and hour < 20:
@@ -139,7 +139,7 @@ if $ARGS[0] = 'Gadbitch':
 						tan += 3
 						'You body is smeared with cream for sunburn and went sunbathing.'
 					end
-					act 'further':minut += 5 & gt'Gadriver', 'Gadbitch'
+					act 'Further':minut += 5 & gt 'Gadriver', 'Gadbitch'
 				end
 			else
 				act 'Sunbathe nude (1:00)':
@@ -162,13 +162,13 @@ if $ARGS[0] = 'Gadbitch':
 						tan += 3
 						'You body is smeared with cream for sunburn and went sunbathing.'
 					end
-					act 'Further':minut += 5 & gt'Gadriver', 'Gadbitch'
+					act 'Further':minut += 5 & gt 'Gadriver', 'Gadbitch'
 				end
 			end
 		end
 	end
 
-	act 'escape':minut += 5 & gt'Gadriver'
+	act 'escape':minut += 5 & gt 'Gadriver'
 end
 
 $mirameadow = {
@@ -190,19 +190,19 @@ $mirameadow = {
 			'<center><img src="images/qwest/gadukino/river/MiraRiverNude.jpg"></center>'
 		end
 	end
-	act 'escape':minut += 5 & gt'Gadriver', 'Gadbitch'
+	act 'Leave':minut += 5 & gt 'Gadriver', 'Gadbitch'
 
-	act'chat':
+	act 'Chat':
 	cls
-	minut+=10
-	manna+=10
-	gs'stat'
+	minut += 10
+	manna += 10
+	gs 'stat'
 		if temp < 10:
-		if miragopQW < 12:
-			'<center><img src="images/qwest/gadukino/river/MiraBeach.jpg"></center>'
-		else
-			'<center><img src="images/qwest/gadukino/river/MiraBeachNude.jpg"></center>'
-		end
+			if miragopQW < 12:
+				'<center><img src="images/qwest/gadukino/river/MiraBeach.jpg"></center>'
+			else
+				'<center><img src="images/qwest/gadukino/river/MiraBeachNude.jpg"></center>'
+			end
 		else
 			if miragopQW < 12:
 				'<center><img src="images/qwest/gadukino/river/MiraRiver.jpg"></center>'
@@ -210,8 +210,8 @@ $mirameadow = {
 				'<center><img src="images/qwest/gadukino/river/MiraRiverNude.jpg"></center>'
 			end
 		end
-	 'You are chatting with Mira about trifles'
-	act 'escape':minut += 5 & gt'Gadriver', 'Gadbitch'
+	 'You are chatting with Mira about trivial things.'
+	act 'Leave':minut += 5 & gt 'Gadriver', 'Gadbitch'
 	end
 }
 
@@ -222,7 +222,7 @@ $fishers = {
 
 	'<center><img src="images/qwest/gadukino/river/GadRiverFishers.jpg"></center>'
 
-	act 'escape':minut += 5 & gt'Gadriver', 'Gadbitch'
+	act 'Leave':minut += 5 & gt 'Gadriver', 'Gadbitch'
 }
 
 $mirapunish = {
@@ -235,6 +235,6 @@ $mirapunish = {
 	'You come closer to her and Miroslav happily smiling to you, asking for her release. As long as you untie her, she tells you that it is so Kolyamba punished for what she lightly bit his cock as he sucked...'
 	'- Thank God - with a sigh of relief she adds to her story. - Well, it was you got to me and not someone else, and then imagine what would have been a picture - naked Mirka, Crucified night among the trees, stay away and do what you want, even fuck, even beat, kill ... Well had passed, thank you, she asks, you did great was saved!'
 
-	act 'escape':minut += 5 & gt'Gadriver', 'Gadbitch'
+	act 'Leave':minut += 5 & gt 'Gadriver', 'Gadbitch'
 }
 --- Gadriver ---------------------------------

locations/gadukino

@@ -29,7 +29,7 @@ end
 'A small village with a rickety wooden houses.'
 
 if StoryLine = 1:'In one <a href="exec:minut += 5 & gt ''Gaddvor''">huts live your grandparents</a>.'
-if miraQW > 0: 'Through the three houses is the house  <a href="exec:minut += 5 & GT ''MiroslavaHome''">Miroslava</a>.'
+if miraQW > 0: 'Through the three houses is the house  <a href="exec:minut += 5 & gt ''MiroslavaHome''">Miroslava</a>.'
 
 if hour >= 6 and hour < 20:
 	if month >= 5 and month <= 9:

locations/mirror

@@ -6,6 +6,7 @@ if $ARGS[0] = 'start':
 	gs 'portmirror'
 	$gt1 = 'mirror'
 	$gt2 = 'fin'
+	
 	dynamic $portmirror
 
 	act 'Move away from the mirror':

locations/mitkabuh

@@ -2,11 +2,9 @@
 gs 'stat'
 
 if miraingop = 0 and alko < 8:
-	act 'Leave':gt 'Gaddvor'
-
 	'<center><img src="images/qwest/gadukino/drunk.jpg"></center>'
 	'Set in a secluded spot three village boy, Mitka kingpin, Bob Package and Kolyamba drink moonshine without snacks. Mitka brew pours into a glass and takes you.'
-	act 'Escape':gt'Gaddvor'
+	act 'Leave':gt 'Gaddvor'
 	act 'Drink':
 		cls
 		minut += 30
@@ -16,7 +14,7 @@ if miraingop = 0 and alko < 8:
 		'<center><img src="images/qwest/gadukino/drunk.jpg"></center>'
 		'You drank moonshine and everything inside burned, breathless you become zanyuhivat sleeve ,because there were no snacks. Mitka said approvingly "Good infection, wade."'
 
-		act 'Catching his breath':gt $curloc
+		act 'Catching your breath':gt $curloc
 	end
 elseif miraingop = 0 and alko >= 8 and mirasextimes = 0:
 	'<center><img src="images/qwest/gadukino/mitka.jpg"></center>'
@@ -42,12 +40,12 @@ elseif miraingop = 0 and alko >= 8 and mirasextimes = 0:
 
 		'Mitka, I lay down on his side and lit "Fucking!"'
 
-		act 'Escape':gt'Gaddvor'
+		act 'Leave':gt 'Gaddvor'
 	end
 elseif miraingop = 0 and alko >= 8:
 	'<center><img src="images/qwest/gadukino/drunk.jpg"></center>'
 	'You got drunk in the trash, leg practically no longer hold you. Mitka noticed your condition keeps you around the waist. It seems, you`ve had enough...'
-	act 'Escape':gt'Gaddvor'
+	act 'Leave':gt 'Gaddvor'
 end
 
 if miraingop = 1 and miragopQW > 0:
@@ -128,7 +126,7 @@ if miraingop = 1 and miragopQW > 0:
 				gs 'stat'
 				'<center><img src="images/qwest/gadukino/drinking.jpg"></center>'
 				'You take a glass of moonshine and start, coughing and sickly, strain it through your teeth. Miroslav meanwhile shyly responds to impudent questions rural youth.'
-				act 'Catching his breath':gt $curloc
+				act 'Catching your breath':gt $curloc
 			end
 		end
 		if temp = 2:

locations/portmirror

@@ -6,11 +6,18 @@ $portmirror = {
 	'<<$hair>> <<$mop>> <<$skin>> <<$vnesh>>'
 	if daystart < 10 and StoryLine = 0:'In the mirror, you looked quite strange woman''s face which is exactly copied all your actions. You hardly get to accept the idea that it is now is you.'
 	if daystart >= 10 and daystart < 30 and StoryLine = 0:'From the mirror looks at you a woman''s face, to which you have become accustomed to, but sometimes, no, no and yes flash the idea that it is not your face.'
-	if kosmetica > 0:'Cosmetics <<kosmetica>>'
-	if kosmetica = 0:'You have no makeup.'
+	
+	if curly > 0: '<br>Your curly hair will last for another <<curly>> days.'
+	
+	set $makeUpString = '<br>'
+	
+	if kosmetica > 0: $makeUpString += 'Cosmetics: <<kosmetica>>'
+	if kosmetica = 0: $makeUpString += 'You have no makeup'
 
-	if lipbalm > 0:'Lip Balm <<lipbalm>>'
-	if lipbalm = 0:'You have no lip balm left.'
+	if lipbalm > 0: $makeUpString += ' | Lip Balm: <<lipbalm>>'
+	if lipbalm = 0: $makeUpString += ' | You have no lip balm left'
+	
+	*pl $makeUpString
 
 	if hapri = 0 and AutoHapri = 1:
 		minut += 3