Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

locations/KatjaHomeTalk.qsrc

@@ -133,11 +133,7 @@ if $ARGS[0] = '':
 			end
 		end
 	end
-	if mey_vika['key'] = 1:
-		Act 'Leave the room': gt 'mey_home', 'start'
-	else
-		act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
-	end
+	act 'Leave the room': gt 'mey_home', 'start'
 end
 
 
@@ -430,11 +426,7 @@ if $ARGS[0] = 'chat':
 		act 'Tell Katja, that you have decided that boys are fun after all <br><font color="red">(Katja will start asking about sex with boys again)</font>': gt 'KatjaHomeTalk',  'boy_yes'
 	end
 
-	if mey_vika['key'] = 1:
-		Act 'Leave the room': gt 'mey_home', 'start'
-	else
-		act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
-	end
+	act 'Leave the room': gt 'mey_home', 'start'
 end
 
 if $ARGS[0] = 'shower':
@@ -785,11 +777,7 @@ if $ARGS[0] = 'homework':
 	'For half an hour you and Katja pour over your books, you fully learn the lessons and pretty well understand the material.'
 
 	act 'Finish': gt 'KatjaHomeTalk'
-	if mey_vika['key'] = 1:
-		act 'Leave the room': gt 'mey_home', 'start'
-	else
-		act 'Say goodbye and leave': minut += 5 & gt 'pav_residential'
-	end
+	act 'Leave the room': gt 'mey_home', 'start'
 end
 
 if $ARGS[0] = 'Sextalk':
@@ -1324,7 +1312,7 @@ if $ARGS[0] = 'bj_talk2':
 	
 	act'It''s boring':
 		cla & *nl
-		'"It''s boring," you roll your eyes. "You have to keep sucking the whole time and after a while, my jaw just starts to ache with the motion. It''s a dick in your mouth, I don''t know what to tell you.'
+		'"It''s boring," you roll your eyes. "You have to keep sucking the whole time and after a while, my jaw just starts to ache with the motion. It''s a dick in your mouth, I don''t know what to tell you."'
 		'Katja seems taken aback, looking almost worried. You guess you just shattered some impressions she had about giving head.'
 		act 'Continue':
 			minut += 5
@@ -1445,10 +1433,8 @@ if $ARGS[0] = 'tender_kiss':
 					end
 					if $loc = 'katja_dorm':
 						act 'Stop talking': gt 'katja_dorm', 'start'
-					elseif mey_vika['key'] = 1:
-						Act 'Leave the room': gt 'mey_home', 'start'
 					else
-						act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
+						act 'Leave the room': gt 'mey_home', 'start'
 					end
 				end
 			else
@@ -1493,10 +1479,8 @@ if $ARGS[0] = 'tender_kiss':
 					end
 					if $loc = 'katja_dorm':
 						act 'Stop talking': gt 'katja_dorm', 'start'
-					elseif mey_vika['key'] = 1:
-						act 'Leave the room': gt 'mey_home', 'start'
 					else
-						act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
+						act 'Leave the room': gt 'mey_home', 'start'
 					end
 				end
 			else
@@ -1784,11 +1768,7 @@ if $ARGS[0] = 'boy_discussion':
 		'You smile. "Okay, I''ll try to dance with him at the disco, and see if I can test him for you."'
 		'"You are the bestest friend!" she says with a huge smile and gives you a tight hug.'
 		act 'Talk about something else': gt 'KatjaHomeTalk'
-		if mey_vika['key'] = 1:
-			act 'Leave the room': gt 'mey_home', 'start'
-		else
-			act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
-		end
+		act 'Leave the room': gt 'mey_home', 'start'
 	end
 end
 
@@ -1812,11 +1792,7 @@ if $ARGS[0] = 'anal_discussion':
 		'"He trains in the gym at the community center in the late afternoon. You might have luck talking with him there. I''ve also heard a rumor that he sometimes uses the women''s shower there," she tells you.'
 		'You smile. "Okay, I''ll try to see if he''s up for something there and try him out for you."'
 		act 'Talk about something else': gt 'KatjaHomeTalk'
-		if mey_vika['key'] = 1:
-			act 'Leave the room': gt 'mey_home', 'start'
-		else
-			act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
-		end
+		act 'Leave the room': gt 'mey_home', 'start'
 	end
 end
 
@@ -1839,10 +1815,8 @@ if $ARGS[0] = 'preventation_talk':
 	end
 	if $loc = 'katja_dorm':
 		act 'Stop talking': gt 'katja_dorm', 'start'
-	elseif mey_vika['key'] = 1:
-		act 'Leave the room': gt 'mey_home', 'start'
 	else
-		act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
+		act 'Leave the room': gt 'mey_home', 'start'
 	end	
 end
 
@@ -1871,11 +1845,7 @@ if $ARGS[0] = 'random_park_sex_talk':
 				act 'Tell Katja that you think she should use birth control': gt 'KatjaHomeTalk', 'preventation_talk'
 			end
 			act 'Talk about something else': gt 'KatjaHomeTalk'
-			if mey_vika['key'] = 1:
-				act 'Leave the room': gt 'mey_home', 'start'
-			else
-				act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
-			end
+			act 'Leave the room': gt 'mey_home', 'start'
 		end
 	end
 end
@@ -2076,10 +2046,8 @@ if $ARGS[0] = 'boy_no':
 	end
 	if $loc = 'katja_dorm':
 		act 'Stop talking': gt 'katja_dorm', 'start'
-	elseif mey_vika['key'] = 1:
-		act 'Leave the room': gt 'mey_home', 'start'
 	else
-		act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
+		act 'Leave the room': gt 'mey_home', 'start'
 	end
 end
 
@@ -2104,10 +2072,8 @@ if $ARGS[0] = 'boy_yes':
 	end
 	if $loc = 'katja_dorm':
 		act 'Stop talking': gt 'katja_dorm', 'start'
-	elseif mey_vika['key'] = 1:
-		act 'Leave the room': gt 'mey_home', 'start'
 	else
-		act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
+		act 'Leave the room': gt 'mey_home', 'start'
 	end
 end
 
@@ -2123,7 +2089,7 @@ if $ARGS[0] = 'fisting_ask':
 	'"But it does sound so hot!" she says. "Maybe... you could..." her voice trails off. After a moment, she continues. "Maybe you could show me..."' 
 	'"You want me to fist myself here in front of you?" you ask.' 
 	'"No, I want you... to..." her voice falters again.' 
-	'"You want me to fist you?" you ask. She doesn''t say anything, but slowly nods. "Right now?" Again she doesn''t say anything, but nods."'
+	'"You want me to fist you?" you ask. She doesn''t say anything, but slowly nods. "Right now?" Again she doesn''t say anything, but nods.'
 	act 'Show Katja how fisting is done': gt 'katja_sex', 'first_fisting'
 	act 'Say you will do it another time':
 		*clr & cla
@@ -2131,10 +2097,8 @@ if $ARGS[0] = 'fisting_ask':
 		'You tell Katja that you are not in the mood right now, but you might do it another time if she asks.'
 		if $loc = 'katja_dorm':
 			act 'Stop talking': gt 'katja_dorm', 'start'
-		elseif mey_vika['key'] = 1:
-			act 'Leave the room': gt 'mey_home', 'start'
 		else
-			act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
+			act 'Leave the room': gt 'mey_home', 'start'
 		end	
 	end
 end

locations/katjaEvDin.qsrc

@@ -94,7 +94,7 @@ if $ARGS[0] = 'kiss':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/grab.jpg"></center>'
 						'You grab Katja firmly so she can''t back away.'
-!!{
+!{
 						if pcs_dom < KatjaQW['dom']:
 							gs 'arousal', 'end'
 							gs 'stat'
@@ -195,10 +195,8 @@ if $ARGS[0] = 'kiss':
 		end
 		if $loc = 'katja_dorm':
 			act 'Stop talking': gt 'katja_dorm', 'start'
-		elseif mey_vika['key'] = 1:
-			Act 'Smile and leave the room': gt 'mey_home', 'start'
 		else
-			act 'Say goodbye and leave':gt 'pav_residential'
+			act 'Leave the room': gt 'mey_home', 'start'
 		end
 	end
 end
@@ -252,14 +250,9 @@ if $ARGS[0] = 'strapon_main':
 	end
 	if $loc = 'katja_dorm':
 		act 'Get dressed and stop talking': gt 'katja_dorm', 'start'
-	elseif mey_vika['key'] = 1:
-		Act 'Smile and leave the room': 
-			gt 'mey_home', 'start'
-		end
 	else
-		act 'Say goodbye and leave':
-			minut += 5
-			gt 'pav_residential'
+		act 'Smile and leave the room': 
+			gt 'mey_home', 'start'
 		end
 	end
 end
@@ -442,14 +435,10 @@ if $ARGS[0] = 'sex':
 			end
 			if $loc = 'katja_dorm':
 				act 'Stop talking': gt 'katja_dorm', 'start'
-			elseif mey_vika['key'] = 1:
+			else
 				act 'Leave the room': 
 					gt 'mey_home', 'start'
 				end
-			else
-				act 'Say goodbye and go home':
-					gt 'pav_residential'
-				end
 			end
 		end
 	end
@@ -485,16 +474,11 @@ if $ARGS[0] = 'sex':
 					gs 'arousal', 'end'
 					gt 'katja_dorm', 'start'
 				end
-			elseif mey_vika['key'] = 1:
+			else
 				act 'Leave the room': 
 					gs 'arousal', 'end'
 					gt 'mey_home', 'start'
 				end
-			else
-				act 'Say goodbye and go home':
-					gs 'arousal', 'end'
-					gt 'pav_residential'
-				end
 			end
 		end
 	end
@@ -545,16 +529,11 @@ if $ARGS[0] = 'kuni':
 				gs 'arousal', 'end'
 				gt 'katja_dorm', 'start'
 			end
-		elseif mey_vika['key'] = 1:
+		else
 			act 'Leave the room': 
 				gs 'arousal', 'end'
 				gt 'mey_home', 'start'
 			end
-		else
-			act 'Say goodbye and go home':
-				gs 'arousal', 'end'
-				gt 'pav_residential'
-			end
 		end
 	end
 end
@@ -595,16 +574,11 @@ if $ARGS[0] = 'fisting':
 				gs 'arousal', 'end'
 				gt 'katja_dorm', 'start'
 			end
-		elseif mey_vika['key'] = 1:
+		else
 			act 'Leave the room': 
 				gs 'arousal', 'end'
 				gt 'mey_home', 'start'
 			end
-		else
-			act 'Say goodbye and go home':
-				gs 'arousal', 'end'
-				gt 'pav_residential'
-			end
 		end
 	end
 end
@@ -643,16 +617,11 @@ if $ARGS[0] = 'kuni_p':
 				gs 'arousal', 'end'
 				gt 'katja_dorm', 'start'
 			end
-		elseif mey_vika['key'] = 1:
+		else
 			act 'Leave the room': 
 				gs 'arousal', 'end'
 				gt 'mey_home', 'start'
 			end
-		else
-			act 'Say goodbye and go home':
-				gs 'arousal', 'end'
-				gt 'pav_residential'
-			end
 		end
 	end
 end
@@ -813,10 +782,8 @@ if $ARGS[0] = 'kuni_dom':
 								end
 								if $loc = 'katja_dorm':
 									act 'Stop talking': gt 'katja_dorm', 'start'
-								elseif mey_vika['key'] = 1:
-									Act 'Leave the room': gt 'mey_home', 'start'
 								else
-									act 'Say goodbye and go home':gt 'pav_residential'
+									act 'Leave the room': gt 'mey_home', 'start'
 								end
 							end
 						end
@@ -828,10 +795,8 @@ if $ARGS[0] = 'kuni_dom':
 		gs 'arousal', 'end'
 		if $loc = 'katja_dorm':
 			act 'Stop talking': gt 'katja_dorm', 'start'
-		elseif mey_vika['key'] = 1:
-			Act 'Leave the room': gt 'mey_home', 'start'
 		else
-			act 'Say goodbye and go home':gt 'pav_residential'
+			act 'Leave the room': gt 'mey_home', 'start'
 		end
 	end
 end
@@ -893,7 +858,7 @@ if $ARGS[0] = 'moron':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/frenchkiss.jpg"></center>'
-			'Looking at Ivan, then at this idiot, it seems that Ivan didn''t notice him. You sigh. "Is that really necessary? She is my best friend and we want to kiss. You just seem jealous!'
+			'Looking at Ivan, then at this idiot, it seems that Ivan didn''t notice him. You sigh. "Is that really necessary? She is my best friend and we want to kiss. You just seem jealous!"'
 			'"Lesbians! Lesbians!" He continues to scream like a freak so much so that people begin to gather around to find out what''s happening. Ivan steps over next to you and puts his hand on your shoulder, giving the idiot a glare as well. Boosted by Ivan''s support, you continue. "We like boys, just not assholes like you!" With those words, you stand on your tiptoes and, clasping Ivan''s head in your hands, give him a long passionate kiss with lots of tongue.'
 
 			act 'Kiss again':

locations/mey_home.qsrc

@@ -125,13 +125,13 @@ if $ARGS[0] = 'start':
 	end
 	act 'Kitchen': minut += 1 & gt 'mey_home', 'kitchen'
 	act 'Bathroom': minut += 1 & gt 'mey_home', 'bathroom'
-	act 'Guest room': minut += 1 & gt 'mey_home', 'guest_bedroom'
+	if mey_vika['mey_vika_qw'] >= 30: act 'Guest room': minut += 1 & gt 'mey_home', 'guest_bedroom'
 	act 'Lounge': minut += 1 & gt 'mey_home', 'lounge'
 	act 'Katja''s room': minut += 1 & gt 'mey_home', 'katja_bedroom'
 	act 'Vicky''s room': minut += 1 & gt 'mey_home', 'vicky_bedroom'
 	act 'Tamara Meynold''s room': minut += 1 & gt 'mey_home', 'tamara_bedroom'
 	act 'Garden': minut += 1 & gt 'mey_home', 'garden'
-	if func('homes_properties', 'is_current_home') = 0 and func('homes_properties', 'can_live_here'):
+	if func('homes_properties', 'is_current_home') = 0 and func('homes_properties', 'can_live_here') and mey_vika['mey_vika_qw'] >= 30:
 		act 'Set this household as your main home':gs 'homes_properties', 'set_home' & gt 'mey_home', 'start'
 	end