Browse Source

assorted control flow improvements, minor enhancements, and bug fixes

John Doe 2 years ago
parent
commit
438325d282

+ 1 - 0
locations/gargazel.qsrc

@@ -30,6 +30,7 @@ if sdadloc = 9:
 end
 
 act 'Leave the garage':minut += 5 & gt 'pav_complex', 'garages'
+if sdadloc = 9: act 'Talk to your stepfather': gt 'garfather'
 
 if YouCanGar > 0:
 	'You have stored <<GarTorgItem>> trinkets in the garage currently. Your stepfather allowed you to store some things in his garage but doesn''t want you taking up all his space, he has allowed you to store up to 100 trinkets here. The garage is not very easily accessible; if you want to sell the trinkets at the station, you will have to bring them back home first.'

+ 38 - 15
locations/gdksport.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">community center</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/gdksport.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
 	'The community center sports club offers lessons in <a href="exec: gt ''gdksport'',''racing1''">Racing</a>, <a href="exec: gt ''gdksport'',''dance1''">Dance</a> and <a href="exec: gt ''gdksport'',''vball1''">Volleyball</a>. All lessons start before 18:00'
 	*nl
 	'In the locker room is a <a href="exec: gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec: gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
@@ -33,7 +33,7 @@ if $ARGS[0] = 'start':
 	if week <= 5 and hour >= 16 and hour < 18 and fedorKozlovQW >= 20:
 		'You can see <a href="exec: gt ''FedorMisc'', ''Fedor Workout''">Fedor</a> on his phone next to some punching bags.'
 	end
-	
+
 	if (temper < 15 or sunWeather ! 1) and hour > 8 and hour < 12 and week = 6 and bbpickupDay + 14 <= daystart and fbpickupDay ! daystart:
 		*nl
 		'As you pass by the sports field you notice that most of the ''jocks'' have gathered around the <a href="exec:gt ''bbgamein'', ''start''">basketball court</a>.'
@@ -126,6 +126,7 @@ if $ARGS[0] = 'start':
 			elseif pregtime >= 90:
 				act 'Play with the team': gt 'gdksport', 'vballreact'
 			end
+			act 'Quit the volleyball team': volleysostav = 0 & gt 'gdksport','start'
 		end
 		if gsAboDance > 0 and AlbinaQW['StarletsJoined'] = 0 and npc_pregtalk['A23'] = 0:
 			if pcs_energy >= 20:
@@ -139,8 +140,10 @@ if $ARGS[0] = 'start':
 			else
 				act 'Take a dance lesson. You have <<gsAboDance>> lessons remaining': '<br><font color="red">You feel too hungry to do this.</font>'
 			end
+		elseif AlbinaQW['StarletsJoined'] = -2:
+			act 'Rejoin the Starlets': gt 'AlbStars', 'albina3'
 		elseif AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['startletsday'] ! daystart:
-			if hour = 15 and starlets_on = 1:
+			if hour >= 15 and hour <= 17 and starlets_on = 1:
 				if pregtime >= 90 or grupTipe = 5 or starlets_missed = 1:
 					if pregtime >= 90: act 'Train with Starlets': gt 'albina_starlets', 'Starletsreact'
 					if grupTipe = 5: act 'Train with Starlets': gt 'albina_starlets', 'StarletsEnd'
@@ -312,7 +315,7 @@ if $ARGS[0] = 'vball2':
 		if pcs_inhib < 40:inhib_exp += rand(0,1)
 	end
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/gdksport.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
 	if alko < 2:
 		'At the beginning of the workout you ran a few laps around the gym. After some sprints, you did abdominal exercises. Afterwards, you practiced volleying and serving the ball.'
 	else
@@ -329,7 +332,7 @@ if $ARGS[0] = 'vball3':
 	menu_off = 1
 	gsAboVolley -= 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/gdksport.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
 	'On Fridays they hold intramural competitions. Scouts for professional teams sometime come to see who the stronger and more talented players are.'
 
 	if alko < 2:
@@ -365,7 +368,7 @@ if $ARGS[0] = 'vball4':
 	npc_rel['A69'] += 1
 	if pcs_inhib < 40:inhib_exp += rand(0,1)
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/gdksport.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
 	'Number of games <<volsesongame>>, Win - <<volsesonwin>>, lesions - <<volsesonloss>>.'
 	'At the beginning of the workout you ran a few laps around the room. Afterwards the coach has you do push-ups and crunches. Then you practiced receiving and setting up plays and serving the ball. At the end of the workout you had a practice game.'
 	act 'Leave': gt 'gdksport', 'start'
@@ -398,7 +401,7 @@ if $ARGS[0] = 'vball5':
 	menu_off = 1
 !	gs 'exercise', 'tier2', 120, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/gdksport.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
 	'The tournament starts at 19:00. Your bus departs at 18:00. You gather your things together with the rest of the team and get on a bus that takes you to the out of town match.'
 	act 'Leave': gt 'gdksport', 'start'
 	act 'Get on bus and go to play':
@@ -426,7 +429,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 < 8 or seealko = 1:
+		if (trener_Speak < 8 or seealko = 1) and pcs_vball < 90:
 			volleysostav = 1
 			poverkomand = 50
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/game3.jpg"></center>'
@@ -552,24 +555,29 @@ if $ARGS[0] = 'volley':
 		seealko = 0
 		if volpoint > volpointv:
 			volsesonwin += 1
+      gs 'fame', 'pav', 'volleyball', 5
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/game6.jpg"></center>'
 			'Your team wins.'
 		elseif volpoint < volpointv:
 			volsesonloss += 1
+      gs 'fame', 'pav', 'volleyball', 1
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/game8.jpg"></center>'
 			'Your team loses.'
 		else
 			if rand (0, 1) = 0:
 				volsesonwin += 1
+        gs 'fame', 'pav', 'volleyball', 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/game7.jpg"></center>'
 				'The match was very close, but in the end your team pulls off a win.'
 			else
 				volsesonloss += 1
+        gs 'fame', 'pav', 'volleyball', 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/game7.jpg"></center>'
 				'The match was very close, but in the end your team still loses.'
 			end
 		end
 		minut += 60 & !total time should be 4 hours, 2 hours for the game and 2 hours travel
+    gs 'stat'
 		act 'Leave': gt 'gdksport', 'start'
 		act 'Talk to the coach': gt 'Voltrener', 'start'
 	end
@@ -588,7 +596,7 @@ if $ARGS[0] = 'shower':
 	gs 'stat'
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 
-	if IvanShowerYes = 1 and rand(0,3) = 1 and ShowerIvan < 3:
+	if IvanShowerYes = 1 and rand(0,3) = 1:
 		if ShowerIvan = 1: ShowerIvan = 2
 		'You enter the women''s shower, and turning the water on, you begin to lather up your body with a washcloth. Suddenly, you hear the door creak open and you remember that you agreed not to lock it for Ivan.'
 		'You look around and see Ivan standing there looking at you. "Hello <<$pcs_nickname>>. The men''s shower is full, so I thought I would join you instead." He smiles.'
@@ -661,7 +669,7 @@ if $ARGS[0] = 'shower':
 			end
 			act 'Wash together':
 				IvanShowerQW = 1
-				IvanShowerYes = 0
+				IvanShowerYes = 1
 				if ShowerIvan = 0: ShowerIvan = 1
 				gt 'gdksport', 'ShowerWithIvan'
 			end
@@ -674,6 +682,18 @@ if $ARGS[0] = 'shower':
 			act 'Continue': gt 'VoltrenerSexShower', '1'
 		elseif (trenerlust >= 40 or trenersex = 1) and rand(0,3) = 0 and VoltrenerVoyeur = 2 and IvanShowerYes = 0:
 			act 'Continue': gt 'VoltrenerSexShower', '2'
+		elseif (trenerlust >= 40 or trenersex = 1) and VoltrenerVoyeur > 2:
+      tmprand = rand(2,4)
+      if tmprand = 1:
+			  act 'Continue': gt 'VoltrenerSexShower', '0'
+      elseif tmprand = 2:
+			  act 'Continue': gt 'VoltrenerSexShower', '1'
+      elseif tmprand = 3:
+			  act 'Continue': gt 'VoltrenerSexShower', '2'
+      else
+        'After your shower, you get dressed.'
+        act 'Get out of the shower': gt 'gdksport', 'start'
+      end
 		else
 			'After your shower, you get dressed.'
 			act 'Get out of the shower': gt 'gdksport', 'start'
@@ -722,9 +742,7 @@ if $ARGS[0] = 'ShowerWithIvan':
 				if agape > 0:
 					act 'Continue':
 						*clr & cla
-						if pcs_throat < dick:pcs_throat += 1
-						spafinloc = 12
-						gs 'cum_manage'
+						gs 'cum_call', 'mouth', 'A3', 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum49.jpg"></center>'
 						'Bent over, expecting to feel his <<dick>>cm <<$dick_girth>> cock against your pussy at any moment, you are momentarily surprised when you feel it pressed up against your asshole.'
@@ -746,8 +764,7 @@ if $ARGS[0] = 'ShowerWithIvan':
 					act 'Turn around and bend over':
 						*clr & cla
 						lubonus = 2
-						spafinloc = 3
-						gs 'Cum_Manage'
+						gs 'cum_call', 'anus', 'A3', 1
 						if pcs_ass + lubonus + 2 < dick:
 							if pcs_makeup > 1:pcs_makeup = 0
 							pcs_horny -= 20
@@ -775,6 +792,12 @@ if $ARGS[0] = 'ShowerWithIvan':
 							act 'Continue': gt 'VoltrenerSexShower', '4'
 						elseif VoltrenerVoyeur = 5:
 							act 'Continue': gt 'VoltrenerSexShower', '5'
+						elseif VoltrenerVoyeur > 5 and rand(0,3) = 0:
+							act 'Continue': gt 'VoltrenerSexShower', '3'
+						elseif VoltrenerVoyeur > 5 and rand(0,3) = 0:
+							act 'Continue': gt 'VoltrenerSexShower', '4'
+						elseif VoltrenerVoyeur > 5 and rand(0,3) = 0:
+							act 'Continue': gt 'VoltrenerSexShower', '5'
 						else
 							if pcs_horny >= 100:
 								if stat['anal'] >= 10 and orgasm > 0:

+ 8 - 1
locations/gkafe.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = '':
 
 	act 'Leave':gt 'pav_market'
 
-	if (momloc = 7 or momloc = 9) and hour = 16 and indorf = 0 and mother_go = 1:
+	if (momloc = 7 or momloc = 9) and hour = 16 and indorf = 0 and (mother_go = 1 or momslut = 0 or rand(1,10)=1):
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe.jpg"></center>'
 		*nl
@@ -90,6 +90,13 @@ if $ARGS[0] = '':
 					'Your <a href="exec:gt ''mother''">mother</a> is currently working at the cafe, taking orders behind the counter.'
 				else
 					'The bar owner <a href="exec:gt ''gkafe'', ''boris''">Borislav</a> is currently taking orders at the counter. Most people call him Slava.'
+					if pcafejob = 2:
+						if PCloStyle2 ! 2: 
+							act 'Use restroom to change into server attire': gt 'wardrobe', 'sets'
+						else
+							act'Work a shift':gt'motherkafeboss','work_shift'
+						end
+					end
 				end
 			end
 

+ 0 - 6
locations/gopskver.qsrc

@@ -217,7 +217,6 @@ if $ARGS[0] = '':
 
 					stat['vaginal'] += 3
 					gang += 1
-					pcs_vag += 3
 					gs 'boyStat', 'A11'
 					cumprecheck = 1
 					gs 'cum_manage'
@@ -591,8 +590,6 @@ if $ARGS[0] = 'BjBeerAct':
 	*clr & cla
 	throatrand=rand(7,8)
 	minut += 15
-	pcs_throat += 1
-	swallow += 1
 	stat['bj'] += 1
 	eggs +=1
 	spafinloc = 12
@@ -665,7 +662,6 @@ if $ARGS[0] = 'BjBeerDouble':
 	Doublerand = rand(14,15)
 	pcs_hairbsh = 0
 	stat['bj'] += 2
-	pcs_throat = pcs_throat + 1
 	spafinloc = 11
 	gs 'cum_manage'
 	
@@ -738,7 +734,6 @@ if $ARGS[0] = 'BjBeerPhone':
 	*clr & cla
 	pcs_hairbsh = 0
 	stat['bj'] += 2
-	pcs_throat += 1
 	spafinloc = 11
 	gs 'cum_manage'
 	
@@ -779,7 +774,6 @@ if $ARGS[0] = 'BjBeerPalevo':
 	Doublerand = rand(14,15)
 	pcs_hairbsh = 0
 	stat['bj'] += 2
-	pcs_throat = pcs_throat + 1
 	spafinloc = 11
 	gs 'cum_manage'
 	

+ 9 - 1
locations/gschool_office.qsrc

@@ -12,7 +12,15 @@ if $ARGS[0] = 'principal':
 		'You take a seat at Miss Volkov''s desk and wait for her to address you with an exacerbated tone: "I usually give pupils the choice of detention so that I don''t have to punish them personally, but you have abused my leniency one time too many. I''m going to teach you not to insult my kindness." She is clearly angry and you can almost already feel the pain on your ass that you are about to receive.'
 		act 'Accept the inevitable': gt 'gschool_office', 'spanked'
 	elseif demerit > 50:
-		'You take a seat at Miss Volkov''s desk and wait for her to address you with an exacerbated tone: "What did you do this time, <<$pcs_lastname>>? No, I don''t want to know. I really don''t care what it is. You obviously have no respect for me or your teachers." She looks over your file some more and shakes her head slightly. "You have been here enough and you know what comes next. So, what will it be this time? Spanking or Saturday detention?" She seems more than a bit annoyed that you appear to be immune to her punishment system, or maybe that you are that troubled of a student.'
+		'You take a seat at Miss Volkov''s desk and wait for her to address you with an exacerbated tone: "What did you do this time, <<$pcs_lastname>>? No, I don''t want to know. I really don''t care what it is. You obviously have no respect for me or your teachers." She looks over your file some more and shakes her head slightly. "You have been here enough and you know what comes next. So, what will it be this time? Spanking or Saturday detention? Therapy is also an option that we may need to explore." She seems more than a bit annoyed that you appear to be immune to her punishment system, or maybe that you are that troubled of a student.'
+		if gschool_therapy ! 1:
+			act 'Choose therapy': 
+				gschool_therapy = 1
+				*nl
+				'She addes a note to your file and slowly shakes her head. "I will schedule an appointment with your therapist, make sure that you don''t miss it.'
+				act 'Continue': gt 'gschool_lessons', 'short_break'
+			end
+		end
 		if detention_set = 0: 
 			act 'Choose detention': detention_set = 1 & gt 'gschool_lessons', 'short_break'
 			act 'Choose spanking': gt 'gschool_office', 'spanked'

+ 1 - 2
locations/igorev.qsrc

@@ -197,7 +197,6 @@ if $ARGS[0] = 'din_sex':
 		'Both of you quickly undress, kissing, as you pull the clothes off each other.'
 		act 'Squat':
 			*clr & cla
-			bja += 1
 			if npc_Sex['A4'] = 0: npc_Sex['A4'] = 1 & guy += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/home/tinydick.jpg"></center>'
@@ -251,7 +250,6 @@ if $ARGS[0] = 'din_sex':
 				act 'Tell him to fuck you in the pussy':
 					cls
 					Igorsex += 1
-					sexa += 1
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/sex/home/pussy.mp4"></video></center>'
 					'Igor nervously spreads your legs and thrusts his cock into you.'
 					'The little cock is giving you very little pleasure and you just wish he would finish quickly enough.'
@@ -800,6 +798,7 @@ if $ARGS[0] = 'din_sisterkom_krossdress':
 													'You continue on sucking his small dick. It starts twitching, he''s close to erupt. You quickly deepthroat and swallow the cum that shoots into your mouth. Some of it sips out and flows from your mouth onto Igor. Finally the flow dies down and you release the now limp cock out of your mouth. Your <<$pc_desc[''lips'']>> lips are wet from semen. While you put all you might into handling Igor''s cum, Igor continues licking your now dripping pussy.'
 													'You lick up the remaining sperm from Igor''s cock and swallow it. You turn your head around seeing Igor still going strong. You are impressed by Igor''s stamina.'
 													'Suddenly you feel a bolt jolting in your pussy and you start screaming. You''re on the edge ready to cum. You tell Igor not to stop, suddenly you start to tremble, embracing the orgasm.'
+					                gs 'cum_call', 'mouth_swallow', $boy, 1
 													gs 'arousal', 'bj', 15
 													$orgasm_or = 'yes'
 													gs 'arousal', 'cuni', 15

+ 3 - 2
locations/igorhome.qsrc

@@ -225,7 +225,7 @@ if $ARGS[0] = 'Chat':
 	end
 	act 'Keep talking': gt 'igorhome', 'Chat'
 !!this is extra options that show up only if certain things have happened.
-	if sisunlock = 1 and igor_krossdress < 1:
+	if sisunlock = 1:
 		act 'Clothes':
 			cla
 			'"So your sister has that many clothes?" you ask Igor.'
@@ -684,12 +684,13 @@ if $ARGS[0] = 'livingroom3':
 						'"Well, I''m sure you''re quite the teacher... I''m just glad Igor has found someone to look after him..."'
 						'You wink at the father as not to worry. You grab Igor by the arm, and the two of you leave the living room feeling relieved that you''ve told Gemorgen.'
 						act 'Leave the living room': gt 'igorhome','hallway'
-					elseif pcs_vag ! 0:
+					elseif stat['vaginal'] ! 0:
 						'"I hope something will happen soon he''s been avoiding that part of our relationship..." you say a bit disappointed.'
 						'"Don''t worry I''ll have a talk man to man. He''s innocent like a little lamb. He probably doesn''t know what to do..."'
 						'Igor blushes while you thank the father for wanting to help out. The two of you leave the living room.'
 						act 'Leave the living room': gt 'igorhome','hallway'
 					elseif pcs_vag = 0:
+					elseif stat['vaginal'] = 0:
 						'"No, I''m still a virgin and I''m not ready yet to lose it yet and Igor is really understanding. One day maybe but not right now..."'
 						'Gemorgen looks a bit disappointed at Igor but doesn''t say anything since his son as he doesn''t want to jeopardize the relationship...'
 						act 'Leave the living room': gt 'igorhome','hallway'

+ 20 - 0
locations/katspalnya.qsrc

@@ -20,6 +20,26 @@ if $ARGS[0] = 'start':
 	if hour >= 23 or hour < 6:'<a href="exec:gt ''katspalnya'', ''katslip''">Kat</a> is sound asleep in her huge bed.'
 
 	act 'Leave Kat''s apartment':gt 'city_residential'
+
+  if hour >= 6 and hour < 18:
+    'A man you''ve never seen before looks at you curiously from the couch. He must be one of Kat''s many friends-with-benefits she told you about.'
+    act 'Seduce the guy':
+      cla
+      *clr
+      '<center><img <<$set_imgh>> src="images/characters/city/katja/kathouse1.jpg"></center>'
+      'He''s rather cute! You wouldn''t mind him joining you in bed...'
+      'You give him a weak smile and slowly pull down your panties, rubbing a finger over your engorged pussy lips. When you notice how wet you are, you slip in two fingers slowly and let out a soft moan while you look him straight in the eye.'
+      'The guy shifts his position a few times, watching you intently. You can tell he''s enjoying your little show a lot.'
+
+      act 'Invite him over':
+        $sexloc = 'katspalnya'
+        gs 'npcgeneratec', 0, 'Kat''s lover', rand(19,45)
+        gs 'boyStat', $npclastgenerated
+        picrand = rand(0,40)
+        gt 'sex', 'start'
+      end
+    end
+  end
 end
 
 if $ARGS[0] = 'katslip':

+ 12 - 30
locations/kit_din.qsrc

@@ -106,35 +106,17 @@ $santehnikend = {
 			money -= 1500
 			gt $curloc
 		end
-	elseif money < 1500:
-		'You do not have enough cash on you.'
-		if money+stolmoney >= 1500:
-			'You remember the stash in your table and with that you''ll have enough.'
-			act 'Pay':
-				money = money+stolmoney & stolmoney = 0
-				money -= 1500
-				gt $curloc
-			end
-		elseif money+stolmoney + karta >= 1500:
-			'You know that even with your stash in the apartment you are short, but you could get the extra from the ATM.'
-			act 'Walk down to the ATM and get the extra money, then pay':
-				minut += 10
-				money = money + stolmoney & stolmoney = 0
-				karta -= (1500 - money)
-				money = 0
-				gt $curloc
-			end
-		elseif money+stolmoney < 1500:
-			act 'I did not have enough money':
-				*clr & cla
-				gs'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s3.jpg"></center>'
-				'You are embarrassed and tell the plumber, that you do not have enough money. He is visibly angry. "You call a fucking plumber and don''t have any money? What am I supposed to do now?"'
-				act 'Shrug':dynamic $santehnikend1
-				act 'Suggest a loan':dynamic $santehnikend2
-			end
+	end
+	if money < 1500 or pcs_inhib > 80:
+		act 'Tell him that you do not have enough money':
+			*clr & cla
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s3.jpg"></center>'
+			'You are embarrassed and tell the plumber that you do not have enough money. He is visibly angry. "You call a fucking plumber and don''t have any money? What am I supposed to do now?"'
+			act 'Shrug':dynamic $santehnikend1
+			act 'Suggest a loan':dynamic $santehnikend2
 		end
-		if money+stolmoney<1500 and shameless > 14:
+		if shameless > 14:
 			act 'Offer a favour instead':
 				*clr & cla
 				gs 'stat'
@@ -150,7 +132,7 @@ $santehnikend = {
 
 					if pcs_apprnc < 60:
 						*clr & cla
-						guy += 1
+						if GrishaSex = 0:GrishaSex = 1 & guy += 1
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s5.jpg"></center>'
 						'You diligently sucking his dick between his legs itched from all desires, you break off a couple of times to stop and go to the sex, but he took you by the head and continued to fuck your mouth, soon he came into your mouth and swallow once you come and pick it up again member, as he put his pants and silently walked to the door, to sleep with you, he was not even going. From rastrojstva you spat out semen on the floor, looks like you do not attract even plumbing.'
 
@@ -268,7 +250,7 @@ $santehnik = {
 								act 'Leave':gt 'sitr'
 							elseif harakHusb = 2:
 								cla
-								guy += 1
+								if GrishaSex = 0:GrishaSex = 1 & guy += 1
 								'You tried to spit the member from your mouth, but your husband grabs hold of your head and he starts to fuck you in the mouth, talking with shocked plumber, "We''re a little busy, at the moment, it''s her feeding time." he laughes, "How much do I owe you?" He continues.'
 								'"Fifteen hundred." Manages the plumber.'
 								'"Well, with those prices can agree that if you feed her too, we consider it paid?" He asks.'

+ 1 - 1
locations/kompMFCoral.qsrc

@@ -63,7 +63,7 @@ if dildo = 1 or middildo = 1 or largedildo = 1 or bigdildo = 1 or extradildo = 1
 					'You are terribly inexperienced at giving blowjobs.  Hesitantly you take your medium dildo into your mouth and do your best to put on an entertaining show.'
 					'You realize that with your inexperience you can''t really do much with this dildo that you couldn''t do with a smaller one.  Nonetheless your clients seem to appreciate the effort and your ambition and you get a few donations.'
 				end
-				if pcs_throat => 15 and pcs_throat < 25:
+				if pcs_throat >= 15 and pcs_throat < 25:
 					pcs_throat += 1
 					mfcclients = 0
 					webpopular += rand(hotcat/2 -2,hotcat/2)

+ 4 - 3
locations/kotovdom.qsrc

@@ -24,15 +24,16 @@ if $ARGS[0] = 'kotov_kom':
 	gs 'stat'
 	gs 'npc','intro',$boy,'images/locations/pavlovsk/resident/vitekhome/kotovkom.jpg','',' '
 	if pain['asshole'] + (agape * 10) > 40: gs 'dinsex','after_anal','no_plug' else gs 'dinsex','after_anal','boy',$boydesc
-	if npc_rel[$boy] > 50 and $clothingworntype ! 'nude' and pcs_sweat < 20 :
+	tmpsweat = iif(cheatNoSweat = 0, pcs_sweat, rand(0,30))
+	if npc_rel[$boy] > 50 and $clothingworntype ! 'nude' and tmpsweat < 20 :
 		'"Are you ready?" he asks, looking up at you from the bed. Seeing that you are, he gets up from the bed and puts on some clothes while he says: "Come on, I''ll walk you home."'
 		act 'Walk home with Vitek': gt 'kotovdom', 'walk'
 	end
-	if npc_rel[$boy] <= 50 and $clothingworntype ! 'nude' and pcs_sweat < 20 :
+	if npc_rel[$boy] <= 50 and $clothingworntype ! 'nude' and tmpsweat < 20 :
 		'"Thanks for fun <<$pcs_nickname>>. " he says looking up at you from the bed. Seeing that you are ready to go, he tells: "Take care, you are always welcome here."'
 		act 'Say goodbye and leave his apartment':gt 'pav_residential'
 	end
-	if pcs_sweat >= 20:
+	if tmpsweat >= 20:
 		'Vitek looks up at you from his bed and says: "You''re all sweaty, kitten. You should go take a shower before going home."'
 		act 'Nod and look for the bathroom':gt 'kotovdom', 'kotovkom'
 	end

+ 1 - 1
locations/lakecafe.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'main':
 			if barrnd = 1:'You see a smiling <a href="exec:gt ''lakecafe'', ''barmensha''">barmaid</a> behind the bar polishing some glasses.'
 			if barrnd = 2:'When you walk into the diner, you see a smiling <a href="exec:gt ''lakecafe'', ''barmensha''">barmaid</a> picking up some dirty dishes and cleaning a table.'
 			if barrnd = 3:'You see a smiling <a href="exec:gt ''lakecafe'', ''barmensha''">barmaid</a> behind the bar skilfully making some drinks.'
-		elseif npc_QW['A89'] => 1:
+		elseif npc_QW['A89'] >= 1:
 			if barrnd = 1:'You see <a href="exec:gt ''lakecafe'', ''barmensha''">Eugene</a> behind the bar with that perpetual smile on her face. She''s currently polishing some glasses.'
 			if barrnd = 2:'You walk into the diner and see <a href="exec:gt ''lakecafe'', ''barmensha''">Eugene</a> with that perpetual smile on her face collecting dirty dishes from tables.'
 			if barrnd = 3:'You see <a href="exec:gt ''lakecafe'', ''barmensha''">Eugene</a> behind the bar with that perpetual smile on her face. She''s skilfully mixing some drinks.'

+ 1 - 1
locations/lezbsex.qsrc

@@ -244,7 +244,7 @@ if $ARGS[0] = 'end':
 		if $sexloc = 'uni_dorm': gt 'uni_dorm', 'dorm_room'
 		if picrand = 22:gt 'city_center'
 		if picrand = 21:gt 'vann', 'start'
-		if picrand = 19 or picrand = 20:gt 'office', 'work'
+		if picrand = 19 or picrand = 20:gt 'office_old', 'work'
 
 		gt $sexloc, 'start'
 	end

+ 3 - 3
locations/liam.qsrc

@@ -55,15 +55,13 @@ end
 !!if arts = 1:'<a href="exec:gt ''Marin'',''start''">Marinka''s Apartment</a>'
 
 act 'Walk to Okhlopkov Square (0:05)':minut += 5 & gt 'liames'
-act 'Walk to the highway (0:05)':minut += 5 & nroad = 15 & gt 'road'
 act 'Walk to Pavlovsk park (0:10)':minut += 10 & nroad = 10 & gt 'pav_park', 'start'
 act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
 act 'Walk to the Market (0:20)':minut += 20 & gt 'pav_market'
 act 'Walk to the Commercial area (0:25)':minut += 25 & gt 'pav_commercial'
 act 'Walk to the Residential area (0:30)':minut += 30 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:30)':minut += 30 & gt 'pav_industrial'
-
-act 'Wait':gs 'obj_din', 'wait'
+act 'Walk to the highway (0:05)':minut += 5 & nroad = 15 & gt 'road'
 
 if pushkin_walk_day ! daystart:
 	act 'Take a walk (1:00)':
@@ -78,5 +76,7 @@ if pushkin_walk_day ! daystart:
 	end
 end
 
+act 'Wait':gs 'obj_din', 'wait'
+
 --- liam ---------------------------------
 

+ 8 - 18
locations/liames.qsrc

@@ -17,6 +17,12 @@ gs'stat'
 
 'Another street runs straight back to the <a href="exec:minut += 5 & gt ''liam''">Pushkin Town Center</a>.'
 'Okhlopkov Square itself leads to the <a href="exec:minut += 5 & gt ''parks'',''start''">Pushkin Park</a>.'
+
+if home_owned[4] = 1: act '<b>Go home</b>':gt'korr2x'
+act 'Pushkin Town Center (0:05)':minut += 5 & gt 'liam','start'
+act 'Pushkin Town Park (0:15)':minut += 15 & gt 'parks','start'
+act 'Wait':gs 'obj_din', 'wait'
+
 if hour >= 8 and hour <= 20:
 	'A small <a href="exec:gt ''larek'',''start''">grocery store</a> is currently open.'
 else
@@ -56,10 +62,6 @@ else
 	'The old theatre that houses a burlesque club is closed now. It is open every day 18:00 - 23:00'
 end
 
-if home_owned[4] = 1: act '<b>Go home</b>':gt'korr2x'
-
-act 'Walk to the Town Center (0:05)':minut += 5 & gt 'liam'
-
 if hour >= 8 and hour <= 17 and exhibitionQW = 3: act 'Search for the shop on the card from Kseniya': gt 'exhibitionistshop', 'start'
 
 act 'wait':gs 'obj_din', 'wait'
@@ -163,22 +165,10 @@ elseif hour >= 15 and hour <= 22 and tusa = 1 and tusnyakday ! daystart:
 
 		act'Leave': gt 'liames'
 		
-		if $pantyworntype = 'none' and sttan = 0:
-			cla
+		if $pantyworntype = 'none':
 			'"Hey guys, <<$pcs_nickname>> is going commando," one of the boys says.'
-			act 'Continue':gt 'dibodi', 'sotusa'
 		end
-
-!!		if sttan = 1 and $pantyworntype = 'none':
-!!			'- <<$pcs_nickname>>, and again without panties, - said one of the boys - Pussy pokezh?'
-!!			'- And yet to show? - you said - How do I want and go.'
-!!			act 'Further':gt'etoexhib','pos2'
-!!		end
-
-!!		if sttan = 1 and $pantyworntype ! 'none':
-!!			'- Vav <<$pcs_nickname>> truselya put.'
-!!			act 'Answer':gt'etoexhib','pos3'
-!!		end
+		act 'Continue':gt 'dibodi', 'sotusa'
 	end
 end
 

+ 2 - 2
locations/love.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'mother':
 	if university['diploma'] > 0:'"I graduated from university."'
 	if work = 0 and cheatWork = 0 and workKafe ! 1:'"I''m unemployed."'
 
-	if modelfoto_nude > 30:
+	if modelfoto['nude'] > 30:
 		loverrelation[lover_number] = 0
 		'She smiles and says with disgust, "Why are you not telling us about the photos you shot for these web sites?" She pulls out the nude photos of you and lies them out on the table. "My son, your mother cares about you. This girl is not worthy of you."'
 		'<<$loverdesc[lover_number]>> blushes and screams, "<<$pcs_nickname>>, I loved you so, and you... you turn out to be just another dirty whore! Get out!"'
@@ -114,7 +114,7 @@ gs 'npcgeneratec', 0, '<<$loverdesc[lover_number]>>''s "friend"', rand(18,32)
 		'<<$loverdesc[lover_number]>> drives you to his friends. You arrive at an apartment and <<$loverdesc[lover_number]>> introduces you as his bride to two other guys. You sit down at a table set and talk for a couple of hours. Everybody has fun and after everyone finishes eating and drinking, <<$loverdesc[lover_number]>> invites you to dance, to which you gladly agree. <<$loverdesc[lover_number]>> is already pretty drunk and he''s bad at dancing, but still start to grope you, his hands squeezing your buttocks. Soon he runs them under your dress and continues to stroke your ass. He hitches up you skirt so everyone can see your panties. The other guys are sitting on the sofa intently staring at your buttocks. Soon one of them gets up he guys got up from the couch and comes over to you. "You have the best butt I''ve ever seen. I would like to check it out." he says, and slaps you on the buttocks making you jump. <<$loverdesc[lover_number]>> pulls you to him and tells the other guy "Stop that. She''s my girl. You can watch, but you can not touch."'
 	end
 
-	if modelfoto_nude > 30 and proverka1 = 0:
+	if modelfoto['nude'] > 30 and proverka1 = 0:
 		'"Calm down. I''ve already seen her naked. The Internet is full of naked pictures of her." the guy says.'
 		'"Is this true?" asks <<$loverdesc[lover_number]>> turning to you.'
 		'"Yes, I did some naked photoshoots, but I only ever showed of my body. I never fucked anyone." you say'

+ 4 - 3
locations/lover_likes.qsrc

@@ -485,8 +485,10 @@ end
 
 if $ARGS[0] = 'makePrefTmp':
 	if pcs_makeup ! 0 and makePrefTmp ! 0:
-		if haraklover[lover_number] = 0:
-
+    if pcs_makeup = 5 and pcs_hairbsh = 1:
+			loverrelation[lover_number] += 1
+			$meetMake = '<<$loverdesc[lover_number]>> says, "Your professional makeup is beautiful."'
+		elseif haraklover[lover_number] = 0:
 			if pcs_hairbsh = 0:
 				loverrelation[lover_number] -= 1
 				$meetMake = '<<$loverdesc[lover_number]>> says timidly "I guess you had to leave in a hurry huh?"'
@@ -529,7 +531,6 @@ if $ARGS[0] = 'makePrefTmp':
 		end
 	elseif pcs_makeup = 0:
 		if haraklover[lover_number] = 0:
-
 			loverrelation[lover_number] -= 1
 			$meetMake = '<<$loverdesc[lover_number]>> looks at you and nerviously says, "Your makeup is running."'
 		elseif haraklover[lover_number] = 1:

+ 9 - 9
locations/lover_pref.qsrc

@@ -23,16 +23,16 @@ figurBoy = figurlover[lover_number]
 	
 if figurBoy = 0:
 	figurePrefMin = 0
-	figurePrefMax = 2
+	figurePrefMax = 49
 elseif figurBoy = 1:
-	figurePrefMin = 3
-	figurePrefMax = 4
+	figurePrefMin = 40
+	figurePrefMax = 90
 elseif figurBoy = 2:
-	figurePrefMin = 5
-	figurePrefMax = 77
+	figurePrefMin = 50
+	figurePrefMax = 100
 else
-	figurePrefMin = 0
-	figurePrefMax = 99
+	figurePrefMin = 70
+	figurePrefMax = 1000
 end
 
 
@@ -42,10 +42,10 @@ if titBoy = 0:
 	titMin = 0
 	titMax = 3
 elseif titBoy = 1:
-	titMin = 3
+	titMin = 2
 	titMax = 4
 elseif titBoy = 2:
-	titMin = 5
+	titMin = 4
 	titMax = 999
 end
 

+ 1 - 1
locations/ludahome.qsrc

@@ -939,7 +939,7 @@ if $ARGS[0] = 'chat_luda':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/luda/talk.jpg"></center>'
 						'You are a little shocked you didn''t know they had an open relationship "You are in an open relationship? You mean you can sleep with other people?"'
 						'She laughs at your reaction "Yes and no it doesn''t bother me and it doesn''t bother him. We know we love each other and sex is just sex."'
-						if (fame['pav_slut'] >= 100 or LudaQW['KnowsSexActive'] >= 10) and LudaQW['olu_offer'] = 0 and pcs_vag ! 0:
+						if (fame['pav_slut'] >= 100 or LudaQW['KnowsSexActive'] >= 10) and LudaQW['olu_offer'] = 0 and stat['vaginal'] > 0:
 							'You nod a bit "Yeah OK I guess I can see that."'
 							'Then she stops and seems to be considering something before saying "Actually I am kinda glad of it, the man has amazing stamina and just loves sex, he can''t get enough of it honestly. Don''t get me wrong I love sex but he wears me out, so I am glad he can burn up some of that sexual energy with other women."'
 							'You are a little surprised by that, but it does explain why she is OK with sharing him "I see Auntie." You say with a sly smile of understanding.'

+ 1 - 21
locations/lug.qsrc

@@ -12,27 +12,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/pushkin/park/lug.jpg" ></center>'
 	'It''s a small but well maintained meadow with evergreen grass, perfect for laying down to rest, have a picnic or just sunbathe. Mothers with small children regularly visit this place. Despite that, if you feel like exposing yourself here, there would be less people to see it, making it easier to find the bravery to do so.'
 
-	streetrand = RAND(0,100)
-	if streetrand >= 60 and pcs_lover < 3:
-		vnerand = RAND(0,300)
-		if vnerand <= pcs_apprnc:
-			gs'boy'
-			'<<$boybody>> <<$boybod>> <<$boyface>> comes up to you. He is wearing <<$boyClo>>'
-			'The guy introduces himself as <<$boydesc>> and asks for your telephone number.'
-
-			act 'Tell him your number':
-				cla
-				gs'boyfrend', 'start'
-				stopboy = 0
-				'<<$boydesc>> thanks you and leaves.'
-				act 'Complete outing':gt'lug', 'start'
-			end
-		end
-
-	end
-
-
-	if pavserhom = 0 and psiha = 0 and home_owned[1] = 0:
+	if pavserhom = 0 and psiha = 0:
 		temp = RAND(1,100)
 		if temp >= 90:
 			pcs_horny += 20

+ 1 - 1
locations/mey_tamara_events.qsrc

@@ -485,7 +485,7 @@ if $args[0] = 'check_look':
 	*clr & cla
 	! dress, medium black, clean, looks stunning
 	!there need a good glamour dress, change to moncheri or expensive in ECV (she already give you 1 moncheri)
-	if ($clothingworntype = 'moncheri_gown' or $clothingworntype = 'moncheri_dress' or $clothingworntype = 'fashionista') and (pcs_makeup = 3 or pcs_makeup = 2) and pcs_sweat <= 20 and pcs_apprnc >= 60:
+	if ($clothingworntype = 'moncheri_gown' or $clothingworntype = 'moncheri_dress' or $clothingworntype = 'fashionista') and (pcs_makeup = 5 or pcs_makeup = 3 or pcs_makeup = 2) and pcs_sweat <= 20 and pcs_apprnc >= 60:
 		! if long hair is desired styling
 		if shorthair = 0 and pcs_hairbsh = 0:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/party0.jpg"></center>'

+ 4 - 2
locations/mother.qsrc

@@ -1433,9 +1433,11 @@ if $ARGS[0] = 'motherQW_2':
 					'"Mooooom, come on! We just talked about this!"'
 					*nl
 					'Your mother looks serious when she raises her hand, motioning you to not interrupt. Since her attitude towards is you is not as demeaning any more, you decide to listen: "Hear me out <<$pcs_nickname>>, please. I just don''t want you to get pregnant, you know? When you have a baby, it should be with the man you are going to stay with, and when you can support it."'
-					if prezik > 0 or tabletki > 0:
+					if birth_control['implant_status'] > 1:
+						'"Don''t worry <<$npc_nickname[''A29'']>>, I have taken precautions. I went to the clinic and got a birth control implant."'
+          elseif prezik > 0 or tabletki > 0:
 						'"Don''t worry <<$npc_nickname[''A29'']>>, I have taken precautions. I went and bought things. When they run out, I will go get more, I promise."'
-					elseif tabletkicheck = 2:
+					elseif shotdays > 0:
 						'"Don''t worry <<$npc_nickname[''A29'']>>, I have taken precautions. I went to the clinic and got a birth control shot. When it runs out, I will get another one, I promise."'
 					else
 						'"You''re right <<$npc_nickname[''A29'']>>, I will go to the pharmacy and get the pill there, and maybe buy some condoms too."'

+ 2 - 2
locations/mother_sextalk.qsrc

@@ -605,7 +605,7 @@ if $ARGS[0] = 'bathroom_dildo_response_single':
 		GspravkaTimes = 2
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-		if stat['vaginal_dildo'] = 0 or pcs_vag = 0:
+		if stat['vaginal_dildo'] = 0 or stat['vaginal'] = 0:
 			'"No! I haven''t! I... I didn''t get to use it yet..."'
 			'"You think I''m going to fall for an obvious lie like that <<$pcs_firstname>>??"'
 			'"No! I swear! It''s true!"'
@@ -737,7 +737,7 @@ if $ARGS[0] = 'bathroom_dildo_response_multiple':
 		GspravkaTimes = 2
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-		if stat['vaginal_dildo'] = 0 or pcs_vag = 0:
+		if stat['vaginal_dildo'] = 0 or stat['vaginal'] = 0:
 			'"No! I haven''t! I... I didn''t get to use them yet..."'
 			'"You think I''m going to fall for an obvious lie like that <<$pcs_firstname>>? There were <i>two of them</i> in there!"'
 			'"No! I swear! It''s true!"'

+ 2 - 1
locations/motherkafeboss.qsrc

@@ -805,6 +805,7 @@ if $ARGS[0] = 'duty':
 		if slava_fuck_pick = 2:gt'motherkafeboss','cloth_bj'
 		if slava_fuck_pick = 3:gt'motherkafeboss','cloth_pre_fuck'
 		if slava_fuck_pick = 4:gt'motherkafeboss','cloth_bj'
+		if slava_fuck_pick = 5:gt'motherkafeboss','first_sex1'
 
 	!act'Fuck him on your terms':
 end
@@ -852,7 +853,7 @@ if $ARGS[0] = 'cloth_bj':
 			act'Leave':gt $loc, $loc_arg
 		end
 
-	elseif slava_cumming = 2:
+	else
 		'After a couple minutes of blowing him he pulls you back and says, "Alright, time for the main course," and bends you over the table.'
 		act'Undress':gt'motherkafeboss','cloth_pre_fuck'