Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/clothing.qsrc

@@ -200,10 +200,10 @@ if $ARGS[0] = 'view_clothing_list':
 
 		if $ARGS[1] = 'store':
 			cloc = 1
-		end
-
-		if $ARGS[1] = 'unwanted':
+		elseif $ARGS[1] = 'unwanted':
 			cloc = 2
+		else
+			cloc = 0
 		end
 
 		if $ARGS[2] = 'gm':

locations/down.qsrc

@@ -130,11 +130,14 @@ else
 end
 'The neon green sign of a <<$desc_txt1>> catches your eye. It''s open 8-10 selling magazines and cigarettes for cheap.'
 *nl
-if hour >= 9 and hour <= 20:
+if hour = 8 and minut >= 30:
+	$desc_txt1 = '<a href="exec: minut += 5 & gt ''torgcentr''">The Galeria mall</a>'
+	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 9:00''">Havana Fitness Center</a>'
+elseif hour >= 9 and hour <= 20:
 	$desc_txt1 = '<a href="exec: minut += 5 & gt ''torgcentr''">The Galeria mall</a>'
 	$desc_txt2 = '<a href="exec:gt ''fit'', ''start''">Havana Fitness Center</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''The Galeria mall is closed and will reopen at 9:00''">The Galeria mall</a>'
+	$desc_txt1 = '<a href="exec:msg ''The Galeria mall is closed and will reopen at 8:30''">The Galeria mall</a>'
 	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 9:00''">Havana Fitness Center</a>'
 end
 '<<$desc_txt1>> is front and center in the commercial area. Nearby is a <<$desc_txt2>> which has a swimming pool that can be used for a small fee.'

locations/foto_models.qsrc

@@ -460,50 +460,56 @@ if $ARGS[0] = 'mari_chat':
 					'	You blush. "Uh, yeah I do, but I, uh, forget to lock it sometimes..."'
 					act 'Keep chatting':gt 'foto_models','mari_chat'
 
-				elseif npc_rel['A34'] >= 20 and npc_rel['A34'] < 40:
+				elseif npc_rel['A34'] < 40:
 					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my annoying little brother."'
 					'	Mari sits up a bit. "Really? What''s so irritating about him?"'
 					'	"Oh, nothing much. Just sibling squabbles. He''s not all that bad, just gets on my nerves sometimes."'
 					act 'Keep chatting':gt 'foto_models','mari_chat'
 
-				elseif npc_rel['A34'] >= 40 and npc_rel['A34'] < 60:
+				elseif npc_rel['A34'] < 60:
 					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my little brother."'
 					'	"That sounds nice. What are they like?"'
 					'	"Well to be honest, my sister can be a bit of a slut, but she''s still the best one I could ask for. My brother loves playing football so sometimes I join him and his friends at the field."'
 					'	"Maybe I''ll get to meet them one day!"'
 					act 'Keep chatting':gt 'foto_models','mari_chat'
 
-				elseif npc_rel['A34'] >= 60 and npc_rel['A34'] < 80:
+				elseif npc_rel['A34'] < 80:
 					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my silly little brother."'
 					'	Mari smiles at you. "That''s sounds nice."'
 					'	You think of your siblings and smile. "Yeah. It is."'
 					act 'Keep chatting':gt 'foto_models','mari_chat'
 
-				elseif npc_rel['A34'] >= 80 and brothersex < 1:
+				elseif sisterLesb >= 5:
+					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
+					'	Mari smiles at you. "You sound close."'
+					'	Your mind wanders back to your sister and how you sometimes wake her up in the middle of the night to fool around with her. "You could say that..."'
+
+					act 'Keep chatting':gt 'foto_models','mari_chat'
+
+				elseif brothersex < 1:
 					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
 					'	Mari smiles at you. "You sound close."'
 					'	You think of your siblings and smile, "Yeah. We are."'
 					act 'Keep chatting':gt 'foto_models','mari_chat'
 
-				elseif sisterLesb >= 5 and brotherSex >= 1 and brotherSex < 7 and npc_rel['A34'] >= 80:
+				elseif sisterLesb >= 5 and brotherSex < 7:
 					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
 					'	Mari smiles at you. "You sound close."'
 					'	Your mind wanders back to your siblings and how you''ve fooled around with both of them separately.'
 					'	"You could say that..."'
 					act 'Keep chatting':gt 'foto_models','mari_chat'
 
-				elseif sisterLesb >= 5 and brotherSex >= 7 and npc_rel['A34'] >= 80:
+				elseif sisterLesb >= 5:
 					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
 					'	Mari smiles at you. "You sound close."'
 					'	Your mind wanders back to your siblings and how you''ve fooled around with your sister and even had full fledged intercourse with your brother. Your thoughts wander to the memory of the last time his cock was inside you and it causes you to blush.'
 					'	"You could say that..."'
 					act 'Keep chatting':gt 'foto_models','mari_chat'
 
-				elseif sisterLesb >= 5 and npc_rel['A34'] >= 80:
-					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
-					'	Mari smiles at you. "You sound close."'
-					'	Your mind wanders back to your sister and how you sometimes wake her up in the middle of the night to fool around with her. "You could say that..."'
-
+				else
+					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my silly little brother."'
+					'	Mari smiles at you. "That''s sounds nice."'
+					'	You think of your siblings and smile. "Yeah. It is."'
 					act 'Keep chatting':gt 'foto_models','mari_chat'
 				end
 			else

locations/young_shop.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'start':
 			'You spend 4 hours cleaning the department, folding and rehanging clothes and serving customers. The store now looks clean and pretty organized.'
 			gs 'young_shop', 'events'
 		end
-	elseif ((hour = 9 and minut <= 5) or (hour = 8 and minut >= 30)) and young_shop_work1 = 1 and week = 6:
+	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
@@ -61,7 +61,7 @@ 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
-!!	elseif ((hour = 9 and minut <= 5) or (hour = 8 and minut >= 30)) and young_shop_work2 = 1 and week > 6:
+!!	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

locations/zaprFWash.qsrc

@@ -59,14 +59,14 @@ if $ARGS[0] = 'wash':
 					gt 'zaprFWash', 'titsQ'
 				end
 			else
-				gs 'zaprF', 'flash_passing'
+				gs 'zaprFWash', 'flash_passing'
 			end
 		else
 			! slightly more money for wearing bimbo or prostitute clothing but not looking too great
 			'You washed the windows of several cars and earned 80 <b>₽</b>.'
 			money += 80
 			
-			gs 'zaprF', 'flash_passing'
+			gs 'zaprFWash', 'flash_passing'
 		end
 	else
 		minut += 60
@@ -80,7 +80,7 @@ if $ARGS[0] = 'wash':
 		! normal money just for the car washing
 		'You washed the windows of several cars and earned 60 <b>₽</b>.'
 		
-		gs 'zaprF', 'flash_passing'
+		gs 'zaprFWash', 'flash_passing'
 	end
 end
 
@@ -100,7 +100,6 @@ if $ARGS[0] = 'titsQ':
 	
 	! inhibition or exhibitionism requirements needed to accept the offer or just have fun with him
 	if pcs_inhib >= 30 or pcs_horny >= 40: act 'Agree and show him your tits':gt 'zaprFWash', 'titsFlash', 'Paid', 'Question'
-	if pcs_inhib >= 35 or pcs_horny >= 50: act 'Show him your tits for free instead':gt 'zaprFWash', 'titsFlash', 'Free', 'Question'
 	act 'Refuse':gt 'zaprFWash', 'refuse'
 end
 
@@ -112,7 +111,6 @@ if $ARGS[0] = 'assQ':
 	
 	! inhibition or exhibitionism requirements needed to accept the offer or just have fun with him
 	if exhibitionist_lvl > 0 or pcs_horny >= 60: act 'Agree and show him your ass':gt 'zaprFWash', 'assFlash', 'Paid', 'Question'
-	if exhibitionist_lvl > 0 or pcs_horny >= 70: act 'Show him your ass for free instead':gt 'zaprFWash', 'assFlash', 'Free', 'Question'
 	act 'Refuse':gt 'zaprFWash', 'refuse'
 end
 
@@ -124,7 +122,6 @@ if $ARGS[0] = 'pussyQ':
 		
 	! inhibition or exhibitionism requirements needed to accept the offer or just have fun with him
 	if exhibitionist_lvl > 1 or pcs_horny >= 80: act 'Agree and show him your pussy':gt 'zaprFWash', 'pussyFlash', 'Paid', 'Question'
-	if exhibitionist_lvl > 1 or pcs_horny >= 90: act 'Show him your pussy for free instead':gt 'zaprFWash', 'pussyFlash', 'Free', 'Question'
 	act 'Refuse':gt 'zaprFWash', 'refuse'
 end
 
@@ -136,7 +133,6 @@ if $ARGS[0] = 'handQ':
 	
 	! slut or horny requirements needed to accept the offer or just have fun with him
 	if pav_slut >= 25 or pcs_horny >= 25: act 'Agree and give him a handjob':gt 'zaprFWash', 'handjob', 'Paid'
-	if pav_slut >= 30 or pcs_horny >= 30: act 'Give him a handjob for free instead':gt 'zaprFWash', 'handjob', 'Free'
 	act 'Refuse':gt 'zaprFWash', 'refuse'
 end
 
@@ -148,7 +144,6 @@ if $ARGS[0] = 'blowQ':
 	
 	! slut or horny requirements needed to accept the offer or just have fun with him
 	if pav_slut >= 30 or pcs_horny >= 30: act 'Agree and give him a blowjob':gt 'zaprFWash', 'blowjob', 'Paid', 'Question'
-	if pav_slut >= 35 or pcs_horny >= 35: act 'Give him a blowjob for free instead':gt 'zaprFWash', 'blowjob', 'Free', 'Question'
 	act 'Refuse':gt 'zaprFWash', 'refuse'
 end
 
@@ -174,7 +169,7 @@ if $ARGS[0] = 'titsFlash':
 		money += 50
 		pav_prostitute += rand(0,1)
 	elseif $ARGS[1] = 'Free':
-		pav_sex += rand(0,1)
+		gs 'exhibitionism', 1
 	end
 	if pcs_inhib < 30: inhib_exp += rand(2,4)
 	mood += 5
@@ -273,7 +268,7 @@ if $ARGS[0] = 'assFlash':
 		money += 50
 		pav_prostitute += rand(0,1)
 	elseif $ARGS[1] = 'Free':
-		pav_sex += rand(0,1)
+		gs 'exhibitionism', 2
 	end
 	if pcs_inhib < 30: inhib_exp += rand(2,4)
 	mood += 5
@@ -353,7 +348,7 @@ if $ARGS[0] = 'pussyFlash':
 		money += 50
 		pav_prostitute += 1
 	elseif $ARGS[1] = 'Free':
-		pav_sex += 1
+		gs 'exhibitionism', 3
 	end
 	if pcs_inhib < 40: inhib_exp += rand(4,6)
 	mood += 5
@@ -440,7 +435,6 @@ if $ARGS[0] = 'handjob':
 	
 	if sub >= 10 or pcs_dom >= 10 or bimbolevel >= 1 or pcs_horny >= 30:
 		if pcs_inhib >= 30 or pcs_horny >= 30:act 'Open your mouth for him':gt 'zaprFWash', 'blowjob', 'Paid', 'handjob'
-		if pcs_inhib >= 35 or pcs_horny >= 35:act 'Open your mouth for him for free instead':gt 'zaprFWash', 'blowjob', 'Free', 'handjob'
 		act 'Rub harder to make him cum':gt 'zaprFWash', 'handjobEndQ'
 	else
 		act 'Rub harder to make him cum':gt 'zaprFWash', 'handjobEndQ'
@@ -498,12 +492,9 @@ if $ARGS[0] = 'blowjob':
 	if sub >= 10 or pcs_dom >= 10 or bimbolevel >= 1 or pcs_horny >= 40:
 		if pcs_vag = 0:
 			if pcs_inhib >= 40 or pcs_horny >= 40: act 'Offer your ass instead (you don''t want to lose your virginity to this stranger...)':gt 'zaprFWash', 'fuckAnal', 'Paid'
-			if pcs_inhib >= 45 or pcs_horny >= 45: act 'Offer your ass for free instead (you don''t want to lose your virginity to this stranger...)':gt 'zaprFWash', 'fuckAnal', 'Free'
 		else
 			if pcs_inhib >= 40 or pcs_horny >= 40: act 'Offer your pussy':gt 'zaprFWash', 'fuckPussy', 'Paid'
-			if pcs_inhib >= 45 or pcs_horny >= 45: act 'Offer your pussy for free instead':gt 'zaprFWash', 'fuckPussy', 'Free'
 			if pcs_inhib >= 40 or pcs_horny >= 40: act 'Offer your ass':gt 'zaprFWash', 'fuckAnal', 'Paid'
-			if pcs_inhib >= 45 or pcs_horny >= 45: act 'Offer your ass for free instead':gt 'zaprFWash', 'fuckAnal', 'Free'
 		end
 		act 'Suck harder to make him cum':gt 'zaprFWash', 'blowjobEndQ'
 	else