1
0
Prechádzať zdrojové kódy

[added] University cafe, and some interactions with Katja there.

bgkjdgbizgblzdgbr 2 rokov pred
rodič
commit
82f07f2b1c

+ 2 - 1
glife.qproj

@@ -941,6 +941,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"/>
@@ -953,7 +955,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>

+ 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 - 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 ---------------------------------
 

+ 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':