Ver código fonte

assorted control flow improvements, minor enhancements, and bug fixes

John Doe 2 anos atrás
pai
commit
22ec080c05

+ 17 - 17
locations/qjob.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'var1':
 		minut += 180
 		money += 2000
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/photoshoot/f0.jpg"></center>'
-		'You arrive at a small photo studio in the center of the city, and smile: "Hi! I''m here for the model job? I came as quick as I could!"'
+		'You arrive at a small photo studio in the center of Old Town, and smile: "Hi! I''m here for the model job? I came as quick as I could!"'
 		'An attractive girl guides you to a dressing room, and tells you to undress. A few other girls are standing around wearing lingerie, probably getting ready for a shoot as well.'
 		'After you undress the photographer comes in, and he studies your body scrutinously before giving his assistant an approving nod: "She''ll do, get her ready."'
 		'His assistant guides you to another dressing room, along with another girl you''ll do your shoot with. She gives you the lingerie to wear for the shoot, and skilfully puts some professional make-up on your face. She works very fast, clearly she has done this many times before.'
@@ -20,7 +20,7 @@ if $ARGS[0] = 'var1':
 			cla
 			'"I don''t think so, that''s not the type of shoot I signed up for! What kind of girl do you think I am!?" you tell the photographer resolutely, and adjust the bra even though he told you not to. The photographer grumbles a bit under his breath, but continues with the shoot as if nothing happened. A while later the shoot is done, and you get dressed again while his assistant hands you an envelope with the 2,000 <b>₽</b> as promised.'
 
-			act 'Leave':gt 'city_center'
+			act 'Leave':gt 'liam'
 		end
 
 		act 'Leave the bra alone':
@@ -41,7 +41,7 @@ if $ARGS[0] = 'var1':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/photoshoot/f0.jpg"></center>'
 					'"Hey, stop that!" you cry out, and pull away from the photographer. He apologizes profusely and after a moment of silence, asks you put the bra back on so you can finish the shoot. The tension in the studio is palpable during the remainder of the shoot, and you''re glad when it''s over. You quickly get dressed again and leave as soon as you can, after you receive your payment.'
-					act 'Leave the studio':gt 'city_center'
+					act 'Leave the studio':gt 'liam'
 				end
 			else
 				act 'Tell him to stop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -72,7 +72,7 @@ if $ARGS[0] = 'var1':
 						'The photographer looks at you a bit surprised, and opens his mouth to object. Then he shrugs and looks at the other girl, who is more willing to go with him. His assistant gives you the money from the shoot, while you hear the photographer and the other model having loud sex in the locker room next to you. The assistant doesn''t seem phased at all; apparently this happens all the time, and you would''ve been just one of the many notches on his belt. You quickly slip back into your normal clothes and leave.'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Leave the studio':gt 'city_center'
+						act 'Leave the studio':gt 'liam'
 					end
 				else
 					act 'Refuse and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -89,7 +89,7 @@ if $ARGS[0] = 'var1':
 	else
 		minut += 60
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/photoshoot/f3.jpg"></center>'
-		'You arrive at a small photo studio in the center of the city, and smile: "Hi! I''m here for the model job? I came as quick as I could!"'
+		'You arrive at a small photo studio on High Street, and smile: "Hi! I''m here for the model job? I came as quick as I could!"'
 		'The only other people in the studio are a female photographer, and a second model you''ll be doing the shoot with. She smiles happily: "Great! I''m glad you could make it on such short notice. Just take a seat over there and we''ll get you sorted!"'
 		'You take place where she told you to, and she quickly adds a tab of make-up and hands you some clothes to wear. When you''re ready, you move to the studio and assume various poses with the other girl, while the photographer examines the two of you closely. She seems happy with her choice.'
 		'When you''re nearly done, she says: "Listen... I''ve already discussed this with the other girl, but you should know: we''re not doing this shoot for advertising purposes. It''s a shoot for a company that produces erotic content."'
@@ -102,7 +102,7 @@ if $ARGS[0] = 'var1':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'"What!? I''m not here to do porn! What kind of girl you think I am!?" you ask indignantly, and quickly walk back to the dressing room. The photographer tries to convince you through the door while you put your own clothes back on, but you leave the building without saying another word. The nerve of some people!'
-				act 'Leave the studio':gt 'city_center'
+				act 'Leave the studio':gt 'liames'
 			end
 		else
 			act 'Refuse and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -151,7 +151,7 @@ if $ARGS[0] = 'var1':
 					gs 'arousal', 'end'
 					gs 'stat'
 				
-					act 'Leave the studio':gt 'city_center'
+					act 'Leave the studio':gt 'liames'
 				end
 			end
 		end
@@ -163,7 +163,7 @@ if $ARGS[0] = 'var2':
 	*clr
 	minut += 120
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/photoshoot/f11.jpg"></center>'
-	'You arrive at a small photo studio in the center of the city, and smile: "Hi! I''m here for the model job? I came as quick as I could!"'
+	'You arrive at a small photo studio near the university, and smile: "Hi! I''m here for the model job? I came as quick as I could!"'
 	'The only other person in the studio is a female photographer. She smiles happily: "Great! I''m glad you could make it on such short notice. Just take a seat over there and we''ll get you sorted!"'
 	'She quickly fixes your make-up and then gives you the underwear you''re supposed to wear for the shoot. It''s a very thin and practically see-through material, but very enticing. You put it on and meet her in the studio area, and diligently follow her instructions while she takes pictures that leave very little to the imagination.'
 	'At one point she tells you to lie down, and your breasts almost pop out of the sheer top you''re wearing. The photographer grins at you and says: "I''ll be honest with you. I don''t plan on publishing this shoot... I''m just a girl with a lot of money to spend, who likes to take photos of beauties such as yourself."'
@@ -180,7 +180,7 @@ if $ARGS[0] = 'var2':
 			'"I''m sorry, but... no. If the shoot is done, I''m done", you tell the lady resolutely. She seems disappointed, but doesn''t stop you when you go to the dressing room to change into your regular clothes.'
 			'When you''re ready to leave, she stands ready by the door with an envelope in your hand. She offers it to you and asks seductively: "Are you sure? I bet we could have some fun, you and I! Completely off-camera..."'
 			'You smile apologetically, but decline and leave the studio. When you open the envelope you find 2,500 <b>₽</b> in it, 500 more than you were promised! It seems she really did enjoy your presence.'
-			act 'Leave the studio':gt 'city_center'
+			act 'Leave the studio':gt 'city_island'
 		end
 	else
 		act 'Respectfully decline (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -228,7 +228,7 @@ if $ARGS[0] = 'var3':
 				'"What, you made me come all the way down here just because you need a whore? Why not just get a whore!?" you ask him, barely stopping yourself from spitting in his face in anger.'
 				'"I''m sorry! I''m so sorry!" he stutters. The guy is terribly embarrassed, and doesn''t know what to say. You actually feel a bit sorry for him when he offers you some money just for showing up, trying to apologize with a desperate look in his eyes.'
 				'Seeing it''s not much, you shout: "Keep it, I don''t want your money!" and quickly leave, slamming the door shut behind you.'
-				act 'Leave the studio':gt 'city_center'
+				act 'Leave the studio':gt 'city_residential'
 			end
 		else
 			act 'Refuse angrily (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -269,7 +269,7 @@ if $ARGS[0] = 'var3':
 			cla
 			'"Erm, okay! I have to go!" you quickly say while you squirm your body out of his grip, and quickly leave his apartment before he can stop you. He can admire his erotic work of art by himself, you want no part in that!'
 
-			act 'Leave his apartment':gt 'city_center'
+			act 'Leave his apartment':gt 'city_suburbs','start'
 		end
 
 		act 'Seduce him to make him feel better':
@@ -296,7 +296,7 @@ if $ARGS[0] = 'var3':
 		if qjobpristrand ! 0:
 			'Finally, the man is finished with his painting. He doesn''t even allow you to look at it but quickly ushers you to the hallway where he pays you the 1,000 <b>₽</b> he promised.'
 
-			act 'Leave the estate':gt 'city_center'
+			act 'Leave the estate':gt 'pav_residential'
 		else
 			'While you stand there posing, the artist occasionally walks up to you and adjusts the sheet. His hands always linger on your body a bit longer than they need to be, and he becomes more and more bold.'
 			'Eventually, he walks up to you once more and just begins to paw at your body greedily, squeezing your exposed boob and gliding his hand further and further down your chest.'
@@ -309,7 +309,7 @@ if $ARGS[0] = 'var3':
 					'"Erm... what are you doing? Could you please stop that?" you ask him intently.'
 					'The man wordlessly pulls his hands away from your body and plucks the sheet a few times, pretending he was just adjusting it. He ignores your questioning smirk as he sits down and continues working on his piece of art, as if nothing happened.'
 					'Finally, the man is finished with his painting. He doesn''t even allow you to look at it but quickly ushers you to the hallway where he pays you the 1,000 <b>₽</b> he promised.'
-					act 'Leave the studio':gt 'city_center'
+					act 'Leave the studio':gt 'pav_residential'
 				end
 			else
 				act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -335,7 +335,7 @@ if $ARGS[0] = 'var3':
 			'After about three hours, the man comes from behind the canvas and smiles: "I have all I need from you. Thank you for time!"'
 			'He tells the other girl to stay a while longer while he walks you out, giving you the 1,000 <b>₽</b> you were promised.'
 
-			act 'Leave the apartment':gt 'city_center'
+			act 'Leave the apartment':gt 'city_industrial'
 		else
 			'The girl becomes flirtier and flirtier while you chat, and she inches ever closer to you. She makes you lean back against the couch and pulls your clothes aside, baring your breasts. She moves her head closer to your chest, but stops a few inches before touching you. You can feel her warm breath tingling on your skin, and she looks as you with a confident smile on her lips. If you want her to stop, you''ll have to do something now.'
 
@@ -350,7 +350,7 @@ if $ARGS[0] = 'var3':
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				act 'Leave the apartment':gt 'city_center'
+				act 'Leave the apartment':gt 'city_industrial'
 			end
 
 			act 'Smile at her':
@@ -385,7 +385,7 @@ if $ARGS[0] = 'var3':
 			money += 1000
 			'A few hours later, the girl smiles at you and says: "Thank you, you were a pleasure to work with! I''ll be sure to leave you a good review online", as the walks you to the door. She gives you the 1,000 <b>₽</b> she owes you when you''re at the door, and you thank her on your way out.'
 
-			act 'Leave the apartment':gt 'city_center'
+			act 'Leave the apartment':gt 'liames'
 
 		else
 			'You stand like that for quite some time, and the squeezing and kneading from the man becomes more and more insistent. By the end he is eagerly pawing your ass, right in front of his wife! When you look at her questioningly, she pretends that nothing is happening and continues to paint without paying any attention to you. Then, the man snakes his hand between your legs and gently caresses your pussy lips...'
@@ -402,7 +402,7 @@ if $ARGS[0] = 'var3':
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				act 'Leave the apartment':gt 'city_center'
+				act 'Leave the apartment':gt 'liames'
 			end
 
 			act 'Don''t object and keep posing':

+ 7 - 0
locations/razrKik.qsrc

@@ -34,6 +34,13 @@ elseif kickbox['sash'] = 4:
 		kickbox['money'] = 7500
 		'You have been awarded black sash, 1st dan.'
 	end
+else
+	if kickbox['advancement'] >= 5:
+		kickbox['sash'] += 1
+		kickbox['advancement'] = 0
+		kickbox['money'] += 1500
+		'You now take in a higher purse from your fights.'
+	end
 end
 
 --- razrKik ---------------------------------

+ 6 - 0
locations/road.qsrc

@@ -23,12 +23,18 @@ if $ARGS[0] = '':
 
 	if car > 0 and cardrive = 22 and ncarroad = nroad:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a> next to the road.'
 	if nroad = 0:act 'Walk to the City Industrial Region (0:15)':minut += 15 & gt 'city_industrial'
+	if nroad = 1:act 'Walk to the suburbs':minut += 15 & gt 'city_suburbs','start'
+	if nroad = 5:
+    act 'Go to cottages (0:15)': minut += 15 & gt 'dachi'
+    act 'Go to train station': gt 'train', 'communal'
+	end
 	if nroad = 10:
 		act 'Go to Gadukino (0:15)': minut += 15 & gt 'gadukino'
 		act 'Go to the train platform': gt 'train', 'village'
 		if npc_QW['A60'] > 15:act 'Look around for Mira': gt 'gadprostitutes', 'start'
 	end
 	if nroad = 16:act 'Check out the construction site (1:00)':minut += 60 & gt 'obekt'
+	if nroad = 19:act 'Walk to old town':minut += 15 & gt 'liam'
 	if nroad = 20:
 		act 'Walk to Pavlovsk train station (0:15)': minut += 15 & gt 'pav_train_hall'
 		act 'Walk to Pavlovsk Commercial area (0:15)': minut += 15 & gt 'pav_commercial'

+ 9 - 2
locations/salon.qsrc

@@ -15,6 +15,13 @@ if $ARGS[0] = 'start':
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Beauty Bar</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/salon.jpg"></center>'
+	*nl
+  if masseuse['jobtype'] > 0 and masseuse['shifts_required'] > masseuse['shifts_worked']:
+	  '<font color="maroon"><b><<masseuse[''shifts_required'']-masseuse[''shifts_worked'']>></b> shifts remaining this week.</font>'
+  end
+  if masseuse['jobtype'] > 0 and masseuse['shifts_worked'] > masseuse['shifts_required']:
+	  '<b><<masseuse[''shifts_required'']-masseuse[''shifts_worked'']>></b> extra shifts worked this week.'
+  end
 	
 	if masseuse['jobtype'] ! 0:
 		masseuse['warning'] = 3 - masseuse['missed shifts']
@@ -80,7 +87,7 @@ if $ARGS[0] = 'receptionist':
 		'"Hello, what can I help you with today?"'
 	elseif masseuse['jobtype'] < 0:
 		'"Hello again, <<$pcs_firstname>>. What can I help you with?"'
-	elseif week = 5 and masseuse['weeks_pay'] > 0:
+	elseif (week >= 5 and masseuse['weeks_pay'] > 0) or masseuse['shifts_worked'] >= masseuse['shifts_required']:
 		'"Hello <<$pcs_firstname>>! Are you here to pick up your paycheck?"'
 	elseif masseuse['jobtype'] > 0:
 		'"Hello <<$pcs_firstname>>! Are you here to work a shift today? Or are you here for some discount services?"'
@@ -97,7 +104,7 @@ if $ARGS[0] = 'receptionist':
 		act'Can I set my schedule for the week?':gt'masseuse_schedule','start'
 		act'I want to change jobs':gt'salon','job_change'
 		act'I''d like to quit':gt'salon','resignation'
-		if masseuse['payday'] > 0:
+	  if (week >= 5 and masseuse['weeks_pay'] > 0) or masseuse['shifts_worked'] >= masseuse['shifts_required']:
 			act'I''m here for my paycheck':gt'salon','payday'
 		end
 	end

+ 2 - 2
locations/selfplay.qsrc

@@ -56,7 +56,7 @@ if $ARGS[0] = 'start':
 				'<center><video autoplay loop src="images/shared/sex/mast/klit.mp4"></video></center>'
 			end
 
-			if pcs_mood >= 20:
+			if pcs_mood >= 20 or cheatNoMood ! 0:
 				pcs_horny += rand(5, 10)
 				'You put your hand down between your legs and gently rub your fingers over your groin. Running your fingers between your pussy lips, you scout out your clitoris and lightly run your finger over it repeatedly. The feeling you get out of this is great, and you feel a pleasant warmth spreading in your lower area.'
 			else
@@ -338,7 +338,7 @@ if $ARGS[0] = 'start':
 
 				if vgape <= 0:
 					act 'Use the dildo on your pussy':
-						if pcs_vag = 0 and dick >= 20:
+						if stat['vaginal'] = 0 and pcs_vag = 0 and dick >= 20:
 							'Are you sure? Doing so will most likely break your hymen.'
 							act 'Yes, do it':
 								cls

+ 5 - 3
locations/sex.qsrc

@@ -195,12 +195,14 @@ if $ARGS[0] = 'end':
 
 	gs 'stat'
 	act 'Leave':
-		if picrand >= 54 and picrand <= 73: killvar 'picrand' & gt 'office', 'work'
+		if picrand >= 54 and picrand <= 73: killvar 'picrand' & gt 'office_old', 'work'
 		if picrand >= 74 and picrand <= 76: killvar 'picrand' & gt 'vann', 'start'
 		if picrand >= 77 and picrand <= 80: killvar 'picrand' & gt 'nichApartment'
-		if picrand >= 81 and picrand <= 82: killvar 'picrand' & gt 'city_center'
+		if picrand = 81: killvar 'picrand' & gt 'city_residential'
+		if picrand = 82: killvar 'picrand' & gt 'city_suburbs','start'
 		if picrand >= 83 and picrand <= 84: killvar 'picrand' & dynamic $brodila
-		if picrand >= 85 and picrand <= 86: killvar 'picrand' & gt'city_center'
+		if picrand = 85: killvar 'picrand' & gt 'pav_residential'
+		if picrand = 86: killvar 'picrand' & gt 'city_center'
 		if picrand = 87 or picrand = 90: killvar 'picrand' & dynamic $brodilk
 		if picrand = 88: killvar 'picrand' & dynamic $brodils
 		if picrand = 89: killvar 'picrand' & gt 'bed', 'start'

+ 2 - 2
locations/sexdvoe.qsrc

@@ -275,8 +275,8 @@ if $ARGS[0] = 'end':
 	killvar 'knwn'
 	
 	act 'Leave':
-		if picrand >= 24 and picrand <= 26:gt 'office', 'work'
-		if picrand >= 30 and picrand <= 34:gt 'office', 'work'
+		if picrand >= 24 and picrand <= 26:gt 'office_old', 'work'
+		if picrand >= 30 and picrand <= 34:gt 'office_old', 'work'
 		if picrand >= 35 and picrand <= 37:gt 'nichApartment'
 		if picrand >= 40 and picrand <= 43:dynamic $brodila
 		if picrand = 38:gt 'bed', 'vorend'

+ 1 - 1
locations/sexorg.qsrc

@@ -63,7 +63,7 @@ if $ARGS[0] = 'var':
 	
 	gs 'stat'
 	act 'Continue the orgy':gt 'sexorg', 'var'
-	if sexvar >= 3:act 'Let the guys finish.':gt 'sexorg', 'end'
+	if sexvar >= 5:act 'Let the guys finish.':gt 'sexorg', 'end'
 end
 
 if $ARGS[0] = 'end':

+ 1 - 1
locations/shop_fancy_pancy.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Fancy Pancy</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pushkin/fancypancy/shop.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pushkin/fancypancy/shop_name.png"></center>'
 	*nl
 	'This small boutique shop looks more like a dressing room at the burlesque club nearby. Satin, leather, ruffles and glamour make it clear this is not a place to buy a practical outfit. It is the only place to buy outfits suitable for the burlesque club or perhaps spice up things in the bedroom.'
 	*nl

+ 1 - 1
locations/shop_fashionista.qsrc

@@ -272,7 +272,7 @@ if $ARGS[0] = 'dressingbras2':
 	
 	if fashionista_bras[i] ! 0:
 		msg 'You already own this bra.'
-		gt 'shop_fashionista', 'bras'
+		gt 'shop_fashionista', 'dressingbra'
 	end
 
 	gt 'bras', 'view_bra_item', 'shop', 'fashionista',i, 750

+ 65 - 55
locations/shop_pussycats.qsrc

@@ -4,10 +4,14 @@
 if $ARGS[0] = 'start':
 	killvar 'clothingfilter'
 	$sexloc = 'shop_pussycats'
-	gs 'themes', 'indoors'
+	$loc_arg = $ARGS[0]
+	$loc = 'shop_pussycats'
+  $location_type = 'public_indoors'
 	$menu_loc = 'shop_pussycats'
 	$menu_arg = 'start'
 	menu_off = 0
+	gs 'stat'
+	gs 'themes', 'indoors'
 
 	'<b><center><font size="4">Pussy-Cats</font></center></b>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/young_shop.jpg"></center>'
@@ -43,44 +47,56 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if ((hour = 16 and minut <= 5) or (hour = 15 and minut >= 30)) and young_shop_work = 1 and week < 6:
-		act '<b>Work</b>':
-			cla
-			inWorkYoungShop = 1
-			young_shop_salary += 4
-			if hour < 16: minut += 60-minut
-			minut += 240
-			pcs_energy += 24
-			pcs_hydra += 48
-			gs 'stat'
-			'You spend 4 hours cleaning the department, folding and rehanging clothes and serving customers. The store now looks clean and pretty organized.'
-			gs 'shop_pussycats', 'events'
+	if hour = 15 and young_shop_work = 1 and week < 6:
+		if PCloQuality < 3:
+			act 'Use restroom to change into fashionable attire': gt 'wardrobe', 'sets'
+		else
+			act '<b>Work</b>':
+				cla
+				inWorkYoungShop = 1
+				young_shop_salary += 4
+				minut += 60*(16 - (hour+1)) + (60-minut) & gs 'stat'
+				minut += 240
+				pcs_energy += 24
+				pcs_hydra += 48
+				gs 'stat'
+				'You spend 4 hours cleaning the department, folding and rehanging clothes and serving customers. The store now looks clean and pretty organized.'
+				gs 'shop_pussycats', 'events'
+			end
 		end
-	elseif ((hour = 9 and minut <= 5) or (hour = 8 and minut >= 30)) and young_shop_work1 = 1 and week > 5:
-		act '<b>Work</b>':
-			cla
-			inWorkYoungShop = 1
-			young_shop_salary += 6
-			if hour < 9: minut += 60-minut
-			minut += 360
-			pcs_energy += 40
-			pcs_hydra += 80
-			gs 'stat'
-			'You spend 6 hours cleaning the department, folding and rehanging clothes and serving customers. The store now looks clean and pretty organized.'
-			gs 'shop_pussycats', 'events'
+	elseif hour = 8 and young_shop_work1 = 1 and week > 5:
+		if PCloQuality < 3:
+			act 'Use restroom to change into fashionable attire': gt 'wardrobe', 'sets'
+		else
+			act '<b>Work</b>':
+				cla
+				inWorkYoungShop = 1
+				young_shop_salary += 6
+				minut += 60*(9 - (hour+1)) + (60-minut) & gs 'stat'
+				minut += 360
+				pcs_energy += 40
+				pcs_hydra += 80
+				gs 'stat'
+				'You spend 6 hours cleaning the department, folding and rehanging clothes and serving customers. The store now looks clean and pretty organized.'
+				gs 'shop_pussycats', 'events'
+			end
 		end
-!!	elseif ((hour = 9 and minut <= 5) or (hour = 8 and minut >= 30)) and young_shop_work2 = 1 and week < 6:
-!!		act '<b>Work</b>':
-!!			cla
-!!			inWorkYoungShop = 1
-!!			young_shop_salary += 6
-!!			if hour < 9: minut += 60-minut
-!!			minut += 360
-!!			pcs_energy += 40
-!!			pcs_hydra += 80
-!!			gs 'stat'
-!!			'You spend 6 hours cleaning the department, folding and rehanging clothes and serving customers. The store now looks clean and pretty organized.'
-!!			gs 'shop_pussycats', 'events'
+!!	elseif hour = 8 and young_shop_work2 = 1 and week < 6:
+!!		if PCloQuality < 3:
+!!			act 'Use restroom to change into fashionable attire': gt 'wardrobe', 'sets'
+!!		else
+!!			act '<b>Work</b>':
+!!				cla
+!!				inWorkYoungShop = 1
+!!				young_shop_salary += 6
+!!			  minut += 60*(9 - (hour+1)) + (60-minut) & gs 'stat'
+!!				minut += 360
+!!				pcs_energy += 40
+!!				pcs_hydra += 80
+!!				gs 'stat'
+!!				'You spend 6 hours cleaning the department, folding and rehanging clothes and serving customers. The store now looks clean and pretty organized.'
+!!				gs 'shop_pussycats', 'events'
+!!			end
 !!		end
 	elseif hour >= 9 and hour < 18 and week < 6 and (young_shop_work = 3 or young_shop_work = 2):
 		act 'Talk to the manager, maybe he will hire you again':
@@ -256,14 +272,14 @@ if $ARGS[0] = '3':
 	'There are four guys walking into the store: two white, two black. They seem to be arguing about something when they approach you. You ask if you can help them and one of them replies, "We certainly hope so!" The four men have a bet over whether a blindfolded girl could tell the difference between a black cock and a white cock using only her mouth. You stare at the four and ask if they''re serious. Then you ask how you could possible help with this before realizing they want to volunteer you for this test. They tell you the two who are right will have sex with you, on the spot.'
 
 	gs 'willpower', 'bj', 'resist'
-    if will_cost <= pcs_willpwr:
+	if will_cost <= pcs_willpwr:
 		act 'Send them away (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gt 'shop_pussycats', 'endwork'
 		end
 	else
-        act 'Send them away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-    end
+		act 'Send them away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
 
 	act 'Ask what else you''ll get':
 		cla & *clr
@@ -280,7 +296,7 @@ if $ARGS[0] = '3':
 			act 'Send them away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
-		act 'Take them to the back room (<<will_cost>> Willpower)':
+		act 'Take them to the back room':
 			cla & *clr
 			gs 'npcgeneratec', 0, 'a cute guy', rand(17,25)
 			gs 'boyStat', $npclastgenerated
@@ -463,14 +479,14 @@ if $ARGS[0] = '9':
 	'You approach the door to his office and you are about to knock as you notice that the door is slightly ajar. You look inside.'
 
 	act 'Look inside':
-		cla
+		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/young_shop_quest10.jpg"></center>'
 		'Your eyes witness an obscene picture. Andrew Sobulyagin is facing the monitor, his pants pulled down, his member in his hands. The manager looks at the monitor and strokes his penis, which has a condom on. Almost immediately he throws back his head and starts to cum.'
 		'Shortly thereafter, he pulls off the condom and throws it in the nearby trash can and wipes his cock off. Then he pulls up his pants and heads towards the door.'
 		'Trying to be as quiet as possible, you rush back from the door and hide behind some boxes near the service exit. Mr. Sobulyagin, noticing nothing, passes you and goes into the toilet. You''re out of your hiding place and go to his office. Out of curiosity, you look at the monitor and some selected German porn. Then you peak in the trash can and notice the used condom.'
 
 		act 'Wait for the manager':
-			cla
+			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/manager_andrew.jpg"></center>'
 			'With a smile, you step away from the manager''s table, thinking about what he''d do if he saw you looking at his computer.'
 			'A minute later, Andrew returns, "Ah, <<$pcs_nickname>>, nice of you to come! I have something for you to sign," the manager goes to his desk and shuffles through some paperwork before handing you a form.'
@@ -490,7 +506,7 @@ if $ARGS[0] = '9':
 				'Deciding to have a bit of fun, you reach into the garbage can and pull out the used condom. It feels a bit slippery and is still warm. You hold the condom up to see through it out of curiosity. Suddenly you hear the door open, Mr. Mikhailovich is coming back! Oh shit, you have a split second to react, what do you do?!'
 
 				act 'In your mouth!':
-					cla
+					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/manager_andrew.jpg"></center>'
 					'Not seeing any other options, you quickly pop the condom into your mouth. Andrew doesn''t seem to notice your distress and begins speaking to you.'
 					'"Ah, <<$pcs_nickname>>, nice of you to come! I have something for you to sign," the manager goes to his desk and shuffles through some paperwork before handing you a form.'
@@ -529,7 +545,7 @@ if $ARGS[0] = '11':
 	*clr & cla
 	i = rand(1, 200)
 	'<b><center><font size="4"><font color="black">Employee Perks</font></center></b>'
-	'<center><img <<$set_imgh>> src="images/pc/items/cats/outfits/<<i>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/items/cats/dress/<<i>>.jpg"></center>'
 	'"<<$pcs_nickname>>, look here," Nastya approaches you. "I''ve got a nice, new blouse but it got a slight defect. The manager is just going to put it in the <b>70%</b> off discount bin, but maybe you want to take it yourself?"'
 	'The store is selling it for <b>2400 ₽</b>, but you can buy it for <b>720 ₽</b>.'
 	if cats_dress[i] = 1:
@@ -754,8 +770,9 @@ end
 
 if $ARGS[0] = '15':
 	*clr & cla
+	i = rand(1, 150)
 	'<b><center><font size="4"><font color="black">The Shirt Off Her Back</font></center></b>'
-	'<center><img <<$set_imgh>> src="images/pc/item/gm/outfits/<<i>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/items/gm/outfits/<<i>>.jpg"></center>'
 	'You go to the changing booths and find that someone has left an outfit behind. You remember that it belongs to a girl who just 5 minutes ago bought an outfit and left the store. Apparently, she decided she no longer needs this and just left it in the booth.'
 	'You decide to wait until the end of the shift, as the shopper may return. An hour passes and your shift ends, but nobody comes for it. You carefully look at it, it is an ordinary outfit from G&M, almost new, no holes, fairly clean. Could you just keep it for yourself?'
 
@@ -766,7 +783,6 @@ if $ARGS[0] = '15':
 		act 'Keep it (<<will_cost>> Willpower)':
 			cla
 			gs 'willpower', 'pay', 'resist'
-			i = rand(1, 413)
 			'Before leaving, you take the outfit with you. The girl didn''t seem to want it, and you''re not about to throw away fairly new clothing. Your mother raised you better than that!'
 
 			! WD: Uninitialised ~ 'wear_chest_have_'
@@ -1018,19 +1034,13 @@ if $ARGS[0] = 'endwork':
 		if week = 5 and young_shop_salary > 0:
 			act '<font color="green">Collect your pay</font>':gt 'andrey'
 		else
-			act '<b>Leave the store</b>':
-				minut += 3
-				gt 'torgcentr'
-			end
+			gt 'shop_pussycats','start'
 		end
 	elseif young_shop_work1 = 1:
 		if week = 7 and young_shop_salary > 0:
 			act '<font color="green">Collect your pay</font>':gt 'andrey'
 		else
-			act '<b>Leave the store</b>':
-				minut += 3
-				gt 'torgcentr'
-			end
+			gt 'shop_pussycats','start'
 		end
 	end
 end

+ 1 - 1
locations/shop_tsar_bomba.qsrc

@@ -77,7 +77,7 @@ if $ARGS[0] = 'dresses':
 	end
 end
 
-if $ARGS[0] = 'bomba_dresses':
+if $ARGS[0] = 'bomba_dress':
 	cla
 	menu_off = 1
 	if bomba_dress[i] ! 0:

+ 26 - 1
locations/shulga_room.qsrc

@@ -1370,7 +1370,9 @@ if $ARGS[0] = 'shulga_lern':
 		act 'Take a break':
 			gt 'shulga_room', 'shulga_bazar_day'
 		end
-	else
+  end
+	act 'Try alternate study methods':
+		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/vasya/sex/shuglinhome/lern/ev<<lern_imgset>>_1.jpg"></center>'
 		if fame['pav_slut'] >= 150:
@@ -1397,12 +1399,35 @@ if $ARGS[0] = 'shulga_lern':
 				end
 				act 'Teach me': gt 'shulga_room', 'shulga_lern_sex_yes'
 			else
+				act 'Teach me': gt 'shulga_room', 'shulga_lern_sex_yes_basic'
 				act 'Stop it': gt 'shulga_room', 'shulga_lern_sex_no'
 			end
 		end
 	end
 end
 
+if $ARGS[0] = 'shulga_lern_sex_yes_basic':
+	menu_off = 1
+	shulga_lern_day = daystart
+	shulga_lern_count -= 1
+	npc_sex['A11'] += 1
+	gs 'boyStat', 'A11'
+	gs 'arousal','bj',5
+	gs 'arousal','cuni',5
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/vasya/sex/shuglinhome/lern/ev<<lern_imgset>>_2.jpg"></center>'
+	'You whimper softy and whisper, "Please Vasily, please teach me."'
+	'He smiles at you. "Ok <<$pcs_nickname>> open your mouth." As he pulls out his dick and begins stroking it.'
+	'His first lesson involves oral sex. You don''t know if you are a straight A student, but from the way he groans in pleasure as you work your mouth on his <<dick>>cm <<$dick_girth>> penis, you think you earned a passing grade. Suddenly he grabs your head and hold it tightly as he cums ropes of semen down your throat.'
+	'Afterwords he lays you on your back and gently licks at your labia you know longer know what to think. Eventually, he parts your lips with one hand, as his tongue finds you clitoris. It''s almost too much. You let out a desperate cry, and buck you hips burying his face deep between your thighs as he makes you orgasm.'
+	gs 'cum_call', 'mouth', 'A11', 1
+	swallow += 1
+	$orgasm_or = 'yes'
+	gs 'arousal', 'end'
+	gs 'stat'
+
+	act 'Leave': gt 'shulga_room'
+end
+
 !Consent to sex
 if $ARGS[0] = 'shulga_lern_sex_yes':
 	menu_off = 1

+ 8 - 1
locations/sister_chat.qsrc

@@ -662,24 +662,31 @@ if $ARGS[0] = 'sister_chat':
 					if temp = 1:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister1.jpg"></center>'
 						'Your sister boasts to you about how good her boyfriend is in bed. She goes into a surprising amount of detail.'
+						act 'Keep talking': gt 'sister_chat', 'sister_chat'
 					elseif temp = 2:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister2.jpg"></center>'
 						'Your sister tells you a story about her and her friend sucking off her other friend on his birthday. Afterwards, he came on both their faces, and they licked his cum off of each other.'
+						act 'Keep talking': gt 'sister_chat', 'sister_chat'
 					elseif temp = 3:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister3.jpg"></center>'
 						'Your sister reveals to you that she just loves it in the ass. With mother having her innocence checked all the time, she wanted to have sex and so decided to try anal. It hurt the first couple of times, but after that she loved it. Once she lost her virginity, she found she liked vaginal sex more, but still does anal. She suggests that you try it or just stick to blowjobs to keep mom from finding out you''re sexually active.'
+						act 'Keep talking': gt 'sister_chat', 'sister_chat'
 					elseif temp = 4:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister4.jpg"></center>'
 						'Your sister tells you about how she gave her boyfriend a blowjob and swallowed his load without slowing down. "Oh, you should have seen his face!"'
+						act 'Keep talking': gt 'sister_chat', 'sister_chat'
 					elseif temp = 5:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister5.jpg"></center>'
 						'Your sister tells you about how, when she was in school, she would go to a classmate''s apartment to study and afterwards he would fuck her ass.'
+						act 'Keep talking': gt 'sister_chat', 'sister_chat'
 					elseif temp = 6:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister6.jpg"></center>'
 						'Your sister reveals to you that she just loves it when a guy takes over, grabs her by the head and just fucks her mouth hard.'
+						act 'Keep talking': gt 'sister_chat', 'sister_chat'
 					elseif temp = 7:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister7.jpg"></center>'
 						'Your sister reveals to you that, at a party, she let two guys fuck her at the same time. Sucking one and getting fucked by the other was fun, but having one fuck her pussy while his friend fucked her ass was amazing.'
+						act 'Keep talking': gt 'sister_chat', 'sister_chat'
 					else
 						cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/sister8.jpg"></center>'
@@ -1204,7 +1211,7 @@ if $ARGS[0] = 'twincompare':
 	else
 		'<font color=#FF0000>Your looks are too different from your sister''s. You are at <<pcs_apprnc>>. You need a score between 60 and 120 </font>'
 	end
-	if pcs_makeup = 4:
+	if pcs_makeup >= 4:
 		'<font color=#008000>Your makeup hides the last differences between you and your sister.</font>'
 		tmp_twinsiscompare +=1
 	else

+ 32 - 7
locations/sistersleep.qsrc

@@ -11,6 +11,8 @@ if $ARGS[0] = 'sister_sleep':
 		gs 'arousal', 'erotic', -2
 		gs 'stat'
 		act 'Move away': gt 'bedrPar'
+		gs 'willpower', 'foreplay', 'self', 'easy'
+		act 'Touch her anways(<<will_cost>> Willpower)': gs 'willpower', 'pay', 'self' & gt 'sistersleep', 'sister_sleep_1'
 	else
 		if sisterQW['lesbDay'] = daystart:
 			'You want to touch her again, but you change your mind at the last minute. Doing this more than once a day could make her really angry. Better try again tomorrow.'
@@ -38,6 +40,8 @@ if $ARGS[0] = 'sister_sleep_1':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/touch1.jpg"></center>'
 	act 'Move away': gs 'arousal', 'end' & gt 'bedrPar'
+	gs 'arousal', 'foreplay', 3, 'incest', 'lesbian'
+	gs 'stat'
 	if sisterLesb <= 2:
 		sisterLesb += 1
 		'You dare to touch your sleeping sister''s perfect ass.'
@@ -61,8 +65,6 @@ if $ARGS[0] = 'sister_sleep_1':
 		'Anya''s whole body is seriously sexy, and it is filling you with desire.'
 		act 'Proceed': gt 'sistersleep', 'sister_sleep_2'
 	end
-	gs 'arousal', 'foreplay', 3, 'incest', 'lesbian'
-	gs 'stat'
 end
 
 if $ARGS[0] = 'sister_sleep_2':
@@ -122,7 +124,7 @@ if $ARGS[0] = 'sister_sleep_2_kiss':
 		gs 'stat'
 		act 'Keep fingering her':
 			*clr & cla
-			sisterLesb = 5
+			if sisterLesb < 5: sisterLesb = 5
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les4.jpg"></center>'
 			'You slip another finger in her, now fingering her deeply with two fingers while your thumb rubs her clit. Anya lies all the way back and starts to moan louder, so you lean forward and start kissing and sucking on her nipple as you keep finger banging her soaking wet pussy. Suddenly, her pussy gently convulses, and she orgasms. Anya looks at you with a sleepy but pleased look on her face and smiles.'
 			'"Well, aren''t you just the sweetest little sister? Now go to sleep," she says as she grabs her panties, slides them back on and rolls over, nuzzling into her pillow and falling asleep. You are a little upset not to receive your own release, but you are satisfied for now.'
@@ -132,7 +134,14 @@ if $ARGS[0] = 'sister_sleep_2_kiss':
 			act 'Move away': gt 'bedrPar'
 		end
 	end
-	if sisterLesb => 5:
+  if sisterLesb >= 7:
+		act 'Tell her you want to have sex':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les1.jpg"></center>'
+			'"I want to make you feel good, I want to make you orgasm." you tell her and then kiss her. She stiffens at the kiss, but then relents and lets you kiss her. She is obviously turned on and trying to fight her desires.'
+			act 'Continue?': gt 'sistersleep', 'sister_sleep_3'
+    end
+  elseif sisterLesb >= 5:
 		act 'Tell her you want to have sex':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les1.jpg"></center>'
@@ -230,7 +239,25 @@ if $ARGS[0] = 'sister_sleep_3':
 							*nl
 							'She shakes her head. "I need to get some sleep. You need to go back to your bed and go to sleep too." She lies back down and rolls over, facing away from you, and tries to go back to sleep.'
 							act 'Move away': gt 'bedrPar'
-						else
+						elseif sisterLesb >= 7:
+							act 'Convince her otherwise':
+								*clr & cla
+								girl += 1
+								npc_rel['A33'] += 5
+								$orgasm_or = 'no'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/les8.jpg"></center>'
+								'"Anya, don''t you enjoy the special release that only another woman knows how to give you?" you say as you begin lightly caressing her thigh.'
+								gs 'arousal', 'kiss', 3, 'incest'
+								gs 'arousal', 'forplay', 3, 'incest'
+								gs 'arousal', 'vaginal_finger', 3, 'incest'
+								$orgasm_txt = 'You both start feeling the heat and lay down, kissing, touching and licking each other into orgasm.'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'cuni', 3, 'incest'
+								gs 'arousal', 'end'
+								gs 'stat'
+								act 'Continue': gt 'sistersleep', 'sister_strapon'
+							end
+            else
 							'She gives you a stern look. "I''m serious! We can''t do this anymore! This is the last time."'
 							act 'Accept her decision':
 								*clr & cla
@@ -434,7 +461,6 @@ end
 
 if $ARGS[0] = 'sister_strapon_vaginal':
 	*clr & cla
-	pcs_vag += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/strap4.jpg"></center>'
 	'You straddle your sister and slowly lower yourself down until you feel the tip of the dildo pressing against your slit. You reach between your legs, line up the dildo and lower yourself until you feel it part your lips and start to slide inside of you, causing you to moan softly. You lower yourself down further and start to slowly fuck the dildo, your sister taking off her top as you do. You take the whole thing inside you. It''s sightly longer and thicker than average and fills you up completely.'
 	*nl
@@ -478,7 +504,6 @@ if $ARGS[0] = 'sister_strapon_anal':
 	gs 'stat'
 	act 'Pleasure yourself':
 		*clr & cla
-		pcs_ass += 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/strap7.jpg"></center>'
 		'With Anya lifting your leg as she thrusts the dildo deep into your ass, you start roughly rubbing your clit.'
 		'"Aaahh... Yeah... Mmmhmmm... Fuck me... Yeah, fuck me good!" you cry out as it starts to feel really good.'

+ 25 - 2
locations/stat.qsrc

@@ -63,7 +63,7 @@ if cheatNoDrink = 1:
 	if pcs_hydra < 60: pcs_hydra = 60
 end
 if cheatNoSleep = 1:
-	if pcs_sleep < 35: pcs_sleep = 35
+	if pcs_sleep < 50: pcs_sleep = 50
 end
 
 if cheatBandit = 1 and npc_horny['A66'] < 19: npc_horny['A66'] = 19
@@ -190,6 +190,7 @@ if healthmax < 1: healthmax = 1
 if willpowermax < 50: willpowermax = 50
 if stammax < 1: stammax = 1
 if manamax < 1: manamax = 1
+if manamax > 10000: manamax = 10000 
 
 !pre-calc max value for later display
 if fairycurse >= daystart and fairyshoo > 0: pcs_horny = 90
@@ -418,6 +419,14 @@ if sec >= 60:
 	if sec >= 60:jump 'loopsec'
 end
 
+if minut < 0:
+  :loopnegmin
+  hour -= 1
+  minut += 60
+  if hour < 0: hour=0
+  if minut < 0: jump 'loopnegmin'
+end
+
 if minut >= 60:
 	:loopmin
 	hour += 1
@@ -1093,6 +1102,9 @@ elseif pcs_mood >= 5:
 else
 	$pcs_mood = '<font color="red">You are really depressed and need to improve your mood.</font>'
 end
+if cheatNoMood ! 0:
+	$pcs_mood = ''
+end
 
 if pcs_energy >= 80:
 	$pcs_energy = '<font color="green">You couldn''t eat one more bite.</font>'
@@ -1246,10 +1258,21 @@ else
 	pornstar['icon'] = 0
 end
 
-if therapistday ! daystart and remindedtherapyday ! daystart and hypnoSchedule = 1 and (hour >= 18 and (minut > 45 or hour >= 19)) and (hour < 20 and (minut < 15 or hour < 19)) and menu_off = 0:
+if therapistday ! daystart and remindedtherapyday ! daystart and (hypnoSchedule = 1 or gschool_therapy = 1) and (hour >= 18 and (minut > 45 or hour >= 19)) and (hour < 20 and (minut < 15 or hour < 19)) and menu_off = 0:
 	remindedtherapyday = daystart
 	gt 'therapist_reminder'
 end
 
+!!--- total cum -------------------
+
+total_cum=0
+cumarr_idx = 0
+:total_cumarrloop
+if cumarr_idx < arrsize('$cumarrnam'):
+  total_cum += cumarrcpt[cumarr_idx]
+  cumarr_idx += 1
+  jump 'total_cumarrloop'
+end
+
 --- stat ---------------------------------
 

+ 110 - 86
locations/stat_display.qsrc

@@ -18,39 +18,25 @@ if Enable_showstatimg = 1:
 	else
 		$stat_imgtool_msg += '<a href="exec:Enable_statimg_face = 0 & gs ''$menu_obnovit''">◆Face</a>'
 		$img_temp = FUNC('$face_image')
-		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
+		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img height="200" src="<<$img_temp>>"></a> '
 	end
-
-	if Enable_statimg_body = 0:
-		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_body = 1 & gs ''$menu_obnovit''">◇Body</a>'
-	else
-		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_body = 0 & gs ''$menu_obnovit''">◆Body</a>'
-		$img_temp = FUNC('$body_image','body')
-		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
-	end
-
-	if Enable_statimg_coat = 0:
-		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_coat = 1 & gs ''$menu_obnovit''">◇Coat</a>'
-	else
-		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_coat = 0 & gs ''$menu_obnovit''">◆Coat</a>'
-		$img_temp = FUNC('$body_image','coat')
-		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
-	end
-
-	if Enable_statimg_cloth = 0:
+  
+  if Enable_statimg_cloth = 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_cloth = 1 & gs ''$menu_obnovit''">◇Clothes</a>'
 	else
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_cloth = 0 & gs ''$menu_obnovit''">◆Clothes</a>'
 		$img_temp = FUNC('$body_image','clothes')
-		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
+		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img height="200" src="<<$img_temp>>"></a> '
 	end
 
+  if Enable_statimg_bra = 1 or Enable_statimg_panties = 1: $stat_imgextra_msg +='<br>'
+	
 	if Enable_statimg_bra = 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_bra = 1 & gs ''$menu_obnovit''">◇Bra</a>'
 	else
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_bra = 0 & gs ''$menu_obnovit''">◆Bra</a>'
 		$img_temp = FUNC('$body_image','bra')
-		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
+		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img height="150" src="<<$img_temp>>"></a> '
 	end
 
 	if Enable_statimg_panties = 0:
@@ -58,16 +44,43 @@ if Enable_showstatimg = 1:
 	else
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_panties = 0 & gs ''$menu_obnovit''">◆Panties</a>'
 		$img_temp = FUNC('$body_image','panties')
-		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
+		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img height="150" src="<<$img_temp>>"></a> '
 	end
+	
+  if Enable_statimg_body = 1 or Enable_statimg_coat = 1 or Enable_statimg_shoes = 1 or Enable_statimg_purse = 1: $stat_imgextra_msg +='<br>'
 
-	if Enable_statimg_shoes = 0:
+	if Enable_statimg_body = 0:
+		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_body = 1 & gs ''$menu_obnovit''">◇Body</a>'
+	else
+		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_body = 0 & gs ''$menu_obnovit''">◆Body</a>'
+		$img_temp = FUNC('$body_image','body')
+		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img height="100" src="<<$img_temp>>"></a> '
+	end
+	
+  if Enable_statimg_shoes = 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_shoes = 1 & gs ''$menu_obnovit''">◇Shoes</a>'
 	else
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_shoes = 0 & gs ''$menu_obnovit''">◆Shoes</a>'
 		$img_temp = FUNC('$body_image','shoes')
-		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
+		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img height="100" src="<<$img_temp>>"></a> '
 	end
+  
+  if Enable_statimg_purse = 0:
+		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_purse = 1 & gs ''$menu_obnovit''">◇Purse</a>'
+	else
+		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_purse = 0 & gs ''$menu_obnovit''">◆Purse</a>'
+		$img_temp = FUNC('$purse_image', $currentpursetype, currentpursenumber)
+		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img height="100" src="<<$img_temp>>"></a> '
+	end
+	
+  if Enable_statimg_coat = 0:
+		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_coat = 1 & gs ''$menu_obnovit''">◇Coat</a>'
+	else
+		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_coat = 0 & gs ''$menu_obnovit''">◆Coat</a>'
+		$img_temp = FUNC('$body_image','coat')
+		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img height="100" src="<<$img_temp>>"></a> '
+	end
+
 	if $menu_loc ! '': $stat_imgtool_msg += ' <a href="exec:gs ''Cheatmenu_din'' & dynamic $cheatmenu[''setting'']">◎Settings</a>'
 end
 !!----------------image Extra messages, end --------------------------
@@ -513,10 +526,10 @@ if $pantyworntype = 'none' and PCloswimwear = 0 and PCloPanties = 0:
 		$stat_panty_msg = 'You are happily commando, feeling very comfortable with your ass and pussy touching the inside of your pants.'
 	elseif PCloPants > 0 and $braworntype = 'none':
 		$stat_panty_msg = 'You aren''t wearing underwear, and your bare pussy is rubbing against your clothing.'
-		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
+		$stat_panty_text = '<BR><b><font color="AB052A"><<$stat_panty_msg>></font></b>'
 	elseif PCloPants > 0 and $braworntype ! 'none':
 		$stat_panty_msg = 'You aren''t wearing panties, and your bare pussy is rubbing against your clothing.'
-		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
+		$stat_panty_text = '<BR><b><font color="AB052A"><<$stat_panty_msg>></font></b>'
 	elseif towel = 1:
 		$stat_panty_msg = 'Your naked body is covered only by a short towel.'
 		$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
@@ -537,11 +550,11 @@ elseif $pantyworntype = 'exhibitionist' and PCloswimwear = 0:
 		$stat_panty_msg = 'Your face is flushed with shame. You are wearing panties so thin they leave your ass clearly visible as it flashes from under your short skirt.'
 		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
 	elseif PCloPants > 0 and trait['commando_lvl'] = 3:
-		$stat_panty_msg = 'You wearing transparent panties, but that you''re wearing any at all is bringing down your mood.'
+		$stat_panty_msg = 'You are wearing transparent panties, but that you''re wearing any at all is bringing down your mood.'
 		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
 	end
 elseif $pantyworntype ! 'none' and trait['commando_lvl'] = 3:
-	$stat_panty_msg = 'You wearing panties and it makes you uncomfortable.'
+	$stat_panty_msg = 'You are wearing panties and it makes you uncomfortable.'
 	$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
 end
 
@@ -654,7 +667,7 @@ elseif PCloswimwear = 1:
 		$stat_clothes_tooltip = 'Normal swimsuit.'
 		$stat_clothes_style = 'swimsuit'
 	end
-elseif $clothingworntype = 'gm_office':
+elseif $clothingworntype = 'gm_office' or PCloStyle3 = 4:
 	if PCloStyle = 4 and PCloBimbo = 1 and cheatBimbo = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'
 		$stat_clothes_msg = 'You''re wearing an office dress a bimbo or a prostitute would wear'
@@ -831,9 +844,11 @@ end
 
 !!---------------- Messages for Icons/Texts (End)----------------------------
 
-if ((young_shop_work = 1 and hour = 16 and week < 6) or (young_shop_work1 = 1 and hour = 9 and week >= 6) or (young_shop_work2 = 1 and hour = 9 and week < 6)) and inWorkYoungShop = 0 and misscheck ! daystart:
+if ((young_shop_work = 1 and hour = 16 and week < 6) or (young_shop_work1 = 1 and hour = 9 and week >= 6) or (young_shop_work2 = 1 and hour = 9 and week < 6)) and misscheck ! daystart:
 	misscheck = daystart
-	young_shop_miss += 1
+  if inWorkYoungShop = 0:
+	  young_shop_miss += 1
+  end
 end
 
 if pornstack > 0:
@@ -907,18 +922,20 @@ if cheatStatusIcons = 0:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_willpower_msg"><img title="<<$stat_willpower_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/willpower_low.png"></a></td>'
 	end
 
-	if pcs_mood >= 80:
-		$statusIconBarTab += '<td><a href="exec:msg ''You are in a great mood.''"><img title="You are in a great mood." height = <<set_siconht>> src="images/system/icons/status/mood_1.png"></a></td>'
-	elseif pcs_mood >= 60:
-		$statusIconBarTab += '<td><a href="exec:msg ''You are in an OK mood.''"><img title="You are in an OK mood." height = <<set_siconht>> src="images/system/icons/status/mood_2.png"></a></td>'
-	elseif pcs_mood >= 40:
-		$statusIconBarTab += '<td><a href="exec:msg ''You are in a good mood.''"><img title="You are in a good mood." height = <<set_siconht>> src="images/system/icons/status/mood_3.png"></a></td>'
-	elseif pcs_mood >= 20:
-		$statusIconBarTab += '<td><a href="exec:msg ''You are in a bad mood.''"><img title="You are in a bad mood." height = <<set_siconht>> src="images/system/icons/status/mood_4.png"></a></td>'
-	elseif pcs_mood >= 5:
-		$statusIconBarTab += '<td><a href="exec:msg ''You are in a terrible mood.''"><img title="You are in a terrible mood." height = <<set_siconht>> src="images/system/icons/status/mood_5.png"></a></td>'
-	else
-		$statusIconBarTab += '<td><a href="exec:msg ''You are really depressed and need to improve your mood.''"><img title="You are really depressed." height = <<set_siconht>> src="images/system/icons/status/mood_6.png"></a></td>'
+	if cheatNoMood = 0:
+		if pcs_mood >= 80:
+			$statusIconBarTab += '<td><a href="exec:msg ''You are in a great mood.''"><img title="You are in a great mood." height = <<set_siconht>> src="images/system/icons/status/mood_1.png"></a></td>'
+		elseif pcs_mood >= 60:
+			$statusIconBarTab += '<td><a href="exec:msg ''You are in an OK mood.''"><img title="You are in an OK mood." height = <<set_siconht>> src="images/system/icons/status/mood_2.png"></a></td>'
+		elseif pcs_mood >= 40:
+			$statusIconBarTab += '<td><a href="exec:msg ''You are in a good mood.''"><img title="You are in a good mood." height = <<set_siconht>> src="images/system/icons/status/mood_3.png"></a></td>'
+		elseif pcs_mood >= 20:
+			$statusIconBarTab += '<td><a href="exec:msg ''You are in a bad mood.''"><img title="You are in a bad mood." height = <<set_siconht>> src="images/system/icons/status/mood_4.png"></a></td>'
+		elseif pcs_mood >= 5:
+			$statusIconBarTab += '<td><a href="exec:msg ''You are in a terrible mood.''"><img title="You are in a terrible mood." height = <<set_siconht>> src="images/system/icons/status/mood_5.png"></a></td>'
+		else
+			$statusIconBarTab += '<td><a href="exec:msg ''You are really depressed and need to improve your mood.''"><img title="You are really depressed." height = <<set_siconht>> src="images/system/icons/status/mood_6.png"></a></td>'
+		end
 	end
 	
 	if mood_trauma > 0:
@@ -1146,7 +1163,7 @@ if cheatStatusIcons = 0:
 		$statusIconBarTab += '<td><a href="exec: msg $stat_model_msg"><img title="<<$stat_model_msg>>" height = <<set_siconht>> src="images/system/icons/status/model_'+iif(night_mode ! 3 and (($location_type = 'public_outdoors' and daystage = 5) or night_mode = 1 or night_mode = 2), 'white', 'black')+'.png"></a></td>'
 	end
 	
-	if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and starlets_on = 1: 
+	if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and starlets_on = 1 and AlbinaQW['startletsday'] ! daystart: 
 		if starlets_missed > 0:
 			$stat_starlet_msg = 'You missed practice with the Starlets today!'
 		else
@@ -1214,7 +1231,7 @@ if cheatStatusIcons = 0:
 	!!Row 5: Drugs and other short term stuff
 
 	if siga > 0:
-		$stat_smoker_msg = 'You have <<siga>> cigarette'+iif(siga = 1, '', 's')+iif(smokerNeed > 0 and NarkImmune = 0, ' and you want to smoke.' , '.')
+    if smokerNeed > 0:	$stat_smoker_msg = 'You have <<siga>> cigarette and you want to smoke.'
 		$statusIconBarTab += '<td><a href="exec:msg $stat_smoker_msg"><img title="<<$stat_smoker_msg>>" height = <<set_siconht>> src="images/system/icons/status/cigarettes.png"></a></td>'
 	end
 
@@ -1304,8 +1321,9 @@ if enable_show_status = 0:
 		$st_temp='rgb(<<(16777216 + fcolor) mod 256>>,<<(16777216 + fcolor)/256 mod 256>>,<<(16777216 + fcolor)/65536>>)'
 		$stat_extra_msg += '<p><font color="<<$st_temp>>"><TABLE width="300" cellpadding="1" cellspacing="0"><TR><TD width="85%">'+FUNC('indiktab', '2', pcs_horny, pcs_horny)+'</TD><TD> Arousal</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '2', pain['total'], pain['total'])+'</TD><TD> Pain</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_health * 100 / healthmax, pcs_health)+'</TD><TD> Health</TD></TR>'
 		if MagikDostup = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mana * 100 / manamax, pcs_mana)+'</TD><TD> Mana</TD></TR>'
-		$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_willpwr * 100 / willpowermax, pcs_willpwr)+'</TD><TD> Willpower</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stam * 100 / stammax, pcs_stam)+'</TD><TD> Stamina</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mood, pcs_mood)+'</TD><TD> Mood</TD></TR>'
-		if cheatNoEat = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_energy, pcs_energy)+'</TD><TD> Hunger</TD></TR>'
+		$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_willpwr * 100 / willpowermax, pcs_willpwr)+'</TD><TD> Willpower</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stam * 100 / stammax, pcs_stam)+'</TD><TD> Stamina</TD></TR>'
+		if cheatNoMood = 0:  $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mood, pcs_mood)+'</TD><TD> Mood</TD></TR>'
+		if cheatNoEat = 0:   $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_energy, pcs_energy)+'</TD><TD> Hunger</TD></TR>'
 		if cheatNoDrink = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_hydra, pcs_hydra)+'</TD><TD> Thirst</TD></TR>'
 		if cheatNoSleep = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_sleep, pcs_sleep)+'</TD><TD> Sleep</TD></TR></TABLE></font></p>'
 	else
@@ -1329,8 +1347,10 @@ if enable_show_status = 0:
 		gs 'indik', '1', pcs_stam * 100 / stammax, pcs_stam
 		$stat_extra_msg += '<BR><<$ind>> Stamina'
 
-		gs 'indik', '1', pcs_mood, pcs_mood
-		$stat_extra_msg += '<BR><<$ind>> Mood'
+		if cheatNoMood = 0:
+			gs 'indik', '1', pcs_mood, pcs_mood
+			$stat_extra_msg += '<BR><<$ind>> Mood'
+		end
 
 		if cheatNoEat = 0:
 			gs 'indik', '1', pcs_energy, pcs_energy
@@ -2052,39 +2072,43 @@ if enable_extra_msg = 1:
 
 	if $stat_court_msg ! '': $stat_msg += '<BR><b><font color="red"><<$stat_court_msg>></font></b>'
 
-	if young_shop_work = 1 and hour = 16 and minut <= 5 and week < 6 and inWorkYoungShop = 0:
-		$stat_msg += 'You are late for work at Pussy-Cats.'
-	elseif young_shop_work = 1 and hour = 16 and week < 6 and inWorkYoungShop = 0 and misscheck ! daystart:
-		$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
-	elseif young_shop_work = 1 and (hour = 14 or hour = 15) and week < 6:
-		$stat_msg += '<BR><b><font color="red">You start work at Pussy-Cats today at 16:00.</font></b>'
-	end
-		
-	if young_shop_work1 = 1 and hour = 9 and minut <= 5 and week >= 6 and inWorkYoungShop = 0:
-		$stat_msg += 'You are late for work at Pussy-Cats.'
-	elseif young_shop_work1 = 1 and hour = 9 and week >= 6 and inWorkYoungShop = 0 and misscheck ! daystart:
-		$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
-	elseif young_shop_work1 = 1 and (hour = 7 or hour = 8) and week >= 6:
-		$stat_msg += '<BR><b><font color="red">By 9:00, you have to be at Pussy-Cats to start work.</font></b>'
-	end
+  if misscheck ! daystart:
+    if young_shop_work = 1 and hour = 16 and minut <= 5 and week < 6 and inWorkYoungShop = 0:
+      $stat_msg += 'You are late for work at Pussy-Cats.'
+    elseif young_shop_work = 1 and hour = 16 and week < 6 and inWorkYoungShop = 0 and misscheck ! daystart:
+      $stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
+    elseif young_shop_work = 1 and (hour = 14 or hour = 15) and week < 6:
+      $stat_msg += '<BR><b><font color="red">You start work at Pussy-Cats today at 16:00.</font></b>'
+    end
+      
+    if young_shop_work1 = 1 and hour = 9 and minut <= 5 and week >= 6 and inWorkYoungShop = 0:
+      $stat_msg += 'You are late for work at Pussy-Cats.'
+    elseif young_shop_work1 = 1 and hour = 9 and week >= 6 and inWorkYoungShop = 0 and misscheck ! daystart:
+      $stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
+    elseif young_shop_work1 = 1 and (hour = 7 or hour = 8) and week >= 6:
+      $stat_msg += '<BR><b><font color="red">By 9:00 you have to be at Pussy-Cats to start work.</font></b>'
+    end
 
-	if young_shop_work2 = 1 and hour = 9 and minut <= 5 and week < 6 and inWorkYoungShop = 0:
-		$stat_msg += 'You are late for work at Pussy-Cats.'
-	elseif young_shop_work2 = 1 and hour = 9 and week < 6 and inWorkYoungShop = 0 and misscheck ! daystart:
-		$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
-	elseif young_shop_work2 = 1 and (hour = 7 or hour = 8) and week < 6:
-		$stat_msg += '<BR><b><font color="red">By 9:00, you have to be at Pussy-Cats to start work.</font></b>'
-	end
+    if young_shop_work2 = 1 and hour = 9 and minut <= 5 and week < 6 and inWorkYoungShop = 0:
+      $stat_msg += 'You are late for work at Pussy-Cats.'
+    elseif young_shop_work2 = 1 and hour = 9 and week < 6 and inWorkYoungShop = 0 and misscheck ! daystart:
+      $stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
+    elseif young_shop_work2 = 1 and (hour = 7 or hour = 8) and week < 6:
+      $stat_msg += '<BR><b><font color="red">By 9:00 you have to be at Pussy-Cats to start work.</font></b>'
+    end
+  end
 
-	if workrin = 1 and (week = 2 or week = 4 or week = 6) and hour > 5 and hour < 8:
-		$stat_msg += '<BR><b><font color="red">At 8 o''clock, you start work in the market.</font></b>'
-	elseif workrin = 1 and (week = 2 or week = 4 or week = 6) and hour = 8:
-		$stat_msg += '<BR><b><font color="red">You need to work in the market now.</font></b>'
-	end
+  if marketWorkday ! daystart:
+    if workrin = 1 and (week = 2 or week = 4 or week = 6) and hour > 5 and hour < 8:
+      $stat_msg += '<BR><b><font color="red">At 8 o''clock you start work on the market.</font></b>'
+    elseif workrin = 1 and (week = 2 or week = 4 or week = 6) and hour = 8:
+      $stat_msg += '<BR><b><font color="red">You need to work on the market now.</font></b>'
+    end
+  end
 	
 
 	if model['status'] > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:
-		$stat_msg += '<BR><b>You have no more modeling jobs available this week.</b>'
+		!! $stat_msg += '<BR><b>You have no more modeling jobs available this week.</b>'
 	elseif model['status'] > 0 and model_week < (daystart - week) / 7 and model_job_week = 1:
 		$stat_msg += '<BR><b>You can get paid for 1 more modeling job this week.</b>'
 	elseif model['status'] > 0 and model_week < (daystart - week) / 7 and model_job_week < 1:
@@ -2111,7 +2135,7 @@ if enable_extra_msg = 1:
 	if prodcosttrue > 0: $stat_msg += '<br><b>You owe money to the porn studio <<prodcost>>?</b>'
 	if firstkasting > 0 and pfilmNO < 1:
 		if pornstack <= 10:
-			$stat_msg += '<br>You are currently unable to book any more porn shoots at the Porn Studio.'
+			!! $stat_msg += '<br>You are currently unable to book any more porn shoots at the Porn Studio.'
 		elseif pornstack = 11:
 			$stat_msg += '<br>You can contract <<10-pornstack>> porn shoot at the Porn Studio.'
 		else
@@ -2136,13 +2160,13 @@ if enable_extra_msg = 1:
 	end
 	
 	
-	if hour < 22 and week >= 2 and week <= 4 and workKafe = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift at The Roadhouse cafe starting at 11:00.</font></b>'
-	if hour < 17 and week < 5 and workSec >= 1 or hour < 17 and week < 5 and workSec = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Titran-Express from 9:00 to 17:00</font></b>'
-	if hour < 17 and week < 5 and BurgerQW['Secretary'] = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Diner Bystroeshka from 9:00 to 17:00</font></b>'
-	if hour < 20 and week => 1 and week <= 5 and age < 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 16:00.</font></b>'
-	if hour < 16 and week => 1 and week <= 5 and age >= 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 8:00.</font></b>'
-	if hour < 16 and week > 1 and week <= 5 and workhosp = 1:$stat_msg += '<BR><b><font color="red">You work as a nurse in the city residential area clinic. Your shift starts at 8:00.</font></b>'
-	if hour < 10 and worksalon = 1 and (week = 1 or week = 3 or week = 5):$stat_msg += '<BR><b><font color = red>Today you have work as masseuse in the beauty salon. Shift starts at 9:00.</font></b>'
+	if hour < 12 and week >= 2 and week <= 4 and workKafe = 1 and kafeWorkday ! daystart:$stat_msg += '<BR><b><font color="red">Today you have a shift at The Roadhouse cafe starting at 11:00.</font></b>'
+	if ((hour < 10 and week < 5 and workSec >= 1) or (hour < 17 and week < 5 and workSec = 1)) and officeSecWorkday ! daystart:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Titran-Express from 9:00 to 17:00</font></b>'
+	if ((hour < 10 and week < 5 and workSec_old >= 1) or (hour < 17 and week < 5 and workSec_old = 1)) and officeSecWorkday ! daystart:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Neptune-Express from 9:00 to 16:00</font></b>'
+	if hour < 10 and week < 5 and BurgerQW['Secretary'] = 1 and burgerSecWorkday ! daystart:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Diner Bystroeshka from 9:00 to 17:00</font></b>'
+	if hour < 17 and week => 1 and week <= 5 and age < 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 16:00.</font></b>'
+	if hour < 9 and week => 1 and week <= 5 and age >= 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 8:00.</font></b>'
+	if hour < 9 and week > 1 and week <= 5 and workhosp = 1 and nurseWorkday ! daystart:$stat_msg += '<BR><b><font color="red">You work as a nurse in the city residential area clinic. Your shift starts at 8:00.</font></b>'
 	if leonidVisit = 1 and hour < 21 and hour > 6: $stat_msg += '<br><b>You have to serve Leonid at 20:00 in his Pavlovsk office!</b>'
 	
 	if hypnoAddict > 0 and $stat_hypno_msg ! '' and hypnoWithdrawal = 1 and missCum >= timeTresh:
@@ -2153,7 +2177,7 @@ if enable_extra_msg = 1:
 		$stat_msg += '<BR><b><font color="red"><<$stat_hypno_msg>></font></b>'
 	elseif hypnoAddict > 0 and $stat_hypno_msg ! '' and hypnoWithdrawal = 2 and missCum < timeTresh:
 		$stat_msg += '<BR><b><font color="red"><<$stat_hypno_msg>></font></b>'
-	elseif hypnoAddict > 0 and $stat_hypno_msg ! '':
+	elseif hypnoAddict > 0 and $stat_hypno_msg ! '' and missCum >= timeTresh:
 		$stat_msg += '<BR><b><font color="magenta"><<$stat_hypno_msg>></font></b>'
 	end
 end

+ 1 - 1
locations/stol.qsrc

@@ -382,7 +382,7 @@ if $ARGS[0] = 'bc':
 			if morning_after_pill = 1:
 				'You have a <a href="exec:gs''medical_din'',''morning_after_pill''">morning after pill</a> hidden in the back corner of the drawer.'
 			else
-				'You have <b><<birth_control[''morning_after'']>></b> <a href="exec:gs''medical_din'',''morning_after_pill''">morning after pills</a> stacked in the back corner of the drawer.'
+				'You have <b><<morning_after_pill>></b> <a href="exec:gs''medical_din'',''morning_after_pill''">morning after pills</a> stacked in the back corner of the drawer.'
 			end
 		else
 			if $locclass = 'bedr':

+ 1 - 0
locations/street_event.qsrc

@@ -1734,6 +1734,7 @@ if $ARGS[0] = 'divorce_party':
 									'"Want to put that mouth to better use?" you tease with a smile as you present your dripping wet pussy to Yefim. Licking his lips, he pulls you over and helps you straddle his face. He grips your thighs and holds you in place as his tongue delves between your swollen pussy lips. You tremble and gasp, his tongue expertly flicking and massaging your clit when he isn''t playing with your labia. You grind your hips down as the pleasure builds, crying out as you cum on his tongue. Your pussy clenches, and your body tenses as you ride out the bliss.'
 									*nl
 									'"Alright, that''s enough," you hear Marta say. She watches you slide off his face with a smirk, taking a moment to admire how wet his lips are with your juices before turning her attention to Eva. "I don''t think he can hold out much longer, so why don''t we end this with a <i>bang</i>!" You don''t know when Alla finished, but she''s here pulling Eva aside to undress her. When they''re done, Yefim switches spots with Eva, with her now on her back. "Now keep those legs spread, babe," Marta says as Yefim positions himself between her legs.'
+									gs 'arousal', 'cuni'
 									$orgasm_or = 'yes'
 									gs 'arousal', 'end'
 									gs 'stat'

+ 19 - 12
locations/tatiana_lab.qsrc

@@ -395,18 +395,18 @@ if $ARGS[0] = 'Tatiana':
 		end
 	end
 
-	if BurgerQW['IvanQW']  = 2 and poverKAR = 0 and softKAR = 0:
-		act 'Ask Tatiana for help with Ivan':
+	if BurgerQW['IlyQW']  = 2 and poverKAR = 0 and softKAR = 0:
+		act 'Ask Tatiana for help with Ily':
 			cla
 			gs 'stat'
-			'You explain the situation and ask Tatiana for assistance. Tatiana says thoughtfully, "It doesn''t sound like there is any physical evidence of Ivan''s guilt, so you need a confession. I think it would be possible to capture and interrogate him. Or, you and I could try a more cunning approach to get the truth out of him. Either way, you need to capture it all on video."'
+			'You explain the situation and ask Tatiana for assistance. Tatiana says thoughtfully, "It doesn''t sound like there is any physical evidence of Ily''s guilt, so you need a confession. I think it would be possible to capture and interrogate him. Or, you and I could try a more cunning approach to get the truth out of him. Either way, you need to capture it all on video."'
 
 			act 'Military solution':
 				cls
 				poverKAR = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
-				'You decide to get Ivan to admit what he''s done by force. Tatiana tells you to go to Ivan''s apartment. There you will meet with Gustav, who will help resolve the issue. She stresses that you keep an eye on him in case he starts getting distraught. Apparently when he does, he turns into a monster.'
+				'You decide to get Ily to admit what he''s done by force. Tatiana tells you to go to Ily''s apartment. There you will meet with Gustav, who will help resolve the issue. She stresses that you keep an eye on him in case he starts getting distraught. Apparently when he does, he turns into a monster.'
 
 				act 'Leave':gt 'tatiana_lab', 'Tatiana'
 			end
@@ -416,16 +416,16 @@ if $ARGS[0] = 'Tatiana':
 				softKAR = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
-				'You decide to trick Ivan into admitting what he''s done. Tatiana tells you to go to Ivan''s apartment and that she will meet you there.'
+				'You decide to trick Ily into admitting what he''s done. Tatiana tells you to go to Ily''s apartment and that she will meet you there.'
 
 				act 'Leave':gt 'tatiana_lab', 'Tatiana'
 			end
 		end
 	elseif poverKAR = 2:
-		act 'Approach Tatiana about the attack on Ivan''s apartment':
+		act 'Approach Tatiana about the attack on Ily''s apartment':
 			cla
 			poverKAR = 3
-			'You come to Tatiana, and she sighs. "Yes, you failed. That bullet Gustav caught in his head made his strength go up to the next level, almost invulnerable but deprived of his mind. That''s why he couldn''t stop himself from killing Ivan before you could get a confession out of him. There are pluses. The cops think it was just a gas explosion for one, so you probably don''t need to worry about much of an investigation. But now you are going to have to pay the debt if you don''t want to go to jail. "'
+			'You come to Tatiana, and she sighs. "Yes, you failed. That bullet Gustav caught in his head made his strength go up to the next level, almost invulnerable but deprived of his mind. That''s why he couldn''t stop himself from killing Ily before you could get a confession out of him. There are pluses. The cops think it was just a gas explosion for one, so you probably don''t need to worry about much of an investigation. But now you are going to have to pay the debt if you don''t want to go to jail. "'
 
 			act 'Leave':gt 'tatiana_lab', 'Tatiana'
 		end
@@ -458,6 +458,8 @@ if $ARGS[0] = 'Tatiana':
 
 	if tat_lesson_number <= 8 and pcs_mana >= 1000:
 		act 'Are there other spells you can teach me? (1:00)': gt 'tatiana_lab', 'teach'
+	elseif pcs_mana >= 1000:
+		act 'Can you reinforce my magic training? (1:00)': gt 'tatiana_lab', 'teach'
 	end
 
 	if pcs_magik >= 5 and spellavtoklon = 0:
@@ -709,6 +711,7 @@ if $ARGS[0] = 'teach_strip':
 	*clr & cla
 	if tat_lesson_number = 0: tat_lesson_number = 1
 	tatiana_teach_escalation += 1
+	if tatiana_teach_escalation > 4: tatiana_teach_escalation = 4
 	'<center><video autoplay loop src="images/locations/pavlovsk/trainstation/bimbo.strip6.mp4"></video></center>'
 	if pcs_inhib < 35:
 		'You squirm and blush under Tatiana''s nonchalant aptitude as she helps you undress to do what is essentially a magical peep show. Only the fact that she seems fully focused on the magical ritual, and the only guy that can peek not only isn''t in the room, but doesn''t appear interested in anything you two are going to do, lets you struggle towards fulfilling your deal with Tatiana.'
@@ -720,7 +723,7 @@ if $ARGS[0] = 'teach_strip':
 	!! NOTE - This action will determine the fucking machine event that initiates the chain.
 	!! NOTE 2 - This action will be repeated every time Sveta asks to learn more spells, but the "act" must be restricted to Sveta''s current fucking machine level.
 
-	if pcs_vag = 0 or tatiana_teach_escalation <= 2:
+	if pcs_vag = 0 or tatiana_teach_escalation <= 4:
 		act 'The saddle-looking one(No penetration)': gt 'tatiana_lab', 'saddle'
 	end
 	if tatiana_teach_escalation <= 4:
@@ -752,7 +755,7 @@ if $ARGS[0] = 'saddle':
     'Finally, the controller slips from your clenching fingers as your magical climax triggers, taking your breath and self-control away and sending wave after wave of magically enhanced pleasure pulsing through your body.'
 
 	act 'Time for a lesson':
-		if pcs_vag = 0 or tatiana_teach_escalation < 2:
+		if (pcs_vag = 0 or tatiana_teach_escalation < 2) and tat_lesson_number <= 8:
 			if pcs_vag ! 0: tatiana_teach_escalation += 1
 			gt 'tatiana_lab', 'lesson<<tat_lesson_number>>'
 		else
@@ -811,7 +814,7 @@ if $ARGS[0] = 'teach_dildo_anal':
     'Finally, in a magical explosion, an orgasmic bliss surges through your body, making you crumble under the sex machine''s onslaught as mana starts flowing around the room.'
 
 	act 'Time for a lesson':
-		if tatiana_teach_escalation < 4:
+		if tatiana_teach_escalation < 4 and tat_lesson_number <= 8:
 			tatiana_teach_escalation += 1
 			gt 'tatiana_lab', 'lesson<<tat_lesson_number>>'
 		else
@@ -850,7 +853,7 @@ if $ARGS[0] = 'teach_dildo_vag':
     'Finally, in a magical explosion, an orgasmic bliss surges through your body, making you crumble under the sex machine''s onslaught as mana starts flowing around the room.'
 
 	act 'Time for a lesson':
-		if tatiana_teach_escalation < 4:
+		if tatiana_teach_escalation < 4 and tat_lesson_number <= 8:
 			tatiana_teach_escalation += 1
 			gt 'tatiana_lab', 'lesson<<tat_lesson_number>>'
 		else
@@ -955,7 +958,11 @@ if $ARGS[0] = 'teach_full':
             'Your arousal grows little by little as your holes are pounded, Tatiana''s magic quickly feeding into your mana and putting your nerves on fire, inducing intensities that <i>mundane</i> sex can''t match, making your mind lose focus as something warm grows in your core.'
             'Finally, there is a sexual climax that makes you scream in delight as your magical core liberates your mana, causing it to course through your nerves, eliciting wave after wave of orgasmic bliss and causing you to collapse on the mat in a heaving mess.'
 
-			act 'Time for a lesson': gt 'tatiana_lab', 'lesson<<tat_lesson_number>>'
+			if tat_lesson_number <= 8:
+				act 'Time for a lesson': gt 'tatiana_lab', 'lesson<<tat_lesson_number>>'
+			else
+				act 'Finish refresher course': gt 'tatiana_lab', 'start'
+			end
 		end
 	end
 end

+ 13 - 4
locations/taxi.qsrc

@@ -77,6 +77,14 @@ if $ARGS[0] = 'locations':
 		end
 	end
 
+	if $loc ! 'city_suburbs':
+		act 'Go to the suburbs':
+			$loc = 'city_suburbs'
+			$loc_arg = 'start'
+			gt 'taxi', 'trip'
+		end
+	end
+
 	if $loc ! 'BDSM_Club' and BDSMtaxi = 1:
 		act 'Go to the BDSM club':
 			$loc = 'BDSM_Club'
@@ -85,13 +93,14 @@ if $ARGS[0] = 'locations':
 		end
 	end
 
-	if $loc ! 'city_suburbs':
-		act 'Go to the city suburbs':
-			$loc = 'city_suburbs'
-			$loc_arg = 'start'
+	if $loc ! 'youplace' and home_owned[5] > 0:
+		act 'Go to your mansion':
+			$loc = 'youplace'
+			$loc_arg = ''
 			gt 'taxi', 'trip'
 		end
 	end
+
 end
 
 if $ARGS[0] = 'ride':

+ 41 - 9
locations/therapist.qsrc

@@ -2,13 +2,13 @@
 
 CLOSE ALL
 if sound = 0:PLAY 'sound/clock.mp3',80
-$loc = 'pav_clinic'
 $location_type = 'public_indoors'
 thingsTheTherapistLikes = 0
 if age < 18:thingsTheTherapistLikes += 1
 if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:thingsTheTherapistLikes += 1
 
 if $ARGS[0] = '':
+	killvar 'gschool_therapy'
 	$cumdesciption3 = ''
 	therapistFuckedPussy = 0
 	therapistFuckedAss = 0
@@ -46,6 +46,22 @@ if $ARGS[0] = 'hypnoGreet':
 
 					'He chucks your panties into the garbage. "Just don''t let it happen again. What did you need help with today Miss <<$pcs_lastname>>?"'
 
+					gs 'therapist', 'therapyOptions'
+				end
+			elseif hypnoBra = 1 and $braworntype ! 'none':
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
+				''
+				'"Miss <<$pcs_lastname>>, what is this?"'
+				'"I''m sorry Dr. Pavlov... I don''t know what I was thinking. I-"'
+				'He interupts you and commands you to strip off your bra and hand it to him.'
+				act 'Remove your bra':
+					cla
+					*clr
+					'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/removeBra.mp4"></video></center>'
+					gs 'bras', 'dispose'
+					''
+					'You remove your bra and hand it to <i>Master</i>.'
+					'He chucks your bra into the garbage. "Just don''t let it happen again. What did you need help with today Miss <<$pcs_lastname>>?"'
 					gs 'therapist', 'therapyOptions'
 				end
 			else
@@ -90,6 +106,22 @@ if $ARGS[0] = 'hypnoGreet':
 					gs 'therapist', 'therapyOptions'
 				end
 			end
+		elseif $braworntype ! 'none':
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
+			''
+			'"Miss <<$pcs_lastname>>, what is this?"'
+			'"I''m sorry Dr. Pavlov... I don''t know what I was thinking. I-"'
+			'He interupts you and commands you to strip off your bra and hand it to him.'
+			act 'Remove your bra':
+				cla
+				*clr
+				'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/removeBra.mp4"></video></center>'
+				gs 'bras', 'dispose'
+				''
+				'You remove your bra and hand it to <i>Master</i>.'
+				'He chucks your bra into the garbage. "Just don''t let it happen again. What did you need help with today Miss <<$pcs_lastname>>?"'
+				gs 'therapist', 'therapyOptions'
+			end
 		else
 			act 'Show Dr. Pavlov your bare pussy':
 				cla
@@ -125,7 +157,7 @@ end
 
 if $ARGS[0] = 'therapyOptions':
 	if hypnoStage < 2:
-		act 'Change your mind and leave':gt $loc
+		act 'Change your mind and leave':gt $loc, $loc_arg
 	end
 
 	if pcs_childtrauma > 0:
@@ -151,7 +183,7 @@ if $ARGS[0] = 'therapyOptions':
 						PavlinQW = 8
 					end
 					'"Please, visit me again if you have any further problems, I will be glad to help!" Says Dr. Pavlov as he escorts you out the door.'
-					act 'Leave':gt $loc
+					act 'Leave':gt $loc, $loc_arg
 				end
 			end
 			act 'Hypnotherapy':gt 'therapist', 'hypno'
@@ -264,7 +296,7 @@ $therapyMethod = {
 			gs 'stat'
 			'<<$therapyTalkMessage>>, and Dr. Pavlov makes some suggestions and asks some pointed questions. Although he makes you look at your own actions and desires closely, making you aware of your own issues, it somehow makes you feel better about yourself.'
 			'"Please, visit me again if you have any further problems, I will be glad to help!" Says Dr. Pavlov, as he escorts you out the door.'
-			act 'Leave':gt $loc
+			act 'Leave':gt $loc, $loc_arg
 		end
 	else
 		gs 'willpower', 'misc', 'resist', 'easy'
@@ -282,7 +314,7 @@ $therapyMethod = {
 				gs 'stat'
 				'<<$therapyTalkMessage>>, and Dr. Pavlov makes some suggestions and asks some pointed questions. Although he makes you look at your own actions and desires closely, making you aware of your own issues, it somehow makes you feel better about yourself.'
 				'"Please, visit me again if you have any further problems, I will be glad to help!" Says Dr. Pavlov, as he escorts you out the door.'
-				act 'Leave':gt $loc
+				act 'Leave':gt $loc, $loc_arg
 			end
 		else
 			act 'Just talk (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1493,7 +1525,7 @@ if $ARGS[0] = 'hypnoEnd':
 		end
 		$hypnoTxt3 = '"Please, visit me again if you have any further problems, I will be glad to help!" says Dr. Pavlov as a goodbye, taking your hands in his, patting them, then closing his door. <br>What a nice old man, you think to yourself.'
 	elseif hypnoTime < 10:
-		hypnoAddict = 1
+		if hypnoAddict < 1: hypnoAddict = 1
 		hypnoDay = daystart
 		inhib_exp += (200-willpowermax)/25+1
 		if pain['vaginal'] > 0: pain['vaginal'] -= 5
@@ -1530,7 +1562,7 @@ if $ARGS[0] = 'hypnoEnd':
 		end
 			$hypnoTxt3 = '"Please, visit me again if you have any further problems, I will be glad to help!" says Dr. Pavlov as a goodbye, taking your hands in his, patting them, then closes his door.<br>What a nice old man, you think to yourself.'
 	else
-		hypnoAddict = 2
+		if hypnoAddict < 2: hypnoAddict = 2
 		hypnoDay = daystart
 		inhib_exp += (200-willpowermax)/25+1
 		if pain['vaginal'] > 0: pain['vaginal'] -= 5
@@ -1623,7 +1655,7 @@ if $ARGS[0] = 'hypnoEnd':
 				if therapistFuckedPussy > 0 and rand(1,2) = 1:
 					'A bit of cum dribbles from your well fucked cunt. You involuntarily clench your pussy; your body trying to keep more from leaking out.'
 				end
-				act 'Leave':gt $loc
+				act 'Leave':gt $loc, $loc_arg
 			end
 		else
 			'<<$hypnoTxt3>>'
@@ -1631,7 +1663,7 @@ if $ARGS[0] = 'hypnoEnd':
 			if therapistFuckedPussy > 0 and rand(1,2) = 1:
 				'A bit of cum dribbles from your well fucked cunt. You involuntarily clench your pussy; your body trying to keep more from leaking out.'
 			end
-			act 'Leave':gt $loc
+			act 'Leave':gt $loc, $loc_arg
 		end
 	end
 end

+ 4 - 3
locations/torgcentr.qsrc

@@ -11,8 +11,11 @@ $menu_loc = 'torgcentr'
 $menu_arg = ''
 menu_off = 0
 
+act 'Leave': minut += 5 & gt 'city_center'
+
 if hour >= 8 and hour <= 20:
 	*p '<center><a href="exec: minut += 3 & gt ''shop_pussycats'', ''start''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a>'
+	if young_shop_work > 0 or young_shop_work1 > 0: act 'Work at Pussy-Kats': gt 'shop_pussycats', 'start'
 !! Pussy-Kats - Youth clothing shop
 		*p '   '
 	*p'<a href="exec: minut += 3 & gt ''moncheri'', ''start''"><img src="images/locations/city/citycenter/mall/moncheri.png"></a>'
@@ -32,6 +35,7 @@ if hour >= 8 and hour <= 20:
 !! Danilovich Sporting goods - Sports shop
 		*p '   '
 	*p '<a href="exec: minut += 3 & gt ''salon'', ''start''"><img src="images/locations/city/citycenter/mall/beautybart.png"></a>'
+	if masseuse['jobtype'] > 0: act 'Work as a masseuse': gt 'salon', 'start'
 !! Beauty bar - Salon
 		*p '   '
 	*p'<a href="exec: minut += 3 & gt ''hairsalon'', ''start''"><img src="images/locations/city/citycenter/mall/goldencurl.png"></a>'
@@ -66,15 +70,12 @@ if hour >= 8 and hour <= 20:
 	*p '<a href="exec: minut += 3 & gt ''shop_photography'',''start''"><img src="images/locations/city/citycenter/mall/photoshop.png"></a>'
 !! Photography store
 
-	act 'Leave': minut += 5 & gt 'city_center'
 	act 'Go to the supermarket': gt 'shop', 'start'
 	act 'Go bowling': gt 'bouling'
 	act 'Play pool': gt 'billiard'
 	act 'Go to the cinema': gt 'kino'
 else
 	'The shopping center is closed and security are guiding everyone out so they can lock up.'
-	
-	act 'Leave': minut += 5 & gt 'city_center'
 end
 
 !!{Old menu

+ 5 - 12
locations/tour_guide.qsrc

@@ -18,16 +18,7 @@ if $ARGS[0] = 'tourstart':
 		*nl
 		'You answer a few questions the management team asks you and are offered a summer position at 100 <b>₽</b> an hour, 6 hours a day. Fresh uniforms are provided daily and training will be you shadowing another guide for the first couple of days to make sure you know the details required to lead your groups.'
 		'Like any teenager your only questions are about breaks and days off. The manager smiles, not surprised, and tells you that working is voluntary. If you do not show up then obviously you will not make any money that day, but otherwise no daily commitment is required from you. Breaks will be allowed if there are no groups to lead at that time and you will be given a small lunch everyday that you choose to work.'
-		act 'Accept the position':
-			if cheatWork = 1:
-				TourGuide = 1
-				gt 'pav_park', 'start'
-			else
-				TourGuide = 1
-				work = 1
-				gt 'pav_park', 'start'
-			end
-		end
+		act 'Accept the position':TourGuide = 1 & gt 'pav_park', 'start'
 		act 'Change your mind': gt 'pav_park', 'start'
 	elseif TourGuide = 1:
 		*clr & cla
@@ -117,6 +108,7 @@ if $ARGS[0] = 'rivernude':
 	'The boys are too busy playing water games with each other to realize you have removed your clothes until you wade into the water with them. When they do notice, jaws drop, and you notice several of them have bulges in their shorts. A few whistle, and a couple of them start sliding closer to you.'
 	pcs_mood += 10
 	pcs_horny += 15
+	rivermissed = rand(0,8)
 	gs 'arousal', 'flash', 3, 'exhibitionism'
 	gs 'clothing', 'strip_all'
 	gs 'stat'
@@ -142,6 +134,7 @@ if $ARGS[0] = 'riverbate':
 	$orgasm_txt = 'All the sensations and sights of the guys cumming on you sets your own orgasm off, leaving you gasping for breath, and your legs shaking.'
 	gs 'arousal', 'clit_finger', 3, 'masturbate', 'exhibitionism'
 	pcs_horny += 25
+	rivermissed = rand(rivermissed,8)
 	gs 'stat'
 	'Once your body settles down, you slip back into the water and wipe the cum off. Most of the guys have pulled their shorts up and are back to splashing around in the water, though a few are still hanging out nearby, hoping you will let them do more.'
 	'You know you have been gone from work too long, any longer and someone will most likely realize you''re missing. The thought of letting them have their way with you is pretty damn tempting, though.'
@@ -157,7 +150,7 @@ end
 if $ARGS[0] = 'riverseduce1':
 	menu_off = 1
 	cla & *clr
-	rivermissed = rand (1,10)
+	rivermissed = rand(rivermissed,10)
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_<<rand(1,3)>>.jpg"></center>'
 	'You wait until the one you think is cute looks at you, then subtly motion him to follow. You casually walk around a bend in the river, out of sight of the others, and wait for him. He follows casually, unnoticed by the others.'
 	'He walks up to you and starts to kiss you, making you melt, hungry for more. He drops his shorts and lies in the sand, while you start kissing your way down his body, until you reach his dick. You start by licking the tip, drawing out a few soft moans from him, before taking his head into your mouth.'
@@ -199,7 +192,7 @@ end
 if $ARGS[0] = 'riverseduce2':
 	menu_off = 1
 	cla & *clr
-	rivermissed = rand (1,10)
+	rivermissed = rand(rivermissed,10)
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkaguysriversex16.jpg"></center>'
 	+$OpenInnerThought+'"Fuck it, I will just say I was in the restroom, or something,"'+$CloseInnerThought+' you tell yourself. Motioning to the nearest guy, you lie on your back, and call out to the rest of the guys, "Come fuck me! Just don''t cum inside or on my face."'
 	if vibratorIN = 1:

+ 75 - 52
locations/train.qsrc

@@ -104,7 +104,7 @@ end
 
 if $ARGS[0] = 'communal_ind':
 	$loc = 'city_industrial_train'
-	$loc_arg = 'platform'
+	$loc_arg = 'inside'
 	minut += 10
 	menu_off = 1
 	if rand(1, 100) < 20: gt 'train', 'events'
@@ -254,7 +254,7 @@ end
 
 if $ARGS[0] = 'village_ind':
 	$loc = 'city_industrial_train'
-	$loc_arg = 'platform'
+	$loc_arg = 'inside'
 	menu_off = 1
 	minut += 20
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
@@ -285,7 +285,7 @@ end
 
 if $ARGS[0] = 'village_pavlovsk':
 	$loc = 'pav_train_hall'
-	$loc_arg = 'platform'
+	$loc_arg = ''
 	minut += 15
 	menu_off = 1
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
@@ -332,53 +332,24 @@ if $ARGS[0] = 'weed':
 		'Only a few minutes have passed when you hear someone walk up behind you and stop. You know they must be mere inches away, so you turn to look. Standing there is a young man, smiling at you, holding up a self-rolled cigarette... that looks suspiciously like a joint. The guy doesn''t seem too concerned about somebody catching him with that in public though and focuses entirely on you.'
 		*nl		
 		'"Hey beautiful, I couldn''t help but notice you sitting here all by yourself. Guess you missed the train too, huh?" He looks around, as if he only just noticed that he is walking around a public place with a joint in his hand, then leans down and whispers conspiratorially, "How about we blaze one while we wait?"'
-		act 'Refuse':
-			*clr & cla
-			gs 'stat'
-			'<center><h4>Pavlovsk Station</h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
-			'You have no idea what could be in it and have no intention of being caught out in the open with marijuana either, so you shake your head. "No, thanks."'
-			'He shrugs and steps away. "Alright, just trying to be friendly. It''s your loss."'
-			*nl
-			'He wanders around for a bit. Eventually, another young woman comes down to the platform. You watch him go over, and you are sure he''s making her the same offer, but unlike you, she nods, and they smoke the joint together.'
-			*nl
-			'You can see them talk a little, and even from where you''re sitting, you can tell that the woman is giving him wanton looks. Before long, the two of them sneak off across the tracks and disappear; just as the train arrives, they come rushing back, clothes out of place and hair disheveled.'
-			'It isn''t hard to guess what they were doing to kill time.'
 
-			act 'Board the train to the city':
-				*clr & cla
-				minut += 40
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/shared/train/cityplat.jpg" ></center>'
-				'After 40 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view. This is the train''s final destination.'
-				act 'Get off the train':
-					if rand(1, 100) <= 5: gt 'train_incidental', 'events'
-					gt 'city_train', 'start'
-				end
-			end
-		end
+		gs 'willpower', 'drugs', 'resist', 'easy'
 
-		act 'Smoke with him':
-			*clr & cla
-			pcs_horny = 100
-			gs 'stat'
-			'<center><h4>Pavlovsk Station</h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/weedsmoke.jpg" ></center>'
-			'You smile and nod, taking the joint from him - you only live once and it''s as good a pastime as any. He lights it as you take a long slow drag off it and hold it in, feeling it in your lungs... until you start coughing, causing him to chuckle. You feel the relaxing effect almost at once, your head feeling both lighter and heavier, your mind slowing down... but you notice a slightly odd taste to the smoke that you can''t place - maybe that''s just what this variety tastes like. You pass it back and forth with him, chatting idly as you smoke, and as you do, you start to feel aroused: Your nipples harden, your pussy gets soaking wet and you feel so wound up that you have to actively keep your hands in check to prevent yourself from masturbating out in the open.'
-			'One thing you know for sure even in your current state: Marijuana isn''t supposed to have this effect. You look at your smoking buddy. "What else was in this joint?"'
-			'"XTC," he responds with hesitation, a lazy smile on his face. "It feels great, right?" He grabs you by the hand and pulls you up along with him. "Come on, let''s go have some fun before the train arrives. I know you''re just as horny as I am."'
-			act 'Refuse':
+		if will_cost <= pcs_willpwr:
+			act 'Refuse (<<will_cost>> Willpower)':
 				*clr & cla
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><h4>Pavlovsk Station</h4></center>'
 				'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
-				'You still have enough presence of mind to know this is a bad idea, so you shake your head. "No, thanks."'
+				'You have no idea what could be in it and have no intention of being caught out in the open with marijuana either, so you shake your head. "No, thanks."'
 				'He shrugs and steps away. "Alright, just trying to be friendly. It''s your loss."'
 				*nl
-				'He wanders around for a bit. Eventually, another young woman comes down to the platform. You watch him go over, and you are sure he''s making her the same offer, and like you, she nods and they smoke the joint together. You briefly consider going to the bathrooms to masturbate but you don''t want to miss the train again.'
+				'He wanders around for a bit. Eventually, another young woman comes down to the platform. You watch him go over, and you are sure he''s making her the same offer, but unlike you, she nods, and they smoke the joint together.'
 				*nl
 				'You can see them talk a little, and even from where you''re sitting, you can tell that the woman is giving him wanton looks. Before long, the two of them sneak off across the tracks and disappear; just as the train arrives, they come rushing back, clothes out of place and hair disheveled.'
-				'It isn''t hard to guess what they were doing to kill time. A part of you wishes you had taken him up on the offer.'
+				'It isn''t hard to guess what they were doing to kill time.'
+
 				act 'Board the train to the city':
 					*clr & cla
 					minut += 40
@@ -390,7 +361,52 @@ if $ARGS[0] = 'weed':
 						gt 'city_train', 'start'
 					end
 				end
-			end		
+			end
+		else
+			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
+
+		act 'Smoke with him':
+			*clr & cla
+			pcs_horny = 100
+			joint += 1
+			gs 'drugs', 'joint'
+			gs 'stat'
+			'<center><h4>Pavlovsk Station</h4></center>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/weedsmoke.jpg" ></center>'
+			'You smile and nod, taking the joint from him - you only live once and it''s as good a pastime as any. He lights it as you take a long slow drag off it and hold it in, feeling it in your lungs... until you start coughing, causing him to chuckle. You feel the relaxing effect almost at once, your head feeling both lighter and heavier, your mind slowing down... but you notice a slightly odd taste to the smoke that you can''t place - maybe that''s just what this variety tastes like. You pass it back and forth with him, chatting idly as you smoke, and as you do, you start to feel aroused: Your nipples harden, your pussy gets soaking wet and you feel so wound up that you have to actively keep your hands in check to prevent yourself from masturbating out in the open.'
+			'One thing you know for sure even in your current state: Marijuana isn''t supposed to have this effect. You look at your smoking buddy. "What else was in this joint?"'
+			'"XTC," he responds with hesitation, a lazy smile on his face. "It feels great, right?" He grabs you by the hand and pulls you up along with him. "Come on, let''s go have some fun before the train arrives. I know you''re just as horny as I am."'
+			gs 'willpower', 'sex', 'resist', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Refuse (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					'<center><h4>Pavlovsk Station</h4></center>'
+					'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
+					'You still have enough presence of mind to know this is a bad idea, so you shake your head. "No, thanks."'
+					'He shrugs and steps away. "Alright, just trying to be friendly. It''s your loss."'
+					*nl
+					'He wanders around for a bit. Eventually, another young woman comes down to the platform. You watch him go over, and you are sure he''s making her the same offer, and like you, she nods and they smoke the joint together. You briefly consider going to the bathrooms to masturbate but you don''t want to miss the train again.'
+					*nl
+					'You can see them talk a little, and even from where you''re sitting, you can tell that the woman is giving him wanton looks. Before long, the two of them sneak off across the tracks and disappear; just as the train arrives, they come rushing back, clothes out of place and hair disheveled.'
+					'It isn''t hard to guess what they were doing to kill time. A part of you wishes you had taken him up on the offer.'
+					act 'Board the train to the city':
+						*clr & cla
+						minut += 40
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/shared/train/cityplat.jpg" ></center>'
+						'After 40 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view. This is the train''s final destination.'
+						act 'Get off the train':
+							if rand(1, 100) <= 5: gt 'train_incidental', 'events'
+							gt 'city_train', 'inside'
+						end
+					end
+				end		
+			else
+				act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end	
 			act 'Go with him':
 				*clr & cla
 				'<center><h4>Pavlovsk Station</h4></center>'
@@ -471,17 +487,24 @@ if $ARGS[0] = 'private':
 		'You stop and look inside, finding a clean-shaven man sitting there with a select few wrinkles that accentuate his angular features; you estimate that he''s in his late thirties or early forties. The expensive suit he''s wearing and the hints of cologne tickling your nose speak volumes about his wealth, and his self-confident, even smug expression tells the rest of the story. He motions for you to sit with him. "It''s alright, there''s plenty of room in here. Why don''t you come in and close the door?"'
 		*nl
 		'You hesitate - he is undressing you with his eyes and not even trying to hide it, so you doubt that all he wants is a conversation partner, and sure enough when he notices your pause, he pulls 500 <b>₽</b> out of his wallet and puts it on the seat next to him. "If you come in and close the door, we can have a very enjoyable trip together... and you can get off with a little pocket money."'
-		act 'Refuse':
-			*clr & cla
-			gs 'stat'
-			minut += 35
-			'<center><img <<$set_imgh>> src="images/locations/shared/train/ride2.jpg" ></center>'
-			'You shake your head indignantly. "Fuck you, I''m no whore! Who do you think you are?!" You don''t give him time to respond but simply walk away and take a seat in the general seating area.' 
-			*nl
-			'You spend some time talking to some of your fellow passengers and share the story with a couple of them. They seem shocked that a man would make such an offer to a nice young lady like you right on this train and speculate that only a crook would be insolent enough to try something like that.'
-!!which of these acts show up depending on where Sveta was going when the act triggered obviously.
-			act 'Continue journey': gt $loc, $loc_arg
-		end
+		gs 'willpower', 'sex', 'resist', 'easy'
+
+		if will_cost <= pcs_willpwr:
+			act 'Refuse (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				minut += 35
+				'<center><img <<$set_imgh>> src="images/locations/shared/train/ride2.jpg" ></center>'
+				'You shake your head indignantly. "Fuck you, I''m no whore! Who do you think you are?!" You don''t give him time to respond but simply walk away and take a seat in the general seating area.' 
+				*nl
+				'You spend some time talking to some of your fellow passengers and share the story with a couple of them. They seem shocked that a man would make such an offer to a nice young lady like you right on this train and speculate that only a crook would be insolent enough to try something like that.'
+				!!which of these acts show up depending on where Sveta was going when the act triggered obviously.
+				act 'Continue journey': gt $loc, $loc_arg
+			end
+		else
+			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
 
 		act 'Accept his offer':
 			*clr & cla

+ 2 - 1
locations/treeCircle.qsrc

@@ -85,6 +85,7 @@ killvar 'i'
 
 if pcs_inhib >= 30 and pcs_horny > 60:
 	act 'Masturbate to clear your head':
+    *clr & cla
 		*nl
 		'<center><video autoplay loop src="images/locations/shared/park/tree_masturb.mp4"></center>'
 		*nl
@@ -98,4 +99,4 @@ if pcs_inhib >= 30 and pcs_horny > 60:
 	end
 end
 
---- treeCircle ---------------------------------
+--- treeCircle ---------------------------------

+ 1 - 0
locations/ugol.qsrc

@@ -13,6 +13,7 @@ else
 end
 
 act 'Leave':gt 'liam'
+act 'Courtyard': gt 'artstudia','bodimod1'
 
 '<a href="exec:gt ''artstudia'',''bodimod1''">Quiet courtyard</a>.'
 

+ 49 - 70
locations/vanrPar.qsrc

@@ -42,17 +42,18 @@ if $ARGS[0] = '':
 		else
 			act 'Return to the hallway': gt 'korrPar'
 		end
-		if vanr_lock = 0:
-			act '<b>Close the latch on the door</b>': vanr_lock = 1 & gt 'vanrPar'
-			act '<b>Always latch the door</b> (blocks all peeking events)': vanr_lock = 2 & gt 'vanrPar'
-		else
-			act '<b>Remove automatic latching</b> (allows peeking events)': vanr_lock = 0 & gt 'vanrPar'
-		end
+		if vanr_lock = 0: act '<b>Close the latch on the door</b>': vanr_lock = 1 & gt 'vanrPar'
 	elseif vanr_lock = 1:
 		act '<b>Open the latch on the door</b>': vanr_lock = 0 & gt 'vanrPar'
 	end
 
 	gs 'din_van', 'private'
+
+	if vanr_lock = 0:
+		act '<b>Always latch the door</b> (blocks all peeking events)': vanr_lock = 2 & gt 'vanrPar'
+	else
+		act '<b>Remove automatic latching</b> (allows peeking events)': vanr_lock = 0 & gt 'vanrPar'
+	end
 end
 
 if $ARGS[0] = 'peek':
@@ -73,44 +74,37 @@ if $ARGS[0] = 'peek':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_3.jpg"></center>'
 				'Suddenly you hear the sound of the bathroom door as it creaks open. You turn around just in time to see your stepfather pull the bathroom door open. He is standing outside the door, devouring your naked body with his eyes. In that instant, all the little moments the two of you have shared flash through your mind, while it dawns on you that your <<$npc_nickname[''A29'']>> is at work... .'
-				act 'Daddy wants to join?': gs 'vanrPar', 'stepdad_sex'
-				act 'Go away': gs 'vanrPar', 'stepdad_sex_no'
+				'You feel your core tighten with desire as he enters the bathroom and closes the door.'
+				gs 'willpower', 'sex', 'resist'
+				act '"Daddy did you lock the door?"': gt 'vanrPar', 'stepdad_sex'
+				if will_cost <= pcs_willpwr:
+					act '"Not now daddy." (<<will_cost>>)': gs 'willpower','pay','resist' & gt 'vanrPar', 'stepdad_nosex'
+				else
+					act '"Not now daddy." (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
 			end
 		end
 	elseif kolloc['athome'] = 1 and brother_ev1 ! daystart and rand(0,4) < 2 and indorf = 0:
 		*clr & cla
 		brother_ev1 = daystart
-		'Despite the pattering sound of the water, you hear the bathroom door creaking open slightly. Through the crack in the door, you notice your brother Kolka watching you.'
-		gs 'willpower', 'exhib', 'resist', 'easy'
-		if will_cost <= pcs_willpwr:
-			act 'Scream (<<will_cost>> Willpower)': gs 'willpower', 'exhib', 'resist', 'easy' & gs 'willpower', 'pay', 'resist' & gt 'brother', 'brother_go_away'
+		'Despite the pattering sound of the water, you hear the bathroom door creaking open slightly. Through the crack in the door, you notice your stepbrother Kolka watching you.'
+		if npc_rel['A34'] < 30: 
+			act '"Leave me alone, you pervert!"': gt 'brother', 'brother_go_away'
+		elseif npc_rel['A34'] < 50: 
+			act '"Go away"':gt 'brother','brother_go_away2'
+		elseif brothershowertalk < 1 and brothershowerspy < 5:
+			act 'Let him watch': brothershowerspy += 1 & gt 'brother', 'brother_voyeur_ev1'
+		elseif brother_shower_times = 0 or (pcs_horny < 50 and hypnoAddict <= 2):
+			act '"Come in"': gt 'brother_voyeur','showertalk1'
 		else
-			act 'Scream (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
-		
-		if brothershowertalk < 1: act 'Tell him off':gt 'brother','brother_go_away2'
-		
-		act 'Let him look':gt 'brother', 'brother_voyeur_ev1'
-		
-		if (pcs_inhib >= 30 and npc_rel['A34'] > 60) or npc_rel['A34'] > 90:
-			gs 'willpower', 'exhib', 'self', 'easy'
-			if will_cost <= pcs_willpwr:
-				act 'Invite him in for a chat (<<will_cost>> Willpower)': gs 'willpower', 'exhib', 'self', 'easy' & gs 'willpower', 'pay', 'self' & gt 'brother_voyeur','showertalk1'
-			else
-				act 'Invite him in for a chat (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
+			act '"Come in"': gt 'brother_voyeur','brother_shower_together'
 		end
-		
-		if brother_shower_times > 0:
-			gs 'willpower', 'exhib', 'self'
-			if will_cost <= pcs_willpwr:
-				act 'Invite him into the shower with you (<<will_cost>> Willpower)': gs 'willpower', 'exhib', 'self' & gs 'willpower', 'pay', 'self' & gt 'brother_voyeur','brother_shower_together'
-			else
-				act 'Invite him into the shower with you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
+		gs 'willpower', 'voyeur', 'resist'
+		if will_cost <= pcs_willpwr:
+			act '"Please leave" (<<will_cost>>)': gs 'willpower','pay','resist' & gt 'brother_voyeur','showertalkbusy'
+		else
+			act '"Please leave" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-
-		if brothershowertalk > 0: act 'Tell him that you''re too busy to talk': gt 'brother_voyeur','showertalkbusy'
 		exit
 	end
 end
@@ -118,6 +112,7 @@ end
 if $ARGS[0] = 'stepdad_nosex':
 	*clr & cla
 	menu_off = 1
+	*clr & cla
 	'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_2.mp4"></video></center>'
 	'You hear movement at the door and turn around. It''s your stepfather. It looks like he passed by and accidentally peeked in. Catching his glance, you feel mischievous and excited, so you blow him a kiss. Without a word, he disappears, yet you can''t help smiling and giggling as you continue drying your hair.'
 	stepdadqw += 1
@@ -154,12 +149,11 @@ if $ARGS[0] = 'stepdad_sex':
 	gs 'arousal', 'vaginal_finger', 5
 	minut -= 5
 	gs 'stat'
-	gs 'willpower', 'cum_inside', 'resist'
-	if will_cost <= pcs_willpwr:
-		act 'Hey, can you put on a condom? (<<will_cost>> Willpower)':
-			*clr & cla
-			gs 'willpower', 'cum_inside', 'resist'
-			gs 'willpower', 'pay', 'resist'
+
+	tmp = rand(1,3)
+	act 'Continue':
+		*clr & cla
+		if tmp = 1:
 			gs 'arousal', 'vaginal', 5, 'rough'
 			gs 'stat'
 			'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_9.mp4"></video></center>'
@@ -172,17 +166,7 @@ if $ARGS[0] = 'stepdad_sex':
 			'He moves slowly and gently at first, but after a few moments of this, he abruptly shuttles forward and buries himself balls-deep. Your eyes roll back into your head from the sharp spike of pleasure.'
 			'<i>Looks like my constant teasing has finally payed off.</i>'
 			act 'You giggle deliriously.':gs 'vanrPar', 'stepdad_sex2'
-		end
-	else
-		act 'Hey, can you put on a condom? (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end
-	
-	gs 'willpower', 'cum_inside', 'resist', 'easy'
-	if will_cost <= pcs_willpwr:
-		act 'Just don''t come inside me! (<<will_cost>> Willpower)':
-			*clr & cla
-			gs 'willpower', 'cum_inside', 'resist', 'easy'
-			gs 'willpower', 'pay', 'resist'
+		elseif tmp = 2:
 			gs 'arousal', 'vaginal', 10, 'rough'
 			gs 'stat'
 			'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_7.mp4"></video></center>'
@@ -193,24 +177,19 @@ if $ARGS[0] = 'stepdad_sex':
 			'As it turns out, you''re only too happy to be his little bitch. You move your hips frantically, desperately seeking every bit of pleasure he''ll give you. With the intense pounding your stepfather is giving you, you doubt you''ll last much longer.'
 			'As you near orgasm, you register that your stepfather is too. You can feel his unprotected dick throbbing inside you, and the realisation sends a warning flashing through your mind.'
 			act '<i>At this rate, will he even have time to pull out?</i>':gs 'vanrPar', 'stepdad_sex3'
+		else
+			gs 'arousal', 'vaginal', 5, 'gentle'
+			gs 'cum_call', 'butt', 'A28', 1
+			gs 'stat'
+			'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_8.mp4"></video></center>'
+			'At this point, you''re so horny for his dick inside you that you can''t think straight. Your stepfather is obviously in a similar condition. Gone is the careful family man, right now he''s just a dog who sees a bitch in heat and wants to mount her.'
+			'You wiggle your ass invitingly, and that''s all it takes for him to step forward and guide himself inside you - slowly filling your pussy with his hot, hard dick.'
+			'You moan with satisfaction, and lustily beg, "Fuck me hard, Daddy!"'
+			'But your stepfather is in no hurry. He thrusts into you with slow, measured strokes, savouring every inch of your tight little pussy, making you impatiently beg for it.'
+			'"Please, Daddy! <i>Please!</i>"'
+			'"You want it that badly, Sunshine?" he pants, grinning.'
+			act 'Your desperate expression tells him everything.':gs 'vanrPar', 'stepdad_sex4'
 		end
-	else
-		act 'Just don''t come inside me! (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end
-	
-	act 'Fuck me!':
-		*clr & cla
-		gs 'arousal', 'vaginal', 5, 'gentle'
-		gs 'cum_call', 'butt', 'A28', 1
-		gs 'stat'
-		'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_8.mp4"></video></center>'
-		'At this point, you''re so horny for his dick inside you that you can''t think straight. Your stepfather is obviously in a similar condition. Gone is the careful family man, right now he''s just a dog who sees a bitch in heat and wants to mount her.'
-		'You wiggle your ass invitingly, and that''s all it takes for him to step forward and guide himself inside you - slowly filling your pussy with his hot, hard dick.'
-		'You moan with satisfaction, and lustily beg, "Fuck me hard, Daddy!"'
-		'But your stepfather is in no hurry. He thrusts into you with slow, measured strokes, savouring every inch of your tight little pussy, making you impatiently beg for it.'
-		'"Please, Daddy! <i>Please!</i>"'
-		'"You want it that badly, Sunshine?" he pants, grinning.'
-		act 'Your desperate expression tells him everything.':gs 'vanrPar', 'stepdad_sex4'
 	end
 	act 'Fuck my ass!':
 		*clr & cla

+ 4 - 2
locations/zoomagazine.qsrc

@@ -76,8 +76,10 @@ if $ARGS[0] = 'start':
 						'You start pleasuring him to the best of your abilities.'
 						'A few minutes into it, the man gestures you to get up and turn around.'
 						gs 'arousal', 'bj', 15
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pet shop/pet6.jpg"</center>'
-						gs 'dinsex','vaginal_sex'
+            if stat['vaginal'] > 0:
+						  '<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/pet shop/pet6.jpg"</center>'
+						  gs 'dinsex','vaginal_sex'
+            end
 						act 'Continue':
 							cla & *clr
 							minut += 5