Преглед изворни кода

Merge remote-tracking branch 'upstream/master' into home-and-internet

Netuttki пре 1 година
родитељ
комит
86637f4997

+ 3 - 3
glife.qproj

@@ -67,6 +67,7 @@
 		<Location name="willpower"/>
 		<Location name="drugs"/>
 		<Location name="npc_relationship"/>
+		<Location name="npc_reactions"/>
 		<Location name="grades"/>
 		<Location name="internet_mobile"/>
 	</Folder>
@@ -682,9 +683,7 @@
 		<Location name="Zvereva_sub_1"/>
 	</Folder>
 	<Folder name="Julia Milov">
-		<Location name="JuliaMilGo"/>
 		<Location name="JuliaMilHome"/>
-		<Location name="JuliaMilVhod"/>
 	</Folder>
 	<Folder name="Arthur">
 		<Location name="arturRinok"/>
@@ -943,6 +942,8 @@
 		<Location name="uni_grounds"/>
 		<Location name="uni_dorm"/>
 		<Location name="uni_admin"/>
+		<Location name="uni_cafe"/>
+		<Location name="uni_library"/>
 		<Location name="uni_programs"/>
 		<Location name="uni_lessons"/>
 		<Location name="uni_lessons1"/>
@@ -955,7 +956,6 @@
 		<Location name="uni_exams2"/>
 		<Location name="uni_exams3"/>
 		<Location name="uni_exams4"/>
-		<Location name="uni_library"/>
 		<Location name="uni_events"/>
 		<Location name="uniutil"/>
 	</Folder>

+ 0 - 22
locations/JuliaMilGo.qsrc

@@ -1,22 +0,0 @@
-# JuliaMilGo
-!2021/05/02
-menu_off = 1
-gs 'stat'
-'<center><b><font color="maroon">Julia Milova, your classmate</font></b></center>'
-'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-'As you approach Julia after school, she smiles at you and asks, "Hi <<$pcs_nickname>>! Want to go to my place? We can do our homework together, and maybe grab a bite to eat?"'
-
-act 'Go with Julia':
-	cls
-	minut += 15
-	BeInJulMilHome = 1
-	gs 'stat'
-	'<center><b><font color="maroon">Julia Milova, your classmate</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-	'You go to Julia''s apartment together, she lives just above you. During the 15 minute walk you chat about random things that happened at school that day.'
-
-	act 'Enter her apartment':gt 'JuliaMilHome'
-end
-
---- JuliaMilGo ---------------------------------
-

+ 686 - 182
locations/JuliaMilHome.qsrc

@@ -1,235 +1,739 @@
 # JuliaMilHome
-!2021/05/02
+!!2022/09/29 - Alaratt
+
+if $ARGS[0] = 'home':
+	$loc = 'JuliaMilHome'
+	$loc_arg = 'home'
+	$menu_loc = 'JuliaMilHome'
+	$menu_arg = 'home'
+	$locM = 'JuliaMilHome'
+	$locM_arg = 'home'
+	$location_type = 'private'
+
+	$track_loop = ''
+	CLOSE ALL
+	if sound = 0:PLAY 'sound/korr.mp3',30
+
+	!! To Do - Track these to figure out what they are and where they are used - Alaratt
+	popolaini = 0
+	saunaYouRoom = 0
+	boycherdaksex = 0
+	bonusZ = 0
+
+	minut += 1
+	menu_off = 0
+	gs 'themes', 'indoors'
+	gs 'stat'
+
+	if NatashaHomeDay ! daystart:
+		NatashaHomeDay = daystart
+		NatashaLoc = 0
+	end
 
-$location_type = 'indoors'
-$menu_loc = 'pav_commercial'
-$menu_arg = ''
-menu_off = 0
-CLOSE ALL
-if BeInJulMilHome = 0:BeInJulMilHome = 1
+	if juliaQW['home_unlocked'] = 0: juliaQW['home_unlocked'] = 1
 
-gs 'stat'
-'<center><b><font color="maroon"><<$npc_firstname[''A12'']>> <<$npc_lastname[''A12'']>></font></b></center>'
-'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-'Julia has a nice room, decorated with high quality furnishings. There are books everywhere, she must really like to read.'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptdoor.jpg"></center>'
 
-if lernHome > 0 and juliaQW['homework_day'] ! daystart:
-	'Julia arranges her school books on a large desk and gets ready to do her homework, inviting you to join her.'
+	act 'Leave':gt'pod_ezd','etaj_3'
+	if kanikuli = 0 and hour > 6 and hour < 15 and week < 6:
+		'You knock on the door, but no one comes to answer. Julia must not be home.'
+	elseif hour > 20 :
+		'It''s too late in the day to visit Julia.'
+	elseif hour < 8:
+		'It''s too early in the day to visit Julia.'
+	else
+		'You knock on the door. You hear footsteps in the apartment and sure enough, a few seconds later Julia opens the door. "Oh, hi <<$pcs_nickname>>! Come on in!"'
+		act 'Enter Julia''s apartment':gt'JuliaMilHome'
+	end
+end
 
-	act 'Do your homework with Julia':
-		cls
-		menu_off = 1
-		minut += 60
-		if lernHome > 1:
-			gs 'grades', 'homework', 'school', 'yes', 2, 1, 'A12'
-		else
-			gs 'grades', 'homework', 'school', 'yes', 1, 1, 'A12'
-		end
-		juliaQW['homework_day'] = daystart
-		gs 'npc_relationship', 'modify', 'A12', 'love' 
-		lern += rand(3,6)
-		gs 'exp_gain', 'intel', rand(1,2) + (mentats_dose - rand(0,mentats_dose))
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-		'You spend an hour doing your homework with Julia, and thanks to her you manage to learn quite a lot. She''s a very clever girl, and good at explaining things.'
+if $ARGS[0] = 'hallway':
+	$loc = 'JuliaMilHome'
+	$loc_arg = 'hallway'
+	$menu_loc = 'JuliaMilHome'
+	$menu_arg = 'hallway'
+	$locM = 'JuliaMilHome'
+	$locM_arg = 'hallway'
+	$location_type = 'indoors'
+	killvar '$locclass'
+
+	CLOSE ALL
+	if sound = 0:PLAY 'sound/korr.mp3',30
+
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+
+	*clr & cla
+	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/julia_home/hallway.jpg"></center>'
+	'As you enter the Milov''s hallway, you notice it very nice, well decorated and very clean. Everything in it''s place.'
+
+	act '<b>Leave Julia''s apartment</b>': gt 'JuliaMilHome', 'leave_apartment'
+	act 'Julia''s Room': gt 'JuliaMilHome', 'julia_room'
+	!!act 'Parents''s Room': gt 'JuliaMilHome', 'parents_room'
+	act 'Living Room': gt 'JuliaMilHome', 'livingroom'
+	act 'Kitchen': gt 'JuliaMilHome', 'kitchen'
+	act 'Bathroom': gt 'JuliaMilHome', 'bathroom'
+end
 
-		act 'Relax after doing your homework':gt $curloc
+if $ARGS[0] = 'livingroom':
+	CLOSE ALL
+	$menu_loc = 'JuliaMilHome'
+	$menu_arg = 'livingroom'
+	$locclass = 'livingr'
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+
+	*clr & cla
+	'<center><b><font color = maroon>Living room</font></b></center>'
+	!! Needs actions like watching tv
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/julia_home/living_room.jpg"></center>'
+	'Like the rest of the house the living room is spotless, with plenty of decorations around, arranged just perfectly.'
+
+	act 'Leave the room':gt 'JuliaMilHome', 'hallway'
+end
+
+if $ARGS[0] = 'kitchen':
+	CLOSE ALL
+	$loc = 'JuliaMilHome'
+	$loc_arg = 'kitchen'
+	$menu_loc = 'JuliaMilHome'
+	$menu_arg = 'kitchen'
+	$locclass = 'kitr'
+
+	menu_off = 0
+	minut += 1
+	gs 'kit_din'
+	gs 'stat'
+
+	*clr & cla
+	'<center><b><font color = maroon>Kitchen</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/julia_home/kitchen.jpg"></center>'
+	'The kitchen is small but has all the necessary things. There is a stove, a fridge, a sink, and a tiny dining table. Everything looks sparkling clean.'
+
+	act 'Leave the room': gt 'JuliaMilHome','hallway'
+	act 'Look in the fridge': gt 'JuliaMilHome', 'fridge'
+	dynamic $driwater
+	dynamic $dritea
+	dynamic $fill_bottle
+end
+
+if $ARGS[0] = 'fridge':
+	menu_off = 1
+	minut += 1
+	gs 'stat'
+	if juliafood_day ! daystart:
+		juliasup_count = 1
+		julialefto_count = 1
+		juliawater_count = 1
+		juliatea_count = 1
+		juliasanw_count = 1
 	end
-else
-	'Julia is sitting on her bed.'
 
-	if eatJulMilDay!daystart:
-		'Julia smiles at you and offers you something to eat.'
+	if julialefto_count >= 1:
+		$julia_lefto = ' some left overs'
+	else
+		$julia_lefto = ''
+	end
+	if juliasup_count >= 1:
+		$julia_sup = ' some soup'
+	else
+		$julia_sup = ''
+	end
+	if juliawater_count >= 1:
+		$julia_water = ' some bottled water'
+	else
+		$julia_water = ''
+	end
+	if juliatea_count >= 1:
+		$julia_tea = ' some tea'
+	else
+		$julia_tea = ''
+	end
+	if juliasanw_count >= 1:
+		$julia_sanw = ' some stuff to make a sandwich'
+	else
+		$julia_sanw = ''
+	end
+	
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/shared/home/kitchen/fridge.jpg"></center>'
+	'You open the fridge and see:<<$julia_tea>><<$julia_water>><<$julia_sup>><<$julia_lefto>><<$julia_sanw>>'
+
+	act 'Close the refrigerator': gt 'JuliaMilHome', 'kitchen'
+	if julialefto_count > 0:
+		act 'Eat some left overs':
+			juliafood_day = daystart
+			julialefto_count -= 1
+			pcs_health += 10
+			pcs_mood += 20
+			fat += 2
+			pcs_energy += 50
+			if pcs_hydra >= 100:
+				pcs_hydra += 20
+			else
+				pcs_hydra += 40
+			end
+			cumspclnt = 2
+			gs 'cum_cleanup'
+			pcs_breath = 0
+			minut += 5
+			gs 'stat'
 
-		act 'Have a meal with Julia':
-			cls
-			menu_off = 1
-			minut += 30
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/shared/food/leftovers.jpg"></center>'
+			'It seems to be left overs from a last nights dinner, it looks very good even for left overs.'
+
+			act 'Continue': gt 'JuliaMilHome', 'kitchen'
+		end
+	elseif juliatea_count >= 0:
+		act 'Have some tea':
+			juliafood_day = daystart
+			juliatea_count -= 1
+			pcs_health += 10
+			pcs_mood += 20
 			fat += 2
-			pcs_energy += 60
-			pcs_hydra += 60
+			pcs_energy += 50
+			if pcs_hydra >= 100:
+				pcs_hydra += 20
+			else
+				pcs_hydra += 40
+			end
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 0
-			eatJulMilDay = daystart
+			minut += 5
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-			'You follow her to the kitchen and have a meal together. When you''re both finished, you return to her room.'
+			
+			
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/shared/food/tea.jpg"></center>'
+			'You find some tea and make it.'
 
-			act 'Hang out':gt $curloc
+			act 'Continue': gt 'JuliaMilHome', 'kitchen'
 		end
+	elseif juliawater_count >= 0:
+		act 'Have some water': 
+			juliafood_day = daystart
+			juliawater_count -= 1
+			pcs_health += 10
+			pcs_mood += 20
+			fat += 2
+			pcs_energy += 50
+			if pcs_hydra >= 100:
+				pcs_hydra += 20
+			else
+				pcs_hydra += 40
+			end
+			cumspclnt = 2
+			gs 'cum_cleanup'
+			pcs_breath = 0
+			minut += 5
+			gs 'stat'
+
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/shared/food/waterbottle1.jpg"></center>'
+			'You drink some bottled water.'
+
+			act 'Continue': gt 'JuliaMilHome', 'kitchen'
+		end
+	elseif juliasup_count >= 0:
+		act 'Have some soup':
+			juliafood_day = daystart
+			juliasup_count -= 1
+			pcs_health += 10
+			pcs_mood += 20
+			fat += 2
+			pcs_energy += 50
+			if pcs_hydra >= 100:
+				pcs_hydra += 20
+			else
+				pcs_hydra += 40
+			end
+			cumspclnt = 2
+			gs 'cum_cleanup'
+			pcs_breath = 0
+			minut += 5
+			gs 'stat'
+
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/shared/food/soup.jpg"></center>'
+			'You find some soup in the fridge, you spoon our a bowlful to eat.'
+
+			act 'Continue': gt 'JuliaMilHome', 'kitchen'
+		end
+	elseif juliasanw_count >= 0:
+		act 'Make a sandwich':
+			juliafood_day = daystart
+			juliasanw_count -= 1
+			pcs_health += 10
+			pcs_mood += 20
+			fat += 2
+			pcs_energy += 50
+			if pcs_hydra >= 100:
+				pcs_hydra += 20
+			else
+				pcs_hydra += 40
+			end
+			cumspclnt = 2
+			gs 'cum_cleanup'
+			pcs_breath = 0
+			minut += 5
+			gs 'stat'
 
-		act 'No thanks, you''re not hungry':
-			cls
-			eatJulMilDay = daystart
-			gt $curloc
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/shared/food/reuben.jpg"></center>'
+			'You get all the stuff you need from the fridge then get some bread out of the cabinet and make yourself a sandwich.'
+
+			act 'Continue': gt 'JuliaMilHome', 'kitchen'
+		end
+	end
+end 
+
+if $ARGS[0] = 'bathroom':
+	CLOSE ALL
+	$loc = 'JuliaMilHome'
+	$loc_arg = 'bathroom'
+	$menu_loc = 'JuliaMilHome'
+	$menu_arg = 'bathroom'
+	$locM = 'JuliaMilHome'
+	$locM_arg = 'bathroom'
+	$location_type = 'bathroom'
+
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	
+	*clr & cla
+	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/julia_home/bathroom.jpg"></center>'
+	'The bathroom is kept spotlessly clean. Everything here has a well cared for look to it.'
+	'The toilet sits along the wall next to a small bathtub.'
+	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
+
+	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0: '<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	act 'Leave the bathroom': gt 'JuliaMilHome','hallway'
+	act 'Take a shower':
+		menu_off = 1
+		minut += 10
+		noShampoo = 1
+		dynamic $showerdin
+		gs 'stat'
+		
+		*clr & cla
+		'<center><h4><font color="maroon">Bathroom</font></h4></center>'
+		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
+		'You take a quick shower.'
+		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+
+		act 'Take a selfie': gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
+		act 'Get out of the shower': gt 'JuliaMilHome','bathroom'
+	end
+	dynamic $bath
+	dynamic $bteeth
+	dynamic $tampon
+	dynamic $basin
+	gs 'din_van', 'prvt_pee'
+end
+
+if $ARGS[0] = 'julia_room':
+	$menu_loc = 'JuliaMilHome'
+	$menu_arg = 'julia_room'
+	$locclass = 'bedr'
+	CLOSE ALL
+	$track_loop = ''
+	music_loop = 1
+
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+
+	if juliaQW['home_unlocked'] = 0: juliaQW['home_unlocked'] = 1
+
+	*clr & cla
+	'<center><b><font color="maroon">Julia''s Room</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/julia_home/julia_room.jpg"></center>'
+	'Julia has a nice room, decorated with high quality furnishings. There are books everywhere, she must really like to read.'
+	if lernHome > 0 and juliaQW['homework_day'] ! daystart:
+		'Julia arranges her school books on a large desk and gets ready to do her homework, inviting you to join her.'
+		act 'Do your homework with Julia':
+			menu_off = 1
+			minut += 60
+			if lernHome > 1:
+				gs 'grades', 'homework', 'school', 'yes', 2, 1, 'A12'
+			else
+				gs 'grades', 'homework', 'school', 'yes', 1, 1, 'A12'
+			end
+			juliaQW['homework_day'] = daystart
+			gs 'npc_relationship', 'modify', 'A12', 'love' 
+			lern += rand(3,6)
+			gs 'exp_gain', 'intel', rand(1,2) + (mentats_dose - rand(0,mentats_dose))
+			gs 'stat'
+
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+			'You spend an hour doing your homework with Julia, and thanks to her you manage to learn quite a lot. She''s a very clever girl, and good at explaining things.'
+
+			act 'Relax after doing your homework': gt 'JuliaMilHome', 'julia_room'
 		end
 	else
-		if wine = 1:
-			act 'Drink your wine with Julia':
-				cls
+		'Julia is sitting on her bed.'
+		if juliaQW['eatJulMilDay'] ! daystart:
+			'Julia smiles at you and offers you something to eat.'
+			act 'Have a meal with Julia':
+				juliaQW['eatJulMilDay'] = daystart
+				fat += 2
+				pcs_energy += 60
+				pcs_hydra += 60
+				cumspclnt = 2
+				gs 'cum_cleanup'
+				pcs_breath = 0
 				menu_off = 1
 				minut += 30
-				wine = 0
-				gs 'drugs', 'alcohol', 'wine', 2
-				gs 'npc_relationship', 'modify', 'A12', 'like' 
-				JulMilBestFrend += 1
 				gs 'stat'
+
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-				'You offer Julia some wine and she happily accepts, leaving the room quickly to get a corkscrew and some glasses. When she finishes pouring the wine, you propose a toast to your friendship and both have a sip. For the next half hour, the two of you enjoy the wine while sharing some juicy gossip. When the bottle is drained you both feel more than a bit tipsy and giggle happily, lying against each other on her bed.'
-
-				act 'Relax in Julia''s room':gt $curloc
-
-				if JulMilBestFrend >= 5:
-					act 'Talk about sex':
-						cls
-						minut += 5
-
-						if SexTalkJulia < 4:SexTalkJulia += 1
-
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-						'You steer the conversation towards sexual topics.'
-
-						if SexTalkJulia = 1:
-							'Julia is too embarrassed to share her sexual experiences with you, and it looks like you killed the mood.'
-						elseif SexTalkJulia = 2:
-							'Julia, trying to contribute to the conversation, boasts that she is no longer a virgin.'
-
-							act '"Oh, really? Do tell!"':
-								cls
-								minut += 5
-								gs 'arousal', 'verbal_erotica', -10
-								gs 'npc_relationship', 'modify', 'A12', 'love' 
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/sex/outdoor.jpg"></center>'
-								'Julia smiles mysteriously and begins her story, "My parents send me to summer camp every year. Last year, I met a guy there... his name is Vovka. He was one of the youth councelors there, a fair bit older than me. After the day''s regular events had concluded, we found ourselves alone in the forest."'
-								'"We began to flirt a little, and then he kissed me... it was so nice to feel wanted! Then he laid me on my back, but the ground was all rough and rocky. I tried to get up, asking him if he would mind if I got down on my knees instead. He... misunderstood, and took off my skirt and panties before telling me to go down on all fours like he thought I had suggested. I didn''t have the courage to say no, and he had been so nice to me... so I did."'
-								'"Then he started to have sex with me. It was quite painful! No one ever told me about the hymen being a part of the female body, and that it tears during the first time. Honestly, the first time I had sex I just stayed bent over, hoping it would be over soon. Luckily Vovka did not last long, and he finished on the ground."'
-
-								act 'Relax in Julia''s room':gt $curloc
-							end
+				'You follow her to the kitchen and have a meal together. When you''re both finished, you return to her room.'
 
-							exit
-						elseif SexTalkJulia = 3:
-							'Julia shares more details about her adventures at summer camp.'
-
-							act '"Go on, keep going!"':
-								cls
-								minut += 5
-								gs 'arousal', 'verbal_erotica', -10
-								gs 'npc_relationship', 'modify', 'A12', 'love' 
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/sex/otrad.jpg"></center>'
-								'Julia once again smiles mysteriously and continues her story where she left off, "Remember when I told you about Vovka last time? I slept with him again, before leaving the camp! One afternoon when no one else was in the cabin, I bumped into him there. Ever since that first time he had been pestering me, wanting more sex. He was cute though, and really treated me like I was special... so I let him."'
-								'"I undressed and lay down on the bed, terribly afraid that it would hurt again. It felt a lot better though! In the beginning it was still a bit painful, but that quickly passed. He came inside me, that second time. I didn''t really get stimulated myself, probably because I was too afraid about someone walking in. Still, it was nice to feel so close to him."'
-								'"No one did enter, and he quickly left after we finished. After that, I saw him one or two more times at the camp but always with other people around, so nothing more happened between us. He lives in the city, actually. I still have his phone number somewhere, but I''m not going to call him. He''s not the one I fancy any more..." She has a dreamy look in her eyes when she says that.'
-
-								act 'Relax in Julia''s room':gt $curloc
-							end
+				act 'Hang out': gt 'JuliaMilHome', 'julia_room'
+			end
+			act 'No thanks, you''re not hungry':
+				juliaQW['eatJulMilDay'] = daystart
+				gt 'JuliaMilHome', 'julia_room'
+			end
+		else
+			if wine = 1:
+				act 'Drink your wine with Julia':
+					juliaQW['JulMilBestFrend'] += 1
+					menu_off = 1
+					minut += 30
+					wine = 0
+					gs 'drugs', 'alcohol', 'wine', 2
+					gs 'npc_relationship', 'modify', 'A12', 'like'
+					gs 'stat'
+
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+					'You offer Julia some wine and she happily accepts, leaving the room quickly to get a corkscrew and some glasses. When she finishes pouring the wine, you propose a toast to your friendship and both have a sip. For the next half hour, the two of you enjoy the wine while sharing some juicy gossip. When the bottle is drained you both feel more than a bit tipsy and giggle happily, lying against each other on her bed.'
+
+					act 'Relax in Julia''s room': gt 'JuliaMilHome', 'julia_room'
+					if juliaQW['JulMilBestFrend'] >= 5:
+						act 'Talk about sex':
+							if juliaQW['SexTalkJulia'] < 4: juliaQW['SexTalkJulia'] += 1
+							minut += 5
+							gs 'stat'
+
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+							'You steer the conversation towards sexual topics.'
+
+							act 'Relax in Julia''s room': gt 'JuliaMilHome', 'julia_room'
+
+							if juliaQW['SexTalkJulia'] = 1:
+								'Julia is too embarrassed to share her sexual experiences with you, and it looks like you killed the mood.'
+							elseif juliaQW['SexTalkJulia'] = 2:
+								'Julia, trying to contribute to the conversation, boasts that she is no longer a virgin.'
+								act '"Oh, really? Do tell!"':
+									minut += 5
+									gs 'arousal', 'verbal_erotica', -10
+									gs 'npc_relationship', 'modify', 'A12', 'love' 
+									gs 'stat'
 
-							exit
-						elseif SexTalkJulia = 4:
-							'Julia is embarrassed and says, "There''s something unusual about you, <<$pcs_nickname>>. I''ve never felt so much at ease around anyone else before, around you I can really be myself. I...", she doesn''t finish her sentence, letting the silence linger in the air for a second. Then she suddenly moves her face to yours, intending to kiss you.'
-
-							act 'Kiss Julia':
-								cls
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/sex/julkiss.jpg"></center>'
-								'You kiss Julia, feeling her soft, sweet smelling lips on your lips as her nimble tongue explores inside your mouth. Her hands gently cup your boobs, and you moan softly as she begins to gently caress them.'
-
-								gs 'arousal', 'kiss', 5, 'lesbian'
-								gs 'stat'
-								
-								act 'Lie back and let her':
-									cls
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/sex/outdoor.jpg"></center>'
+									'Julia smiles mysteriously and begins her story, "My parents send me to summer camp every year. Last year, I met a guy there... his name is Vovka. He was one of the youth councilors there, a fair bit older than me. After the day''s regular events had concluded, we found ourselves alone in the forest."'
+									*nl
+									'"We began to flirt a little, and then he kissed me... it was so nice to feel wanted! Then he laid me on my back, but the ground was all rough and rocky. I tried to get up, asking him if he would mind if I got down on my knees instead. He... misunderstood, and took off my skirt and panties before telling me to go down on all fours like he thought I had suggested. I didn''t have the courage to say no, and he had been so nice to me... so I did."'
+									*nl
+									'"Then he started to have sex with me. It was quite painful! No one ever told me about the hymen being a part of the female body, and that it tears during the first time. Honestly, the first time I had sex I just stayed bent over, hoping it would be over soon. Luckily Vovka did not last long, and he finished on the ground."'
+
+									act 'Relax in Julia''s room':
+										gs 'arousal', 'end'
+										gt 'JuliaMilHome', 'julia_room'
+									end
+								end
+							elseif juliaQW['SexTalkJulia'] = 3:
+								'Julia shares more details about her adventures at summer camp.'
+								act '"Go on, keep going!"':
+									minut += 5
+									gs 'arousal', 'verbal_erotica', -10
+									gs 'npc_relationship', 'modify', 'A12', 'love' 
 									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/sex/jultit.jpg"></center>'
-									'Julia bares your chest and slowly lowers her kisses, slowly trailing her way down to your chest. You do your best to stifle your moans when she takes your nipple in her mouth, gently biting it as her fingers rub the other one. Then her fingers find their way down between your legs, pulling your clothes to the side.'
 
-									gs 'npc_relationship', 'modify', 'A12', 'adore' 
-									gs 'arousal', 'foreplay', 5, 'lesbian'
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/sex/otrad.jpg"></center>'
+									'Julia once again smiles mysteriously and continues her story where she left off, "Remember when I told you about Vovka last time? I slept with him again, before leaving the camp! One afternoon when no one else was in the cabin, I bumped into him there. Ever since that first time he had been pestering me, wanting more sex. He was cute though, and really treated me like I was special... so I let him."'
+									*nl
+									'"I undressed and lay down on the bed, terribly afraid that it would hurt again. It felt a lot better though! In the beginning it was still a bit painful, but that quickly passed. He came inside me, that second time. I didn''t really get stimulated myself, probably because I was too afraid about someone walking in. Still, it was nice to feel so close to him."'
+									*nl
+									'"No one did enter, and he quickly left after we finished. After that, I saw him one or two more times at the camp but always with other people around, so nothing more happened between us. He lives in the city, actually. I still have his phone number somewhere, but I''m not going to call him. He''s not the one I fancy any more..." She has a dreamy look in her eyes when she says that.'
+
+									act 'Relax in Julia''s room':
+										gs 'arousal', 'end'
+										gt 'JuliaMilHome', 'julia_room'
+									end
+								end
+							elseif juliaQW['SexTalkJulia'] = 4:
+								'Julia is embarrassed and says, "There''s something unusual about you, <<$pcs_nickname>>. I''ve never felt so much at ease around anyone else before, around you I can really be myself. I...", she doesn''t finish her sentence, letting the silence linger in the air for a second. Then she suddenly moves her face to yours, intending to kiss you.'
+								act 'Kiss Julia':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/sex/julkiss.jpg"></center>'
+									'You kiss Julia, feeling her soft, sweet smelling lips on your lips as her nimble tongue explores inside your mouth. Her hands gently cup your boobs, and you moan softly as she begins to gently caress them.'
+									gs 'arousal', 'kiss', 5, 'lesbian'
 									gs 'stat'
-								
-									act 'Eat each other out':
-										cls
-										minut += 15
-
-										if npc_sex['A12'] = 0: 
-											npc_sex['A12'] = 1
-											lesbian += 1
+
+									act 'Lie back and let her':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/sex/jultit.jpg"></center>'
+										'Julia bares your chest and slowly lowers her kisses, slowly trailing her way down to your chest. You do your best to stifle your moans when she takes your nipple in her mouth, gently biting it as her fingers rub the other one. Then her fingers find their way down between your legs, pulling your clothes to the side.'
+										gs 'npc_relationship', 'modify', 'A12', 'adore' 
+										gs 'arousal', 'foreplay', 5, 'lesbian'
+										gs 'stat'
+
+										act 'Eat each other out':
+											if npc_sex['A12'] = 0: npc_sex['A12'] = 1
+
+											*clr & cla
+											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/sex/julick.jpg"></center>'
+											'You and Julia giddily take off your clothes and you lie back down on the bed. Julia, eager to taste you, throws her leg over your head and buries her face between your legs, grinding her pussy against your lips as she gets to work.'
+											*nl
+											'Feeling her tongue lapping against your pussy like her life depended on it, you don''t want to let her finish you without reciprocating. Equally enthusiastically you stick out your tongue and lick up her juices from her budding flower, and soon enough it feels like a contest as to which of you can get the other off first. Julia wins: even though you tried to fight it as long as you could, your body spasms against her tongue as you groan into her pussy in orgasm.'
+											gs 'arousal', 'cuni_give', 15, 'lesbian'
+											$orgasm_or = 'yes'
+											gs 'arousal', 'cuni', 15, 'lesbian'
+											gs 'stat'
+											*nl
+											'This sends Julia over the edge as well. Her hips squirm against your mouth, and you feel a splash of warm liquid hit you as her pussy squirts her sweet nectar all over your face. You lick up some of it, and then give Julia another deep kiss. Quickly leaving the room to wash up, you return a minute later and cuddle for a while.'
+
+											act 'Relax in Julia''s room':
+												gs 'arousal', 'end'
+												gt 'JuliaMilHome', 'julia_room'
+											end
 										end
-										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/sex/julick.jpg"></center>'
-										'You and Julia giddily take off your clothes and you lie back down on the bed. Julia, eager to taste you, throws her leg over your head and buries her face between your legs, grinding her pussy against your lips as she gets to work.'
-										'Feeling her tongue lapping against your pussy like her life depended on it, you don''t want to let her finish you without reciprocating. Equally enthusiastically you stick out your tongue and lick up her juices from her budding flower, and soon enough it feels like a contest as to which of you can get the other off first. Julia wins: even though you tried to fight it as long as you could, your body spasms against her tongue as you groan into her pussy in orgasm.'
-										$orgasm_or = 'yes'
-										gs 'arousal', 'cuni', 15, 'lesbian'
-										'This sends Julia over the edge as well. Her hips squirm against your mouth, and you feel a splash of warm liquid hit you as her pussy squirts her sweet nectar all over your face. You lick up some of it, and then give Julia another deep kiss. Quickly leaving the room to wash up, you return a minute later and cuddle for a while.'
-
-										gs 'arousal', 'cuni_give', 15, 'lesbian'
+									end
+
+									act 'Ask her to please stop touching you': 
+										gs 'npc_relationship', 'modify', 'A12', 'hate'
 										gs 'arousal', 'end'
-										gs 'stat'
-								
-										act 'Relax in Julia''s room':gt $curloc
+										gt 'JuliaMilHome', 'julia_room'
 									end
 								end
 
-								act 'Ask her to please stop touching you': 
-									gs 'npc_relationship', 'modify', 'A12', 'hate' 
-									gt $curloc
+								act 'Whoa! Tell her to stop right now!':
+									gs 'npc_relationship', 'modify', 'A12', 'loathe' 
+									gt 'JuliaMilHome', 'julia_room'
 								end
 							end
-										
-							act 'Whoa! Tell her to stop right now!':
-								gs 'npc_relationship', 'modify', 'A12', 'loathe' 
-								gt $curloc
-							end
 						end
-
-						gs 'arousal', 'end'
-						gs 'stat'
-										
-						act 'Relax in Julia''s room':gt $curloc
 					end
 				end
 			end
 		end
+		act 'Chat with Julia': gt 'JuliaMilHome', 'julia_chat'
+	end
+end
 
-		act 'Chat with Julia':
-			cls
-			menu_off = 1
-			minut += 15
-			JulMilBestFrend += 1
+if $ARGS[0] = 'julia_chat':
+	menu_off = 1
+	minut += 2
+	gs 'stat'
+	
+	*clr & cla
+	if npc_sex['A12'] = 1 and juliaQW['date'] = 0:
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+		'When you enter the room, you immediately notice she seems different, she seems excited and is smiling more than normal.'
+		'You look at Julia, slightly confused, "What''s up, Julia?"'
+		'She smiles at you as she says, "Well, we''ve spent a lot of time together and we... you know, so I figured it would be nice to make it official."'
+		'Not sure what you means you ask, "Make what official?"'
+		'Julia is silent a moment before she asks. "<<$pcs_nickname>> Will you be my girlfriend?"'
+
+		act 'Tell her no':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+			'You shake your head no. "I''m sorry if you got the wrong impression Julia. I like you I really do, but I don''t want to be your girlfriend."'
+			'She looks heart broke like she might cry. "Is there someone else?"'
+			'You sigh slightly. "It''s not that, I just don''t want to be anyones girlfriend right now. Can''t we just keep doing what we are? Be friends and stuff?"'
+			*nl
+			'Tears start to roll down her cheeks, then she stands up. "I get it, you want to just date anyone, well I can''t do that. I thought we had something special but I guess I was wrong. Please leave now and never come back!" You know there is nothing you can say and trying to explain will only make things worse, so you get up and head for the door.'
+			'"I''ll see you later ok?" You say but she turns away from you. Once you close the door you can hear her crying. Not sure what else to do, you just leave.'
+
+			gs 'npc_relationship', 'modify', 'A12', -25
+			gs 'stat'
+
+			act 'Leave': gt 'pod_ezd', 'etaj_3'
+		end
+
+		act 'Tell her yes':
+			juliaQW['date'] = 1
+			gs 'npc_relationship', 'modify', 'A12', 'adore'
+			gs 'stat'
+
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+			'She gets a huge grin on her face, she pulls you up and into a tight fierce hug. She nuzzles your neck as the two of you hug. "You just made me the happiest girl in the world. I love you <<$pcs_nickname>>."'
+			act 'Tell her you love her too':
+				juliaQW['Julialove'] = 1
+				gs 'npc_relationship', 'modify', 'A12', 'adore'
+				gs 'stat'
+
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+				'You kiss her, once you break the kiss you say. "I love you too Julia."'
+				'You have never seen her look so happy, she looks at you like you are the most amazing thing in the world. She kisses you for a moment before shyly breaking away and putting a little space between you, but she holds your hand as you both sit on the bed.'
+
+				act 'Stop talking': gt 'JuliaMilHome','julia_room'
+				act 'Keep talking': gt 'JuliaMilHome', 'julia_chat'
+			end
+			act 'Say nothing, just hug him back':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+				'You kiss her and hug her back. You have never seen her look so happy, she looks at you like you are the most amazing thing in the world. She looks at you like you are the most amazing thing in the world. She kisses you for a moment before shyly breaking away and putting a little space between you, but she holds your hand as you both sit on the bed.'
+
+				act 'Stop talking': gt 'JuliaMilHome','julia_room'
+				act 'Keep talking': gt 'JuliaMilHome', 'julia_chat'
+			end
+		end
+	else
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+		'You sit on the bed with Julia just enjoying each others company.'
+
+		act 'Stop talking': gt 'JuliaMilHome','julia_room'
+
+		act 'Make small talk':
+			minut += 5
+			gs 'npc_relationship', 'modify', 'A12', 'like'
 			gs 'stat'
+
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-			'You spend 15 minutes talking with Julia about whatever topics come to mind. She really is a nice girl.'
-			tiprand = rand(0, 5)
+			'You talk with Julia about a variety of things, mostly about his friends and the other Gopniks. He doesn''t ask about your life at all.'
+
+			act 'Keep talking': gt 'JuliaMilHome', 'julia_chat'
+			act 'Stop talking': gt 'JuliaMilHome','julia_room'
+		end
+
+		act 'Ask about the future':
+			minut += 5
+			gs 'npc_relationship', 'modify', 'A12', 'like'
+			gs 'stat'
+
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+			'"What do you plan to do after school?" you ask.'
+			'She looks at you smiling; "I''m going to the to the University in Saint Petersburg."'
+			'Before you can say something she asks you. "What about you? What are your plans for the future?"'
+
+			act 'I don''t know':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+				'"I''m not sure, I have a few options I guess." You tell her.'
+				'She nods a bit. "Well you still have some time to decided what you want to do."'
+				'Not sure what more to say about it, you decided to change the subject.'
+
+				act 'Stop talking': gt 'JuliaMilHome', 'julia_room'
+				act 'Keep talking': gt 'JuliaMilHome', 'julia_chat'
+			end
 
-			!JuliaNatSexProposed is a flag required in the upcoming rework of Natasha Belova''s questline
+			act 'Go to the University':
+				gs 'npc_relationship', 'modify', 'A12', 'like'
+				gs 'stat'
+				
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+				'You get a bit excited. "I am planning to attend the University too. Now I will for sure know someone there."'
+				'She grins. "That''s great maybe we can hang out there as well."'
+
+				act 'Stop talking': gt 'JuliaMilHome', 'julia_room'
+				act 'Keep talking': gt 'JuliaMilHome', 'julia_chat'
+			end
+		end
+
+		act 'Ask what she''s been up to':
+			minut += 5
+			gs 'npc_relationship', 'modify', 'A12', 'like'
+			gs 'stat'
 			
-			if tiprand = 0:
-				'Julia mentions in passing that she used to be friends with Natasha Belova, but cut the ties after Natasha kept borrowing money despite not being able to pay any of it back. Julia frowns, and you can tell they used to get along quite well.'
-				if SexTalkJulia = 4 and NatbelQW['QWstage'] > 8 and JuliaNatSexProposed = 0:
-					'"Well, I''ve had the same problem with her. But lately I''ve started making her repay me in other ways." You admit to Julia.'
-					'"What? How could she repay you if she doesn''t have any money?" Julia asks you.'
-					'"Well, she does know how to use that mouth of hers. I''ve been putting it to good use." You answer, blushing.'
-					'You notice Julia''s cheeks flushing red at this comment. She''s clearly getting aroused just by talking of this.'
-					if strapon = 1:
-						'"You know, I''ve bought myself a strap-on. I was planning to use it on Natasha." You admit.'
-						'"If you''re up for it, you could get yourself one too and we can both have some fun with Natasha." You offer.'
-						'"That does sound, uhm ..., like it could be a lot of fun." Julia responds, unconsciously rubbing her thighs together. "Ok, I''m in."'
-						JuliaNatSexProposed = 1
-					else
-						'Maybe I can find a way to get Julia to join me and Natasha some time, you think to yourself.'
-					end
-				end
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+			'You ask her, "So what have you been up to lately?"'
+			'She gives you a smile. "Oh you know the normal studying, playing games, think about our DnD campaign."'
+			'You talk for a bit about what you have both been up too since you last talked.'
+
+			act 'Stop talking': gt 'JuliaMilHome','julia_room'
+			act 'Keep talking': gt 'JuliaMilHome', 'julia_chat'
+		end
+		if juliaQW['date'] = 1:
+			act 'Break up with her':
+				juliaQW['date'] = -1
+				gs 'npc_relationship', 'modify', 'A12', -30
+				minut += 15
+				gs 'stat'
+				
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/Julia/Juliacry.jpg"></center>'
+				'You quietly walk in and sit on the bed next to Julia.'
+				'Julia looks at you questioningly, "<<$pcs_nickname>>..."'
+				'You frown as you look at her. "We need to talk."'
+				'Julia asks. "Ok about what?"'
+				'You sigh, "I think we should break up."'
+				*nl
+				'Julia starts to cry, "Why <<$pcs_nickname>>? What did I do wrong?"'
+				'You get up to put a little space between you. "It''s not you... I just don''t love you anymore."'
+				'Julia openly starts to cry. "Is it someone else?"'
+				'You shake your head, "No, your a great, I just feel differently now is all." You try to comfort her and she begs and pleads you not to do this, but after some time you finally get up. "I''m sorry but this is over. I''m truly sorry." With that you turn and walk out, leaving Julia crying behind you.'
+
+				act 'Leave Julia''s apartment':minut += 5 & gt 'pod_ezd','etaj_3'
 			end
-			act 'Relax in Julia''s room':gt $curloc
 		end
 	end
 end
 
-act 'Leave Julia''s apartment':gt 'pod_ezd','etaj_3'
+		!!I commented this out for now as it needs to be more meaningful, like dating her for awhile
+		!!if tiprand = 0:
+			!!'Julia mentions in passing that she used to be friends with Julia Milov, but cut the ties after Julia kept borrowing money despite not being able to pay any of it back. Julia frowns, and you can tell they used to get along quite well.'
+			!!if julia[SexTalkJulia] = 4 and NatbelQW['QWstage'] > 8 and julia[JuliaNatSexProposed] = 0:
+				!!'"Well, I''ve had the same problem with her. But lately I''ve started making her repay me in other ways." You admit to Julia.'
+				!!'"What? How could she repay you if she doesn''t have any money?" Julia asks you.'
+				!!'"Well, she does know how to use that mouth of hers. I''ve been putting it to good use." You answer, blushing.'
+				!!'You notice Julia''s cheeks flushing red at this comment. She''s clearly getting aroused just by talking of this.'
+				!!if strapon = 1:
+					!!'"You know, I''ve bought myself a strap-on. I was planning to use it on Julia." You admit.'
+					!!'"If you''re up for it, you could get yourself one too and we can both have some fun with Julia." You offer.'
+					!!'"That does sound, uhm ..., like it could be a lot of fun." Julia responds, unconsciously rubbing her thighs together. "Ok, I''m in."'
+					!!julia[JuliaNatSexProposed] = 1
+				!!else
+					!!'Maybe I can find a way to get Julia to join me and Julia some time, you think to yourself.'
+				!!end
+			!!end
+		!!end
+		!!act 'Relax in Julia''s room':gt $curloc
+	!!end
+!!end
+
+if $ARGS[0] = 'julia_go':
+	menu_off = 1
+	*clr & cla
+	'<center><b><font color="maroon">Julia Milova, your classmate</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+	'As you approach Julia after school, she smiles at you and asks, "Hi <<$pcs_nickname>>! Want to go to my place? We can do our homework together, and maybe grab a bite to eat?"'
+
+	act 'Go with Julia':
+		if juliaQW['home_unlocked'] = 0: juliaQW['home_unlocked'] = 1
+		minut += 15
+		gs 'stat'
+
+		*clr & cla
+		'<center><b><font color="maroon">Julia Milova, your classmate</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+		'You go to Julia''s apartment together, she lives just above you. During the 15 minute walk you chat about random things that happened at school that day.'
+
+		act 'Enter her apartment':gt 'JuliaMilHome', 'julia_room'
+	end
+end
 
 --- JuliaMilHome ---------------------------------
 

+ 0 - 23
locations/JuliaMilVhod.qsrc

@@ -1,23 +0,0 @@
-# JuliaMilVhod
-
-CLOSE ALL
-menu_off = 1
-*clr & cla
-
-if BeInJulMilHome = 0:BeInJulMilHome = 1
-gs'stat'
-
-act 'Leave':gt'pod_ezd','etaj_3'
-if kanikuli = 0 and hour > 6 and hour < 15 and week < 6:
-	'You ring the door bell, but no one comes to answer. Julia must not be home.'
-elseif hour > 20 :
-	'It''s too late in the day to visit Julia.'
-elseif hour < 8:
-	'It''s too early in the day to visit Julia.'
-else
-	'You ring the door bell. You hear footsteps in the apartment and sure enough, a few seconds later Julia opens the door. "Oh, hi <<$pcs_nickname>>! Come on in!"'
-	act 'Enter Julia''s apartment':gt'JuliaMilHome'
-end
-
---- JuliaMilVhod ---------------------------------
-

+ 2 - 0
locations/KatjaHomeTalk.qsrc

@@ -237,6 +237,8 @@ if $ARGS[0] = 'chat':
 		'Katja looks at you with a smile.'
 	end
 
+	func('npc_reactions', 'general', 'A14')
+
 	if lernHome > 0 and katjaQW['QWstage'] >= 2: 
 		!!If you have homework you can do it with Katja.
 		act 'Do your homework together': 

+ 126 - 32
locations/brother2.qsrc

@@ -145,6 +145,9 @@ if $ARGS[0] = 'kiss':
 	act'Finish':gt'brother2','kiss_end'
 	act'Keep making out':gt'brother2','kiss2'
 
+	if brother_lesson_oral = 1:
+		act 'Have him give you head':gt'brother2','cuni'
+	end
 	if brotherSex >= 4:
 		act'Give him a handjob':gt'brother2','hj'
 	end
@@ -180,50 +183,137 @@ if $ARGS[0] = 'kiss_end':
 	act'Finish':gt 'sitrPar'
 end
 
-if $ARGS[0] = 'hj':
-	brotherhj += 1
+if $ARGS[0] = 'cuni':
+	brothercuni += 1
 	npc_rel['A34'] += 1
 	cla & *clr
-	gs 'arousal', 'hj', rand(1,3)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/hj.jpg"></center>'
-	'Snaking your hand into his pants, you pull out his cock, jerking him off with the same vigor you continue to kiss him with.'
-	brohj = 1
-	act'Keep going':
-		cla
-		*nl
-		gs 'arousal', 'hj', rand(1,3)
+	'"Kolka, you know you told me that you wanted more because I taste good?" you ask and Kolka looks a little confused.' 
+	'"I... What?"'
+	'"When we were doing your anatomy homework, and you said that I tasted good?"'  
+	'Kolka looks a little embarrassed. "Umm, yeah?"' 
+	'You smile sweetly. "Would you like another taste?"' 
+	'He smiles broadly. "Absolutely!"'
+	act'Undress':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/kuni/pussylick1.mp4"></center>'
+		'You quickly undress and get comfortable, Kolka watching you intensely as you do so.  Sitting on the couch with your ass near the edge, you lay back and spread your legs as Kolka eagerly puts his head between them and starts to explore your rapidly wetting pussy.'
+		$orgasm_or = 'no'
+		gs 'arousal', 'cuni', rand(1,3)
 		gs 'stat'
-		'You continue to give him a handjob while making out with him until you feel his body start to stiffen beneath yours. You think he''s probably about to cum.'
-		act'Let him cum in your hand':
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/hj_cum.jpg"></center>'
-			'Not stopping, you quicken your pace until you feel ropes of his thick cum spattering against your hand.'
-			'Moving your head back, you survey your handiwork before smiling back at him and leaning in for a peck on the lips before getting up to find some tissues for your brother and to wash off your hand.'
-			gs 'arousal', 'end'
-			gs 'stat'
-			act 'Finish': gt 'sitrPar'
-		end
-		act'Put your lips over the tip':
+		act'Enjoy':
 			cla & *clr
-			gs 'arousal', 'bj', 1
-			gs 'cum_call', 'mouth_swallow', 'A34', 1
-			gs 'arousal', 'end'
+			'<center><video autoplay loop src="images/shared/sex/kuni/pussylick3.mp4"></center>'
+			'His tongue laps, flicks and probes at your intimate hole. Anything he lacks in skill he more than makes up in enthusiasm.'
+			'He moves between sucking on your clit and plunging his tongue deep into you.  The licking and sucking makes an obscene noise, and you have to fight the urge to loudly moan.'
+			$orgasm_or = 'no'
+			gs 'arousal', 'cuni', rand(3,5)
 			gs 'stat'
-			npc_rel['A34'] += 3
-			if brotherSex < 6: brotherSex = 6
-			'<center><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/homework/swallow.mp4"></video></center>'
-			'You break away from the kiss and moving quickly, you wrap your lips around the tip of his cock. No sooner than your mouth envelopes him do you feel his cum explode inside you, the taste his hot salty cum filling your mouth.'
-			'He spurts several times and you wait a several seconds more until nothing more comes out. After spending a moment to make sure he''s finished, you suck hard to gather up all the cum in your mouth while pulling your lips back from his tip and leaving his cock completely clean and cum free. As your lips leave his cock, you tilt back your head to look at him, swallowing in the same motion. Kolka stares at you in disbelief of what you just did.'
-			'"I didn''t want to leave a mess," you smile bashfully.'
-			'Licking his tip a few more times, you ensure that his cock is clean enough to put back inside his trousers, happily giving him a kiss on the cheek as he does so.'
-			act 'Finish': gt 'sitrPar'
+			act'Keep going':
+				cla & *clr
+				'<center><video autoplay loop src="images/shared/sex/kuni/pussylickorgasm.mp4"></center>'
+				$orgasm_txt = 'As the sensations build, you find yourself gripping onto his head when your mind goes blank as Kolka''s tongue makes another deep probe. You can feel your muscles clamp down as a wonderful orgasm violently bursts though you.'  
+				$orgasm_or = 'custom'
+				gs 'arousal', 'cuni', rand(3,5)
+				gs 'stat'
+				'Your legs are trembling uncontrollably as your previous actions are reversed, and you start trying to push Kolka off. He pushes against your hands as he returns to your clit. Catching your breath, you reluctantly have to tell him to stop.'
+				act'Enough':
+					cla & *clr
+					gs 'underwear', 'wear'
+					gs 'clothing', 'wear_last_worn'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/12.jpg"></center>'
+					'After a few more blissful seconds, he pulls back and asks "Are you sure you want me to stop?"'
+					'"As much as I wish we could keep going, I don''t want to push our luck," you reply.'
+					*nl
+					'You get dressed as Kolka grabs a shirt from his pile of clothes and wipes his face clean.'
+					$orgasm_or = 'no'
+					gs 'arousal', 'cuni', 1
+					gs 'arousal', 'end'
+					act 'Finish': gt 'sitrPar'
+					act 'Give him a handjob':
+						brotherhj += 1
+						npc_rel['A34'] += 1
+						cla & *clr
+						gs 'arousal', 'hj', rand(1,3)
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/hj.jpg"></center>'
+						'"Do you want me to give you a <i>hand</i>?" you ask sweetly.'
+						'"I thought you didn''t want to push our luck?" Kolka asks and you sweetly smile.'
+						'"Well, if you don''t want to..."'
+						'Kolka pulls his already very hard cock out. "No! I want to!"'
+						'You start jerking it as you lean in to kiss him.'
+						act'Give him a handjob':gt'brother2','hj'
+					end
+					act 'Give him a blowjob':
+						cla & *clr
+						npc_rel['A34'] += 2
+						gs 'arousal', 'bj', rand(1,5)
+						gs 'stat'
+						if brotherSex < 6: brotherSex = 6
+						brotherbj += 1
+						'"Get that cock out and I''ll return the favour," you tell him and he starts pulling his cock out.'
+						'"I thought we were short of time?" he asks and you smile.'
+						'"You won''t take that long..."'  
+						'"Shut up!" he retorts as he guides your head towards his hard cock.'
+						'It doesn''t take long before you feel his body start to tense up.'
+						'"OH God, I''m going to cum sis."'
+						gs 'brother2', 'bj2'
+					end
+				end
+			end
 		end
 	end
-	
+end
+
+if $ARGS[0] = 'hj':
+	brotherhj += 1
+	npc_rel['A34'] += 1
+	cla & *clr
+	gs 'arousal', 'hj', rand(1,3)
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/hj.jpg"></center>'
+	'Snaking your hand into his pants, you pull out his cock. It is painfully erect in a way only a teenage boy anticipating sexual relief can be.'
+	'You wrap your hand around it feeling the warmth and his quickening pulse. Continuing to kiss him you start to pump it vigorously, your mouth suppressing his moans and gasps as you work his cock hard and fast.'
+	brohj = 1
+	act'Keep going': gt 'brother2', 'hj2'
 	act'Give him a blowjob':gt'brother2','bj'
 end
 
+if $ARGS[0] = 'hj2':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/hj.jpg"></center>'
+	'You continue to give him a handjob while making out, your arm is complaining with the effort but you know you have to get him off quickly.'
+	'It doesn''t take long before you feel his body start to stiffen beneath yours. He must be about to cum.'
+	gs 'arousal', 'hj', rand(1,3)
+	gs 'stat'
+	act'Let him cum in your hand':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/hj_cum.jpg"></center>'
+		'Not stopping, you quicken your pace still further until you feel ropes of his thick cum spattering against your hand.'
+		'Moving your head back, you survey your handiwork before smiling back at him and leaning in for a peck on the lips before getting up to find some tissues for your brother and to wash off your hand.'
+		gs 'arousal', 'end'
+		gs 'stat'
+		act 'Finish': gt 'sitrPar'
+	end
+	act'Put your lips over the tip':
+		cla & *clr
+		gs 'arousal', 'bj', 1
+		gs 'cum_call', 'mouth_swallow', 'A34', 1
+		gs 'arousal', 'end'
+		gs 'stat'
+		npc_rel['A34'] += 3
+		if brotherSex < 6: brotherSex = 6
+		'<center><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/homework/swallow.mp4"></video></center>'
+		'You break away from the kiss and moving quickly, you wrap your lips around the tip of his cock. The additional stimulus from your mouth enveloping him is more than he can handle and his cum explodes inside you, the taste of his hot salty cum filling your mouth.'
+		'He spurts several times and you wait a several seconds more until nothing more comes out. After spending a moment to make sure he''s finished, you suck hard to gather up all the cum in your mouth while pulling your lips back from his tip and leaving his cock completely clean and cum free. As your lips leave his cock, you tilt back your head to look at him, swallowing in the same motion. Kolka stares at you in disbelief of what you just did.'
+		'"I didn''t want to leave a mess," you smile bashfully.'
+		'Licking his tip a few more times, you ensure that his cock is clean enough to put back inside his trousers, happily giving him a kiss on the cheek as he does so.'
+		act 'Finish': gt 'sitrPar'
+	end
+end
+
 if $ARGS[0] = 'bj':
 	cla & *clr
 	npc_rel['A34'] += 2
@@ -244,6 +334,10 @@ if $ARGS[0] = 'bj':
 	end
 	'Taking his cock in your mouth, you begin to move your lips up and down his shaft, sucking gently. After an indeterminate amount of time goes by, you hear your brother''s voice.'
 	'"<<$pcs_nickname>>!" he whispers harshly. "I''m gonna cum!"'
+	gs 'brother2', 'bj2'
+end
+
+if $ARGS[0] = 'bj2':
 	act'Keep sucking':
 		cla & *clr
 		gs 'cum_call', 'mouth_swallow', 'A34', 1

+ 44 - 34
locations/brother_lessons.qsrc

@@ -668,54 +668,63 @@ if $ARGS[0] = 'anatomylesson3':
 				'"The next part I can''t actually show you, but I might as well show you where it should be," you say. You spread your pussy lips apart and let him look inside. "Normally, there''s something called a ''hymen'' here. You can see a diagram of it in your textbook. Every girl is born with one and will have it until it gets torn."'
 			end
 			
-			'"How does it get torn?" Kolka quickly asks while continuing to stare at yours in wonder.'
-			'"Well, it can get torn in a number of ways but the most common is when a girl loses her virginity. We''ll talk about this more next time, but when a boy and a girl have sex, the boy sticks his penis inside the girl''s vagina. The only way to get the penis all the way inside is to push through the hymen and break it. It usually causes a small amount of bleeding. That''s why they call it ''popping a cherry,''" you smile.'
+			'"How does it get torn?" Kolka quickly asks while continuing to stare at your pussy as if trying to imprint it into his mind.'
+			'"Well, it can get torn in a number of ways, but the most common is when a girl loses her virginity. We''ll talk about this more next time, but when a boy and a girl have sex, the boy sticks his penis inside the girl''s vagina."' 
+			*nl
+			if brotherSex = 7:
+				'Kolka interrupts you. "Duh! I know the penis goes in, I was there!"'
+				'"You asked. Now let me get back to the lesson!" you reply in annoyance and Kolka raises his hands in surrender before you continue.'
+			end
+			'"Anyway, the boy sticks his penis inside the girl''s vagina and the only way to get the penis all the way inside is to push through the hymen and break it. It usually causes a small amount of bleeding. That''s why they call it ''popping a cherry.''"'
 
 			if vagtype = 0:
 				'He continues to look at your hymen for a few moments before asking, "So... does this mean..."'
 				'"That I''ve never had sex? Yeah Kolka. It means I''m a virgin." The admittance causes you to blush for some reason, you''re not sure why.'
 			else
-				'He takes note of your clear lack of a hymen and asks, "So... does this mean you''ve... you know...?"'
-				if guy > 0:
-					'"That I''ve had sex? Yeah. Someone already took my v-card," You say somewhat proudly. "But don''t tell <<$npc_nickname[''A29'']>>!"'
-				else
-					'"That I''ve had sex? No actually. I actually broke mine-" You stop and blush with the realization of what you''re about to admit. "mastur... bating..."'
-				end
+				'He takes note of your clear lack of a hymen. "So... When we... Was it painful?"'
+				'"A little. There was a fairly sharp pain followed by a dull ache, but it went away before the end," you say somewhat proudly. "But don''t assume that all girls are the same. For some unlucky ones, it may be too painful to continue once their cherry is popped, but other girls say that they barely noticed it happening."'
 			end
 			'He nods in acknowledgement while writing down some more notes.'
 			*nl
 
-			if vagtype = 2:
-				'"Is it supposed to look this loose?" he asks, causing you to blush hard.'
-			elseif vagtype = 3:
-				'<br>	"Woah! It''s like a cave in there! Are they all this wide?" he exclaims. You blush harder than you think you''ve ever blushed in your life.'
-			end
-		
-			if (vagtype = 2 or vagtype = 3) and guy > 0:
-				act'"I''ve had a lot of sex"':
-					cla
-					'"I''ve had a lot of sex..." you say slowly.'
-					'After a couple more questions, you continue on with the lesson.'
-					act'Continue':gt'brother_lessons', 'anatomylesson4'
+			if brotherSex = 7:
+				'"So if you''re ever given the chance to add to your V-card collection, listen and be understanding," you tell him and he nods.'
+				'After a few more questions, you continue with the lesson.'
+				'After a couple more questions, you continue on with the lesson.'
+				act'Continue':gt'brother_lessons', 'anatomylesson4'
+			else
+				if vagtype = 2:
+					'"Is it supposed to look this loose?" he asks, causing you to blush hard.'
+				elseif vagtype = 3:
+					'<br>	"Woah! It''s like a cave in there! Are they all this wide?" he exclaims. You blush harder than you think you''ve ever blushed in your life.'
 				end
+			
+				if (vagtype = 2 or vagtype = 3) and guy > 0:
+					act'"I''ve had a lot of sex"':
+						cla
+						'"I''ve had a lot of sex..." you say slowly.'
+						'After a couple more questions, you continue on with the lesson.'
+						act'Continue':gt'brother_lessons', 'anatomylesson4'
+					end
 
-				act'"There''ve been a few... big ones..."':
-					cla
-					'"There''ve been..." you don''t really know how to say this without saying it. "There have been a few uhh, big guys inside me...", you trail off.'
+					act'"There''ve been a few... big ones..."':
+						cla
+						'"There''ve been..." you don''t really know how to say this without saying it. "There have been a few uhh, big guys inside me...", you trail off.'
+						'After a couple more questions, you continue on with the lesson.'
+						act'Continue':gt'brother_lessons', 'anatomylesson4'
+					end
+				elseif vagtype = 2:
+					'"I masturbate a lot..."'
+					'After a couple more questions, you continue on with the lesson.'
+					act'Continue':gt'brother_lessons', 'anatomylesson4'
+				elseif vagtype = 3:
+					'"No... Not all..." you force out. "I masturbate a lot, okay...?" you mutter somewhat ashamed.'
+					'After a couple more questions, you continue on with the lesson.'
+					act'Continue':gt'brother_lessons', 'anatomylesson4'
+				else
 					'After a couple more questions, you continue on with the lesson.'
 					act'Continue':gt'brother_lessons', 'anatomylesson4'
 				end
-			elseif vagtype = 2:
-				'"I masturbate a lot..."'
-				'After a couple more questions, you continue on with the lesson.'
-				act'Continue':gt'brother_lessons', 'anatomylesson4'
-			elseif vagtype = 3:
-				'"No... Not all..." you force out. "I masturbate a lot, okay...?" you mutter somewhat ashamed.'
-				'After a couple more questions, you continue on with the lesson.'
-				act'Continue':gt'brother_lessons', 'anatomylesson4'
-			else
-				'After a couple more questions, you continue on with the lesson.'
-				act'Continue':gt'brother_lessons', 'anatomylesson4'
 			end
 		end
 	end
@@ -757,6 +766,7 @@ if $ARGS[0] = 'anatomylesson4':
 		'"Yeah!" he almost shouts.'
 		'You curl your index finger, motioning for him to come closer as you get up on the couch and invite him in between your legs. "Well then hurry up and get your head down here! Come find out what a girl tastes like!"'
 		act'Continue':
+			brother_lesson_oral = 1
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/kuni/pussylick1.mp4"></center>'
 			'You instruct him as best you can as he leans in and starts giving you head. It''s a little rough at first but with your encouragement he starts to focus more on your clit, licking and swirling his tongue around it.'

+ 3 - 0
locations/cikl.qsrc

@@ -629,6 +629,9 @@ end
 !!Resetting the counter for relationship modifications that are limited in how many time a day they can be applied.
 killvar 'npc_rel_daily'
 
+!!Resetting the counters for npc reactions after certain time periods have passed.
+gs 'npc_reactions', 'cikl'
+
 !!Keeping Christina hating Sveta
 gs 'Zvereva_events', 'cikl'
 

+ 2 - 2
locations/city_hotel.qsrc

@@ -39,7 +39,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 	act 'Leave': minut += 5 & gt 'city_center'
 
-	if hotelRoomDays['city_hotel'] - daystart >= 1:
+	if hotelRoom['city_hotel'] ! 0:
 		act 'Go to your room':
 			$hotel = 'city_hotel'
 			if hotelRoom['city_hotel'] = 1:gt'hotelroom','normal'
@@ -98,7 +98,7 @@ if $ARGS[0] = 'reception':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hotel/receptionist.jpg"></center>'
 			'She looks in the computer: "I see you already have a room here. As it is already booked and paid for the only way to change it to a different room, would be to cancel your existing booking. To do so without notice would forfeit your payment, I would advise against this, but you may do so if you wish."'
-			act'Yes, cancel your booking':hotelroom=0 & gt'city_hotel'
+			act'Yes, cancel your booking':hotelRoom['city_hotel'] = 0 & gt'city_hotel'
 			act'No':gt'city_hotel'
 		elseif hotelRoom['city_hotel'] = 0:
 			act 'Yes':

+ 67 - 36
locations/food.qsrc

@@ -29,15 +29,21 @@ if $ARGS[0] = 'pirosh':
 	pcs_breath = 0
 	gs 'food', 'aftermeal'
 	'<center><img <<$set_imgh>> src="images/shared/food/pirozhki.jpg"></center>'
-	'You enjoy some vegetarian Piroshki, and <<$mtxt>>'
-	gs 'stat'
-	killvar '$_eat'
-
-	if food_loc = 1:
-		act 'Finish': gt 'food_menu'
+	if $loc = 'uni_cafe':
+		uni_lunch_bought = 1
+		'You buy some vegetarian Piroshki.'
+		gs 'uni_cafe', 'sitting_choice'
 	else
-		act 'Finish':gt $loc, $loc_arg
+		'You enjoy some vegetarian Piroshki, and <<$mtxt>>'
+		gs 'stat'
+		if food_loc = 1:
+			act 'Finish': gt 'food_menu'
+		else
+			act 'Finish':gt $loc, $loc_arg
+		end
 	end
+
+	killvar '$_eat'
 end
 
 if $ARGS[0] = 'golub':
@@ -59,15 +65,21 @@ if $ARGS[0] = 'golub':
 	pcs_breath = 0
 	gs 'food', 'aftermeal'
 	'<center><img <<$set_imgh>> src="images/shared/food/golubtsy.jpg"></center>'
-	'You enjoy some well made Golubtsy in a tomato sauce. The portions were moderate and<<$mtxt>>'
-	gs 'stat'
-	killvar '$_eat'
-
-	if food_loc = 1:
-		act 'Finish': gt 'food_menu'
+	if $loc = 'uni_cafe':
+		uni_lunch_bought = 1
+		'You buy some well made Golubtsy in a tomato sauce. The portions is of moderate size.'
+		gs 'uni_cafe', 'sitting_choice'
 	else
-		act 'Finish':gt $loc, $loc_arg
+		'You enjoy some well made Golubtsy in a tomato sauce. The portions were moderate and<<$mtxt>>'
+		gs 'stat'
+		if food_loc = 1:
+			act 'Finish': gt 'food_menu'
+		else
+			act 'Finish':gt $loc, $loc_arg
+		end
 	end
+
+	killvar '$_eat'
 end
 
 if $ARGS[0] = 'pozhar':
@@ -89,15 +101,21 @@ if $ARGS[0] = 'pozhar':
 	pcs_breath = 0
 	gs 'food', 'aftermeal'
 	'<center><img <<$set_imgh>> src="images/shared/food/pozharsky.jpg"></center>'
-	'You thoroughly enjoy the nicely cooked Pozharsky Cutlets. The portions were moderate and<<$mtxt>>'
-	gs 'stat'
-	killvar '$_eat'
-
-	if food_loc = 1:
-		act 'Finish': gt 'food_menu'
+	if $loc = 'uni_cafe':
+		uni_lunch_bought = 1
+		'You buy a Pozharsky Cutlets. The portions is of moderate size.'
+		gs 'uni_cafe', 'sitting_choice'
 	else
-		act 'Finish':gt $loc, $loc_arg
+		'You thoroughly enjoy the nicely cooked Pozharsky Cutlets. The portions were moderate and<<$mtxt>>'
+		gs 'stat'
+		if food_loc = 1:
+			act 'Finish': gt 'food_menu'
+		else
+			act 'Finish':gt $loc, $loc_arg
+		end
 	end
+
+	killvar '$_eat'
 end
 
 if $ARGS[0] = 'reuben':
@@ -119,15 +137,21 @@ if $ARGS[0] = 'reuben':
 	pcs_breath = 0
 	gs 'food', 'aftermeal'
 	'<center><img <<$set_imgh>> src="images/shared/food/reuben.jpg"></center>'
-	'You had trouble finishing the Rueben Sandwich, but you enjoyed it immensely. The portion was fairly large and<<$mtxt>>'
-	gs 'stat'
-	killvar '$_eat'
+	if $loc = 'uni_cafe':
+		uni_lunch_bought = 1
+		'You buy a Rueben Sandwich. It is quit large.'
+		gs 'uni_cafe', 'sitting_choice'
+	else
+		'You had trouble finishing the Rueben Sandwich, but you enjoyed it immensely. The portion was fairly large and<<$mtxt>>'
+		gs 'stat'
+		if food_loc = 1:
+			act 'Finish': gt 'food_menu'
+		else
+			act 'Finish':gt $loc, $loc_arg
+		end
+	end	
 
-	if food_loc = 1:
-		act 'Finish': gt 'food_menu'
-	else
-		act 'Finish':gt $loc, $loc_arg
-	end
+	killvar '$_eat'
 end
 
 if $ARGS[0] = 'bliny':
@@ -149,15 +173,22 @@ if $ARGS[0] = 'bliny':
 	pcs_breath = 0
 	gs 'food', 'aftermeal'
 	'<center><img <<$set_imgh>> src="images/shared/food/blini.jpg"></center>'
-	'You eat some bliny. The portions are fairly small and<<$mtxt>>'
-	gs 'stat'
-	killvar '$_eat'
-
-	if food_loc = 1:
-		act 'Finish': gt 'food_menu'
+	if $loc = 'uni_cafe':
+		uni_lunch_bought = 1
+		'You buy some bliny. The portions are fairly small.'
+		gs 'uni_cafe', 'sitting_choice'
 	else
-		act 'Finish':gt $loc, $loc_arg
+		'<center><img <<$set_imgh>> src="images/shared/food/blini.jpg"></center>'
+		'You eat some bliny. The portions are fairly small and<<$mtxt>>'
+		gs 'stat'
+		if food_loc = 1:
+			act 'Finish': gt 'food_menu'
+		else
+			act 'Finish':gt $loc, $loc_arg
+		end
 	end
+
+	killvar '$_eat'
 end
 
 if $ARGS[0] = 'varenfan':

+ 38 - 0
locations/food_menu.qsrc

@@ -436,6 +436,44 @@ elseif $loc = 'restoran':
 	$_drink['5,name'] = 'Glass of Champagne'
 	$_drink['5,type'] = 'bev_cha'
 	$_drink['5,price'] = 900
+elseif $loc = 'uni_cafe':
+	'<center><b><font color="maroon">University cafe</font></b></center>'
+	*nl
+	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
+	$_eat['0,name'] = 'Vegetarian Piroshki'
+	$_eat['0,type'] = 'pirosh'
+	$_eat['0,price'] = 100
+	$_eat['1,name'] = 'Herring Blini'
+	$_eat['1,type'] = 'bliny'
+	$_eat['1,price'] = 190
+	$_eat['2,name'] = 'Golubtsy'
+	$_eat['2,type'] = 'golub'
+	$_eat['2,price'] = 210
+	$_eat['3,name'] = 'Pozharsky Cutlets'
+	$_eat['3,type'] = 'pozhar'
+	$_eat['3,price'] = 290
+	$_eat['4,name'] = 'Rueben Sandwich'
+	$_eat['4,type'] = 'reuben'
+	$_eat['4,price'] = 340
+
+	$_drink['0,name'] = 'Water'
+	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,price'] = 'Free'
+	$_drink['1,name'] = 'Kvass'
+	$_drink['1,type'] = 'bev_kva'
+	$_drink['1,price'] = 60
+	$_drink['2,name'] = 'Juice'
+	$_drink['2,type'] = 'bev_jui'
+	$_drink['2,price'] = 80
+	$_drink['3,name'] = 'Spiced Tea'
+	$_drink['3,type'] = 'bev_tea'
+	$_drink['3,price'] = 120
+	$_drink['4,name'] = 'Black Coffee'
+	$_drink['4,type'] = 'bev_cof'
+	$_drink['4,price'] = 130
+	$_drink['5,name'] = 'Milkshake'
+	$_drink['5,type'] = 'bev_mil'
+	$_drink['5,price'] = 200
 end
 
 $_str = '<center><table border="0" width="800" cellpadding="0" cellspacing="1">'

+ 5 - 4
locations/gschool_grounds.qsrc

@@ -1,4 +1,5 @@
 # gschool_grounds
+!!2022/09/29 - Alaratt
 
 !Outside school building
 if $ARGS[0] = 'main':
@@ -245,9 +246,9 @@ if $ARGS[0] = 'main':
 			if anushkaFirstvisit = 0 and meet_after_school = 1: '<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka</a> is leaning against a tree just in front of the school.'
 			if LariskaQW['story'] >= 5 and cheerleaders_on = 0: 'You see <a href="exec:minut += 1 & gt ''LariskaGo''">Lariska</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
 			if christinaQW['subpath'] >= 4 and cheerleaders_on = 0: '<a href="exec:minut += 1 & gt ''Zvereva_house_events'', ''Chris_walk_home''">Christina Zvereva</a> is walking across the school courtyard, looking irritated.'
-			if JuliaMilLernQW >= 1: '<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia</a> is sitting out on the courtyard, reading a book.'
+			if juliaQW['study_unlocked'] >= 1: '<a href="exec:minut += 1 & gt ''JuliaMilHome'', ''julia_go''">Julia</a> is sitting out on the courtyard, reading a book.'
 			if NatbelQW['QWstage'] > 0: '<a href="exec:minut += 1 & gt ''natbelEv'', ''natbel_go''">Natasha</a> is standing in a corner.'
-			if artemLernQW >= 1 and artemVitokQW ! 2 and artemQW['artemblok'] = 0 and  artemQW['artlie'] ! 2 and artemQW['artembrokenheart'] ! 1: '<a href="exec:minut += 15 & gt ''artem_events'', ''start''">Artem</a> is waiting for you near the school entrance.'
+			if artemLernQW >= 1 and artemVitokQW ! 2 and artemQW['artemblok'] = 0 and artemQW['artlie'] ! 2 and artemQW['artembrokenheart'] ! 1: '<a href="exec:minut += 15 & gt ''artem_events'', ''start''">Artem</a> is waiting for you near the school entrance.'
 			if katjaQW['afterschool_hangout_day'] ! daystart and katjaQW['QWstage'] >= 1 and locat['katja'] = 6: '<a href="exec:minut += 15 & gt ''katjaEv''">Katja</a> is walking across the school courtyard, getting ready to go home.'
 			if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:
 				'<a href="exec:minut += 15 & gt ''dimaEv'', ''after_school''">Dimka</a> is deep in thought, as he leans against a lamp post.'
@@ -274,9 +275,9 @@ if $ARGS[0] = 'main':
 			if anushkaFirstvisit = 0 and meet_after_school = 1: gs 'show_table', '<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka Konstantinov</a>', '5'
 			if LariskaQW['story'] >= 5 and cheerleaders_on = 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a>', '5'
 			if christinaQW['subpath'] >= 4 and cheerleaders_on = 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''Zvereva_house_events'', ''Chris_walk_home''">Christina Zvereva</a>', '5'
-			if JuliaMilLernQW >= 1: gs 'show_table', '<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a>', '5'
+			if juliaQW['study_unlocked'] >= 1: gs 'show_table', '<a href="exec:minut += 1 & gt ''JuliaMilHome'', ''julia_go''">Julia Milova</a>', '5'
 			if NatbelQW['QWstage'] > 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''natbelEv'', ''natbel_go''">Natasha Belova</a>', '5'
-			if artemLernQW >= 1 and artemVitokQW ! 2 and artemQW['artemblok'] = 0 and  artemQW['artlie'] ! 2 and artemQW['artembrokenheart'] ! 1: gs 'show_table', '<a href="exec:minut += 15 & gt ''artem_events'', ''start''">Artem Chebotarev</a>', '5'
+			if artemLernQW >= 1 and artemVitokQW ! 2 and artemQW['artemblok'] = 0 and artemQW['artlie'] ! 2 and artemQW['artembrokenheart'] ! 1: gs 'show_table', '<a href="exec:minut += 15 & gt ''artem_events'', ''start''">Artem Chebotarev</a>', '5'
 			if katjaQW['afterschool_hangout_day'] ! daystart and katjaQW['QWstage'] >= 1 and locat['katja'] = 6: gs 'show_table', '<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a>', '5'
 			if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:
 				gs 'show_table', '<a href="exec:minut += 15 & gt ''dimaHome'', ''home''">Dimka Nosov</a>', '5'

+ 2 - 2
locations/gschool_nerd_chats.qsrc

@@ -149,8 +149,8 @@ if $ARGS[0] = 'julia':
 	gs 'npc_relationship', 'modify', 'A12', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-	if JuliaMilLernQW = 0 and npc_rel['A12'] >= 60:
-		JuliaMilLernQW = 1
+	if juliaQW['study_unlocked'] = 0 and npc_rel['A12'] >= 60:
+		juliaQW['study_unlocked'] = 1
 		if fame['pav_slut'] >= 175:
 			'You approach Julia and explain how you''re struggling in school and could really use her help studying. She obliquely comments on your damaged reputation at school, but agrees to help you anyway. She doesn''t seem to care much either way as long as you don''t tell anyone.'
 		else

+ 5 - 5
locations/journal_quests.qsrc

@@ -137,13 +137,13 @@ if $ARGS[0] = 'start':
 		*nl
 		if fame['pav_slut'] < 200:
 			if npc_rel['A12'] >= 60:
-				if JuliaMilLernQW = 1:
-					if BeInJulMilHome = 1:
+				if juliaQW['study_unlocked'] = 1:
+					if juliaQW['home_unlocked'] = 1:
 						if wine = 1:
-							if JulMilBestFrend >= 5:
-								if SexTalkJulia >= 4:
+							if juliaQW['JulMilBestFrend'] >= 5:
+								if juliaQW['SexTalkJulia'] >= 4:
 									'Julia and I are in a sexual relationship now.'
-								elseif SexTalkJulia > 0:
+								elseif juliaQW['SexTalkJulia'] > 0:
 									'I should try getting Julia to tell me more about her sexual adventures.'
 								else
 									'I should try talking to Julia about sex.'

+ 2 - 0
locations/katja_chat.qsrc

@@ -278,6 +278,8 @@ if $ARGS[0] = 'chat1':
 
 	gs 'katja_procedural', 'face_color'
 
+	func('npc_reactions', 'general', 'A14')
+
 	!!if CloSkirtShortness > 0 and $pantyworntype = 'none':
 	!!	act 'Show Katja you''re not wearing panties': gt 'katja_procedural', 'makeup', 'katja_chat', 'chat'
 	!!end

+ 2 - 0
locations/katja_dorm.qsrc

@@ -217,6 +217,8 @@ if $ARGS[0] = 'chat':
 		'Katja looks at you with a smile.'
 	end
 
+	func('npc_reactions', 'general', 'A14')
+
 	act 'Chat with Katja':
 		!!The generic chat option.
 		cla & *clr

+ 5 - 5
locations/katja_meynold_schedule.qsrc

@@ -215,7 +215,7 @@ else
 						locat['katja']  = 27
 					end
 				else
-					!!University classsroom  - atending lecture
+					!!University classsroom  - attending lecture
 					locat['katja']  = 26
 				end
 			elseif hour < 13:
@@ -223,10 +223,10 @@ else
 					!!Coffee shop - eating lunch/hanging out
 					locat['katja']  = 30
 				elseif minut < 30:
-					!!University classsroom  - atending lecture
+					!!University classsroom  - attending lecture
 					locat['katja']  = 26
 				else
-					!!University cafeteria?? - eating lunch
+					!!University cafe - eating lunch
 					locat['katja']  = 28
 				end
 			elseif hour < 14:
@@ -240,7 +240,7 @@ else
 							locat['katja']  = 27
 						end
 					else
-						!!University classsroom  - atending lecture
+						!!University classsroom  - attending lecture
 						locat['katja']  = 26				
 					end
 				else
@@ -258,7 +258,7 @@ else
 							locat['katja']  = 31
 						end
 					else
-						!!University classsroom  - atending lecture
+						!!University classsroom  - attending lecture
 						locat['katja']  = 26				
 					end
 				else

+ 55 - 1
locations/katja_uni.qsrc

@@ -63,7 +63,7 @@
 !! katjaQW['knows_sex'] = 1 You have told Katja that you have had vaginal sex with a guy (KatjaKnowSex =1)
 !! katjaQW['knows_anal'] = 1 You have told Katja that you have had anal sex with a guy (KatjaKnowAnal =1)
 !! katjaQW['knows_cuni'] = 1 You have told Katja that have gone down on another girl (KatjaKnowKuni =1)
-!! katjaQW['know_Pirced_tongue'] = 1 katja has noticed your tongue piercing (KatjaKnowPirsA =1)
+!! katjaQW['know_Pirced_tongue'] = 1 Katja has noticed your tongue piercing (KatjaKnowPirsA =1)
 
 !! katja['school_sex'] = 1 Katja has taken you to a storage room at school to have sex. (katschoolsex)
 !! katjaQW['disco_Foto'] = 1 somebody has taken a picture of Katja''s exposed breast at the disco. Right now the only use of this variable is so that another photo won''t be taken. (katja_disco_Foto)
@@ -76,6 +76,8 @@
 !! katjaQW['know_going_to_teaching_degree'] = 1 you have told Katja that you are going to the university to study in the teaching program.
 !! katjaQW['meet_uni_class'] = 1 You have met Katja in your uni class.
 
+!! katjaQW['lazar_uni_meet'] = 1 You and Katja have meet Lazar at the university cafe.
+
 if $ARGS[0] = 'first_in_class_meet':
 	menu_off = 1
 	katjaQW['meet_uni_class'] = 1
@@ -1393,5 +1395,57 @@ if $ARGS[0] = 'try_clothes':
 	end
 end
 
+if $ARGS[0] = 'katja_lazar_cafe':
+	CLOSE ALL
+	*clr & cla
+	menu_off = 1
+	$loc = 'uni_cafe'
+	$location_type = 'public_indoors'
+	katjaQW['lazar_uni_meet'] = 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/lazar_cafe_uni.jpg"></center>'
+	'As Katja and you sit in the cafeteria eating lunch. While you talk about life at the University, someone suddenly sits down at your table. You glance over and see it is Lazar. "Hey girls what''s up? How''s college life treating you?"'
+	act 'Tell him to get lost':
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/lazar_cafe_uni.jpg"></center>'
+		'You frown as he intrudes on your lunch with Katja. "Do you mind Lazar, this was a private conversation."'
+		'He gets up with a frown. "Damn, I just wanted to say hi. You don''t got to be a bitch about it." With that he walks off.'
+		'Katja looks at him walking away a moment and then turns towards you. "That wasn''t very nice." After that Katja is not very talkative, seems she felt you was rude earlier. When she finishes her lunch she gets up and excuses herself and doesn''t invites you to go with her.'
+		act 'uni_cafe': gt 'uni_cafe'
+	end
+	act 'Talk to him':
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/lazar_cafe_uni.jpg"></center>'
+		if  katjaQW['boy_block'] = 0 and (katjaQW['slut'] > 50 or  katjaQW['QWstage'] >= 4):
+			'You smile to Lazar. "Hey you, things are going well. Was just hanging out with Katja here, how are you finding college life?"'
+			'He nods with a big friendly smile. "Good to hear, things are going well. College life is amazing, I thought Secondary school was a blast but this blows that away. By the way you girls are looking nice today, especially you Katja. You know the three of us should totally hang out some night and have some fun."'
+			*nl
+			'Katja grins at his comment and obvious interest, his body language and way he says things leave no doubt in your mind what he means by fun. You can''t really blame him you suppose, most girls want to hook up with two girls at a time. The three of you talk well paste having finished your lunch, Lazar is charming, friendly and flirty the whole time. Katja seems to respond in kind, it seems you friend is more than a little interested in Lazar, which only encourages him more. Finally each of you need to get going, you say your good byes and everyone gets up.'
+			act 'uni_cafe': gt 'uni_cafe'
+		else
+			'You smile to Lazar. "Hey you, things are going well. Was just hanging out with Katja here, how are you finding college life?"'
+			'He nods with a big friendly smile. "Good to hear, things are going well. College life is amazing, I thought Secondary school was a blast but this blows that away. By the way you girls are looking nice today, especially you Katja. You know the three of us should totally hang out some night and have some fun."'
+			'Katja seems to be in two minds about his comment and obvious interest, his body language and way he says things leave no doubt in your mind what he means by fun. You can''t really blame him you suppose, most girls want to hook up with two girls at a time. The three of you talk well paste having finished your lunch, Lazar is charming, friendly and flirty the whole time. Finally each of you need to get going, you say your good byes and everyone gets up.'
+			act 'uni_cafe': gt 'uni_cafe'
+		end
+	end
+	act 'Be flirty':
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/lazar_cafe_uni.jpg"></center>'
+		if  katjaQW['boy_block'] = 0 and (katjaQW['slut'] > 50 or  katjaQW['QWstage'] >= 4):
+			'You smile to Lazar. "Hey you, things are going well, better now that you are here. Katja and I was just having lunch, you should totally join us. So how are you finding college life, as exciting as I am finding it I hope?"'
+			'He nods with a big friendly smile. "Damn nice, glad things are going so well for you." He says with a wink to you. "College life is amazing, I thought Secondary school was a blast but this blows that away. By the way you girls are looking nice today, especially you Katja. You know the three of us should totally hang out some night and have some fun."'
+			*nl
+			'Katja grins at his comment and obvious interest, his body language and way he says things leave no doubt in your mind what he means by fun. You can''t really blame him you suppose, most girls want to hook up with two girls at a time. The three of you talk well paste having finished your lunch, Lazar is charming, friendly and flirty the whole time. Katja seems to respond in kind, it seems you friend is more than a little interested in Lazar, which only encourages him more. Finally each of you need to get going, you say your good byes and everyone gets up.'
+			act 'uni_cafe': gt 'uni_cafe'
+		else
+			'You smile to Lazar. "Hey you, things are going well, better now that you are here. Katja and I was just having lunch, you should totally join us. So how are you finding college life, as exciting as I am finding it I hope?"'
+			'He nods with a big friendly smile. "Damn nice, glad things are going so well for you." He says with a wink to you. "College life is amazing, I thought Secondary school was a blast but this blows that away. By the way you girls are looking nice today, especially you Katja. You know the three of us should totally hang out some night and have some fun."'
+			*nl
+			'Katja seems to be in two minds about his comment and obvious interest, his body language and way he says things leave no doubt in your mind what he means by fun. You can''t really blame him you suppose, most girls want to hook up with two girls at a time. The three of you talk well paste having finished your lunch, Lazar is charming, friendly and flirty the whole time. Finally each of you need to get going, you say your good byes and everyone gets up.'
+			act 'uni_cafe': gt 'uni_cafe'
+		end
+	end
+end
+
+
+
 --- katja_uni ---------------------------------
 

+ 2 - 2
locations/mey_tamara_events.qsrc

@@ -303,12 +303,12 @@ if $args[0] = 'learning1':
 						if newdress_id = 6: jump 'looptamaraschool'
 						!skip default uniform 6
 						if gm_school[newdress_id] = 0:
-							gs 'clothing_attributes', gm_school, newdress_id
+							gs 'clothing_attributes', 'gm_school', newdress_id
 							if CloInhibit < 30: jump 'looptamaraschool'
 							gm_school[newdress_id] = 1
 							gm_school_h[newdress_id] = 120
 							gm_school_b[newdress_id] = pcs_hips
-							*P '<center><img height = 400 src="images/pc/items/gm/school/<newdress_id>>.jpg"></center>'
+							*P '<center><img height = 400 src="images/pc/items/gm/school/<<newdress_id>>.jpg"></center>'
 						end
 					end
 

+ 3 - 3
locations/mey_vika_events.qsrc

@@ -994,9 +994,9 @@ if $ARGS[0] = 'case_gift':
 							cla
 							'<center><img <<$set_imgh>> src="'+'images/characters/pavlovsk/school/girl/vicky/sex/case_gift5.jpg'+'"></center>'
 							'You can hear her clearly now. Vicky doesn''t seem to mind that you were spying on them.'
-							'Dangling his legs in the air, she grabs a large white Teddy bear and presses it to her.'
+							'Dangling her legs in the air, she grabs a large white Teddy bear and presses it to her.'
 							'"Since you don''t seem to love me, my new boyfriend will have to do instead." She says and pulls out a... dildo.'
-							'your mouth drops open. "This is the gift her mother gave her. A fake cock... Her mother gave her a dildo as a gift!!! Can you imagine if my mother would have given me a dildo as a gift..."'
+							'Your mouth drops open. "This is the gift her mother gave her. A fake cock... Her mother gave her a dildo as a gift!!! Can you imagine if my mother would have given me a dildo as a gift..."'
 
 							act 'Further':
 								*clr
@@ -1139,7 +1139,7 @@ if $ARGS[0] = 'learning0':
 								'As soon as you enter the room, Vicky stands up and hugs you. She makes you sit next to her.'
 								'"I''ve seen a lot and been through a lot in my life. And I don''t want my children to go through the same mishaps as I did. Sex is an integral part of our lives and if you know how to properly make use of this knowledge, you will find many doors opening. There are many wrong choices you can make in life. And who would I be, if I didn''t prepare my children for the adult life?"'
 								'"You''re the best, mother!" Says Vicky, still embracing you. "I love you very much!"'
-								'"Yes, aunt Tamara"! Vanya agrees.'
+								'"Yes, aunt Tamara!" Vanya agrees.'
 								'He is certainly not ashamed about what they were doing.'
 								'Tamara sighs...'
 								'"If only I could make Katja understand..."'

+ 130 - 0
locations/npc_reactions.qsrc

@@ -0,0 +1,130 @@
+# npc_reactions
+
+!! 2022/30/09
+!!This file is for npc''s reaction to different aspect of the player character. 
+!! It has functions that can be called from an interaction with an npc to add a line of text that reacts to some aspect of the player character.
+!! The following are thing that need to have reactions, fell free to fill out any of these you like:
+!{Clothing:
+- Style = bimbo, goth, punk, etc
+- Thinness
+- Bra/Braless (if applicable)
+- Skirt length
+- Pant length
+- Panties/Pantyless (if applicable)
+- Footwear
+- Visible piercings
+- bimbo look
+
+Cosmetics:
+- Makeup
+- Visible Tattoos
+- Visible cum on face
+- visible cum on clothes
+- Perfume (if we add it?)
+
+Physical traits:
+- BMI/Fitness
+- Breast size
+- Ass size
+- Skin condition
+- Hair length/health/quality
+- Leg hair
+- Sweat/deodorant
+- Pregnancy
+- Skin Tan
+- strength
+- exposed genitals
+- exposed breast
+}
+
+if $ARGS[1] = 'cikl':
+	if week = 1:
+		killvar 'npc_reaction_weekly'
+	end
+end
+
+!! This is the code for choosing the aspect of the player character. This is called from a file by func('npc_reactions', 'general', npc_identifier/opinion) and returns a string of text that can be added to the to screen as its own line or to an other string by +
+!! $ARGS[1] is either the npc_identifirer for a npc with entry in npc_startic or the name of the npc.
+!! $ARGS[2] is npc''s opinion of the player character and is only used for npc's that don't have an identifier. It set to either 'love', 'like', 'indifferent' or 'dislike', if it is not set it will default to the opinion of hate. So remember to set it unless the npc hate the player character.
+if $ARGS[0] = 'general':
+	if bimbo_flag = 1 and dyneval( 'RESULT = npc_reaction_weekly[''<<$ARGS>>_bimbo'']') = 0:
+		dynamic 'npc_reaction_weekly[''<<$ARGS>>_bimbo''] = 1'
+		$result = func('npc_reactions', 'bimbo_look', $ARGS[1], $ARGS[2])
+	end
+	
+	killvar 'npc_reactions_temp_preferences'
+end
+
+!! This is an example for how the reaction should be done. Feel free to improve the text if you have a better version.
+!! Notice how the reactions both depend on the npc''s relationship with the player character and if the like the particular aspect.
+!! The preference for an npc with entries in npcstatic is set there. If you want to set the preference for an npc that in not in npcstatic then you have to set npc_reactions_temp_preferences['bimbo'] equal to 1 for like and -1 for dislike before you call the function that gives the reaction.
+!! This also means the for some combination of these there might  be an reaction, which is done by having $result = ''
+if $ARGS[0] = 'bimbo_look':
+	!! Thisd is out comoneted since we don''t have special reactions from Katja and Dimka yet, it is just to show how the code will be when special reactions is added.
+	!!if $ARGS[1] = 'A01'
+	!!	!!Special text for Dimka
+	!!	$result = func('dimca_reaction', 'bimbo')
+	!!elseif $ARGS[1] = 'A14'
+	!!	!!Special text for Katja
+	!!	$result = func('katja_procedural', 'bimbo')
+	!!else
+		if dyneval( 'RESULT = npc_preference[''<<$ARGS[1]>>_bimbo'']') = 1 or npc_reactions_temp_preferences['bimbo'] = 1:
+			!!text if the npc likes the bimbo look
+			if npc_rel[$ARGS[1]] > 80 or $ARGS[2] = 'love':
+				!!if the npc likes the bimbo looks and love the player character
+				$result = '"I love how you look." '+iif(mid($ARGS[1],1,1) = 'A', '<<$npc_firstname[$ARGS[1]]>>', '<<$ARGS[1]>>')+' says'
+			elseif npc_rel[$ARGS[1]] > 60 or $ARGS[2] = 'like':
+				!!if the npc likes the bimbo looks and likes the player character
+				$result = '"I that look suits you." '+iif(mid($ARGS[1],1,1) = 'A', '<<$npc_firstname[$ARGS[1]]>>', '<<$ARGS[1]>>')+' says'
+			elseif npc_rel[$ARGS[1]] > 40 or $ARGS[2] = 'indifferent':
+				!!if the npc likes the bimbo looks and is indifferent to  the player character
+				$result = '"I  like your look." '+iif(mid($ARGS[1],1,1) = 'A', '<<$npc_firstname[$ARGS[1]]>>', '<<$ARGS[1]>>')+' says'
+			elseif npc_rel[$ARGS[1]] > 25 or $ARGS[2] = 'dislike':
+				!!if the npc like the bimbo looks and dislikes the player character
+				$result = '"I think that would look good on somebody else." '+iif(mid($ARGS[1],1,1) = 'A', '<<$npc_firstname[$ARGS[1]]>>', '<<$ARGS[1]>>')+' says'
+			else
+				!!if the npc like the bimbo looks and hates the player character
+				$result = '"Why the fuck do you think you can wear something like that, you are way to ugly to pull of a great look like that" '+iif(mid($ARGS[1],1,1) = 'A', '<<$npc_firstname[$ARGS[1]]>>', '<<$ARGS[1]>>')+' says'
+			end
+		elseif dyneval( 'RESULT = npc_preference[''<<$ARGS[1]>>_bimbo'']') = -1 or npc_reactions_temp_preferences['bimbo'] = -1:
+			!!text if the npc dislikes the bimbo look
+			if npc_rel[$ARGS[1]] > 80 or $ARGS[2] = 'love':
+				!!if the npc dislikes the bimbo looks and love the player character
+				$result = '"I love you, but I am not sure I agree with you look." '+iif(mid($ARGS[1],1,1) = 'A', '<<$npc_firstname[$ARGS[1]]>>', '<<$ARGS[1]>>')+' says'
+			elseif npc_rel[$ARGS[1]] > 60 or $ARGS[2] = 'like':
+				!!if the npc dislikes the bimbo looks and likes the player character
+				$result = '"I think we need to go shopping together, so we can get you some real good clothes." '+iif(mid($ARGS[1],1,1) = 'A', '<<$npc_firstname[$ARGS[1]]>>', '<<$ARGS[1]>>')+' says'
+			elseif npc_rel[$ARGS[1]] > 40 or $ARGS[2] = 'indifferent':
+				!!if the npc dilikes the bimbo looks and is indifferent to  the player character
+				$result = ''
+			elseif npc_rel[$ARGS[1]] > 25 or $ARGS[2] = 'dislike':
+				!!if the npc dislike the bimbo looks and dislikes the player character
+				$result = '"Well at least the look match you intelligence." '+iif(mid($ARGS[1],1,1) = 'A', '<<$npc_firstname[$ARGS[1]]>>', '<<$ARGS[1]>>')+' says'
+			else
+				!!if the npc like the bimbo looks and hates the player character
+				$result = '"You at least dress like the dumb cow you are." '+iif(mid($ARGS[1],1,1) = 'A', '<<$npc_firstname[$ARGS[1]]>>', '<<$ARGS[1]>>')+' says'
+			end
+		else
+			!!text if the npc is indifferent to the bimbo look
+			if npc_rel[$ARGS[1]] > 80 or $ARGS[2] = 'indifferent':
+				!!if the  npc is indifferent to the bimbo looks and love the player character
+				$result = '"You look nice." '+iif(mid($ARGS[1],1,1) = 'A', '<<$npc_firstname[$ARGS[1]]>>', '<<$ARGS[1]>>')+' says'
+			elseif npc_rel[$ARGS[1]] > 60 or $ARGS[2] = 'like':
+				!!if the  npc is indifferent to the bimbo looks and likes the player character
+				$result = ''
+			elseif npc_rel[$ARGS[1]] > 40 or $ARGS[2] = 'indifferent':
+				!!if the  npc is indifferent to the bimbo looks and is indifferent to  the player character
+				$result = ''
+			elseif npc_rel[$ARGS[1]] > 25 or $ARGS[2] = 'dislike':
+				!!if the  npc is indifferent to the bimbo looks and dislikes the player character
+				$result = ''
+			else
+				!!if the  npc is indifferent to the bimbo looks and hates the player character
+				$result = '"What the fuck are you wearing?" '+iif(mid($ARGS[1],1,1) = 'A', '<<$npc_firstname[$ARGS[1]]>>', '<<$ARGS[1]>>')+' says'
+			end
+		end
+	!!end
+end
+
+--- npc_reactions ---------------------------------
+

+ 7 - 6
locations/pav_complex.qsrc

@@ -1,4 +1,5 @@
 # pav_complex
+!!2022/09/29 - Alaratt
 
 if $ARGS[0] = 'start':
 	$menu_loc = 'pav_complex'
@@ -88,11 +89,11 @@ if $ARGS[0] = 'start':
 	if pavComplex_met_dealer >= 3 and hour > 20: '<br>You can see the <a href="exec:minut += 3 & gt ''pav_aptcourtev'', ''dealer''">boy</a> who sells weed in the courtyard.'
 	
 	if Enable_tablemap = 0:
-		if npc_rel['A112'] >=70 or (week < 6 and hour >= 14 and hour <= 23) or (week >= 6 and hour >= 10 and hour < 14) or (hour >= 0 and hour < 2):'<a href="exec:minut += 15 & gt ''shulgahome''">The Shulgin family</a> live in the apartment above your parents.'
+		if npc_rel['A112'] >=70 or (week < 6 and hour >= 14 and hour <= 23) or (week >= 6 and hour >= 10 and hour < 14) or (hour >= 0 and hour < 2):'<a href="exec:minut += 15 & gt ''vasilyhome'', ''home''">The Shulgin family</a> live in the apartment above your parents.'
 		if ArtemBeInHome > 0 and artemQW['artemblok'] = 0:'<a href="exec:minut += 15 & gt ''artemhome'', ''home''">Artem Chebotarev</a>, one of your classmates, lives in the same apartment building as your parents, on the first floor.'
-		if BeInJulMilHome = 1:
+		if juliaQW['home_unlocked'] = 1:
 			if (hour >= 15 and hour <= 20 and week < 6) or (hour >= 8 and hour <= 20 and week >= 6):
-				'<a href="exec:minut += 15 & gt ''JuliaMilVhod''">Julia Milova</a>, one of your classmates, lives in the same apartment building as your parents, on the third floor.'
+				'<a href="exec:minut += 15 & gt ''JuliaMilHome'', ''home''">Julia Milova</a>, one of your classmates, lives in the same apartment building as your parents, on the third floor.'
 			else
 				'Julia Milova, one of your classmates, lives in the same apartment building as your parents. She resides on the third floor.'
 			end
@@ -108,14 +109,14 @@ if $ARGS[0] = 'start':
 	else
 		st_count=0 & $show_table=''
 		if npc_rel['A112'] >=70 or (week < 6 and hour >= 14 and hour <= 23) or (week >= 6 and hour >= 10 and hour < 14) or (hour >= 0 and hour < 2):
-			gs'show_table','Apartment of Uncle <a href="exec:minut += 15 & gt ''shulgahome''" >Shulgin</a>.','3'
+			gs'show_table','Apartment of Uncle <a href="exec:minut += 15 & gt ''vasilyhome'', ''home''" >Shulgin</a>.','3'
 		else
 			gs'show_table','Apartment of Uncle Shulgin.','3'
 		end
 		if ArtemBeInHome > 0 and artemQW['artemblok'] = 0:gs'show_table','Apartment of <a href="exec:minut += 15 & gt ''artemhome'', ''home''">Artem Chebotarev</a>.','3'
-		if BeInJulMilHome = 1:
+		if juliaQW['home_unlocked'] = 1:
 			if (hour >= 15 and hour <= 20 and week < 6) or (hour >= 8 and hour <= 20 and week >= 6):
-				gs'show_table','Apartment of <a href="exec:minut += 15 & gt ''JuliaMilHome''">Julia Milova</a>.','3'
+				gs'show_table','Apartment of <a href="exec:minut += 15 & gt ''JuliaMilHome'', ''home''">Julia Milova</a>.','3'
 			else
 				gs'show_table','Apartment of Julia Milova.','3'
 			end

+ 1 - 1
locations/pav_hotel.qsrc

@@ -16,7 +16,7 @@ gs'stat'
 if $ARGS[0] = 'skip_resepevent': jump 'skipresepevent'
 
 if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3 and rand(1,10) = 10)):
-	if hotelroom = 0:
+	if hotelRoom['pav_hotel'] = 0:
 		*clr
 		'When you want to enter the hotel you notice the doors are closed.'
 		'You try knocking on the door but nobody comes to open them.'

+ 1 - 1
locations/pav_hotelReception.qsrc

@@ -121,7 +121,7 @@ if $ARGS[0] = '':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
 			'She looks in the computer: "I see you already have a room here. As it is already booked and paid for the only way to change it to a different room, would be to cancel your existing booking. To do so without notice would forfeit your payment, I would advise against this, but you may do so if you wish."'
-			act'Yes, cancel your booking':hotelroom=0 & gt'pav_hotel'
+			act'Yes, cancel your booking':hotelRoom['pav_hotel'] = 0 & gt'pav_hotel'
 			act'No':gt'pav_hotel'
 		elseif hotelRoom['pav_hotel'] = 0:
 			act 'Yes':

+ 5 - 3
locations/pod_ezd.qsrc

@@ -1,5 +1,7 @@
 # pod_ezd
-!!2022/05/03
+!!2022/09/29 - Alaratt
+
+
 !!SETTINGS:
 CLOSE ALL
 gs 'themes', 'indoors'
@@ -181,8 +183,8 @@ if $ARGS[0] = 'etaj_3':
 
 	act 'Go down to the second floor': minut += 1 & gt 'pod_ezd','etaj_2'
 	act 'Go up to the fourth floor': minut += 1 & gt 'pod_ezd','etaj_4'
-	act 'Apartment 13: Vasily and Sergei Shulgin':gt 'shulgahome'
-	if BeInJulMilHome = 1: act 'Apartment 15: Julia Milova': gt 'JuliaMilVhod'
+	act 'Apartment 13: Vasily and Sergei Shulgin': gt 'vasilyhome', 'home'
+	if juliaQW['home_unlocked'] = 1: act 'Apartment 15: Julia Milova': gt 'JuliaMilHome', 'home'
 	act 'Take the elevator': gt 'pod_ezd','lift','etaj_3'
 end
 

+ 14 - 2
locations/saveupdater.qsrc

@@ -1082,8 +1082,12 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	i += 1
 	if i < 250: jump 'saveupdaterloop853_1'
 
-	hotelRoomDays['pav_hotel'] = hotelroom1day
-	hotelRoom['pav_hotel'] = hotelroom
+	if hotelroom1day ! 0:
+		hotelRoomDays['pav_hotel'] = hotelroom1day
+		killvar'hotelroom1day'
+		hotelRoom['pav_hotel'] = hotelroom
+		hotelroom = 0
+	end
 end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080504:
@@ -1279,6 +1283,14 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if artsveslut > 0: artemQW['sveslut'] = artsveslut & killvar 'artsveslut'
 	if metArtemMom > 0: artemQW['metArtemMom'] = metArtemMom & 'metArtemMom'
 	if artdimhelp > 0: artemQW['dimkahelp'] = artdimhelp & killvar 'artdimhelp'
+	
+	!! update Julia to an array
+	if JulMilBestFrend > 0: juliaQW['JulMilBestFrend'] = JulMilBestFrend & killvar 'JulMilBestFrend'
+	if eatJulMilDay: juliaQW['eatJulMilDay'] = eatJulMilDay & killvar 'eatJulMilDay'
+	if SexTalkJulia: juliaQW['SexTalkJulia'] = SexTalkJulia & killvar 'SexTalkJulia'
+	if BeInJulMilHome: juliaQW['home_unlocked'] = BeInJulMilHome & killvar 'BeInJulMilHome'
+	if JuliaMilLernQW: juliaQW['study_unlocked'] = JuliaMilLernQW & killvar 'JuliaMilLernQW'
+	
 end
 
 gs 'saveg'

+ 14 - 6
locations/stat.qsrc

@@ -1142,15 +1142,23 @@ if workFabrika = 1 and week => 1 and week <= 5 and hour > 8 and age => 16 and ag
 end
 
 if hotelRoom['pav_hotel'] > 0:
-	if hotelRoomDays['pav_hotel'] = daystart: $stat_msg += '<BR>You have 1 night left on your pav hotel booking.'
-	if hotelRoomDays['pav_hotel'] < daystart and hour < 11: $stat_msg += '<BR>Your pav hotel booking has expired, and you cannot return to your room after 11:00'
-	if hotelRoomDays['pav_hotel'] < daystart and hour >= 11: hotelRoom['pav_hotel'] = 0
+	if hotelRoomDays['pav_hotel'] - 1 = daystart:
+		$stat_msg += '<BR>You have 1 night left on your pav hotel booking.'
+	elseif hotelRoomDays['pav_hotel'] = daystart and hour < 11:
+		$stat_msg += '<BR>Your room at the Pavlosk hotel has check out today at 11:00'
+	elseif hotelRoomDays['pav_hotel'] = daystart:
+		hotelRoom['pav_hotel'] = 0
+	end
 end
 
 if hotelRoom['city_hotel'] > 0:
-	if hotelRoomDays['city_hotel'] = daystart: $stat_msg += '<BR>You have 1 night left on your city center hotel booking.'
-	if hotelRoomDays['city_hotel'] < daystart and hour < 11: $stat_msg += '<BR>Your city center hotel booking has expired, and you cannot return to your room after 11:00'
-	if hotelRoomDays['city_hotel'] < daystart and hour >= 11: hotelRoom['city_hotel'] = 0
+	if hotelRoomDays['city_hotel'] - 1 = daystart:
+		$stat_msg += '<BR>You have 1 night left on your pav hotel booking.'
+	elseif hotelRoomDays['city_hotel'] = daystart and hour < 11:
+		$stat_msg += '<BR>Your room at the St Petersburg hotel has check out today at 11:00'
+	elseif hotelRoomDays['city_hotel'] = daystart:
+		hotelRoom['city_hotel'] = 0
+	end
 end
 
 if hour >= 8 and hour < 14 and week < 6 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and schoolProgulDay ! daystart:

+ 70 - 0
locations/uni_cafe.qsrc

@@ -0,0 +1,70 @@
+# uni_cafe
+
+if $ARGS[0] = '':
+	CLOSE ALL
+	$loc_arg = ''
+	$loc = 'uni_cafe'
+	$menu_loc = 'uni_cafe'
+	$menu_arg = ''
+	menu_off = 0
+	$location_type = 'public_indoors'
+	gs 'stat'
+	gs 'katja_meynold_schedule'
+	gs 'themes', 'indoors'
+	'<center><b><font color="maroon">University cafe</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/uni_cafe.jpg"></center>'
+	*nl
+	'The University cafe, a well-known meeting point for the students attending the university. Students spend their days here, either preparing for their exams or just to unwind from their busy schedule.'
+	'The cafe offers a rich variation of reasonably priced food and beverages. There is also free wi-fi, even if it''s wonky at best, and you can often overhear students complain about it.'
+	if locat['katja'] = 28:
+		'You see '+iif( katjaQW['know_katja_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'a redheaded girl', '<a href="exec:gt ''katja_chat'', ''uni_cafe''">Katja</a>')+' sitting  at a table eating her lunch.'
+	end
+	
+	gs 'uni_cafe', 'menu'
+	
+	
+	act 'Leave': gt 'uni_grounds', 'main'
+	if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
+	if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
+end
+
+if $ARGS[0] = 'menu':
+	if week < 5 and (university['semester_week'] > 0 or university['exam_week'] > 0) and university['enrolled_in_semester'] > university['semester_passed'] and ((hour = 10 and minut > 30) or (hour = 12 and minut > 45) or (hour = 13 and minut < 15)):
+		'You might not have time to eat before your next class.'
+		act 'Order from the menu anyway': 
+			menu_off = 1
+			$loc = 'uni_cafe'
+			gs 'food_menu'
+		end	
+	else
+		act 'Order from the menu': 
+			menu_off = 1
+			$loc = 'uni_cafe'
+			gs 'food_menu'
+		end
+	end
+end
+
+if $ARGS[0] = 'sitting_choice':
+	if locat['katja'] = 28 and npc_rel['A14'] > 40 and katjaQW['know_katja_uni'] = 1: 
+		act 'Eat your lunch with Katja': gt 'katja_chat', 'uni_cafe'
+	end
+
+	act 'Eat you lunch alone':
+		!!this is a variable to use in npc''s chats to see if you have lunch to eat together with them. Should be set to zero after it is checked in their chat.
+		*clr & cla
+		uni_lunch_bought = 0
+		'<center><b><font color="maroon">University cafe</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/uni_cafe.jpg"></center>'
+		'You sit down and eat your lunch alone and<<$mtxt>>'
+		gs 'stat'
+		
+		act 'Leave': gt 'uni_grounds', 'main'
+
+		if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
+		if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
+	end
+end
+
+--- uni_cafe ---------------------------------
+

+ 7 - 2
locations/uni_grounds.qsrc

@@ -108,12 +108,17 @@ if $ARGS[0] = 'main':
 		end
 	end
 	if week < 6 and hour > 7 and hour < 17:
-			act 'Go to the administration building':
+		act 'Go to the administration building':
 			minut += 2
 			gt 'uni_admin', 'start'
 		end
 	end
-
+	if week < 6 and hour > 9 and hour < 17:
+		act 'Go to the university cafe':
+			minut += 2
+			gt 'uni_cafe'
+		end
+	end
 end
 
 if $ARGS[0] = 'day_warm':