Merge branch 'master' of http://git.tfgamessite.com/Ekay_Eto/girllife-ecv

.gitignore

@@ -4,3 +4,4 @@ images
 glife.txt
 music/
 
+MakeQSPEkay.bat

MakeQSP.bat

@@ -1,5 +0,0 @@
-:: if you dont want to copy the glife.qsp anywhere just comment out (::) the last command.
-
-python -3 txtmerge.py locations glife.txt
-txt2gam.exe glife.txt glife.qsp
-cp glife.qsp ..\GL_ECV

locations/Gpornmark

@@ -27,14 +27,14 @@ elseif pornMagazine = 1:
 			act 'Leave':gt 'Grinok'
 		end
 	end
+	
 elseif porndeal = 1:
 	if money >= 500:
 		act 'Buy a porn mag for the Chinese boy':
 			cls
 			minut += 5
 			money -= 500
-			pornMagazine = 50
-			TimesBuyPorno += 1
+			haveporn = 1
 			gs 'stat'
 			'You tried not to look into the eyes of the seller as you counted out the money. You took the magazine and quickly hid it.'
 

locations/Grinok

@@ -2,6 +2,8 @@
 !{change log
 March 31, 2016
 Added rice wine quest
+April 20, 2016
+Fixed Rice wine event
 }
 $metka = $ARGS[0]
 $loc = $CURLOC
@@ -263,77 +265,78 @@ if hour >= 8 and hour <= 18:
 			act 'Leave':gt $curloc
 		end
 	end
-elseif ShowerIvan = 5 and porndeal = 0 and rand(1,100) <= 10:
-	cls
-	cla
-	gs 'stat'
-	minut += 20
-	'<center><img src="images/locations/Pavlovsk/Market/chinese_stall01.jpg"></center>'
-	'You were looking through the market when you came upon a stall selling Chinese foods. On a shelf behind the old woman minding the stall there are a number of bottles.'
-	act 'Ask about huangjiu':
-		'You asked the old woman if she has any rice wine to sell. She smiles at you and points to a basket filled with rice.'
-		'"Onry 2 kopec, hundred glam." she said in badly accented Russian, "You buy?"'
-		'"No," you replied, "I need rice wine, rice wine."'
-		'She looked at you in confusion for a moment then suddenly brightened, "Ah!" she exclaimed, "Come, come!"'
-		'The old woman hurried to the other side of the stall and you followed her to where a number of smoked piglets hung in a row.'
-		'"Here," the old woman crowed handing you one of r the pigs, "Nice swine, vely nice swine."'
-		'"No, not nice swine," you cried in dispair, "Rice. Wine."'
-		'"Yes, yes," the woman countered, "Nice swine, only 5 lubles."'
-		'Just as you were about to give up, a young Chinese boy about your brother''s age arrived.'
-		'"I am sorry, my grandmother does not speak much Russian." he said as he stepped up beside the old woman who started to speak rapidly to him in what you assumed was Chinese.'
-		'"My grandmother asks why you don''t like the piglets." he translated as the old woman stopped speaking.'
-		'"I don''t want a pig," you replied in relief as his Russian is quite good, "I am looking for rice wine, wang-goo."'
-		'"Ah, huangjiu!" he said in understanding then spoke to his grandmother in Chinese.'
-		'the old woman glared at you then hung the smoked pig back on its hook. She shuffled over to the shelf with the bottles and peered short-sightedly at the labels. She finally picked up one of them and brought it over to you.'
-		'"Why you not say wanted lice wine." she asked in aggrieved tones, "2000 lubles."'
-		if money >= 2000:
-			act 'Buy the wine':
-				money -= 2000
-				ricewine = 1
-				'You hand the woman the money and she gives you the wine.'
-				act 'Leave': gt $curloc
-			end
-		else
-			'You are astonished by the price and realize that you cannot afford the wine. You apologize and turn away.'
-			act 'Leave the market': gt $curloc
-			act 'Continue browsing the market':
-				cls
-				cla
-				gs 'stat'
-				minut += 15
-				'<center><img src="images/locations/Pavlovsk/Market/market_boy01.jpg"></center>'
-				'You continued to wander through the market for another 15 minutes when the boy from the Chinese stall came up to you.'
-				'"Hey, you really want that rice wine?" he asked after checking to make sure no one was watching.'
-				'"Yes," you answered him, "But it costs too much. I can''t afford it."'
-				'"I''ll make a deal with you." he said, "Go to the porn dealer and buy me a porn magazine and I''ll get you the wine."'
-				if pornmarkonce = 0: pornmarkonce = 1 & '"Where is the porn dealer?" you asked and he gives you directions.'
-				act 'Agree': porndeal = 1 & gt 'Gpornmark'
-				act 'Refuse':
-					'You declined his offer and he shrugged and walked away.'
+	if ShowerIvan = 5 and porndeal = 0 and rand(1,100) <= 10:
+		cls
+		cla
+		gs 'stat'
+		minut += 20
+		'<center><img src="images/locations/Pavlovsk/Market/chinese_stall01.jpg"></center>'
+		'You were looking through the market when you came upon a stall selling Chinese foods. On a shelf behind the old woman minding the stall there are a number of bottles.'
+		act 'Ask about huangjiu':
+			'You asked the old woman if she has any rice wine to sell. She smiles at you and points to a basket filled with rice.'
+			'"Onry 2 kopec, hundred glam." she said in badly accented Russian, "You buy?"'
+			'"No," you replied, "I need rice wine, rice wine."'
+			'She looked at you in confusion for a moment then suddenly brightened, "Ah!" she exclaimed, "Come, come!"'
+			'The old woman hurried to the other side of the stall and you followed her to where a number of smoked piglets hung in a row.'
+			'"Here," the old woman crowed handing you one of r the pigs, "Nice swine, vely nice swine."'
+			'"No, not nice swine," you cried in dispair, "Rice. Wine."'
+			'"Yes, yes," the woman countered, "Nice swine, only 5 lubles."'
+			'Just as you were about to give up, a young Chinese boy about your brother''s age arrived.'
+			'"I am sorry, my grandmother does not speak much Russian." he said as he stepped up beside the old woman who started to speak rapidly to him in what you assumed was Chinese.'
+			'"My grandmother asks why you don''t like the piglets." he translated as the old woman stopped speaking.'
+			'"I don''t want a pig," you replied in relief as his Russian is quite good, "I am looking for rice wine, wang-goo."'
+			'"Ah, huangjiu!" he said in understanding then spoke to his grandmother in Chinese.'
+			'The old woman glared at you then hung the smoked pig back on its hook. She shuffled over to the shelf with the bottles and peered short-sightedly at the labels. She finally picked up one of them and brought it over to you.'
+			'"Why you not say wanted lice wine." she asked in aggrieved tones, "2000 lubles."'
+			if money >= 2000:
+				act 'Buy the wine':
+					money -= 2000
+					ricewine = 1
+					'You hand the woman the money and she gives you the wine.'
 					act 'Leave': gt $curloc
 				end
+			else
+				'You are astonished by the price and realize that you cannot afford the wine. You apologize and turn away.'
+				act 'Leave the market': gt $curloc
+				act 'Continue browsing the market':
+					cls
+					cla
+					gs 'stat'
+					minut += 15
+					'<center><img src="images/locations/Pavlovsk/Market/market_boy01.jpg"></center>'
+					'You continued to wander through the market for another 15 minutes when the boy from the Chinese stall came up to you.'
+					'"Hey, you really want that rice wine?" he asked after checking to make sure no one was watching.'
+					'"Yes," you answered him, "But it costs too much. I can''t afford it."'
+					'"I''ll make a deal with you." he said, "Go to the porn dealer and buy me a porn magazine and I''ll get you the wine."'
+					if pornmarkonce = 0: pornmarkonce = 1 & '"Where is the porn dealer?" you asked and he gives you directions.'
+					act 'Agree': porndeal = 1 & gt 'Gpornmark'
+					act 'Refuse':
+						'You declined his offer and he shrugged and walked away.'
+						act 'Leave': gt $curloc
+					end
+				end
 			end
 		end
-	end
 
-elseif porndeal = 1 and porndealday ! daystart:
-	cls 
-	cla
-	gs 'stat'
-	porndealday = daystart
-	'<center><img src="images/locations/Pavlovsk/Market/market_boy01.jpg"></center>'
-	'The boy from the Chinese stall comes up to you as you entered the market.'
-	'"Do you have it?" he asked eagerly.'
-	if haveporn = 1: 
-		porndeal = 2 & ! to close the ricewine event
-		ricewine = 1
-		'"Do you have the wine?" you countered.'
-		'He pulls the bottle out of his backpack and you trade items.'
-		act 'Leave': gt $curloc
-	else
-		'You told him you didn''t have his magazine yet but you were working on it.'
-		act 'Leave': gt $curloc
-	end 
+	elseif porndeal = 1 and porndealday ! daystart:
+		cls 
+		cla
+		gs 'stat'
+		porndealday = daystart
+		'<center><img src="images/locations/Pavlovsk/Market/market_boy01.jpg"></center>'
+		'The boy from the Chinese stall comes up to you as you entered the market.'
+		'"Do you have it?" he asked eagerly.'
+		if haveporn = 1: 
+			porndeal = 2 & ! to close the ricewine event
+			ricewine = 1
+			'"Do you have the wine?" you countered.'
+			'He pulls the bottle out of his backpack and you trade items.'
+			act 'Leave': gt $curloc
+		else
+			'You told him you didn''t have his magazine yet but you were working on it.'
+			act 'Leave': gt $curloc
+		end 
+	end
 else
 	'There is no one in the market.'
 end

locations/VolleyTrenerSpeak

@@ -9,7 +9,7 @@ gs 'stat'
 
 !At disco
 if volleysostav > 0:
-	if trenerSex = 1:
+	if trenerSex ! 0:
 	   gt 'Voltrenersex', 'discoSex'
 	else
 		'<center><img src="images/qwest/alter/volley/Tren/VolleyTrener2.jpg"></center>'

locations/Voltrener

@@ -303,14 +303,14 @@ if $ARGS[0] = 'trener_speak':
 			'"You don''t want to satisfy my curiosity? How about just satisfying me?" you whispered suggestively. Coach looked uncertainly at you as if he were about to say something but turned away instead.'
 		end
 	elseif trenerepa > 10 and trener_Speak = 1:
-		trener_Speak += 1
+		trener_Speak = 2
 		'Seeing that the subject upset Mikhail, you made attempts to cheer him up. Chirping all sorts of nonsense, you eventually asked if he has a girlfriend or wife. Coach said, "<<$surname>> do you have nothing better to do than ask about stuff that doesn''t concern you?" You continued to pester him and say that you are very interested. Coach finally gave up and said, "Yes, I have a wife. She is, of course, beautiful and jealous. So if she sees you hanging around me, she''ll try to kill you."'
 		if horny > 80 or GorSlut > 0:
 			trenerepa += 2
 			'"I''m not afraid, and I doubt she is prettier than me." you retort and the coach just smiled at your words.'
 		end
 	elseif trenerepa > 20  and trener_Speak = 2:
-		trener_Speak += 1
+		trener_Speak = 3
 		'Studiously avoiding all mention of the European championship, you asked the coach to talk about volleyball. He told you that being a competitive player means being focused. Responsible players do not go to dances and guzzle booze right before competitions. You were hoping to hear something more interesting, and instead got a lecture about the grass was greener and the trees above, yada yada yada.'
 		if horny > 80 or GorSlut > 0:
 			trenerepa += 3
@@ -342,7 +342,7 @@ if $ARGS[0] = 'trener_speak':
 			end
 		end
 	elseif trenerepa > 30 and trener_Speak = 3:
-		trener_Speak += 1
+		trener_Speak = 4
 		'Once again you decided to talk about volleyball with coach. Coach''s eyes became a bit unfocused and began his story: "When we arrived at the competition, the USSR teams settled into the hotel. I was not small, 194 cm in height, but while waiting for the lift I was quite impressed by the team of our Soviet athletes standing nearby. I felt like a pygmy next to these monumental figures from the great sport. All together we went into the elevator and began to go upstairs. On the middle floors, the elevator stopped, and two puny Asians wearing coaches'' caps got on and begin enthusiastically to speak to each other, looking at the bottoms of our girls. Apparently, they had an argument between themselves on frivolous topic, because when the elevatort stopped and the women got off, one of the Asians playfully slaps the last one on the ass. Without turning around, and by pure reflex, she thrusts her elbow back, catching the Asian right between the eyes. There was a dull thud and the unfortunate guy falls unconscious sliding down the rear wall of the elevator under the laughter of his friend. The woman slowly turns her head and utters the immortal phrase: - "Oh, exotics wanted..."'
 		'As the coach told this story, with its sexual overtones, you thought, "Maybe he''d be more into me if I made him jealous. What if he saw me with one of the other jocks? And if I don''t wear panties to training he might catch a glimpse of what he really wants."'
 		volleytanga = 1 & ! flag start training without panties in  gdksport - go to coaching
@@ -371,7 +371,7 @@ if $ARGS[0] = 'trener_speak':
 			end
 		end
 	elseif ShowerIvan = 3 and trener_Speak = 4:
-		trener_Speak += 1
+		trener_Speak = 5
 		'"Mikail, are you angry with me about Ivan, we''re not serious, he only cares about his competition. Anyway I like you better." Coach, tries to gather himself, only able to stare at you and cough.'
 		'You seize the initiative, "I wanted to ask you, do the coaches of the Junior volleyball teams get paid well? Then I might also want to become a coach, you have a car and you dress up stylishly, but you, as a former international player and European championship winner probably get paid extra." You decided to once again touch on the topic of the championship.'
 		act 'Humbly listen':
@@ -415,11 +415,11 @@ if $ARGS[0] = 'trener_speak':
 		end
 	elseif trener_Speak = 5 and ShowerIvan = 6:
 		cls
+		centr = 3 & ! to close the fitness center encounters
+		trener_Speak = 6
 		'<center><img src="images/qwest/alter/volley/VoltrenerSpeak19.jpg"></center>'
 		'You took the hand of the coach in your''s, "Mikhail, I want to tell you, that I will never betray you, I certainly like to gossip, but human relationships are not the reason for the chatter. I''m not like the girl from the national team." having blurted this out, you stared at the coach and waited for his reaction.' 
 		'"That damn Chinaman just can''t help but gossip." the coach smiled and continued, "And you''re a stubborn wench <<$surname>>, I will think about your words, now go home".'
-		centr = 3 & ! to close the fitness center encounters
-		trener_Speak += 1
 	elseif trener_Speak = 6 and trenerSex >= 1:
 		cla & *clr
 		'<center><img src="images/qwest/alter/volley/VoltrenerSpeak21.jpg"></center>'
@@ -445,7 +445,7 @@ if $ARGS[0] = 'trener_speak':
 		act 'Hold your temper':
 			cla & *clr
 			trenerepa += 5
-			trener_Speak += 1
+			trener_Speak = 7
 			'You really wanted to yell at him for his remarks, but you resisted, still faithfully looking into the eyes of the coach, you said you''re ready for your good behavior to show. You bent over and presented your ass.'
 			if Discoclose = 1 and tanga = 1:
 				'<center><img src="images/qwest/alter/volley/VoltrenerSpeak25.jpg"></center>'
@@ -473,7 +473,7 @@ if $ARGS[0] = 'trener_speak':
 			end
 		end
 	elseif trener_Speak = 7 and trenerepa > 150 and volleyboll > 150:
-		trener_Speak += 1
+		trener_Speak = 8
 		cla
 		*clr
 		'<center><img src="images/qwest/alter/volley/Tren/VolleyTrener5.jpg"></center>'

locations/Voltrenersex

@@ -443,7 +443,6 @@ if $ARGS[0] = 'masaj':
 end
 
 if $ARGS[0] = 'discoSex':
-	gs 'Voltrener_din'
 	cls
 	'<center><img src="images/qwest/alter/volley/Tren/VolleyTrener4.jpg"></center>'
 	'"<<$surname>>, let''s find a secluded place fuck." You are about to say that there isn''t a quiet place, when coach smiles and says, "Follow me."'

locations/din_bad

@@ -681,8 +681,8 @@ $d_tabletkiedA = {
 		tabletkipd += tabletkipt
 		tabletki -= 1
 		if tabletkiday ! daystart:
-			pillcon += 1+(pillcon+15)/40
-			if pillcon > 40: pillcon = 40
+			pillcon += ((pillcon+15000)/40)+1000
+			if pillcon > 40000: pillcon = 40000
 			tabletkiday = daystart
 			tabletkipt = 0
 			tabletkipi = 0

locations/gdksport

@@ -717,7 +717,7 @@ if $ARGS[0] = 'volley':
 	'The teams take to the court and start playing.'
 
 		!! reserve player or you were caught drinking by the coach and he forbid you from playing
-		if trener_Speak < 9 or seealko = 1:
+		if trener_Speak < 8 or seealko = 1:
 			volleysostav = 1
 			poverkomand = 500
 			'<center><img src="images/qwest/alter/volley/game3.jpg"></center>'

locations/start

@@ -20,7 +20,7 @@ bcolor = rgb(255, 255, 255)
 lcolor = rgb(106, 90, 205)
 $fname = 'Tahoma'
 fsize = 12
-$version = '0.5.0-rc1 Store wars: G & M awakens.'
+$version = '0.5.0.3 Store wars: G & M awakens.'
 
 *nl
 *nl
@@ -196,3 +196,5 @@ end
 set $ImageNeededPlacholder = '<center><img src="images/community/Image_needed.png"></center>'
 --- start ---------------------------------
 
+-------------------------------
+