Browse Source

[changed] more schedule tweaks

Anya 2 years ago
parent
commit
8895c60dff
3 changed files with 40 additions and 68 deletions
  1. 3 4
      locations/bedrPar2.qsrc
  2. 13 12
      locations/family_schedule.qsrc
  3. 24 52
      locations/korrPar.qsrc

+ 3 - 4
locations/bedrPar2.qsrc

@@ -45,8 +45,6 @@ if $ARGS[0] = '':
 			end
 		end
 	end
-
-	if hour = 21 and parsexrand = 5 and parentsexday ! daystart:gt 'bedrPar2', 'peek'
 end
 
 ! book
@@ -83,8 +81,8 @@ end
 
 if $ARGS[0] = 'wardrobe_search':
 	*clr & cla
-	if (hour >= 21 or hour < 6) and indorf = 0:
-		'What are you thinking? You can''t go through the wardrobe while your parents are sleeping right there!'
+	if indorf = 0 and (momloc = 1 or momloc = 3 or sdadloc = 1 or sdadloc = 2):
+		'What are you thinking? You can''t go through the wardrobe while your parents are in the room!'
 		act 'Leave ': gt $loc, $loc_arg
 		exit
 	end
@@ -122,6 +120,7 @@ end
 
 if $ARGS[0] = 'peek':
 	cla & *clr
+	parentsexday = daystart
 	minut += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad1.jpg"></center>'

+ 13 - 12
locations/family_schedule.qsrc

@@ -219,7 +219,7 @@ end
 if indorf = 0:
 	if week <= 5:
 		if hour < 5 or (hour = 5 and minut < 30):
-			!!Asleep, if Sveta knocks she''ll ask to wake Kolka
+			!!Asleep
 			momloc = 1
 			momloc['athome'] = 0
 		elseif hour = 5 and minut < 45:
@@ -228,7 +228,7 @@ if indorf = 0:
 			momloc['athome'] = 1
 			if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar':gs'mother_sextalk','discover_dildo'
 		elseif hour < 6:
-			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
+			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka
 			momloc = 3
 			momloc['athome'] = 1
 		elseif hour = 6 or (hour = 7 and minut < 30):
@@ -306,21 +306,21 @@ if indorf = 0:
 				momloc['athome'] = 1
 			end
 		else
-			!! Sleep (Small chance she and step dad have sex before sleep) - I think this was blocked off
+			!! Asleep (Small chance she and step dad have sex before sleep 22:00-22:59)
 			momloc = 1
 			momloc['athome'] = 0
 		end
 	else
 		if hour < 5 or (hour = 5 and minut < 30):
-			!! Sleep
+			!! Asleep
 			momloc = 1
 		elseif hour = 5 and minut < 45:
-			!! Shower, if Sveta knocks she''ll ask to wake Kolka
+			!! Shower
 			momloc = 2
 			momloc['athome'] = 1
 			if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar':gs'mother_sextalk','discover_dildo'
 		elseif hour < 6:
-			!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
+			!! Getting dressed in her room, if Sveta knocks she''ll ask you to wake Kolka 
 			momloc = 3
 			momloc['athome'] = 1
 		elseif hour = 6 or (hour = 7 and minut < 30):
@@ -351,6 +351,7 @@ if indorf = 0:
 			!! Gets her nails done/hair cut at the salon or such things - On Sunday goes to the church during these hours
 			momloc['athome'] = 0
 			if week = 6:
+				!! Salon
 				momloc = 15
 			else
 				!!Church
@@ -400,7 +401,7 @@ if indorf = 0:
 				momloc['athome'] = 1
 			end
 		else
-			!! Sleep (Small chance she and step dad have sex before sleep) - I think this was blocked off
+			!! Asleep (Small chance she and step dad have sex before sleep 22:00-22:59)
 			momloc = 1
 			momloc['athome'] = 0
 		end
@@ -412,11 +413,11 @@ end
 if indorf = 0:
 	if week <= 5:
 		if hour < 6 or (hour = 6 and minut < 10):
-			!! Sleep
+			!! Asleep
 			sdadloc = 1
 			sdadloc['athome'] = 0
 		elseif hour < hour = 6 and minut < 45:
-			!!Getting ready, sometimes has quicky
+			!!Getting ready
 			sdadloc = 2
 			sdadloc['athome'] = 1
 		elseif (hour = 6 and minut > 45) or (hour = 7 and minut < 15):
@@ -474,13 +475,13 @@ if indorf = 0:
 			sdadloc = 11
 			sdadloc['athome'] = 1
 		else
-			!! Sleep - (small chance mom and step dad have sex before actually going to sleep)
+			!! Asleep (Small chance she and step dad have sex before sleep 22:00-22:59)
 			sdadloc = 1
 			sdadloc['athome'] = 0
 		end
 	else
 		if hour < 6 or (hour = 6 and minut < 10):
-			!! Sleep
+			!! Asleep
 			sdadloc = 1
 			sdadloc['athome'] = 0
 		elseif hour < hour = 6 and minut < 45:
@@ -533,7 +534,7 @@ if indorf = 0:
 				sdadloc['athome'] = 1
 			end
 		else
-			!! Sleep
+			!! Asleep (Small chance she and step dad have sex before sleep 22:00-22:59)
 			sdadloc = 1
 			sdadloc['athome'] = 0
 		end

+ 24 - 52
locations/korrPar.qsrc

@@ -47,7 +47,7 @@ if (hour ! 16 or hour ! 17) and blockBedrPar = 1:blockBedrPar = 0
 
 !!Her room isn''t on the cleaning list yet
 !!if (momloc = <number for cleaning her room> ) and motherQW['con_steal_hear'] + 4 < daystart and prezikday + 4 < daystart and rand(1,4) = 1: gt 'mother', 'condom_steal', 'hear'
-if momloc = 1 and hour = 22 and minut < 30 and motherQW['con_steal_talk'] + 4 < daystart and prezikday + 4 < daystart and rand(1,3) = 1: gt 'mother', 'condom_steal', 'talk'
+if momloc = 1 and hour = 22 and minut < 30 and motherQW['con_steal_talk'] + 4 < daystart and prezikday + 4 < daystart and rand(1,4) = 1: gt 'mother', 'condom_steal', 'talk'
 
 act '<b>Leave and go to the stairwell</b>':
 	if $clothingworntype ! 'nude':
@@ -84,64 +84,37 @@ if blockBedrPar = 0:
 		act 'Go to your room':gt 'bedrPar'
 	end
 end
-if momloc = 3 and sdadloc = 2:
-	if hour < 6:
-		'The door is closed. You know your <<$npc_nickname[''A29'']>> is likely waking up your stepfather and getting dressed.'
-		act 'Knock on your parents'' door':
-			if hour = 6 and minut < 10 and rand(0,2) ! 0:
-				cla & *clr
-				minut += 2
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/pc/activities/spy/peep3.jpg"></center>'
-				'You knock on the door and wait for a few minutes. Your <<$npc_nickname[''A29'']>> opens the door looking like she just woke up. "I don''t have time right now. Go wake up your brother." She then closes the door in your face.'
-				act 'Leave':gt 'korrPar'
-				act 'Go wake up Kolka':
-					cla & *clr
-					minut += 5
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/sleeping.jpg"></center>'
-					'You walk down the hall and into the living room where you find Kolka still sound asleep on the couch.'
-
-					!!act 'Shake him':gt '', ''
-					!!I am leaving the rest of this for Sicaa so he can tie in any events he has for kolka
-					act 'Leave':gt 'korrPar'
-				end
-			else
-				cla & *clr
-				minut += 2
-				momvladroom = rand(1,10)
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/pc/activities/spy/peep3.jpg"></center>'
-				if momvladroom = 1:
-					'You knock on the door and you hear your <<$npc_nickname[''A29'']>> say "<<$pcs_nickname>>? Is that you? Go set the table."'
-					*nl
-					'After a few minutes of silence, you faintly hear hushed voices and what you <i>think</i> is the sound of your mother giggling.'
-
-					act 'Leave':gt 'korrPar'
-					gs 'willpower', 'voyeur', 'self', 'medium'
-					if will_cost <= pcs_willpwr:
-						act 'Peek (<<will_cost>> Willpower)':
-							*clr & cla
-							gs 'willpower', 'pay', 'self'
-							gs 'stat'
-							gt 'bedrPar2', 'peek'
-						end
-					else
-						act 'Peek (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end
-				else
-					'You knock on the door and wait for a few minutes. Your <<$npc_nickname[''A29'']>> opens the door fully dressed while your stepfather gets out of bed. "I don''t have time right now. Go set the table for breakfast." She then closes the door in your face.'
-					act 'Leave':gt 'korrPar'
-				end
-			end
+
+if momloc = 3:
+	act 'Knock on your parents'' door':
+		cla & *clr
+		minut += 2
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/pc/activities/spy/peep3.jpg"></center>'
+		'You knock on the door and wait for a few minutes. Your <<$npc_nickname[''A29'']>> opens the door looking like she just got out of the shower. "I don''t have time right now. Go wake up your brother." She then closes the door in your face.'
+		act 'Leave':gt 'korrPar'
+		act 'Go wake up Kolka':
+			cla & *clr
+			minut += 5
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/sleeping.jpg"></center>'
+			'You walk down the hall and into the living room where you find Kolka still sound asleep on the couch.'
+
+			act 'Leave': gt 'sitrPar'
 		end
+	end
+elseif momloc = 1:
+	if hour = 22 and parsexrand = 5 and parentsexday ! daystart:
+		act 'Go to your parents'' room': gt 'bedrPar2', 'peek'
 	else
 		act 'Go to your parents'' room': msg'Your parents are probably asleep, you shouldn''t go in right now.'
 	end
 else
 	act 'Go to your parents'' room':gt 'bedrPar2'
 end
+
 act 'Go to the living room':gt 'sitrPar'
+
 if momloc = 2:
 	if vanrPar_suction_dildo > 0:
 		motherQW['dildo_shower_discovery'] = 1
@@ -164,7 +137,6 @@ end
 
 if motherQW['bathroom_dildos'] > 0 and momloc['athome'] = 1: gt'mother_sextalk','bathroom_dildos1'
 
-
 act 'Go to the kitchen':gt 'kuhrPar'
 
 !to add a counter if you avoid Dimka