Explorar el Código

Re-did the Pavlovsk toilet to bring it in-line with the others.

KevinSmarts hace 8 años
padre
commit
c4668118d9
Se han modificado 4 ficheros con 96 adiciones y 229 borrados
  1. 5 5
      locations/vokBimbo
  2. 0 219
      locations/vokdin
  3. 89 2
      locations/vokmantoiev
  4. 2 3
      locations/vokzalGin

+ 5 - 5
locations/vokBimbo

@@ -35,7 +35,7 @@ if $ARGS[0] = 'pos1':
 			end
 	end
 	act 'wait for men':gt 'vokBimbo', 'pos1'
-	act 'Leave':gt 'vokzalGin'
+	act 'Leave':gt 'vokmantoiev', 'male'
 end
 
 if $ARGS[0] = 'pos2':
@@ -47,7 +47,7 @@ if $ARGS[0] = 'pos2':
 	'<center><img src="images/etogame/vokBimbo2.jpg"></center>'
 	'Unfamiliar man blushed and went into the booth.'
 	act 'Come to him in the booth.':gt 'vokBimbo', 'pos22'
-	act 'Leave':gt 'vokzalGin'
+	act 'Leave':gt 'vokmantoiev', 'male'
 end
 
 if $ARGS[0] = 'pos22':
@@ -119,7 +119,7 @@ gs 'cum_manage'
 		act 'Get out of the booth.':gt 'vokBimbo', 'pos1'
 	end
 	
-	act 'Leave':gt 'vokzalGin'
+	act 'Leave':gt 'vokmantoiev', 'male'
 end
 
 
@@ -219,7 +219,7 @@ if $ARGS[0] = 'pos4':
 	'You pretend not to notice anything. Should be about you think that you are so stupid, that mixed up the mens room with a female.'
 
 	act 'wait':gt 'vokBimbo', 'pos1'
-	act 'Leave':gt 'vokzalGin'
+	act 'Leave':gt 'vokmantoiev', 'male'
 end
 
 if $ARGS[0] = 'pos5':
@@ -230,7 +230,7 @@ if $ARGS[0] = 'pos5':
 	'<center><img src="images/etogame/vokBimbo1.jpg"></center>'
 	'You ran into the toilet stall and closed. What a shame if somebody saw you were here. Heart was pounding. '
 
-	act 'Run out of toilet':gt 'vokzalGin'
+	act 'Run out of toilet':gt 'vokmantoiev', 'male'
 end
 
 if $ARGS[0] = 'pos6':

+ 0 - 219
locations/vokdin

@@ -103,225 +103,6 @@ $din_vokzalg_kabinet = {
 	end
 }
 
-$din_vokzalg_toilet_deyst = {
-	if hapri = 0:
-		act 'Comb your hair (0:03)':
-			cla
-			minut += 3
-			hapri = 1
-
-			if vokzalToilet = 1:act 'Finish':dynamic $din_vokzalg_toilet_f
-			if vokzalToilet = 2:act 'Finish':dynamic $din_vokzalg_toilet_m
-		end
-	end
-
-	if mop = 1 and kosmetica > 0:
-		act 'Apply make-up':
-			cla
-			*clr
-			'<center><img src="images/etogame/mop.jpg"></center>'
-
-			act 'Light make-up (0:03)':
-				cla
-				minut += 3
-				kosmetica -= 1
-				mop = 2
-				'You quickly apply some mascara to highlight your eyes a little, and apply some lipstick.'
-
-				if vokzalToilet = 1:act 'Finish':dynamic $din_vokzalg_toilet_f
-				if vokzalToilet = 2:act 'Finish':dynamic $din_vokzalg_toilet_m
-			end
-
-			if kosmetica >= 2:
-				act 'Normal make-up (0:05)':
-					cla
-					minut += 5
-					kosmetica -= 2
-					mop = 3
-					'After applying a quick foundation you put on some lipstick, and then apply some eyeshadow and mascara to highlight your eyes more.'
-
-					if vokzalToilet = 1:act 'Finish':dynamic $din_vokzalg_toilet_f
-					if vokzalToilet = 2:act 'Finish':dynamic $din_vokzalg_toilet_m
-				end
-			end
-
-			if kosmetica >= 3:
-				act 'Heavy make-up (0:10)':
-					cla
-					minut += 10
-					kosmetica -= 3
-					vidageday -= 1
-					mop = 4
-					'You put a dense layer of make-up on your skin covering all your blemishes, and take ten minutes to make yourself look as pretty as you can.'
-
-					if vokzalToilet = 1:act 'Finish':dynamic $din_vokzalg_toilet_f
-					if vokzalToilet = 2:act 'Finish':dynamic $din_vokzalg_toilet_m
-				end
-			end
-		end
-	end
-
-	!!0.2.6 extension: reworked how quick wash and face wash was supposed to work, it is now uniform in all toilet/bathroom locations
-	!!Removed sweat =- 1 when cum is wiped off clothes
-	!!clrbelo: Amount of clean panties available
-	if spdirtyi > 0 or spdirtyn > 0:
-		act 'Quick wash (0:15)':
-			cla
-			*clr
-
-			if clrbelo > 0:
-				clrbelo -= 1
-				dirtbelo += 1
-			elseif tanga = 1:
-				tanga = 0
-				dirtbelo += 1
-			end
-
-			dynamic $showerdin
-			sweat -= 1
-			minut += 15
-			'<center><img src="images/pics/wash5.jpg"></center>'
-			'You give yourself a quick wash, removing any trace of cum from your body.'
-
-			if vokzalToilet = 1:act 'Finish':dynamic $din_vokzalg_toilet_f
-			if vokzalToilet = 2:act 'Finish':dynamic $din_vokzalg_toilet_m
-		end
-	end
-
-	temp = arrpos('sparrloc',11)
-	if sparrloc[temp] = 11 and sparrvol[temp] > 0:
-		temp = 1
-	else
-		temp = arrpos('sparrloc',16)
-		if sparrloc[temp] = 16 and sparrvol[temp] > 0:
-			temp = 1
-		else
-			temp = 0
-		end
-	end
-	if temp > 0 or spdirtyb > 0 :
-		act 'Clean your face from sperm (0:05)':
-			cla
-			*clr
-			mop = 1
-			cumspclnt = 12
-			gs 'cum_cleanup'
-			sweat -= 1
-			minut += 5
-			'<center><img src="images/etogame/facesp.jpg"></center>'
-			'You clean your face and get rid of any trace of cum.'
-
-			if vokzalToilet = 1:act 'Finish':dynamic $din_vokzalg_toilet_f
-			if vokzalToilet = 2:act 'Finish':dynamic $din_vokzalg_toilet_m
-		end
-	end
-
-	if spdirtyc > 0:
-		act 'Wipe the cum off your clothes (0:10)':
-			cla
-			*clr
-			cumspclnt = 6
-			gs 'cum_cleanup'
-			minut += 10
-			'<center><img src="images/etogame/frotsp.jpg"></center>'
-			'You wipe the cum off your clothes and thoroughly rinse out the stains with water.'
-
-			if vokzalToilet = 1:act 'Finish':dynamic $din_vokzalg_toilet_f
-			if vokzalToilet = 2:act 'Finish':dynamic $din_vokzalg_toilet_m
-		end
-	end
-	!!
-
-	if sanpad > 0 and mesec > 0 and isprok = 0 and isprokp = 0 and tanga = 1:
-		act 'Use a sanitary napkin (0:05)':
-			cla
-			*clr
-			sanpad -= 1
-			isprokp = 1
-			minut += 5
-			manna -= 5
-			'<center><img src="images/pics/wash3.jpg"></center>'
-			'You use a sanitary napkin.'
-			act 'Finish':gt $locM, $metkaM
-		end
-	end
-	
-	if tampon > 0 and mesec > 0 and isprok = 0 and isprokp = 0:
-		act 'Use a tampon (0:05)':
-			cla
-			*clr
-			tampon -= 1
-			isprok = 1
-			minut =+ 5
-			manna -= 5
-			'<center><img src="images/pics/wash3.jpg"></center>'
-			'You use a tampon.'
-
-			if vokzalToilet = 1:act 'Finish':dynamic $din_vokzalg_toilet_f
-			if vokzalToilet = 2:act 'Finish':dynamic $din_vokzalg_toilet_m
-		end
-	end
-
-	if horny >= 90:
-		act 'Masturbate':
-			cls
-			orgasm += 1
-			mastr += 1
-			horny = 0
-			gs 'stat'
-			'<center><img src="images/qwest/alter/Ev/mastr.jpg"></center>'
-			'You close the door to the toilet stall and quickly remove your clothes as you sit down on the toilet seat.'
-			'Gently caressing your pussy lips, you then thrust in two fingers while you flick your thumb over your clit.'
-			'Soon you hit a powerful orgasm, and you take a second to recover before you straighten your clothes, feeling ready to continue your day.'
-
-			if vokzalToilet = 1:act 'Finish':dynamic $din_vokzalg_toilet_f
-			if vokzalToilet = 2:act 'Finish':dynamic $din_vokzalg_toilet_m
-		end
-	end
-}
-
-$din_vokzalg_toilet_f = {
-	cls
-	vokzalToilet = 1
-	gs 'stat'
-	'<center><h4>The ladies'' room</h4></center>'
-	'<center><img src="images/etogame/PublicToilet.jpg"></center>'
-	'You open the door to the ladies'' room and go in.'
-
-	act 'Leave':minut += 1 & dynamic $din_vokzalg_toilet
-
-	dynamic $din_vokzalg_toilet_deyst
-}
-
-$din_vokzalg_toilet_m = {
-	cls
-	vokzalToilet = 2
-	gs 'stat'
-	'<center><h4>The men''s room</h4></center>'
-	'<center><img src="images/etogame/PublicToilet.jpg"></center>'
-	'You open the door to the men''s room and go in.'
-
-	if bimbolevel >= 1:
-		act 'Wait and see if someone finds you':gt 'vokBimbo', 'pos1'
-		act 'Quickly enter a stall':gt 'vokBimbo', 'pos5'
-	end
-	act 'Leave':minut += 1 & dynamic $din_vokzalg_toilet
-
-	dynamic $din_vokzalg_toilet_deyst
-}
-
-$din_vokzalg_toilet = {
-	cls
-	vokzalToilet = 0
-	gs 'stat'
-
-	'<center><h4>Pavlovsk train station interior</h4></center>'
-	'<center><img src="images/qwest/alter/vokzal.jpg"></center>'
-	'You are at the station''s restrooms, you can find the <a href="exec:minut += 1 & dynamic $din_vokzalg_toilet_f">ladies'' room</a> and <a href="exec:minut += 1 & dynamic $din_vokzalg_toilet_m">men''s room</a> here.'
-
-	act 'Return to the station':minut += 1 & gt 'vokzalGin'
-}
-
 $din_vokazalg_podbros2 = {
 	cls
 	gs 'stat'

+ 89 - 2
locations/vokmantoiev

@@ -1,5 +1,92 @@
 # vokmantoiev
-$d_vok_man_toilet_event = {
+
+if $ARGS[0] = 'start':
+	cls
+	vokzalToilet = 0
+	gs 'stat'
+
+	'<center><h4>Pavlovsk train station interior</h4></center>'
+	'<center><img src="images/qwest/alter/vokzal.jpg"></center>'
+	'You are at the station''s restrooms, you can find the <a href="exec:minut += 1 & gt ''vokmantoiev'', ''female''">ladies'' room</a> and <a href="exec:minut += 1 & gt ''vokmantoiev'', ''male''">men''s room</a> here.'
+
+	act 'Return to the station':minut += 1 & gt 'vokzalGin'
+end
+
+if $ARGS[0] = 'female':
+	$metkaM = $ARGS[0]
+	$locM = $CURLOC
+	$metka = $ARGS[0]
+	$loc = $CURLOC
+	cls
+	vokzalToilet = 1
+	gs 'stat'
+	'<center><h4>The ladies'' room</h4></center>'
+	'<center><img src="images/etogame/PublicToilet.jpg"></center>'
+	'You open the door to the ladies'' room and go in.'
+
+	act 'Leave':minut += 1 & gt 'vokmantoiev', 'start'
+
+	act 'Look in the mirror':gt 'mirror', 'start'
+
+	if spdirtyc > 0:
+		act 'Wipe the cum off your clothes (0:10)':
+			cla
+			*clr
+			cumspclnt = 6
+			gs 'cum_cleanup'
+			minut += 10
+
+			'You wipe the cum off your clothes and thoroughly rinse out the stains with water.'
+
+			act 'Finish':gt 'vokmantoiev', 'female'
+		end
+	end
+
+	dynamic $tampon
+	dynamic $quickwash
+	dynamic $basin
+end
+
+if $ARGS[0] = 'male':
+	$metkaM = $ARGS[0]
+	$locM = $CURLOC
+	$metka = $ARGS[0]
+	$loc = $CURLOC
+	cls
+	vokzalToilet = 2
+	gs 'stat'
+	'<center><h4>The men''s room</h4></center>'
+	'<center><img src="images/etogame/PublicToilet.jpg"></center>'
+	'You open the door to the men''s room and go in.'
+
+	if bimbolevel >= 1:
+		act 'Wait and see if someone finds you':gt 'vokBimbo', 'pos1'
+		act 'Quickly enter a stall':gt 'vokBimbo', 'pos5'
+	end
+	act 'Leave':minut += 1 & gt 'vokmantoiev', 'start'
+
+	act 'Look in the mirror':gt 'mirror', 'start'
+
+	if spdirtyc > 0:
+		act 'Wipe the cum off your clothes (0:10)':
+			cla
+			*clr
+			cumspclnt = 6
+			gs 'cum_cleanup'
+			minut += 10
+
+			'You wipe the cum off your clothes and thoroughly rinse out the stains with water.'
+
+			act 'Finish':gt 'vokmantoiev', 'female'
+		end
+	end
+
+	dynamic $tampon
+	dynamic $quickwash
+	dynamic $basin
+end
+
+if $ARGS[0] = 'toilet_event':
 	startevtoirand = rand(0, 1)
 
 	if startevtoirand = 0:
@@ -81,7 +168,7 @@ $d_vok_man_toilet_event = {
 	elseif startevtoirand > 0:
 		'You wash the floor in the men''s room, and ponder whether you should move out for a minute when you hear a man loudly evacuate his bowels. You decide against it and just focus on finishing your cleaning work as fast as you can, doing your best to ignore the smell.'
 	end
-}
+end
 
 --- vokmantoiev ---------------------------------
 

+ 2 - 3
locations/vokzalGin

@@ -8,7 +8,6 @@ frost = 0
 poezddalsled = 0
 gs 'vokdin'
 gs 'vokdinvera'
-gs 'vokmantoiev'
 gs 'stat'
 fcolor = rgb(0, 0, 0)
 bcolor = rgb(255, 255, 255)
@@ -17,7 +16,7 @@ lcolor = rgb(106, 90, 205)
 
 '<center><h4>Pavlovsk train station interior</h4></center>'
 '<center><img src="images/qwest/alter/vokzal.jpg"></center>'
-'The center of the station building is a large waiting room, where passengers can wait until their train arrives. Off to one side, the <a href="exec:dynamic $din_vokzalg_kassi">ticket office</a> is situated next to the departures board. Opposite to that you can find the <a href="exec:dynamic $din_vokzalg_kabinet">station manager''s office</a>, and the <a href="exec:minut += 1 & dynamic $din_vokzalg_toilet">toilets</a> on the other end of the building.'
+'The center of the station building is a large waiting room, where passengers can wait until their train arrives. Off to one side, the <a href="exec:dynamic $din_vokzalg_kassi">ticket office</a> is situated next to the departures board. Opposite to that you can find the <a href="exec:dynamic $din_vokzalg_kabinet">station manager''s office</a>, and the <a href="exec:minut += 1 & gt ''vokmantoiev'', ''start''">toilets</a> on the other end of the building.'
 'You can go to the train <a href="exec:GT ''vokzalperG'',''start''">platforms</a> through the station building.'
 
 if katalkinSexOnce = 1:'There is a small <a href="exec:minut += 5 & gt ''katalkin''">police station</a> inside the station building.'
@@ -62,7 +61,7 @@ if vokzalVork >= 1:
 			gs 'stat'
 			'<center><img src="images/etogame/clener1.jpg"></center>'
 			'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and go to the men''s room.'
-			dynamic $d_vok_man_toilet_event
+			gs 'vokmantoiev', 'toilet_event'
 			!!'You began to wash the floor in the men''s room, and then began to scrub toilets.'
 
 			act 'Leave':minut += 1 & gt 'vokzalGin'