ソースを参照

[Changed/Fixed] Kolka schedule enabled and fixes for stepdads schedule. Probably need a lot of testing to iron out any bugs, both bro and stepdad scattered through a lot of files.

Alaratt 3 年 前
コミット
f203c791a0

+ 6 - 6
locations/brother.qsrc

@@ -79,7 +79,7 @@ if $ARGS[0] = 'start':
 	act 'Leave':gt $loc, $loc_arg
 
 	*nl
-	if hour >= 7 and hour < 23:
+	if kolloc = 7 or kolloc = 11:
 		! WD: Fix old nude variable
 		if (cumloc[1] > 0 or cumloc[4] > 0 or cumloc[8] > 0 or cumloc[9] > 0 or cumloc[10] > 0 or cumloc[14] > 0 or cumloc[15] > 0) and $clothingworntype = 'nude':
 			if $pantyworntype = 'none' and cumloc[1] = 1:
@@ -188,10 +188,10 @@ if $ARGS[0] = 'start':
 	end
 
 	if $loc = 'sitrPar' or ($loc = 'family' and $loc_arg = 'sofa'):
-		if hour >= 7 and hour < 23:
+		if kolloc = 11 or kolloc = 2:
 			act'Chat with Kolka':gt 'brother2', 'chat'
 			!!act'Banter with Kolka':gt'brother2','banter'
-			if sdadloc ! 10 or hour > 20:
+			if sdadloc ! 10 and momloc ! 19 and momloc ! 24:
 				if brotherSex < 5 and brotherkiss >= 1 and brotherkisstalk < 1:
 					act'Talk about the kiss':gt 'brother', 'kiss_talk'
 				elseif brotherkisstalk = 1 or brotherSex > 4 and momloc ! 19:
@@ -299,7 +299,7 @@ if $ARGS[0] = 'start':
 				'Your brother is playing video games.'
 			end
 
-			if hour = 23 and brotherSex > 4 and brotherNightSex ! daystart and momloc ! 19:
+			if hour >= 23 and brotherSex > 4 and brotherNightSex ! daystart and momloc ! 19:
 				'As you approach your sleeping brother, he suddenly opens his eyes and looks at you.'
 				!!sub/dom dialog needs fixing
 				!!if sub > 0 or (evgenQW >= 4 and pav_slut >= 150):
@@ -363,7 +363,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if (week = 6 and brother_homework = daystart - 1) or (week = 7 and brother_homework = daystart - 2): brother_homework = daystart
-	if $loc = 'sitrPar' and brotherAge < 18 and kanikuli = 0 and npc_rel['A34'] >= 20 and brother_homework ! daystart and hour >= 18 and hour < 20:
+	if $loc = 'sitrPar' and brotherAge < 18 and kanikuli = 0 and npc_rel['A34'] >= 20 and brother_homework ! daystart and kolloc = 7:
 		if rand(1,3) = 1:
 			cla
 			*clr & cla
@@ -894,7 +894,7 @@ if $ARGS[0] = 'brotherSexEnd':
 			!!act 'Continue':gt $loc, $loc_arg
 		!!end
 	!!else
-	if $loc = 'sitrPar' and sdadloc ! 10 and hour >= 18 and hour < 23:
+	if $loc = 'sitrPar' and sdadloc ! 10 and kolloc = 11:
 		'With a wide grin on his face, Kolka tells you, "Many thanks, <<$pcs_nickname>>, you''ve helped me a lot." He resumes his prior business.'
 		act 'Leave': gt 'sitrPar'
 	elseif $loc = 'sitrPar' and npc_rel['A34'] >= 80:

+ 2 - 2
locations/dinfather.qsrc

@@ -295,7 +295,7 @@ if $ARGS[0] =  'watchtv_act1':
                     TouchedByFather = 1
                     '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim18.jpg"></center>'
                     'Biting your lip, you lie quietly on the chest of your stepfather and enjoy his caresses, restraining your moans. Slowly but surely he focuses more on your nipples, pinching them and tugging at them. You do your best to stay quiet, but it''s getting more and more difficult. Then you hear him let out a chuckle, and he whispers "<<$pcs_nickname>>, I know you''re not sleeping."'
-                    if npc_sex['A28']!0 and mother_go = 1 and hour = 16:
+                    if npc_sex['A28']!0 and momloc['athome'] = 0:
                         '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim21.jpg"></center>'
                         'You open your eyes and notice the large bulge in his pants. As you turn your head and give him a sweet smile, you put your hand on the bulge and gently start to pet it. Your stepfather, without hesitation, unbuttons his pants and pulls out his dick. You, also without hesitation, lower your head and give it a lick.'
                         act 'Get down on your knees':gs 'fathersex',  'fatherblow4'
@@ -315,7 +315,7 @@ if $ARGS[0] =  'watchtv_act1':
                     pcs_ass+=1
                     if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim17.jpg"></center>' & 'Not noticing any reluctance from you, your stepfather continues his kneading and then slides his hands underneath your clothes. His sexual preference is abundantly clear: he immediately searches out your tight asshole, and gently rubs his finger against it. Unable to help yourself you begin to gyrate your hips to mimic his movements, trying to stifle your moans. He notices anyway: the pressure of his finger against your sphincter grows, and his decisive actions make you realize he has no intentions of stopping there. When his finger penetrates you, you can''t hold back your moans any longer. He chuckles and whispers: "I knew you were awake all along <<$pcs_nickname>>, just relax and enjoy."'
                     if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim16.jpg"></center>' & 'When his hand slips under your clothes, you feel his fingers feeling around for a second, grasping for something that isn''t there. He was clearly expecting panties, and is confused by the lack of them. When he realizes you''re not wearing any his actions grow bolder, and soon feel two fingers rubbing up against your asshole with the intention of going in. You adjust your hips slightly to grant him easier access, which he recognizes as a sign of consent and increases the pressure on your sphincter, pushing his two fingers in slowly but surely.'
-                    if npc_sex['A28']!0 and mother_go = 1 and hour = 16:
+                    if npc_sex['A28']!0 and momloc['athome'] = 0:
                         '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim21.jpg"></center>'
                         'You open your eyes and notice the large bulge in his pants. As you turn your head and give him a sweet smile, you put your hand on the bulge and gently start to pet it. Your stepfather, without hesitation, unbuttons his pants and pulls out his dick. You, also without hesitation, lower your head and give it a lick.'
                         act 'Get down on your knees': gs 'fathersex',  'fatherblow4'

+ 9 - 24
locations/family.qsrc

@@ -84,42 +84,27 @@ if StoryLine = 1:
 		end
 
 		if $loc = 'sitrPar' or ($loc = 'family' and $loc_arg = 'sofa'):
-			if hour < 7 and brothermorningsex = daystart:
+			if kolloc = 2 and brothermorningsex = daystart:
 				ocpd_room = 1
 				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is getting ready for school.'
-			elseif hour < 7 and brothermorningsex ! daystart:
+			elseif kolloc = 1 and brothermorningsex ! daystart:
 				ocpd_room = 1
 				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the sofa.'
-			elseif hour >= 23:
+			elseif kolloc = 1:
 				ocpd_room = 1
 				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the sofa.'
+			elseif kolloc = 7:
+				ocpd_room = 1
+				'Your little brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting by the table and doing his homework.'
+			elseif kolloc = 11:
+				ocpd_room = 1
+				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, playing video games.'
 			end
 
 			if sdadloc = 10:
 				ocpd_room = 1
 				'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
 			end
-
-			if hour >= 18 and hour < 20:
-				if kanikuli > 0:
-					ocpd_room = 1
-					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, playing video games.'
-				else
-					ocpd_room = 1
-					'Your little brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting by the table and doing his homework.'
-				end
-			elseif hour >= 20 and hour < 23:
-				ocpd_room = 1
-				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, playing video games.'
-			end
-		end
-
-		if $loc = 'korrPar':
-			!! for future code I guess
-		end
-
-		if $loc = 'pav_train':
-			!! for future code I guess
 		end
 
 		if $loc = 'gschool_grounds':

+ 94 - 32
locations/family_schedule.qsrc

@@ -333,7 +333,7 @@ end
 !!indorf = 1 means stepdad is in the village
 if indorf = 0:
 	if week <= 5:
-		if hour = 6 and minut < 10:
+		if hour < 6 or (hour = 6 and minut < 10):
 			!! Sleep
 			sdadloc = 1
 			sdadloc['athome'] = 0
@@ -387,7 +387,7 @@ if indorf = 0:
 			sdadloc['athome'] = 0
 		end
 	else
-		if hour = 6 and minut < 10:
+		if hour < 6 or (hour = 6 and minut < 10):
 			!! Sleep
 			sdadloc = 1
 			sdadloc['athome'] = 0
@@ -429,7 +429,7 @@ if indorf = 0:
 			!! Family dinner
 			sdadloc = 8
 			sdadloc['athome'] = 1
-		elseif hour < 21:
+		elseif hour < 22:
 			!! Watch tv in living room
 			sdadloc = 10
 			sdadloc['athome'] = 1
@@ -445,54 +445,116 @@ end
 !!indorf = 1 means kolka is in the village
 if indorf = 0:
 	if week <= 5:
-		if hour = 6 and minut < 45:
-			kolloc = 13
+		if hour < 6 or (hour = 6 and minut < 45):
+			if brothermorningsex ! daystart:
+				!! Sleep
+				kolloc = 1
+				kolloc['athome'] = 0
+			else
+				!! Awake - Sveta woke him up
+				kolloc = 2
+				kolloc['athome'] = 1
+			end
 		elseif hour = 7 and minut < 15:
-			kolloc = 4
+			!! Family Breakfast
+			kolloc = 3
+			kolloc['athome'] = 1
 		elseif hour < 8:
-			kolloc = 0
+			!! Leaves for school and hangs out with friends
+			kolloc = 4
+			kolloc['athome'] = 0
 		elseif hour < 14:
-			kolloc = 0
-		elseif hour = 16 and minut < 45:
-			kolloc = func('shortgs', 'rand_pick', '', 10, 11, 12)
-		elseif hour < 17:
-			kolloc = 0
+			!! At School
+			kolloc = 5
+			kolloc['athome'] = 0
+		elseif hour >= 14 and hour < 17:
+			!! Track Field
+			kolloc = 6
+			kolloc['athome'] = 0
 		elseif hour < 18:
-			kolloc = 13
+			if kanikuli = 0 and brother_homework ! daystart:
+				!! Homework
+				kolloc = 7
+				kolloc['athome'] = 1
+			else
+				!! Watches TV or games
+				kolloc = 11
+				kolloc['athome'] = 1
+			end
 		elseif hour = 18 and minut < 30:
-			kolloc = 4
-		elseif hour = 18 and minut < 45:
-			kolloc = 0
+			!! Family Dinner
+			kolloc = 8
+			kolloc['athome'] = 1
 		elseif hour < 21:
-			kolloc = 10
+			!! Leaves apartment
+			kolloc = 9
+			kolloc['athome'] = 0
 		elseif hour = 21 and minut < 15:
-			kolloc = 5
+			!! Shower
+			kolloc = 10
+			kolloc['athome'] = 1
 		elseif hour < 23:
-			kolloc = 13
+			!! Watches TV or games
+			kolloc = 11
+			kolloc['athome'] = 1
 		else
-			kolloc = 13
+			!! Sleep
+			kolloc = 1
+			kolloc['athome'] = 0
 		end
 	else
-		if hour = 6 and minut < 45:
-			kolloc = 13
+		if hour < 6 or (hour = 6 and minut < 45):
+			if brothermorningsex ! daystart:
+				!! Sleep
+				kolloc = 1
+				kolloc['athome'] = 0
+			else
+				!! Awake - Sveta woke him up
+				kolloc = 2
+				kolloc['athome'] = 1
+			end
 		elseif hour = 7 and minut < 15:
-			kolloc = 4
+			!! Family Breakfast
+			kolloc = 3
+			kolloc['athome'] = 1
 		elseif hour < 10:
-			kolloc = 13
-		elseif hour = 13 and minut < 10:
-			kolloc = 13
+			if kanikuli = 0 and brother_homework ! daystart:
+				!! Homework
+				kolloc = 7
+				kolloc['athome'] = 1
+			else
+				!! Watches TV or games
+				kolloc = 11
+				kolloc['athome'] = 1
+			end
+		elseif hour <= 13:
+			!! Watches TV
+			kolloc = 11
+			kolloc['athome'] = 1
 		elseif hour < 18:
-			kolloc = func('shortgs', 'rand_pick', '', 8, 10, 11, 12)
+			!! Leaves apartment
+			kolloc = 9
+			kolloc['athome'] = 0
 		elseif hour = 18 and minut < 30:
-			kolloc = 4
+			!! Family Dinner
+			kolloc = 8
+			kolloc['athome'] = 1
 		elseif hour < 21:
-			kolloc = func('shortgs', 'rand_pick', '', 10, 11, 12)
+			!! Watches TV or games
+			kolloc = 11
+			kolloc['athome'] = 1
 		elseif hour = 21 and minut < 15:
-			kolloc = 5
+			!! Shower
+			kolloc = 10
+			kolloc['athome'] = 1
 		elseif hour < 23:
-			kolloc = 13
+			!! Watches TV or games
+			kolloc = 11
+			kolloc['athome'] = 1
 		else
-			kolloc = 13
+			!! Sleep
+			kolloc = 1
+			kolloc['athome'] = 0
 		end
 	end
 end

+ 35 - 33
locations/father.qsrc

@@ -459,38 +459,40 @@ if (hour > 10 and week < 6) or week >= 6:
         end
     end
 
-    act 'Watch TV together':
-        *clr & cla
-		menu_off = 1
-        minut += 60
-        pcs_mood += rand(10,50)
-        gs 'stat'
-        '<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
-        '<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
-
-        dynamic $fatherRep
-        act 'Move away':gt $loc, $loc_arg
-
-        if npc_rel['A28'] < 20:
-            gs 'dinfather', 'watchtv1'
-            exit
-        elseif npc_rel['A28'] >= 20 and npc_rel['A28'] < 40:
-            gs 'dinfather', 'watchtv2'
-            exit
-        elseif npc_rel['A28'] >= 40:
-            if pcs_apprnc + (npc_rel['A28']/10) <= 0:
-                gs 'dinfather', 'watchtv4'
-                exit
-            end
-            if pcs_apprnc + (npc_rel['A28']/10) > 60:
-                gs 'dinfather', 'watchtv4'
-                exit
-            end
-        end
-    end
+	if sdadloc = 10:
+		act 'Watch TV together':
+			*clr & cla
+			menu_off = 1
+			minut += 60
+			pcs_mood += rand(10,50)
+			gs 'stat'
+			'<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
+			'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
+
+			dynamic $fatherRep
+			act 'Move away':gt $loc, $loc_arg
+
+			if npc_rel['A28'] < 20:
+				gs 'dinfather', 'watchtv1'
+				exit
+			elseif npc_rel['A28'] >= 20 and npc_rel['A28'] < 40:
+				gs 'dinfather', 'watchtv2'
+				exit
+			elseif npc_rel['A28'] >= 40:
+				if pcs_apprnc + (npc_rel['A28']/10) <= 0:
+					gs 'dinfather', 'watchtv4'
+					exit
+				end
+				if pcs_apprnc + (npc_rel['A28']/10) > 60:
+					gs 'dinfather', 'watchtv4'
+					exit
+				end
+			end
+		end
+	end
 end
 
-if mother_go = 1 and hour = 16 and TouchedByFather = 1 and pcs_horny >= 50 or npc_sex['A28']!0 and mother_go = 1 and hour = 16:
+if sdadloc = 10 and momloc['athome'] = 0 and kolloc['athome'] = 0 and TouchedByFather = 1 and pcs_horny >= 50 or npc_sex['A28'] ! 0:
     act 'Seduce him':
 		menu_off = 1
         if npc_rel['A28'] < 20:
@@ -590,9 +592,9 @@ if $clothingworntype = 'nude':
             exit
         end
     else
-        if mother_go = 0:$mother_go_text = '"You really should go put some clothes on though, your mother is home."'
+        if momloc['athome'] = 1:$mother_go_text = '"You really should go put some clothes on though, your mother is home."'
             'His eyes never stop looking at your naked body, you can tell he''s very much impressed by your beauty as you walk around the room.<<$mother_go_text>>"'
-        if mother_go = 0:
+        if momloc['athome'] = 1:
             act 'Move away':gt 'bedrPar'
             exit
         end
@@ -616,7 +618,7 @@ end
 if npc_sex['A28']!0:fatherwantssex = rand(1,2)
 
 if $clothingworntype = 'nude': fatherwantssex = 1
-if npc_sex['A28']!0 and fatherwantssex = 1 and mother_go = 1 and hour = 16 and npc_rel['A28'] > 60:
+if npc_sex['A28']!0 and fatherwantssex = 1 and momloc['athome'] = 0 and kolloc['athome'] = 0 and npc_rel['A28'] > 60:
     *clr & cla
 	menu_off = 1
     gs 'stat'

+ 3 - 1
locations/gkafe.qsrc

@@ -9,6 +9,8 @@ if $ARGS[0] = '':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	gs 'stat'
+	gs 'family'
+	gs 'family_schedule'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe.jpg"></center>'
@@ -18,7 +20,7 @@ if $ARGS[0] = '':
 
 	act 'Leave the cafe':gt 'pav_train'
 
-	if mother_go = 1 and hour = 16 and indorf = 0:
+	if momloc = 9 and hour = 16 and indorf = 0 and mother_go = 1:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe.jpg"></center>'
 		*nl

+ 4 - 2
locations/korrPar.qsrc

@@ -47,7 +47,7 @@ if hour ! 18 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,2) = 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,3) = 1: gt 'mother', 'condom_steal', 'talk'
 
 act '<b>Leave and go to the stairwell</b>':
 	if $clothingworntype ! 'nude':
@@ -154,6 +154,8 @@ elseif sdadloc = 5 and sdadloc = 11:
 	else
 		act 'Go to the bathroom':msg'You try to open the bathroom door but it immediately stops, banging against the latch. You hear the water running and your stepfather shout "I''m in the shower!"'
 	end
+elseif kolloc = 10:
+	act 'Go to the bathroom':msg'You try to open the bathroom door but it immediately stops, banging against the latch. You hear the water running and your brother shout "I''m in the shower!"'
 else
 	act 'Go to the bathroom':minut += 1 & gt 'vanrPar'
 end
@@ -384,7 +386,7 @@ elseif motherWorry = 1 and indorf > 0:
 	motherWorry = 0
 end
 
-if notathomesleep > 7 and hour >= 16 and hour < 21 and mother_go = 0:
+if notathomesleep > 7 and hour >= 16 and hour < 21 and momloc['athome'] = 1:
 	notathomesleep = 0
 	*clr & cla
 	*pl $korrParMomHeader

+ 2 - 2
locations/vanrPar.qsrc

@@ -62,7 +62,7 @@ if $ARGS[0] = 'peek':
 			stepdadqw += 1
 			act 'Finish': gt 'vanrPar'
 		else
-			if npc_sex['A28'] = 0 or stepdadqw < 5 or pcs_vag = 0 or mesec > 0 or mother_go = 0 or hour < 16:
+			if npc_sex['A28'] = 0 or stepdadqw < 5 or pcs_vag = 0 or mesec > 0 or momloc['athome'] = 1:
 				gs 'vanrPar', 'stepdad_nosex'
 			else
 				*clr & cla
@@ -73,7 +73,7 @@ if $ARGS[0] = 'peek':
 				act 'Daddy wants to join?': gs 'vanrPar', 'stepdad_sex'
 			end
 		end
-	elseif ((hour >= 18 and hour < 23 and week < 6) or (hour >= 20 and hour < 23 and week >= 6)) and brother_ev1 ! daystart and rand(0,4) < 2 and indorf = 0:
+	elseif kolloc['athome'] = 1 and brother_ev1 ! daystart and rand(0,4) < 2 and indorf = 0:
 		*clr & cla
 		brother_ev1 = daystart
 		'Despite the pattering sound of the water, you hear the bathroom door creaking open slightly. Through the crack in the door, you notice your brother Kolka watching you.'