Merge pull request #18 from mjsmagalhaes/V1.1.3-Patches

Bug Fixes and Minor Improvements

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/AlbFatherQW

@@ -64,7 +64,7 @@ $din_zajava_albfather_no = {
 }
 
 gs 'stat'
-'A car suddenly stops next to you. A man wearing a nice suit emerges from the vehicle. He introduces himself,'"Captain Chernov. State Security Service," as he pulls out his liscence and badge. In surprise you  blurt out,'"Why are you here, what did I do, am I under arrest?" Captain Chernov asks you in a rhetorical manner,'"You are <<$name>> <<$surname>>? Let''s step aside and have a friendly chitchat."'
+'A car suddenly stops next to you. A man wearing a nice suit emerges from the vehicle. He introduces himself,"Captain Chernov. State Security Service," as he pulls out his liscence and badge. In surprise you  blurt out, "Why are you here, what did I do, am I under arrest?" Captain Chernov asks you in a rhetorical manner, "You are <<$name>> <<$surname>>? Let''s step aside and have a friendly chitchat."'
 act 'Move with Chernov':
 	cls
 	minut += 1
@@ -76,8 +76,8 @@ act 'Move with Chernov':
 		minut += 1
 		gs 'stat'
 
-		if age < 18:'You ask the Captain Chernov what he has in mind. Captain Chernov says, '"You give me a written testamony that Albina Barlovskaya coerced you into prostitution, and since you are underage it will harder for Albina to get rid of the accusation."'
-		if age >= 18:'You ask the Captain Chernov what he has in mind. Captain Chernov says, '"You give me a written testamony that Albina Barlovskaya coerced you into prostitution."'
+		if age < 18:'You ask the Captain Chernov what he has in mind. Captain Chernov says, "You give me a written testamony that Albina Barlovskaya coerced you into prostitution, and since you are underage it will harder for Albina to get rid of the accusation."'
+		if age >= 18:'You ask the Captain Chernov what he has in mind. Captain Chernov says, "You give me a written testamony that Albina Barlovskaya coerced you into prostitution."'
 
 		'Captain Chernov pauses, giving you time to think and then continues. "If you write this deposition then you will be charged as the victim and not the culprit. Your name will be kept from the media."'
 
@@ -86,7 +86,7 @@ act 'Move with Chernov':
 				cls
 				minut += 1
 				gs 'stat'
-				'You ask him what is so important with Albina, that they need security service and not the police. A frown forms on Captain Chernov''s brow, '"I underestimated you; you''re a smart girl. Okay, I''ll show you my cards. You know who Albina''s father is? Barlovsky Boris, a retired police colonel. He served as chief of police in this town. He is retired now, but he still communicates with the police. "'
+				'You ask him what is so important with Albina, that they need security service and not the police. A frown forms on Captain Chernov''s brow, "I underestimated you; you''re a smart girl. Okay, I''ll show you my cards. You know who Albina''s father is? Barlovsky Boris, a retired police colonel. He served as chief of police in this town. He is retired now, but he still communicates with the police."'
 
 				if intel >= 75:
 					act 'Tell him that he hasn''t answered your question':

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
 		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/mirror

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

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