Forráskód Böngészése

[Bug Fixes] Fixed bathroom shower bug and KorrPar command order. The correct order of execution should be init, file paths, game loc and then quest trackers.

Hooded Silence 1 hónapja
szülő
commit
a7420991a1

+ 3 - 4
locations/bedrPar.qsrc

@@ -14,7 +14,9 @@
 
 
 !! Begin location content
-if $ARGS[0] = '' or $ARGS[0] = 'start':
+if $ARGS[0] = '' or $ARGS[0] = 'start':	
+	!! Call in location default actions
+	gs 'home_family_init', 'init'
 	!! Set location vars:
 	fromoutside = iif($loc = 'bedrPar',0,1)
 	
@@ -23,9 +25,6 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	!! This is runs only once, just to make sure that Sveta can sing from the start, does not have to wait a whole day for `cikl` to run.
 	if ml_performance['max_perform_minutes'] = 0: ml_performance['max_perform_minutes'] = pcs_instrmusic + pcs_vokal
 
-	!! Call in location default actions
-	gs 'home_family_init', 'init'
-
 	!! Set up game location data
 	$locclass = 'bedr'
 	gs 'shortgs', 'setloc', 'bedrpar', $ARGS[0]

+ 4 - 2
locations/bedrPar2.qsrc

@@ -6,13 +6,15 @@
 !! 
 !! Desc: Paernts bedroom links to family flat corridor
 
+!! Call in location default actions
+gs 'home_family_init', 'init'
+
 !! Set location header - img path is set in init
 $setloc['StageTitle'] = 'Parents Bedroom'
 $setloc['StageImage'] = '<<$default_img_path>>/bedrpar2.jpg'
 
 !! Set location vars:
-!! Call in location default actions
-gs 'home_family_init', 'init'
+
 
 !! Set up game location data
 $locclass = 'bedr'

+ 5 - 6
locations/home_family_init.qsrc

@@ -9,14 +9,13 @@
 !! Internal rooms to location: BedrPar, BedrPar2, korrPar, kuhrPar, sitrPar, vanrPar
 !! External links to location: pav_residential, pod_ezd
 
-!! Set up default image paths for npc and location:
-
-$default_img_path = 'locations/pavlovsk/resident/apartment/home'
-$mother_img_path = 'images/characters/pavlovsk/resident/mom/'
+if $ARGS[0] = '' or $ARGS[0] = 'init':
+    !! Set up default image paths for npc and location:
 
-!! clear and initialise location for content:
+    $default_img_path = 'locations/pavlovsk/resident/apartment/home'
+    $mother_img_path = 'images/characters/pavlovsk/resident/mom/'
 
-if $ARGS[0] = '' or $ARGS[0] = 'init':
+    !! clear and initialise location for content:
     *clr & cla
     CLOSE ALL	
     music_loop = 0

+ 3 - 5
locations/korrPar.qsrc

@@ -6,6 +6,8 @@
 !! 
 !! Desc: Family home kitchen links to family flat corridor
 
+!! Call in location default actions
+gs 'home_family_init', 'init'
 
 !! Set location header - img path is set in init
 $setloc['StageTitle'] = 'Corridor'
@@ -20,10 +22,6 @@ saunaYouRoom = 0
 boycherdaksex = 0
 bonusZ = 0
 display_bb = 0
-
-!! Call in location default actions
-gs 'home_family_init', 'init'
-
 !! Set up game location data
 gs 'shortgs', 'setloc', 'korrPar', $ARGS[0]
 
@@ -153,7 +151,7 @@ elseif locat['Kolka'] = 10:
 elseif locat['Anya'] = 5:
 	act 'Go to the bathroom':msg'You try to open the bathroom door, but it immediately stops and bangs against the latch. You hear the water running and your sister yell "I''ll be done in a few minutes!"'
 else
-	act 'Go to the bathroom':minut += 1 & gt 'vanrPar'
+	act 'Go to the bathroom':minut += 1 & gt 'vanrPar', 'start'
 end
 
 if motherQW['bathroom_dildos'] > 0 and locat['Mom_athome'] = 1: gt'mother_sextalk','bathroom_dildos1'

+ 2 - 3
locations/kuhrPar.qsrc

@@ -7,6 +7,8 @@
 !! Desc: Family home kitchen links to family flat corridor
 
 !! Start location initialisation
+!! Call in location default actions
+gs 'home_family_init', 'init'
 !! Set location header - img path is set in init
 $setloc['StageTitle'] = 'Parents Kitchen'
 $setloc['StageImage'] = '<<$default_img_path>>/kuhrpar.jpg'
@@ -16,9 +18,6 @@ $setloc['StageImage'] = '<<$default_img_path>>/kuhrpar.jpg'
 !! Call in kitchen library:
 gs 'kit_din'
 
-!! Call in location default actions
-gs 'home_family_init', 'init'
-
 !! Set up game location data
 gs 'shortgs', 'setloc', 'kuhrpar', $ARGS[0]
 !! End location initialisation

+ 5 - 5
locations/sitrPar.qsrc

@@ -7,7 +7,8 @@
 !! Desc: Family living room and Kolka''s bedroom links to family corridor
 
 if $ARGS[0] = '' or $ARGS[0] = 'start':
-
+	!! Call in location default actions
+	gs 'home_family_init', 'init'
 	!! Start location initialisation
 
 	!! Set location header - img path is set in init
@@ -22,10 +23,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	locat['Fam_livingroom'] = 0
 
 	!! Set location vars:
-	minut += 1
 
-	!! Call in location default actions
-	gs 'home_family_init', 'init'
+
+
 	
 	!! Check if anyone is in the room
 	gs 'sitrPar', 'occupied'
@@ -84,7 +84,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			'You sit at the festive table laid in front of the TV and celebrate the New Year with your family, the TV providing some background noise. At the table, people strike up a conversation and common problems are forgotten as everyone is has fun talking to each other. At midnight, everyone wishes one another a happy New Year and enjoys the champagne and fireworks outside as your mother gives you an envelope with a greeting card and 5000 <b>₽</b>.' 
 			'You continue to watch TV and enjoy the champagne and company of your family, but everyone eventually grows tired and they go to bed, one by one.'
 
-			act 'Leave': gt 'korrPar'
+			act 'Leave': 	minut += 1 & gt 'korrPar'
 		end
 	elseif month = 1 and day = 1:
 		act 'Eat some leftovers at the festive table':

+ 24 - 23
locations/vanrPar.qsrc

@@ -6,29 +6,30 @@
 !! 
 !! Desc: Family home bathroom links to family flat corridor
 
-!! Start location initialisation
-!! Set location header - img path is set in init
-$setloc['StageTitle'] = 'Parents Bathroom'
-$setloc['StageImage'] = '<<$default_img_path>>/vanrpar.jpg'
 
-!! Set location vars:
+if $ARGS[0] = '' or $ARGS[0] = 'start':
+	!! Start location initialisation
 
+	!! Call in location default actions
+	gs 'home_family_init', 'init'
 
-!! Call in location default actions
+	!! Set location header - img path is set in init
+	$setloc['StageTitle'] = 'Parents Bathroom'
+	$setloc['StageImage'] = '<<$default_img_path>>/vanrpar.jpg'
 
-gs 'home_family_init', 'init'
+	!! Set location vars:
 
-!! Set up game location data
-$location_type = 'bathroom'
-$bathtype = 'bathtub shower'
-gs 'shortgs', 'setloc', 'vanrPar', $ARGS[0]
+	!! Set up game location data
+	$location_type = 'bathroom'
+	$bathtype = 'bathtub shower'
 
-!! End location initialisation
-if $ARGS[0] = '' or $ARGS[0] = 'start':
+	!! End location initialisation
+
+	!! prevent peek scene setting $loc_arg
+	gs 'shortgs', 'setloc', 'vanrPar', 'start'
 	!! Display header and banner image
 	gs 'core_library', 'stage_title'
 
-
 	!! Begin location content
 	
 	!! Location default description:
@@ -66,7 +67,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		end
 	elseif vanr_lock = 1:
 		act 'Unlatch the door and leave': 
-			minut += 1
+			minut += 1 
 			vanr_lock = 0
 			gt 'korrPar'
 		end
@@ -77,17 +78,17 @@ end
 
 if $ARGS[0] = 'latch':
 	vanr_lock = 1
-	gt 'vanrPar'
+	gt 'vanrPar', 'start'
 end
 
 if $ARGS[0] = 'unlatch':
 	vanr_lock = 0
-	gt 'vanrPar'
+	gt 'vanrPar', 'start'
 end
 
 if $ARGS[0] = 'perm_latch':
 	vanr_lock = 2
-	gt 'vanrPar'
+	gt 'vanrPar', 'start'
 end
 
 if $ARGS[0] = 'peek':
@@ -100,7 +101,7 @@ if $ARGS[0] = 'peek':
 			'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_0.mp4"></video></center>'
 			'As luck would have it, you hear footsteps at the door. Turning around, you catch a glimpse of your stepfather through the gap in the door right before he moves away, muttering something about the door. Once again alone, you find yourself feeling confused, and with a rapidly beating heart.'
 			stepdadqw += 1
-			act 'Finish': gt 'vanrPar'
+			act 'Finish': gt 'vanrPar', 'start'
 		else
 			if npc_sex['A28'] = 0 or stepdadqw < 5 or mesec > 0 or locat['Mom_athome'] = 1:
 				gs 'vanrPar', 'stepdad_nosex'
@@ -151,7 +152,7 @@ if $ARGS[0] = 'stepdad_nosex':
 	'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_2.mp4"></video></center>'
 	'You hear movement at the door and turn around. It''s your stepfather. It looks like he passed by and accidentally peeked in. Catching his glance, you feel mischievous and excited, so you blow him a kiss. Without a word, he disappears, yet you can''t help smiling and giggling as you continue drying your hair.'
 	stepdadqw += 1
-	act 'Finish': gt 'vanrPar'
+	act 'Finish': gt 'vanrPar', 'start'
 end
 
 if $ARGS[0] = 'stepdad_sex_no':
@@ -161,7 +162,7 @@ if $ARGS[0] = 'stepdad_sex_no':
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shower_coverup.jpg"></center>'
 	'He stands at the threshold for a moment, staring at you and nervously licking his lips. They way he is looking at your makes you feel exposed and you quickly cover yourself up. "Oh my god what you are doing? Get out and close the door." He looks surprised by your outburst, he looks like he is about to say something, but then he just shakes his head and walks out pulling the door closed behind him, letting you finish your shower in peace.'
 	stepdadqw -= 2
-	act 'Finish': gt 'vanrPar'
+	act 'Finish': gt 'vanrPar', 'start'
 end
 
 if $ARGS[0] = 'stepdad_sex':
@@ -346,7 +347,7 @@ if $ARGS[0] = 'stepdad_sex_end':
 		noshampoo = 1
 		dynamic $showerdin
 		gs 'stat'
-		gt 'vanrPar'
+		gt 'vanrPar', 'start'
 	end
 end
 
@@ -362,7 +363,7 @@ if $ARGS[0] = 'stepdad_sex_analend':
 		noshampoo = 1
 		dynamic $showerdin
 		gs 'stat'
-		gt 'vanrPar'
+		gt 'vanrPar', 'start'
 	end
 end