Procházet zdrojové kódy

[changed] commented out missing images and added the "missing image" image to brother_voyeur
[fixes] you can brush your teeth to remove the taste of cum in din_van
[fixes] changed cls into *clr & cla in parchurch and parchurch2 to avoid missing a missing stat window, removed unnecessary cla's

julzor před 5 roky
rodič
revize
9386bd436d

+ 17 - 26
locations/ParChurch.qsrc

@@ -54,8 +54,8 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'vigil':
-	cls
 	CLOSE ALL
+	*clr & cla
 	menu_off = 1
 	churchday = daystart
 	pcs_mood += 10
@@ -81,7 +81,7 @@ if $ARGS[0] = 'vigil':
 
 	act 'Return to Narthex': gt 'ParChurch', 'Narthex'
 	act 'Stay for the Rite of Mutual Forgiveness':
-		cls
+		*clr & cla
 		pcs_mood += 10
 		pcs_horny -= 20
 		moral += 1
@@ -107,7 +107,7 @@ if $ARGS[0] = 'vigil':
 end
 
 if $ARGS[0] = 'liturgy':
-	cls
+	*clr & cla
 	CLOSE ALL
 	churchday = daystart
 	menu_off = 1
@@ -152,7 +152,7 @@ if $ARGS[0] = 'liturgy':
 end
 	
 if $ARGS[0] = 'Narthex':
-	cls
+	*clr & cla
 	CLOSE ALL
 	menu_off = 1
 	gs 'stat'
@@ -170,7 +170,7 @@ if $ARGS[0] = 'Narthex':
 end
 
 if $ARGS[0] = 'candle':
-	cls
+	*clr & cla
 	minut += 30
 	menu_off = 1
 	gs 'stat'
@@ -204,7 +204,7 @@ if $ARGS[0] = 'candle':
 end
 
 if $ARGS[0] = 'pray':
-	cls
+	*clr & cla
 	menu_off = 1
 	randtime = rand(15,60)
 	minut += randtime
@@ -266,13 +266,13 @@ if $ARGS[0] = 'pray':
 end
 
 if $ARGS[0] = 'amends':
-	cls
+	*clr & cla
 	menu_off = 1
 	minut += 15
 	gs 'stat'
 	'As you approach the priest, you recall your previous behaviour and that the priest said that he wanted to discuss it with you further.'
 	act 'Approach him':
-		cls
+		*clr & cla
 		cla
 		gs 'stat'
 		moral += 1
@@ -285,15 +285,13 @@ if $ARGS[0] = 'amends':
 		'"Your behaviour was indeed unbefitting a young lady." the priest replies gravely, "However, it is given to us to forgive each other even as God forgives us. If you truly wish to make amends, there is something you could do."'
 		'"Of course, father," you reply, eager for forgiveness, "What do you need me to do?"'
 		if Churchbad = 1:
-			cla
-			cls
+			*clr & cla
 			!'<center><img <<$set_imgh>> src="images/qwest/alter/church/broom_closet.jpg"></center>' Missing Image.
 			'<center><img src="images/system/image_needed.png"></center>'
 			'The priest leads you back to the Narthex and opens a door on the side opposite the counter where you buy candles. Inside you see cleaning supplies.'
 			'Taking out a broom, the priest smiles at you, "The Narthex and the Sanctuary could use a good sweeping and mopping." he says.'
 			act 'Take the broom':
-				cla
-				cls
+				*clr & cla
 				gs 'stat'
 				minut += 60
 				Churchbad = 0
@@ -305,8 +303,7 @@ if $ARGS[0] = 'amends':
 				act 'Leave the church': gt 'ParChurch' , 'start'
 			end
 			act 'Tell him what he can do with the broom':
-				cla
-				cls
+				*clr & cla
 				gs 'stat'
 				minut += 5
 				Churchbad = 2
@@ -324,8 +321,7 @@ if $ARGS[0] = 'amends':
 			'"I know father." you reply with a sigh, "But I just can''t seem to help it sometimes."'
 			if pav_slut >= 75 and pcs_horny > 50:
 				act 'Try to tease him':
-					cla
-					cls
+					*clr & cla
 					Kirill_Crpt += 1
 					moral -= 1
 					'<center><img <<$set_imgh>> src="images/shared/sex/exhibitionism/fatherim30.jpg"></center>'
@@ -369,8 +365,7 @@ if $ARGS[0] = 'amends':
 					end
 				end
 			else
-				cla
-				cls
+				*clr & cla
 				moral += rand(0,3)
 				Churchbad = 1
 				Kirill += rand(0,2)
@@ -447,8 +442,7 @@ if $ARGS[0] = 'fillers':
 end
 
 if $ARGS[0] = 'confessional':
-	cls
-	cla
+	*clr & cla
 	menu_off = 1
 	minut += 5
 	gs 'atat'
@@ -457,8 +451,7 @@ if $ARGS[0] = 'confessional':
 	'"One moment, my dear." he says softly, "I was wondering if you wouldn''t mind indulging an old man."'
 	'"Of course father." you answer wirhout hesitation, "Although I don''t think you''re old at all."'
 	act 'Continue':
-		cls 
-		cla
+		*clr & cla 
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_stairs.jpg"></center>'
 		'Father Kirill leads you to the Narthex and through a door opposite the candle counter. He opens another door and you see stairs leading to the basement.'
@@ -466,8 +459,7 @@ if $ARGS[0] = 'confessional':
 		'"What is it you want me to do?" you ask nervously.'
 		'"I want to show you something that an old friend of mine gave me years ago," Father Kirill replied, "It has been down in the cellar for years but I''ve always wanted to try it."'
 		act 'Refuse to go down the stairs':
-			cls
-			cla
+			*clr & cla
 			Kirill -= 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_stairs.jpg"></center>'
@@ -477,8 +469,7 @@ if $ARGS[0] = 'confessional':
 			act 'Leave the church': gt 'ParChurch' , 'start'
 		end	
 		act 'Go with Father Kirill':
-			cls
-			cla
+			*clr & cla
 			Kirill += 1
 			con_box = 1
 			gs 'stat'

+ 11 - 18
locations/ParChurch2.qsrc

@@ -1,6 +1,6 @@
 # ParChurch2
 if $ARGS[0] = 'confession':
-	cls
+	*clr & cla
 	menu_off = 1
 	gs 'stat'
 	if confK ! 0: lastconf = daystart - confess
@@ -32,8 +32,7 @@ if $ARGS[0] = 'confession':
 	if confK >= 10 and Kirill >= 60: gt 'ParChurch2', 'secrets'
 	minut += rand(20,45)
 	act 'Be honest':
-		cla
-		cls
+		*clr & cla
 		gs 'stat'
 		if con_box = 0: $confstring = 'kneel together next to the analogion holding a richly decorated Gospel Book with a blessing cross upon its cover' & '<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confessionalt.jpg"></center>'
 		if con_box = 1:	$confstring = 'go to the confessional in the basement and sit down inside' & '<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
@@ -337,7 +336,7 @@ if $ARGS[0] = 'confession':
 end
 
 if $ARGS[0] = 'first_conf':
-	cls
+	*clr & cla
 	gs 'stat'
 	minut += rand(20,30)
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confessionalt.jpg"></center>'
@@ -349,13 +348,11 @@ if $ARGS[0] = 'first_conf':
 	'You explained to the priest that you have never confessed before and he nodded in understanding. He led you to a quiet corner, not far from an analogion and gestured for you to sit next to him on a small bench. He explained to you how confession works and the importance of being truthful when confessing. He stressed that it is not to him that you confess, but rather to God through Jesus. He told you that although They already know your sins, you must acknowledge them to yourself by declaring them, only then can they be forgiven.'
 	'You indicated your understanding and the priests asked you if you are ready to begin.'
 	act 'Be honest':
-		cla
-		cls
+		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confessionalt.jpg"></center>'
 
 		if group['exp'] ! 0:
-			cla
 			confK += 1
 			moral += 1
 			Kirill += 1
@@ -372,7 +369,6 @@ if $ARGS[0] = 'first_conf':
 			'"Now you must mend you ways, child. Please come again, and if you feel unsure, simply pray to God and He will hear you."'
 			'"Thank you, Father." you say as you leave.'
 		elseif stat['anal'] ! 0:
-			cla
 			confK += 1
 			moral += 1
 			Kirill += 1
@@ -389,7 +385,6 @@ if $ARGS[0] = 'first_conf':
 			'"Now you must mend you ways, child. Please come again, and if you feel unsure, simply pray to God and He will hear you."'
 			'"Thank you, Father." you say as you leave.'
 		elseif stat['vaginal'] ! 0:
-			cla
 			confK += 1
 			moral += 1
 			Kirill += 1
@@ -406,7 +401,6 @@ if $ARGS[0] = 'first_conf':
 			'"Now you must mend you ways, child. Please come again, and if you feel unsure, simply pray to God and He will hear you."'
 			'"Thank you, Father." you say as you leave.'
 		elseif stat['bj'] ! 0:
-			cla
 			confK += 1
 			moral += 1
 			Kirill += 1
@@ -422,7 +416,6 @@ if $ARGS[0] = 'first_conf':
 			'"Please come again, and if you feel unsure, simply pray to God and He will hear you."'
 			'"Thank you, Father." you say as you leave.'
 		elseif stat['hj'] ! 0:
-			cla
 			confK += 1
 			moral += 1
 			Kirill += 1
@@ -452,7 +445,7 @@ if $ARGS[0] = 'first_conf':
 		act 'Return to Narthex': gt 'ParChurch', 'Narthex'
 	end
 	act 'Don''t confess':
-		cls
+		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confessionalt.jpg"></center>'
 		confK += 1
@@ -468,7 +461,7 @@ if $ARGS[0] = 'first_conf':
 		act 'Return to Narthex': gt 'ParChurch', 'Narthex'
 	end
 	act 'Waste his time':
-		cls
+		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confessionalt.jpg"></center>'
 		confK += 1
@@ -518,7 +511,7 @@ if $ARGS[0] = 'first_conf':
 end
 
 if $ARGS[0] = 'secrets':
-	cls
+	*clr & cla
 	gs 'stat'
 	minut += rand(20,60)
 	if Kirill_Crpt >= 20 and con_box = 0: gt 'ParChurch', 'confessional'
@@ -540,7 +533,7 @@ if $ARGS[0] = 'secrets':
 		end
 	end
 	act 'Confess your less dramatic sins':
-		cls
+		*clr & cla
 		gs 'stat'
 		if con_box = 0: $confstring = 'kneel together next to the analogion holding a richly decorated Gospel Book with a blessing cross upon its cover' & '<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confessionalt.jpg"></center>'
 		if con_box = 1:	$confstring = 'go to the confessional in the basement and sit down inside' & '<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
@@ -782,7 +775,7 @@ if $ARGS[0] = 'secrets':
 !!	if lesbian ! 0 or sisterLesb ! 0 or brotherSex ! 0 or evgenQW = 4 or sisboytrio ! 0 or trfatherMishaQW = 7 or zoo ! 0 or DogHJ ! 0 or DogBJ ! 0 or DogVag ! 0 or DogAnal ! 0 or FatherMolest ! 0 or npc_sex['A28']!0:
 	if lesbian ! 0 or sisterLesb ! 0 or seepornofut ! 0:
 		act 'Confess a secret':
-			cls
+			*clr & cla
 			if con_box = 0: $confstring = 'kneel together next to the analogion holding a richly decorated Gospel Book with a blessing cross upon its cover' & '<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confessionalt.jpg"></center>'
 			if con_box = 1:	$confstring = 'go to the confessional in the basement and sit down inside' & '<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
 
@@ -873,7 +866,7 @@ if $ARGS[0] = 'secrets':
 					end
 					if evgenQW >= 2:
 						act 'Admit to jerking the boys':
-							cls
+							*clr & cla
 							cla
 							if con_box = 0: '<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confessionalt.jpg"></center>'
 							if con_box = 1:	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
@@ -891,7 +884,7 @@ if $ARGS[0] = 'secrets':
 					end
 					if evgenQW >= 3:
 						act 'Admit to sucking the boys':
-							cls
+							*clr & cla
 							if con_box = 0: '<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confessionalt.jpg"></center>'
 							if con_box = 1:	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
 							gs 'stat'

+ 6 - 3
locations/brother_voyeur.qsrc

@@ -523,7 +523,8 @@ if $ARGS[0] = 'brother_shower_together_ask':
 
 	act'Just close the latch':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk5.jpg"></center>'
+		!!'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk5.jpg"></center>'
+		'<center><img src="images/system/image_needed.png"></center>'
 		'	"Just close the latch! It''ll be fine!" you insist.'
 		'	You can see he''s still conflicted, but in the end his baser instincts win and he starts to undress, unable to pass up an opportunity to shower with a female.'
 		act'Let him get in':gt'brother_voyeur','brother_shower_together_first'
@@ -531,12 +532,14 @@ if $ARGS[0] = 'brother_shower_together_ask':
 
 	act'What, are you chicken?':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk6.jpg"></center>'
+		!!'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk6.jpg"></center>'
+		'<center><img src="images/system/image_needed.png"></center>'
 		'	"What''s the matter Kolka? Are you chicken?" you tease.'
 		'	"I am not!" he says, his face starting to turn red.'
 		act'Prove it':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk5.jpg"></center>'
+			!!'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk5.jpg"></center>'
+			'<center><img src="images/system/image_needed.png"></center>'
 			'	"Prove it."'
 			'	Your challenge can''t be passed up and Kolka practically starts throwing his clothes off to climb into the shower with you.'
 			act'Let him get in':gt'brother_voyeur','brother_shower_together_first'

+ 1 - 1
locations/din_van.qsrc

@@ -29,7 +29,7 @@ $showerdin = {
 }
 
 $bteeth = {
-	if pcs_breath ! 1:
+	if pcs_breath ! 1 or cumloc[12] = 1:
 		act 'Brush your teeth (0:05)':
 		menu_off = 1
 			cla