[changed] rearranged the exit action in pod_ezd (Misha), stwork, and young_shop.

locations/pod_ezd.qsrc

@@ -61,7 +61,7 @@ if $ARGS[0] = 'etaj_1' or $ARGS[0] = '':
 				end
 			else
 				act 'Yes, go outside (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 		else
 			gt 'pavcomplex', 'start'
 		end
@@ -105,6 +105,7 @@ if $ARGS[0] = 'etaj_2':
 
 	act 'Apartment 9: Uncle Misha':
 		cla
+		act 'Leave': gt 'pod_ezd','etaj_2'
 		if hour >= 0 and hour < 5:
 			'It''s too late to visit uncle Misha, he''s probably sleeping now.'
 		elseif hour >= 5 and hour < 10:
@@ -112,7 +113,7 @@ if $ARGS[0] = 'etaj_2':
 		elseif week < 6 and hour >= 10 and hour < 19:
 			'You ring the door bell, but no one answers the door.'
 		elseif mishahouse_count = 1 and dyadyamishaevent >= 1 and week < 6 and hour >= 19 and hour <= 23 or mishahouse_count = 1 and dyadyamishaevent >= 1 and week >= 6 and hour >= 10 and hour <= 23:
-			*clr & cla
+			*clr
 			gs 'stat'
 			'The door opens and uncle Misha invites you into the apartment.'
 			act 'Enter':
@@ -125,7 +126,6 @@ if $ARGS[0] = 'etaj_2':
 		else
 			'You ring the door bell, but no one answers the door.'
 		end
-		act 'Leave': gt 'pod_ezd','etaj_2'
 	end
 
 	act 'Take the elevator': gt 'pod_ezd','lift','etaj_2'

locations/stwork.qsrc

@@ -32,6 +32,24 @@ if $ARGS[0] = 'start':
 	if tatarm > 0:stripKoef6 = rand(1, 3)
 	if tatside > 0:stripKoef7 = rand(1, 3)
 	stripKoef = stripKoef1 + stripKoef2 + stripKoef3 + stripKoef4 + stripKoef5 + stripKoef6 + stripKoef7
+	if countmoney = 1:
+		countmoney = 0
+		gs 'stwork2', 'tipcalculator'
+	end
+
+	act 'Exit the club':
+		if $clothingworntype ! 'nude':
+			gt 'stripclub', 'start'
+		else
+			msg'<b><font color = red>You need to get dressed.</font></b>'
+			gt 'stwork', 'start'
+		end
+	end
+	act 'Go to the staff bathroom':gt 'stwork', 'toilet'
+	act 'Change your clothes':gt 'wardrobe', 'start'
+	act 'Look in the mirror': gt 'mirror', 'start'
+	if money >= 100: act 'Have a snack (0:15) (100 <b>₽</b>)': money -= 100 & gs 'food', 'snack'
+	act 'Have a cup of water (0:05)':gs 'beverage', 'bev_wat'
 
 	!! Private dance available
 	if stprivatechance > 0:
@@ -43,17 +61,13 @@ if $ARGS[0] = 'start':
 		if stpriv > rand (0, 100):
 		*nl
 			'One of the bouncers walks up to you, telling you that a customer is waiting for you in one of the private rooms.'
-			act '<b>Go perform a private dance</b>': 
+			act '<b>Go perform a private dance</b>':
 				stprivatechance = 0
 				gt 'stwork2', 'privatdance'
 			end
 		end
 	end
-	if countmoney = 1:
-		countmoney = 0
-		gs 'stwork2', 'tipcalculator'
-	end
-	
+
 	if (kosmetica >= 3 or pcs_makeup >= 4) and (hour >= 11 or hour <= 2):
 		act '<b>Prepare for your show</b>':
 			*clr & cla
@@ -127,7 +141,7 @@ if $ARGS[0] = 'start':
 							else
 								'"Damn it <<$pcs_stagename>>, you stink. Grab a shower we can''t have the club smelling like a locker room."'
 								act 'Go to the dressing room': gt 'stwork', 'start'
-							end	
+							end
 						end
 					else
 						act 'Go on stage':
@@ -143,7 +157,8 @@ if $ARGS[0] = 'start':
 			act 'Leave':gt $locM, $metkaM
 		end
 	else
-		'You don''t have enough make-up to get ready.'
+		*nl
+		'<font color="red">You don''t have enough make-up to get ready.</font>'
 	end
 	!act '<b>Go on stage</b>':
 	!	if hour >= 11 or hour <= 2:
@@ -176,19 +191,6 @@ if $ARGS[0] = 'start':
 	!		'You''re done for today. Time to head home.'
 	!	end
 	!end
-	act 'Go to the staff bathroom':gt 'stwork', 'toilet'
-	act 'Look in the mirror': gt 'mirror', 'start'
-	act 'Change your clothes':gt 'wardrobe', 'start'
-	act 'Have a cup of water (0:05)':gs 'beverage', 'bev_wat'
-	if money >= 100: act 'Have a snack (0:15) (100 <b>₽</b>)': money -= 100 & gs 'food', 'snack'
-	act 'Exit the club':
-		if $clothingworntype ! 'nude':
-			gt 'stripclub', 'start'
-		else
-			msg'<b><font color = red>You need to get dressed.</font></b>'
-			gt 'stwork', 'start'
-		end
-	end
 end
 
 if $ARGS[0] = 'stripgirl':
@@ -235,7 +237,7 @@ if $ARGS[0] = 'toilet':
 	'There is no mirror, only a grimy shower, toilet, and basin'
 	*nl
 	'Your razor will last for <b><<stanok>></b> more shavings. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
-	
+
 	act 'Leave the bathroom':gt 'stwork', 'start'
 !	if kosmetica >= 3:
 !		act 'Have a shower and get ready for work':
@@ -270,7 +272,7 @@ if $ARGS[0] = 'toilet':
 		act 'Get out and dry off':gt $locM, $metkaM
 		dynamic $brit
 	end
-	
+
 	dynamic $brit
 	dynamic $toymanage
 	dynamic $enema

locations/young_shop.qsrc

@@ -11,6 +11,21 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/young_shop.jpg"></center>'
 	*nl
 	'The latest chart topping pop single is playing throughout the small store. The interior is decorated in bright colors and bold designs, and the floor is packed with stands and tables displaying clothes with a more daring style. Looking around at all the advertisements with attractive yet emaciated models, you''ll either leave here seduced into buying something or with lower self-esteem.'
+	end
+
+	act 'Leave the shop': minut += 3 & gt 'torgcentr'
+
+	act 'View clothing': minut += 5 & gt 'sell_young_clothes', 'start'
+
+	act 'View panties': minute += 5 & gt 'sell_young_clothes', 'panties'
+
+	act 'View bras': minute += 5 & gt 'sell_young_clothes', 'bras'
+
+	act 'View shoes': minute += 5 & gt 'sell_young_clothes', 'shoes'
+
+	act 'View purses': minut += 5 & gt 'sell_young_clothes', 'purses'
+
+	if hour >= 8 and hour <= 18 and young_shop_miss >= 3 and week < 6 and young_shop_work = 1:gt 'andrey'
 
 	if young_shop_work = 0 and young_shop_work1 = 0 and young_shop_work2 = 0:
 		*nl
@@ -69,21 +84,6 @@ if $ARGS[0] = 'start':
 !!			'You spend 6 hours cleaning the department, folding and rehanging clothes and serving customers. The store now looks clean and pretty organized.'
 !!			gs 'young_shop', 'events'
 !!		end
-	end
-
-	act 'Leave the shop': minut += 3 & gt 'torgcentr'
-
-	act 'View clothing': minut += 5 & gt 'sell_young_clothes', 'start'
-
-	act 'View panties': minute += 5 & gt 'sell_young_clothes', 'panties'
-
-	act 'View bras': minute += 5 & gt 'sell_young_clothes', 'bras'
-
-	act 'View shoes': minute += 5 & gt 'sell_young_clothes', 'shoes'
-
-	act 'View purses': minut += 5 & gt 'sell_young_clothes', 'purses'
-
-	if hour >= 8 and hour <= 18 and young_shop_miss >= 3 and week < 6 and young_shop_work = 1:gt 'andrey'
 
 	! WD: Change trading hours to consistant with the other shops
 	! if hour > 21 or hour < 8 or week >= 6:
@@ -206,7 +206,7 @@ if $ARGS[0] = '1':
 		'You begin to change in a booth, and you notice that the guy is spying on you through the loosely closed curtain.'
 
 		act 'Close the curtain':gt 'young_shop', 'endwork'
-		
+
 		gs 'willpower', 'sex', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Take him to the back room (<<will_cost>> Willpower)':
@@ -216,7 +216,7 @@ if $ARGS[0] = '1':
 			 end
 		else
 			act 'Take him to the back room (<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
 end
 
@@ -258,7 +258,7 @@ if $ARGS[0] = '3':
 		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	
+    end
 
 	act 'Ask what else you''ll get':
 		cla & *clr
@@ -273,7 +273,7 @@ if $ARGS[0] = '3':
 			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	
+		end
 
 		act 'Take them to the back room (<<will_cost>> Willpower)':
 			cla & *clr
@@ -302,7 +302,7 @@ if $ARGS[0] = '4':
 
 		act 'Finish your shift':gt 'young_shop', 'endwork'
 	end
-	
+
 	gs 'willpower', 'sex', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Give them what they want (<<will_cost>> Willpower)':
@@ -317,9 +317,9 @@ if $ARGS[0] = '4':
 			picrand = 16
 			gs 'willpower', 'pay', 'resist'
 			xgt 'sexdvoe', 'var'
-		end		
+		end
 	else
-		act 'Give them what they want (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'		
+		act 'Give them what they want (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 
@@ -337,7 +337,7 @@ if $ARGS[0] = '5':
 		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	
+    end
 
 	act 'Do as you were told':
 		cla & *clr
@@ -348,7 +348,7 @@ if $ARGS[0] = '5':
 
 		gs 'arousal', 'cuni', 5, 'lesbian', 'sub'
 		gs 'stat'
-		
+
 		act 'Thank her':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/mag7.jpg"></center>'
@@ -356,7 +356,7 @@ if $ARGS[0] = '5':
 
 			gs 'arousal', 'cuni_give', 5, 'lesbian', 'sub'
 			gs 'stat'
-		
+
 			act 'Further':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/mag8.jpg"></center>'
@@ -365,7 +365,7 @@ if $ARGS[0] = '5':
 
 				gs 'arousal', 'cuni_give', 5, 'lesbian', 'sub'
 				gs 'stat'
-			
+
 				act 'Further':
 				cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/sex/mag9.jpg"></center>'
@@ -374,12 +374,12 @@ if $ARGS[0] = '5':
 					gs 'arousal', 'cuni_give', 5, 'lesbian', 'sub'
 					gs 'arousal', 'end'
 					gs 'stat'
-			
+
 					act 'Leave':gt 'young_shop', 'endwork'
 				end
 			end
 		end
-    end	
+    end
 end
 
 if $ARGS[0] = '6':
@@ -404,17 +404,17 @@ if $ARGS[0] = '6':
 	else
 		act 'Refuse, you have worked the whole day (<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':
 		cla
 		minut += 70
 		young_shop_bonus += 1
-			
+
 		'It seems that you have no choice. You can''t let down your co-workers.'
 		'After working for another hour, you are very tired, but the thought of a bonus makes you smile.'
 
 		act 'Finish your shift':gt 'young_shop', 'endwork'
-	end	
+	end
 end
 
 if $ARGS[0] = '7':
@@ -469,14 +469,14 @@ if $ARGS[0] = '9':
 
 			act 'Finish your shift':gt 'young_shop', 'endwork'
 		end
-		
+
 		gs 'willpower', 'swallow', 'self', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Take the condom (<<will_cost>> Willpower)':
 				cla & *clr
 				gs 'willpower', 'swallow', 'self', 'hard'
 				gs 'willpower', 'pay', 'self'
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/cats/condom_cum.jpg"></center>'
 				'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?!'
 
@@ -493,7 +493,7 @@ if $ARGS[0] = '9':
 			end
 		else
 			act 'Take the condom (<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
 end
 
@@ -584,7 +584,7 @@ if $ARGS[0] = '13':
 
 	if pcs_intel >= 40:
 		'It suddenly occurs to you that this man may be a pedophile. This little girl could be in danger! Should you do something about it?'
-		
+
 		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Report the man (<<will_cost>> Willpower)':
@@ -603,7 +603,7 @@ if $ARGS[0] = '13':
 			act 'Report the man (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
-	
+
 	act 'Try on clothes':
 		cla & *clr
 		pcs_horny += 30
@@ -619,7 +619,7 @@ if $ARGS[0] = '13':
 		'"What a beauty, my daughter will look simply amazing. Listen... would you like to make some money?"'
 		'"What do you mean?" you ask surprised.'
 		'"You know, you''re so beautiful and sexy, I''m very excited looking at you! I will pay you 5,000 <b>₽</b> if you just show off this blouse and this skirt... without your bra and panties. You don''t have to do anything else."'
-		
+
 		gs 'willpower', 'prostitution', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse (<<will_cost>> Willpower)':
@@ -629,7 +629,7 @@ if $ARGS[0] = '13':
 		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 'Agree':
 			gs 'npcgeneratec', 0, 'middle aged customer', rand(35,45)
 			gs 'boyStat', $npclastgenerated
@@ -638,7 +638,7 @@ if $ARGS[0] = '13':
 			pcs_horny += 10
 			gs 'stat'
 			'Excitedly the man pulls out his wallet and hands you <b>5,000 ₽</b>.'
-				
+
 			'"Okay, but I won''t do anything more!" <b>5,000 ₽</b> is a great motivator and it would be foolish to ignore such a sum of money.'
 			'You unfasten and put away your bra baring your breasts to a stranger.'
 			'You put on a little blouse to cover your bare chest and thrust your hand under the skirt to slowly remove your panties.'
@@ -648,7 +648,7 @@ if $ARGS[0] = '13':
 
 			gs 'arousal', 'flash', 5
 			gs 'stat'
-				
+
 			act 'Close your eyes':
 				cla & *clr
 				facial += 1
@@ -665,10 +665,10 @@ if $ARGS[0] = '13':
 					'The smell and taste is driving you crazy, your legs give way and you feel your underbelly beginning to shudder. You''re coming.'
 					'Recovering, you see the man standing over you smiling, "Thank you, beautiful! Let''s take these clothes off, I want to buy them" You begin to tell him that you should bring out new ones, or at least clean the dirty ones, but he interrupts you. "No, they do not need to be cleaned, these stains will remind me of this wonderful moment with you."'
 					'You undress and change back to your clothes, then quickly run to the restroom. Your shift is not over yet, and you should clean yourself up before returning to work.'
-							
+
 					gs 'arousal', 'end'
 					gs 'stat'
-					
+
 					act 'Finish your shift':gt 'young_shop', 'endwork'
 				else
 					swallow += 1
@@ -688,7 +688,7 @@ if $ARGS[0] = '13':
 			end
 		end
 	end
-		
+
 	gs 'willpower', 'misc', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
@@ -702,7 +702,7 @@ if $ARGS[0] = '13':
 			act 'Refuse':gt 'young_shop', 'endwork'
 		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>'	
+		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
 end
 
@@ -721,7 +721,7 @@ if $ARGS[0] = '14':
 
 		act 'Finish your shift':gt 'young_shop', 'endwork'
 	end
-	
+
 	gs 'willpower', 'misc', 'self', 'medium'
 	if will_cost <= pcs_willpwr:
 		act 'Tell the manager about the camcorder (<<will_cost>> Willpower)':
@@ -739,7 +739,7 @@ if $ARGS[0] = '14':
 			act 'Leave work':gt 'young_shop', 'endwork'
 		end
 	else
-		act 'Tell the manager about the camcorder (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'	
+		act 'Tell the manager about the camcorder (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
 
@@ -751,7 +751,7 @@ if $ARGS[0] = '15':
 	'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?'
 
 	act 'Put it back and finish your shift':gt 'young_shop', 'endwork'
-	
+
 	gs 'willpower', 'misc', 'resist', 'easy'
 	if will_cost <= pcs_willpwr:
 		act 'Keep it (<<will_cost>> Willpower)':
@@ -775,7 +775,7 @@ if $ARGS[0] = '15':
 		end
 	else
 		act 'Keep it (<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
 
 if $ARGS[0] = '16':
@@ -793,13 +793,13 @@ if $ARGS[0] = '16':
 			cla & *clr
 			gs 'willpower', 'misc', 'self', 'hard'
 			gs 'willpower', 'pay', 'self'
-			
+
 			'You decide to stand next to the cabin and listen to the young couple. You listen as she licks and sucks his cock loudly. Suddenly she makes a strange sound indicating that something has changed.'
 			'"Did they stop?" You look down again into the booth and see what''s wrong. The guy is holding the girl''s hair and pulls her mouth firmly onto his penis. You have never seen a girl getting fucked in the throat with such force.'
 			'"She could suffocate," you think. But instead of easing up or helping the girl, her boyfriend runs a hand over her hardened nipples and down to her skirt.'
 			'Then you hear the guy starting to moan, he must be close.'
 			'The girl, coughing, pleads him on, "Yes, yes, cum on my face, yes..."'
-			
+
 			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 
@@ -814,21 +814,21 @@ if $ARGS[0] = '16':
 				gs 'arousal', 'voyeur_sex', 5
 				gs 'arousal', 'end'
 				gs 'stat'
-				
+
 				act 'Finish your shift':gt 'young_shop', 'endwork'
 			end
 		end
 	else
 		act 'Eavesdrop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
-	
+	end
+
 	gs 'willpower', 'misc', 'self', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Ignore (<<will_cost>> Willpower)':
 			cla & *clr
 			gs 'willpower', 'misc', 'self', 'hard'
 			gs 'willpower', 'pay', 'self'
-			
+
 			'This is clearly none of your business, plus snooping and eavesdropping is indecent. Of course, you could get rid of them, but you do not want to spoil their fun.'
 			'You go away from the booth and start folding scattered blouses. After a few minutes, the couple comes out of the booth and you see traces of semen on the girl''s face. All your efforts to stop yourself from smiling fail.'
 			'The couple quickly and quietly leave the store.'
@@ -837,7 +837,7 @@ if $ARGS[0] = '16':
 		end
 	else
 		act 'Ignore (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
+	end
 
 	act 'Disperse':
 		cla & *clr
@@ -867,7 +867,7 @@ if $ARGS[0] = '17':
 
 		act 'Finish your shift':gt 'young_shop', 'endwork'
 	end
-	
+
 	gs 'willpower', 'misc', 'self', 'easy'
 	if will_cost <= pcs_willpwr:
 		act 'Shame on you, grandma! (<<will_cost>> Willpower)':
@@ -1007,7 +1007,7 @@ end
 if $ARGS[0] = 'endwork':
 	!!if young_shop_work = 1 and young_shop_miss < 3:
 	cla
-	
+
 	if young_shop_work = 1 or young_shop_work2 = 1:
 		if week = 5 and young_shop_salary > 0:
 			act '<font color="green">Collect your pay</font>':gt 'andrey'