Browse Source

[added] Katja chat at uni gounds and in her room, plus some reoganization of her stuff.

bgkjdgbizgblzdgbr 1 year ago
parent
commit
bbc3d21764

+ 2 - 0
glife.qproj

@@ -478,6 +478,7 @@
 		<Location name="igor_schedule"/>
 	</Folder>
 	<Folder name="Katja Meynold">
+		<Location name="katja_procedural"/>
 		<Location name="katjaEv"/>
 		<Location name="katja_lake"/>
 		<Location name="katjaEvDin"/>
@@ -488,6 +489,7 @@
 		<Location name="katja_uni"/>
 		<Location name="katja_uni_sex"/>
 		<Location name="katja_dorm"/>
+		<Location name="katja_chat"/>
 	</Folder>
 	<Folder name="Viky Meynold">
 		<Location name="mey_home"/>

+ 1 - 23
locations/KatjaHomeTalk.qsrc

@@ -78,28 +78,6 @@
 !! 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 meet Katja in you uni class.
 
-if $ARGS[0] = 'cikl':
-	!!Modifying Katja''s arousal level.
-	if katjaQW['QWstage'] > 2:
-		if katjaQW['horny'] >= 0: katjaQW['horny'] += (katjaQW['slut'] - rand(1,50))/10
-		if katjaQW['horny'] < 0:katjaQW['horny'] = 0
-		if katjaQW['horny'] >= 100:
-			if rand(0,2) = 0 and week < 6:
-				katjaQW['horny'] = max(katjaQW['slut']/2,50)
-				if katjaQW['masturbates'] = 0: katjaQW['masturbates'] = 1
-			else
-				katjaQW['horny'] = 100
-			end
-		end
-	end
-
-	!!Reseting if Katja have shown you that she is not wearing panties at the disco. The reason to not use a daystart variable, is the if you show it very late Friday it might prevent you from seeing it Saturday (daystart can change during the event)
-	if katjaQW['no_panties_at_disco'] > 0: katjaQW['no_panties_at_disco'] = 0
-
-	!!Out commented Katja becoming pregnant until more content for a pregnant Katja is done 
-	!!if katjaPreg = 0 and month >= 2 and year > 2016: katjaPreg = 1
-end
-
 if $ARGS[0] = '':
 	$loc = 'mey_home'
 	$loc_arg = '5'
@@ -2141,7 +2119,7 @@ end
 if $ARGS[0] = 'katja_uni_tell':
 	*clr & cla
 	minut += 15
-	 katjaQW['know_katja_uni'] = 1
+	katjaQW['know_katja_uni'] = 1
 	katjaQW['knows_dorm_room_number'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'

+ 1 - 1
locations/cikl.qsrc

@@ -615,7 +615,7 @@ killvar 'npc_rel_daily'
 gs 'Zvereva_events', 'cikl'
 
 !!Updating Katja''s variables.
-gs 'katjaHomeTalk', 'cikl'
+gs 'katja_procedural', 'cikl'
 
 if npc_rel['A69'] > 60 and rand(0,3) = 0:npc_rel['A69'] -= 1
 

+ 1 - 1
locations/djibrilev1.qsrc

@@ -716,7 +716,7 @@ if $ARGS[0] = 'djibril_nush':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some1.jpg"></center>'
-                'You stand up. "I''ll leave you guys to it then."'
+				'You stand up. "I''ll leave you guys to it then."'
 				'Anushka smiles at you as she scoots over against Djibril and starts running her hands down his body while he looks at you. "Okay, thanks for stopping by. Come by any time you want."' 
 				'He then turns his full attention to Anushka and you make your way over to the door. You glance back and see them kissing before you walk out and close the door behind you.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'

+ 3 - 3
locations/katja_dorm.qsrc

@@ -53,7 +53,7 @@
 !! katjaQW['birth_control_start_day'] This is set to the daystart value from the day Katja''s birth control will be effective if the player tells her to use it. Should be used to check if Katja can become pregnant by if katjaQW['birth_control_start_day'] ! 0 and katjaQW['birth_control_start_day'] < daystart to make sure is protected.
 
 !! KatjaQW['orgasm_day'] Is set to be equal to daystart when Katja gain an orgasm (It is not set all palces). (KatjaOrgasm)
-!! katjaQW['take_of_panties_day'] is set to ddaystart if you get >katja to take of her panties during school break.
+!! katjaQW['take_of_panties_day'] is set to daystart if you get katja to take of her panties during school break.
 !! katjaQW['afterschool_hangout_day'] Is set to be equal daystart when you choose to hang out with Katja after school. (katjaMeynoldday)
 !! katjaQW['no_panties_day'] Is set to daystart if you show Katja that you are not wearing panties.
 !! katjaQW['no_panties_day_disco'] Is set to daystart if you show Katja that you are not wearing panties at the pav disco. (tangaday)
@@ -100,11 +100,11 @@ if $ARGS[0] = 'start':
 	elseif locat['katja'] = 20:
 		'Katja is a sleep, so you should not disturb her.'
 	elseif locat['katja'] = 22:
-		'Katja is getting dressed and doing her makeup, she doesn want to be disturbed right now.'
+		'Katja is getting dressed and doing her makeup, she doesn''t want to be disturbed right now.'
 	elseif locat['katja'] = 24:
 		if minut < 50: 
 			'Katja is preparing to go to class, collecting the things she needs.'
-			!!act 'Talk to Katja': gt 'katja_uni', 'chat' This is the generic talk that can also be accessed if she is waiting for class at unni campus
+			act 'Talk to Katja': gt 'katja_chat', 'chat'
 		else
 			'Katja is heading out the door to go to class and doesn''t have time to talk right now.'
 		end

+ 1 - 1
locations/katja_meynold_schedule.qsrc

@@ -378,7 +378,7 @@ else
 					!!Coffee shop - eating brunch/hanging out
 					locat['katja']  = 30
 				elseif hour < 16:
-					!!Randomized locations, depeding on weather. 42 - city beach, 43 - central park, 44 - shoping mall in city center.
+					!!Randomized locations, depending on weather. 42 - city beach, 43 - central park, 44 - shopping mall in city center.
 					if locat['katja_rand1'] ! daystart:
 						if sunWeather = 1:
 							if temper >= 20 and month >= 5 and month <= 9 and rand(0,4) > 0:

+ 5 - 0
locations/uni_grounds.qsrc

@@ -11,6 +11,7 @@ if $ARGS[0] = 'main':
 	menu_off = 0
 	*clr & cla
 	killvar '$locclass'
+	gs 'katja_meynold_schedule'
 	gs 'stat'
 
 	if totminut > university['campus_event_time'] + 60 and sunWeather = 1 and (hour ! 8 or minut <= 50) and (hour ! 9 or minut <= 20) and (hour ! 13 or minut <=5) and (university['semester_week'] + university['exam_week']) > 0:
@@ -80,6 +81,10 @@ if $ARGS[0] = 'main':
 		end
 	end
 
+	if locat['katja']  = 25:
+		'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'', ''start''">Katja</a>')+' sitting  talking on her phone.'
+	end
+
 	act 'Return to the city':
 		minut += 5
 		gt 'city_island'