Browse Source

[fixed] missing or wrong menu variables in din_van, gadukino and kit_din

julzor 5 years ago
parent
commit
5c76b1b7ec
3 changed files with 49 additions and 72 deletions
  1. 8 13
      locations/din_van.qsrc
  2. 1 0
      locations/gadukino.qsrc
  3. 40 59
      locations/kit_din.qsrc

+ 8 - 13
locations/din_van.qsrc

@@ -1291,10 +1291,9 @@ end
 
 !!Private bathrooms: One of these text should be randomly selected if using a private restroom, such as one in a home.
 if $ARGS[0] = 'prvt_pee':
-	menu_off = 1
 	act 'Go pee':
-		*clr
-		cla
+		*clr & cla
+		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/pc/pee/pee-private/' + rand(1,19) + '.jpg"></center>'
 		!!Get random pee-private picture
 		rand_pee = rand(0,7)
@@ -1368,11 +1367,10 @@ end
 
 
 !!Public bathrooms: These texts should be randomly selected if using a public restroom
-if $ARGS[0] = 'pblc_pee':
-	menu_off = 1
+if $ARGS[0] = 'pblc_pee':	
 	act 'Go pee':
-		*clr
-		cla
+		*clr & cla
+		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/pc/pee/pee-public/' + rand(1,11) + '.jpg"></center>'
 		rand_pee = rand(0,7)
 		if rand_pee = 0:
@@ -1443,8 +1441,7 @@ if $ARGS[0] = 'pblc_pee':
 !!This may require an addition check to see if the PC has a purse since I think they need that to carry tampons with them.
 		if isprok = 1 and tampon > 0:
 			act 'Change tampon':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
 				'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one before unpackaging it and carefully inserting it into you.'
 
@@ -1456,8 +1453,7 @@ if $ARGS[0] = 'pblc_pee':
 !!This may require an addition check to see if the PC has a purse since I think they need that to carry pads with them.
 		if isprokp = 1 and sanpad > 0:
 			act 'Change pad':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/pad/' + rand(1,6) + '.jpg"></center>'
 				'Checking your pad, you decide it''s time for a new one. You carefully peel it off of your panties before folding it into thirds and setting it aside to be thrown away. Digging in your bag, you pull out a fresh pad, unpackage it, peel off the adhesive strip, and place it into your underwear. Finally, you wrap the wings around the sides of the gusset to make sure it is nice and secure.'
 
@@ -1472,8 +1468,7 @@ end
 
 if $ARGS[0] = 'pblc_pee_end':
 	act 'Finish and wipe':
-		*clr
-		cla
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/pc/pee/wiping/' + rand(1,9) + '.jpg"></center>'
 		rand_pee = rand(0,6)
 		if rand_pee = 0:

+ 1 - 0
locations/gadukino.qsrc

@@ -17,6 +17,7 @@ if $ARGS[0] = '':
 	mitkarand = rand(1,10)
 	if mitkaday ! daystart and hour >= 7 and hour < 20 and mitkarand = 1 and (npc_QW['A63'] < 11 or gadriver_gang > 2):
 		*clr & cla
+		menu_off = 1
 		minut += 5
 		gs 'stat'
 		'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'

+ 40 - 59
locations/kit_din.qsrc

@@ -1,7 +1,7 @@
 # kit_din
 
 $santehnikgr = {
-	cls
+	*clr & cla
 	ransloman = 0
 	minut += 25
 	gs 'stat'
@@ -11,7 +11,7 @@ $santehnikgr = {
 }
 
 $santehnikend3 = {
-	cls
+	*clr & cla
 	ransloman = 0
 	facial += 1
 	spafinloc = 11
@@ -32,7 +32,7 @@ $santehnikend3 = {
 }
 
 $santehnikend1 = {
-	cls
+	*clr & cla
 	kransloman = 0
 	minut += 1
 	gs 'stat'
@@ -42,14 +42,14 @@ $santehnikend1 = {
 	act 'Suggest a loan':dynamic $santehnikend2
 
 	act 'Another way?':
-		cls
+		*clr & cla
 		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s3.jpg"></center>'
 		'You ask the plumber what he has in mind. Instead of answering, he takes you by the shoulders and draws you to him. You rest your soft breasts against his chest and feel your stomach resting on something solid. He easily pushes your shoulders and whispers, "Come on baby, do not be shy."'
 
 		act 'Kneel':
-			cls
+			*clr & cla
 			minut += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/plumber/bj.jpg"></center>'
@@ -62,7 +62,7 @@ $santehnikend1 = {
 			end
 
 			act 'Suck':
-				cls
+				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/plumber/bj1.jpg"></center>'
 				'You cup the warm and hard cock between your lips and start sucking it, uttering slurping sounds. The plumber begins to move his hips trying to drive his cock deeper into your mouth. His solid organ fills almost your entire mouth and sticks in your throat, unwittingly choking you.'
@@ -78,7 +78,7 @@ $santehnikend1 = {
 }
 
 $santehnikend2 = {
-	cls
+	*clr & cla
 	kransloman = 0
 	minut += 15
 	santehnikDolg = 1500
@@ -94,21 +94,19 @@ $santehnikend2 = {
 }
 
 $santehnikend = {
-	cla
-	*clr
+	*clr & cla
 	kransloman = 0
 	minut += 30
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s3.jpg"></center>'
 	'Half an hour later he says he is finished, and it will be 1,500 <b>₽</b>'
 
-	if money>=1500:
+	if money >= 1500:
 		act 'Pay':
 			money -= 1500
 			gt'kuhr'
 		end
-	end
-	if money < 1500:
+	elseif money < 1500:
 		'You do not have enough cash on you.'
 		if money+stolmoney >= 1500:
 			'You remember the stash in your table and with that you''ll have enough.'
@@ -128,7 +126,7 @@ $santehnikend = {
 			end
 		elseif money+stolmoney < 1500:
 			act 'I did not have enough money':
-				cls
+				*clr & cla
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s3.jpg"></center>'
 				'You are embarrassed and tell the plumber, that you do not have enough money. He is visibly angry. "You call a fucking plumber and don''t have any money? What am I supposed to do now?"'
@@ -138,8 +136,7 @@ $santehnikend = {
 		end
 		if money+stolmoney<1500 and shameless > 14:
 			act 'Offer a favour instead':
-				cla
-				*clr
+				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s4.jpg"></center>'
 				'I do not have money, but you can take another form of payment? you say, dropping to her knees and starting to unbutton his pants. The guy obviously does not mind and watching your actions. You remove it even flaccid penis and tightly gripping his hand, start to kiss the head, gradually sucking it into his mouth.'
@@ -149,8 +146,7 @@ $santehnikend = {
 				
 				act 'Continue':
 					if pcs_apprnc < 60:
-						cla
-						*clr
+						*clr & cla
 						guy += 1
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s5.jpg"></center>'
 						'You diligently sucking his dick between his legs itched from all desires, you break off a couple of times to stop and go to the sex, but he took you by the head and continued to fuck your mouth, soon he came into your mouth and swallow once you come and pick it up again member, as he put his pants and silently walked to the door, to sleep with you, he was not even going. From rastrojstva you spat out semen on the floor, looks like you do not attract even plumbing.'
@@ -179,12 +175,10 @@ $santehnik1 = {
 	'You lead him into the kitchen and he starts to get to work. When you reached up to one of the shelves, you notice that he is staring at your ass.'
 
 	act 'Disregard':dynamic $santehnikend
-
 }
 
 $santehnik = {
-	cla
-	*clr
+	*clr & cla
 	kransloman = 0
 
 	if husband = 0 or husbandrink = 10:dynamic $santehnik1 & exit
@@ -195,16 +189,14 @@ $santehnik = {
 	gs 'boyStat', 53, 'a'
 
 	if husband > 0 and husbandrink ! 10:
-		cla
-		*clr
+		*clr & cla
 		minut += 20
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s7.jpg"></center>'
 		'You tell your husband about the leak and he makes a phone call. After 20 minutes, a plumber arrives.'
 		'Your husband walks him to the kitchen and the two of you began to observe his actions, you are sick of hearing about how the plumber hates cheap Chinese fittings and what people pushed into the sink, and you decided to wait in the living room.'
 
 		act 'Leave':
-			cla
-			*clr
+			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s8.jpg"></center>'
 			'You go into the room and sit on the couch, soon your husband comes in and sits down beside you. With one hand on your breast, he runs his other hand down under your panties and begins to massage your clitoris.'
@@ -215,8 +207,7 @@ $santehnik = {
 			gs 'arousal', 'foreplay', 10, 'sub'
 			gs 'stat'
 			act 'Start':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/s9.jpg"></center>'
 				'The husband stands up and pulls from his unbuttoned pants his member, you drop to your knees and his cock is in your mouth, right then the plumber enters, "I''m finished." he says and freezes, seeing this picture.'
 
@@ -245,8 +236,7 @@ $santehnik = {
 						gs 'arousal', 'bj', 10, 'sub'
 						gs 'stat'
 						act 'Ride your husband':
-							cla
-							*clr
+							*clr & cla
 							gs 'cum_manage'
 							suprdolg += 1
 							husband += 1
@@ -360,8 +350,7 @@ $santehnik = {
 
 $dirtarm = {
 	if fairy > 0:
-		cla
-		*clr
+		*clr & cla
 		fairy -= 1
 		minut += dirttarelka * 3
 		cltarelka += dirttarelka
@@ -378,8 +367,7 @@ $dirtarm = {
 }
 
 $edagotd = {
-	cla
-	*clr
+	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
 	'What kind of meal would you like to make?'
@@ -391,8 +379,7 @@ $edagotd = {
 }
 
 $edagotpk = {
-	cla
-	*clr
+	*clr & cla
 	minut += 30
 	edahot += 1
 	eda -= 1
@@ -409,8 +396,7 @@ $edagotpk = {
 }
 
 $edahotd = {
-	cla
-	*clr
+	*clr & cla
 	edahot = 0
 	dirttarelka += 1
 	pcs_mood += 20
@@ -420,8 +406,7 @@ $edahotd = {
 }
 
 $eatout = {
-	cla
-	*clr
+	*clr & cla
 	edahot = 0
 	pcs_mood += 20
 	gs 'food', 'm_meal'
@@ -439,17 +424,15 @@ $posudomashina = {
 }
 
 $edasnack = {
-	act 'Have a snack (0:15)':
-		gs 'food', 'snack'
-	end
+	act 'Have a snack (0:15)': gs 'food', 'snack'
 }
 
 $pranik = {
 	if pranik > 0:
 		'You have <<pranik>> tea biscuits.'
 		act 'Have tea with biscuits (0:05)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			pranik -= 1
 			pcs_health += 30
@@ -475,17 +458,15 @@ $pranik = {
 }
 
 $dritea = {
-	act 'Have a cup of tea (0:10)':
-		gs 'beverage', 'bev_tea'
-	end
+	act 'Have a cup of tea (0:10)': gs 'beverage', 'bev_tea'
 }
 
 $edaD = {
 	if edaD > 0:
 		'The refrigerator contains <b><<edaD>></b> healthy meals.'
 		act 'Eat diet food (0:30)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			frost = 0
 			minut += 30
 			pcs_health += 10
@@ -501,6 +482,7 @@ $edaD = {
 				pcs_energy += 80
 				'The diet meal is tasty, and you enjoy eating it.'
 			end
+			gs 'stat'
 
 			act 'Get up from the table':gt $curloc
 		end
@@ -510,8 +492,8 @@ $edaD = {
 $fatdel = {
 	if fatdel > 0:
 		act 'Take fat burners (0:05)':
-			cla
-			*clr
+			*clr & cla
+			menu_off = 1
 			minut += 5
 			fatdel -= 1
 			if pcs_hydra >= 100:
@@ -522,6 +504,7 @@ $fatdel = {
 			fat -= 20
 
 			'You drink the fat burning capsule. These capsules are quick release and results can be seen soon.'
+			gs 'stat'
 
 			act 'Get up from the table':gt $loc, $metka
 		end
@@ -529,9 +512,7 @@ $fatdel = {
 }
 
 $driwater = {
-	act 'Drink some water (0:05)':
-		gs 'beverage', 'bev_wat'
-	end
+	act 'Drink some water (0:05)': gs 'beverage', 'bev_wat'
 }
 
 $fill_bottle = {
@@ -562,8 +543,8 @@ $lekarstvo = {
 
 		if sick > 0 and lekarday ! daystart:
 			act 'Take a pill (0:05)':
-				cla
-				*clr
+				*clr & cla
+				menu_off = 1
 				minut += 5
 				lekarday = daystart
 				lekarstvo -= 1
@@ -575,6 +556,7 @@ $lekarstvo = {
 				end
 				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/lekr<<picrand>>.jpg"></center>'
 				'You took a pill'
+				gs 'stat'
 
 				act 'Move away':gt $loc, $metka
 			end
@@ -588,9 +570,8 @@ $vitamin = {
 
 		if vitaminday ! daystart:
 			act 'Take vitamins (0:05)':
-				cla
-				*clr
-
+				*clr & cla
+				menu_off = 1
 				minut += 5
 				vitaminday = daystart
 				vitamin -= 1
@@ -605,8 +586,8 @@ $vitamin = {
 				if SifacOnce = 1 and Sifilis >= 10:Sifilis -= rand(0, 1)
 
 				pcs_skin += 1
-
 				'You took some vitamins.'
+				gs 'stat'
 
 				act 'Move away':gt $loc, $metka
 			end