Browse Source

mirror - merge with portmirror and resolve dependencies

rachels 6 years ago
parent
commit
33d3cd6c8f
14 changed files with 314 additions and 509 deletions
  1. 0 1
      glife-notepad++
  2. 0 1
      glife.qproj
  3. 4 11
      locations/abduction
  4. 4 10
      locations/club
  5. 5 13
      locations/gschool_grounds
  6. 7 12
      locations/gschool_lessons
  7. 5 11
      locations/kafe2
  8. 6 13
      locations/laketoilet
  9. 5 15
      locations/leonid
  10. 264 59
      locations/mirror
  11. 0 327
      locations/portmirror
  12. 5 14
      locations/sexshop
  13. 5 12
      locations/stwork
  14. 4 10
      locations/zaprF

+ 0 - 1
glife-notepad++

@@ -583,7 +583,6 @@
 			<File name="locations\pornhist" />
 			<File name="locations\pornschedule" />
 			<File name="locations\pornstudio" />
-			<File name="locations\portmirror" />
 			<File name="locations\portnoi" />
 			<File name="locations\portnoi2" />
 			<File name="locations\postdeliveries" />

+ 0 - 1
glife.qproj

@@ -907,7 +907,6 @@
       <Location name="balkon2"/>
       <Location name="dom_gor"/>
       <Location name="comendant"/>
-      <Location name="portmirror"/>
       <Location name="buklinik"/>
       <Location name="buklinik_event"/>
     </Folder>

+ 4 - 11
locations/abduction

@@ -506,9 +506,8 @@ if $ARGS[0] = 'abdEscapeWindow3':
 end
 
 if $ARGS[0] = 'abdFood':
-	cls
-	$gt1 = 'abduction'
-	$gt2 = 'abdFood'
+	$locM = 'abduction'
+	$metkaM = 'abdFood'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/basement2.jpg"></center>'
 	'There are some water bottles and dried food beneath your bed.'
@@ -588,14 +587,8 @@ if $ARGS[0] = 'abdFood':
 		end
 	end
 
-	act 'Look in the mirror':
-		cla
-		gt 'portmirror', 'start'
-	end
-
-	if pcs_hairbsh = 0:
-		act 'Brush your hair': gt 'portmirror', 'brush'
-	end
+	act 'Look in the mirror': gt 'mirror', 'start'
+	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
 	act 'Take a cold shower (0:15)':
 		cumspclnt = 1

+ 4 - 10
locations/club

@@ -226,8 +226,8 @@ if $ARGS[0] = 'tou':
 	$locM = $CURLOC
 	$metka = $ARGS[0]
 	$loc = $CURLOC
-	$gt1 = 'club'
-	$gt2 = 'tou'
+	$locM = 'club'
+	$metkaM = 'tou'
     $location_type = 'bathroom'
 	cls
 	minut += 5
@@ -247,14 +247,8 @@ if $ARGS[0] = 'tou':
 
 	act 'Leave the toilet':gt 'club', 'inside'
 
-	act 'Look into the mirror':
-		cla
-		gt 'portmirror', 'start'
-	end
-
-	if pcs_hairbsh = 0:
-		act 'Brush your hair': gt 'portmirror', 'brush'
-	end
+	act 'Look into the mirror': gt 'mirror', 'start'
+	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
 	if (cumloc[6] = 1 or cumloc[7] = 1):
 		act 'Wipe the cum off your clothes (0:10)':

+ 5 - 13
locations/gschool_grounds

@@ -549,13 +549,11 @@ if $ARGS[0] = 'SchoolRun2':
 end
 
 if $ARGS[0] = 'change_room':
-	$metkaM = 'change_room'
-	$locM = 'gschool_grounds'
 	$metka = 'change_room'
 	$loc = 'gschool_grounds'
-	$gt1 = 'gschool_grounds'
-	$gt2 = 'change_room'
-    $location_type = 'bathroom'
+	$location_type = 'bathroom'
+	$locM = 'gschool_grounds'
+	$metkaM = 'change_room'
 	cls
 	minut += 5
 	gs 'stat'
@@ -585,14 +583,8 @@ if $ARGS[0] = 'change_room':
 		exit
 	end
 
-	act 'Look in the mirror':
-		cla
-		gt 'portmirror', 'start'
-	end
-
-	if pcs_hairbsh = 0:
-		act 'Brush your hair': gt 'portmirror', 'brush'
-	end
+	act 'Look in the mirror': gt 'mirror', 'start'
+	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
 	if (cumloc[6] = 1 or cumloc[7] = 1):
 		act 'Wipe the cum off your clothes (0:10)':

+ 7 - 12
locations/gschool_lessons

@@ -631,26 +631,21 @@ end
 !!second note, make sure to randomize the teachers for the classes that is not Anatoly, the other ones that can be random teachers of classes would be numbers 47, 48, 51, 52, 54, and 55. the rest of them would have a specific class like PE etc or they don''t teach classes.
 if $ARGS[0] = 'postphys2':
 	if zverRageQW = 10 and postphys_event ! daystart:postphys_event = daystart & gt 'gKristinaZv'
-	cls
 	$metka = 'postphys2'
 	$loc = 'gschool_lessons'
-	$gt1 = 'gschool_lessons'
-	$gt2 = 'postphys2'
+	$location_type = 'bathroom'
+	$locM = 'gschool_lessons'
+	$metkaM = 'postphys2'
+
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
-    'You enter the girls locker room and find several other girls already inside, undressing, changing, heading for or returning from the showers, or simply chatting with each other. You ignore the young women in various states of undress around you, find your locker, and start to take off your clothes.'
+	'You enter the girls locker room and find several other girls already inside, undressing, changing, heading for or returning from the showers, or simply chatting with each other. You ignore the young women in various states of undress around you, find your locker, and start to take off your clothes.'
 	gs 'gschool_gossip', 'gym'
 	act 'Get dressed': gt 'gschool_lessons', 'dress'
 !!This should just let Sveta change to any clothes since Gym is always the last class at school.
 	act 'Have a shower': gt 'gschool_lessons', 'shower'
-	act 'Use the mirror':
-		cla
-		gt 'portmirror', 'start'
-	end
-
-	if pcs_hairbsh = 0:
-		act 'Brush your hair': gt 'portmirror', 'brush'
-	end
+	act 'Use the mirror': gt 'mirror', 'start'
+	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 end
 
 if $ARGS[0] = 'shower':

+ 5 - 11
locations/kafe2

@@ -1,11 +1,11 @@
 # kafe2
 
 if $ARGS[0] = 'toilet':
+
+	$location_type = 'bathroom'
 	$locM = 'kafe2'
 	$metkaM = 'toilet'
-	$gt1 = 'kafe2'
-	$gt2 = 'toilet'
-	cls
+
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/toilet.jpg"></center>'
 	'Dirty and smelly toilet that seems to have never been cleaned'
@@ -40,14 +40,8 @@ if $ARGS[0] = 'toilet':
 		exit
 	end
 
-	act 'Look in the mirror':
-		cla
-		gt 'portmirror', 'start'
-	end
-
-	if pcs_hairbsh = 0:
-		act 'Brush your hair': gt 'portmirror', 'brush'
-	end
+	act 'Look in the mirror': gt 'mirror', 'start'
+	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
 	dynamic $quickwash
 	dynamic $basin

+ 6 - 13
locations/laketoilet

@@ -5,11 +5,10 @@ if $ARGS[0] = 'main':
 
 	$metka = $ARGS[0]
 	$loc = $CURLOC
-	$metkaM = $ARGS[0]
-	$locM = $CURLOC
-	$gt1 = 'laketoilet'
-	$gt2 = 'main'
-    $location_type = 'bathroom'
+	$location_type = 'bathroom'
+	$locM = 'laketoilet'
+	$metkaM = 'main'
+
 	cla
 	*clr
 	LCtoiletiventrand = rand(1, 100)
@@ -29,14 +28,8 @@ if $ARGS[0] = 'main':
 		'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/toilet.jpg"></center>'
 		'The diner has a single unisex restroom. From the dirt and smell, you don''t think this toilet has ever been cleaned before. Ugh.'
 
-		act 'Look in the mirror':
-			cla
-			gt 'portmirror', 'start'
-		end
-
-		if pcs_hairbsh = 0:
-			act 'Brush your hair': gt 'portmirror', 'brush'
-		end
+		act 'Look in the mirror': gt 'mirror', 'start'
+		if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
 		if (cumloc[6] = 1 or cumloc[7] = 1):
 			act 'Wipe the cum off your clothes (0:10)':

+ 5 - 15
locations/leonid

@@ -831,15 +831,11 @@ end
 
 if $ARGS[0] = 'toilet':
 	CLOSE ALL
-	cla
-	*clr
-	$locM = 'leonid'
-	$metka = 'toilet'
-	$metkaM = 'toilet'
 	$loc = 'leonid'
+	$metka = 'toilet'
 	$location_type = 'bathroom'
-	$gt1 = 'leonid'
-	$gt2 = 'toilet'
+	$locM = 'leonid'
+	$metkaM = 'toilet'
 	minut += 2
 
 	'<center><h4>Office toilet</h4></center>'
@@ -851,14 +847,8 @@ if $ARGS[0] = 'toilet':
 	end
 	act 'Change your clothes':gt 'clothing_QV', 'list'
 
-	act 'Look in the mirror':
-		cla
-		gt 'portmirror', 'start'
-	end
-
-	if pcs_hairbsh = 0:
-		act 'Brush your hair': gt 'portmirror', 'brush'
-	end
+	act 'Look in the mirror': gt 'mirror', 'start'
+	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
 	if (cumloc[6] = 1 or cumloc[7] = 1):
 		act 'Wipe the cum off your clothes (0:10)':

+ 264 - 59
locations/mirror

@@ -1,93 +1,298 @@
 # mirror
 if $ARGS[0] = 'start':
-	cla
-	clr
-	gs 'stat'
-	if mirror_steam ! hour: mirror_steam = 100
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc = 'yvan'and mirror_steam = hour: gt'mirror','steam'
+	*clr & cla
+	gs 'stat' &! It should be here, because some of the strigs have to be initialized
 	if player_avatar = 1:
 		'<center><img <<$set_imgh>> src="images/avatar.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 	end
 
-	$gt1 = 'mirror'
-	$gt2 = 'fin'
-	gt 'portmirror', 'start'
+	if mirror_steam ! hour: mirror_steam = 100
+	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc = 'yvan'and mirror_steam = hour: gt'mirror','steam'
 
 	if pcs_hairbsh = 0:
-		act 'Brush your hair': gt 'portmirror', 'brush'
+		act 'Brush your hair': xgt 'mirror', 'brush'
 	end
-end
 
-if $ARGS[0] = 'fin':
-	cla
-	gt $locM, $metkaM
-!'
-	if housr = 1 and housrA = 1 and housrMir = 0 and fitMir = 0 and saunaYouRoom = 0:
-		housrA = 0
-			gt 'korr'
-		end
+	*nl
+	if daystart  < 10 and StoryLine = 0:'In the mirror, you see a strange woman''s face looking back at you that exactly copies all your actions. You can hardly accept the idea that this is now you.'
+	if daystart >= 10 and daystart < 30 and StoryLine = 0:'In the mirror you see a woman''s face to which you have become accustomed to. But sometimes, you get the feel that this is not your face.'
+	'<<$hair>>'
+	'<<$pcs_makeup>>. <<$lip>>'
+	'<<$skin>>'
+	'<<$pcs_apprnc>>'
 
-		if housr = 1 and housrA = 1 and housrMir = 1 and fitMir = 0 and saunaYouRoom = 0:
-			housrA = 0
-			housrMir = 0
-			gt 'bedr'
-		end
+	if curly > 0 and defcurly = 0: '<br>Your curly hair will last for another <<curly>> days.'
+	if straight > 0 and defcurly = 1: '<br>Your straightened hair will last for another <<straight>> days.'
+	if hbraids > 0: '<br>Your braided hair will last for another <<hbraids>> days.'
+	if pcs_haircol ! nathcol:
+		if dyefade > 0 and dyefade < 7: '<br>Your hair dye is beginning to fade and your roots are showing.'
+		if dyefade = 0: '<br>Your hair dye has faded and looks terrible.'
+	end
 
-		if housrA = 0 and fitMir = 1 and saunaYouRoom = 0:
-			fitMir = 0
-			! WD: Argument is 'dressing room'
-			gt 'fit', 'dressing room'
-		end
 
-		if housrA = 0 and stripMir = 1 and saunaYouRoom = 0:
-			stripMir = 0
-			gt 'stwork', 'start'
-		end
+	if kosmetica > 0: *nl 'Cosmetics: <<kosmetica>>' else *nl 'You have no makeup'
+	if lipbalm > 0: *pl ' | Lip Balm: <<lipbalm>>' else *pl ' | You have no lip balm left'
+	*nl
 
-		if housrA = 0 and palMir = 1 and saunaYouRoom = 0:
-			palMir = 0
-			gt 'palatka', 'start'
-		end
+	$makeupLight =   'You subtly apply some neutral tones, with a light application of makeup to bring out your natural beauty.'
+	$makeupNatural = 'You apply some mildly vibrant tones and colors of makeup to cover your minor imperfections and enhance your best features.'
+	$makeupHeavy =   'You apply some deeper, richer shades of makeup, thick enough to cover most imperfections, while drawing attention to your eyes and lips.'
 
-		if saunaYouRoom = 1:
-			saunaYouRoom = 0
-			gt $locBroom, $metkaBroom
-		end
+	! WD: Cheat Unused ~ 'AutoHapri'
+	if pcs_hairbsh = 0 and AutoHapri = 1:
+		minut += 3
+		pcs_hairbsh = 1
+		'You brush your hair.'
+	end
 
-		if housrA = 0 and obMir = 1:
-			obMir = 0
-			gt 'obroom', 'start'
+	!! WD: Cheat Unused ~ 'AutoMakeup'
+	if pcs_makeup = 1 and kosmetica > 0 and AutoMakeup = 1:
+		pcs_makeup = AutoMakeupType
+		makupskl_exp += rand(1,3)
+		if kosmetica < 3 and pcs_makeup = 4:pcs_makeup = 3
+		if kosmetica < 2 and pcs_makeup = 3:pcs_makeup = 2
+		if kosmetica < 1 and pcs_makeup ! 1:
+			pcs_makeup = 1
+			'You have no make-up left.'
+		else
+			if pcs_makeup = 2:
+				*pl $makeupLight
+				minut -= 3
+				kosmetica -= 1
+			end
+
+			if pcs_makeup = 3:
+				*pl $makeupNatural
+				minut -= 5
+				kosmetica -= 2
+			end
+
+			if pcs_makeup = 4:
+				*pl $makeupHeavy
+				minut -= 10
+				vidageday -= 1
+				kosmetica -= 3
+			end
 		end
+	end
 
-		if housrA = 0 and borMir = 1:
-			borMir = 0
-			gt 'bordel', 'start'
+	! WD: Cheat Unused ~ 'AutoLipBalm'
+
+	!! Added the makeup setting.
+
+	if pcs_makeup = 1 and kosmetica >= makeupSetting:
+		act 'Apply makeup':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/pc/mop.jpg"></center>'
+			*nl
+			'You consider for a moment which look you want to go for.'
+			*nl
+			if makeupSetting = 1:
+				cla
+				'Without thinking, you instantly apply a sutle amount of makeup to your face.'
+				minut += 3
+				makupskl_exp += rand(1,3)
+				kosmetica -= 1
+				pcs_makeup = 2
+				'<<$makeupLight>>'
+				act 'View results':gt 'mirror', 'start'
+			elseif makeupSetting = 2:
+				cla
+				'Without thinking, you instantly apply a moderate amount of makeup to your face.'
+				minut += 5
+				makupskl_exp += rand(1,3)
+				kosmetica -= 2
+				pcs_makeup = 3
+				'<<$makeupNatural>>'
+				act 'View results':gt 'mirror', 'start'
+			elseif makeupSetting = 3:
+				cla
+				'Without thinking, you instantly apply a heavy amount of makeup to your face.'
+				minut += 10
+				makupskl_exp += rand(1,3)
+				kosmetica -= 3
+				vidageday -= 1
+				pcs_makeup = 4
+				'<<$makeupHeavy>>'
+				act 'View results':gt 'mirror', 'start'
+			else
+				if kosmetica > 0:
+					act 'Light make-up':
+						cla
+						minut += 3
+						makupskl_exp += rand(1,3)
+						kosmetica -= 1
+						pcs_makeup = 2
+						'<<$makeupLight>>'
+						act 'View results':gt 'mirror', 'start'
+					end
+				end
+
+				if kosmetica > 1:
+					act 'Natural makeup':
+						cla
+						minut += 5
+						makupskl_exp += rand(1,3)
+						kosmetica -= 2
+						pcs_makeup = 3
+						'<<$makeupNatural>>'
+						act 'View results':gt 'mirror', 'start'
+					end
+				end
+
+				if kosmetica > 2:
+					act 'Heavy makeup':
+						cla
+						minut += 10
+						makupskl_exp += rand(1,3)
+						kosmetica -= 3
+						vidageday -= 1
+						pcs_makeup = 4
+						'<<$makeupHeavy>>'
+						act 'View results':gt 'mirror', 'start'
+					end
+				end
+
+				act 'No makeup':
+					cla
+					minut += 2
+					'After looking in the mirror, you decide that you look fine and don''t need to put on any makeup, especially since you''ll likely be washing it off in a few hours.'
+					act 'View results':gt 'mirror', 'start'
+				end
+			end
 		end
+	elseif kosmetica < makeupSetting:
+		'You don''t have enough makeup to apply your chosen option.'
+	end
 
-		if housrA = 0 and tanhouse1 = 1:
-			tanhouse1 = 0
-			gt 'spalnya'
+	if AutoLipBalm = 1:	gs 'mirror','applyLipbalm'
+	if lipbalm > 0 and pcs_lipbalm <= 0:
+		act 'Apply lip balm':
+			cla
+			gs 'mirror','applyLipbalm'
+			act 'View results':gt 'mirror', 'start'
 		end
-'!
-end
+	end
+
+	if (pcs_makeup <= 1 and kosmetica > 0) or (lipbalm > 0 and pcs_lipbalm <= 0 and pcs_hairbsh = 0):
+		act 'Do the works': gt 'mirror', 'works'
+	end
+
+	!!New makeup setting
+	!!This imforms the person what makeup they have pre selected
+	!! 0 - none, 1 - light, 2 - moderate, 3 - heavy
+
+	'Select level for auto make-up: <a href="exec:makeupSetting = 0 & gt ''mirror'', ''start''">none</a>, <a href="exec:makeupSetting = 1 & gt ''mirror'', ''start''">light</a>, <a href="exec:makeupSetting = 2 & gt ''mirror'', ''start''">vibrant</a>, <a href="exec:makeupSetting = 3 & gt ''mirror'', ''start''">thick</a>.'
+
+	if makeupSetting = 0:
+		'Currently you have no make-up set.'
+	elseif makeupSetting = 1:
+		'Currently the level you have set is for light make-up.'
+	elseif makeupSetting = 2:
+		'Currently the level you have set is for vibrant make-up.'
+	elseif makeupSetting = 3:
+		'Currently the level you have set is for thick make-up.'
+	end
+
+	gs 'stat'
+
+	act 'Move away from the mirror':gt 'mirror','fin'
+	
+end --- start ---
 
 if $ARGS[0] = 'steam':
-	cla
-	clr
-	gs'stat'
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/mirror1.jpg"></center>'
 	'<center>Mirror heavily misted. It must wipe or leave to cool.</center>'
+	gs 'stat'
 	act 'Wipe the mirror':
-		cls
+		*clr & cla
 		minut+=1
 		mirror_steam = 100
-		gs'stat'
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/mirror2.jpg"></center>'
 		'<center>You wiped the mirror with a towel.</center>'
-		act 'Look in the mirror':gt'mirror','start'
+		act 'Look in the mirror':gt 'mirror','start'
+	end
+	act '<b>Move away from the mirror</b>':gt 'mirror','fin'
+end &! --- steam ----
+
+if $ARGS[0] = 'brush':
+	minut += 3
+	pcs_hairbsh = 1
+	'You brush your hair.'
+	wait 500
+	gt 'mirror', 'start'
+end &! --- brush ----
+
+if $ARGS[0] = 'works':
+	cla
+	if kosmetica <= 0:
+		'You don''t have any makeup.'
+	elseif pcs_makeup = 1 and kosmetica >= makeupSetting:
+		*clr
+		'<center><img <<$set_imgh>> src="images/pc/mop.jpg"></center>'
+		*nl
+		'You consider for a moment which look you want to go for.'
+		*nl
+		if makeupSetting = 1:
+			'Without thinking, you instantly apply a sutle amount of makeup to your face.'
+			minut += 3
+			makupskl_exp += rand(1,3)
+			kosmetica -= 1
+			pcs_makeup = 2
+			'<<$makeupLight>>'
+		elseif makeupSetting = 2:
+			'Without thinking, you instantly apply a moderate amount of makeup to your face.'
+			minut += 5
+			makupskl_exp += rand(1,3)
+			kosmetica -= 2
+			pcs_makeup = 3
+			'<<$makeupNatural>>'
+		elseif makeupSetting = 3:
+			'Without thinking, you instantly apply a heavy amount of makeup to your face.'
+			minut += 10
+			makupskl_exp += rand(1,3)
+			kosmetica -= 3
+			vidageday -= 1
+			pcs_makeup = 4
+			'<<$makeupHeavy>>'
+		end
+	elseif kosmetica < makeupSetting:
+		'You don''t have enough makeup to apply your chosen option.'
 	end
-	act '<b>Move away from the mirror</b>':gt'mirror','fin'
-end
+	if pcs_hairbsh = 0:
+		minut += 3
+		pcs_hairbsh = 1
+		'You brush your hair.'
+	end
+	gs 'mirror','applyLipbalm'
+	
+	act 'View results':gt 'mirror', 'start'
+end &! --- works ----
+
+if $ARGS[0] = 'applyLipbalm':
+	if lipbalm > 0 and pcs_lipbalm <= 0:
+		minut += 10
+		lipbalm -= 1
+		lipkoef += rand(0, 1)
+		if lipkoef > 50:
+			lipkoef = 0
+			pcs_lip += 1
+		end
+		pcs_lipbalm += 8
+		'You apply some moisturizing balm on your lips.'
+	end
+end &! --- applyLipbalm ---
+
+if $ARGS[0] = 'fin':
+	killvar '$makeupLight'
+	killvar '$makeupNatural'
+	killvar '$makeupHeavy'
+	gt $locM, $metkaM
+end &! --- fin ----
+
 
 --- mirror ---------------------------------
 

+ 0 - 327
locations/portmirror

@@ -1,327 +0,0 @@
-# portmirror
-
-if $ARGS[0] = 'start':
-	cls
-	gs 'stat'
-	*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-	*nl
-	if daystart < 10 and StoryLine = 0:'In the mirror, you see a strange woman''s face looking back at you that exactly copies all your actions. You can hardly accept the idea that this is now you.'
-	if daystart >= 10 and daystart < 30 and StoryLine = 0:'In the mirror you see a woman''s face to which you have become accustomed to. But sometimes, you get the feel that this is not your face.'
-	*pl '<<$hair>>'
-	*pl '<<$pcs_makeup>>. <<$lip>>'
-	*pl '<<$skin>>'
-	*pl '<<$pcs_apprnc>>'
-
-	if curly > 0 and defcurly = 0: '<br>Your curly hair will last for another <<curly>> days.'
-	if straight > 0 and defcurly = 1: '<br>Your straightened hair will last for another <<straight>> days.'
-	if hbraids > 0: '<br>Your braided hair will last for another <<hbraids>> days.'
-	if pcs_haircol ! nathcol:
-		if dyefade > 0 and dyefade < 7: '<br>Your hair dye is beginning to fade and your roots are showing.'
-		if dyefade = 0: '<br>Your hair dye has faded and looks terrible.'
-	end
-
-	$makeUpString = '<br>'
-
-	if kosmetica > 0: $makeUpString += 'Cosmetics: <<kosmetica>>'
-	if kosmetica = 0: $makeUpString += 'You have no makeup'
-
-	if lipbalm > 0: $makeUpString += ' | Lip Balm: <<lipbalm>>'
-	if lipbalm = 0: $makeUpString += ' | You have no lip balm left'
-
-	*pl $makeUpString
-	*nl
-
-	$makeupLight = 'You subtly apply some neutral tones, with a light application of makeup to bring out your natural beauty.'
-	$makeupNatural = 'You apply some mildly vibrant tones and colors of makeup to cover your minor imperfections and enhance your best features.'
-	$makeupHeavy = 'You apply some deeper, richer shades of makeup, thick enough to cover most imperfections, while drawing attention to your eyes and lips.'
-	$brushHair = 'You brush your hair.'
-	$applyLipbalm = 'You apply some moisturizing balm on your lips.'
-
-	! WD: Cheat Unused ~ 'AutoHapri'
-	if pcs_hairbsh = 0 and AutoHapri = 1:
-		minut += 3
-		pcs_hairbsh = 1
-		*pl $brushHair
-	end
-
-	!! WD: Cheat Unused ~ 'AutoMakeup'
-	if pcs_makeup = 1 and kosmetica > 0 and AutoMakeup = 1:
-		pcs_makeup = AutoMakeupType
-		makupskl_exp += rand(1,3)
-		if kosmetica < 3 and pcs_makeup = 4:pcs_makeup = 3
-		if kosmetica < 2 and pcs_makeup = 3:pcs_makeup = 2
-		if kosmetica < 1 and pcs_makeup ! 1:
-			pcs_makeup = 1
-			'You have no make-up left.'
-		else
-			if pcs_makeup = 2:
-				*pl $makeupLight
-				minut -= 3
-				kosmetica -= 1
-			end
-
-			if pcs_makeup = 3:
-				*pl $makeupNatural
-				minut -= 5
-				kosmetica -= 2
-			end
-
-			if pcs_makeup = 4:
-				*pl $makeupHeavy
-				minut -= 10
-				vidageday -= 1
-				kosmetica -= 3
-			end
-		end
-	end
-
-	! WD: Cheat Unused ~ 'AutoLipBalm'
-	if lipbalm > 0 and pcs_lipbalm <= 0 and AutoLipBalm = 1:
-		minut -= 10
-		lipbalm -= 1
-		lipkoef += rand(0, 1)
-		if lipkoef > 50:
-			lipkoef = 0
-			pcs_lip += 1
-		end
-
-		pcs_lipbalm += 8
-		*pl $applyLipbalm
-	end
-
-	if pcs_hairbsh = 0:
-		act 'Brush your hair': gt 'portmirror', 'brush'
-	end
-
-	!! Added the makeup setting.
-
-	if pcs_makeup = 1 and kosmetica >= makeupSetting:
-		act 'Apply makeup':
-			cla
-			*clr
-			'<center><img <<$set_imgh>> src="images/pc/mop.jpg"></center>'
-			*nl
-			*pl 'You consider for a moment which look you want to go for.'
-			*nl
-			if makeupSetting = 1:
-				cla
-				'Without thinking, you instantly apply a sutle amount of makeup to your face.'
-				minut += 3
-				makupskl_exp += rand(1,3)
-				kosmetica -= 1
-				pcs_makeup = 2
-				*pl $makeupLight
-				act 'View results':gt 'portmirror', 'start'
-			elseif makeupSetting = 2:
-				cla
-				'Without thinking, you instantly apply a moderate amount of makeup to your face.'
-				minut += 5
-				makupskl_exp += rand(1,3)
-				kosmetica -= 2
-				pcs_makeup = 3
-				*pl $makeupNatural
-				act 'View results':gt 'portmirror', 'start'
-			elseif makeupSetting = 3:
-				cla
-				'Without thinking, you instantly apply a heavy amount of makeup to your face.'
-				minut += 10
-				makupskl_exp += rand(1,3)
-				kosmetica -= 3
-				vidageday -= 1
-				pcs_makeup = 4
-				*pl $makeupHeavy
-				act 'View results':gt 'portmirror', 'start'
-			else
-				if kosmetica > 0:
-					act 'Light make-up':
-						cla
-						minut += 3
-						makupskl_exp += rand(1,3)
-						kosmetica -= 1
-						pcs_makeup = 2
-						*pl $makeupLight
-						act 'View results':gt 'portmirror', 'start'
-					end
-				end
-
-				if kosmetica > 1:
-					act 'Natural makeup':
-						cla
-						minut += 5
-						makupskl_exp += rand(1,3)
-						kosmetica -= 2
-						pcs_makeup = 3
-						*pl $makeupNatural
-						act 'View results':gt 'portmirror', 'start'
-					end
-				end
-
-				if kosmetica > 2:
-					act 'Heavy makeup':
-						cla
-						minut += 10
-						makupskl_exp += rand(1,3)
-						kosmetica -= 3
-						vidageday -= 1
-						pcs_makeup = 4
-						*pl $makeupHeavy
-						act 'View results':gt 'portmirror', 'start'
-					end
-				end
-
-				act 'No makeup':
-					cla
-					minut += 2
-					'After looking in the mirror, you decide that you look fine and don''t need to put on any makeup, especially since you''ll likely be washing it off in a few hours.'
-					act 'View results':gt 'portmirror', 'start'
-				end
-			end
-		end
-	elseif kosmetica < makeupSetting:
-		'You don''t have enough makeup to apply your chosen option.'
-	end
-
-	if lipbalm > 0 and pcs_lipbalm <= 0:
-		act 'Apply lip balm':
-			cla
-			minut += 10
-			lipbalm -= 1
-			lipkoef += rand(0, 1)
-			if lipkoef > 50:
-				lipkoef = 0
-				pcs_lip += 1
-			end
-
-			pcs_lipbalm += 8
-			*pl $applyLipbalm
-			act 'View results':gt 'portmirror', 'start'
-		end
-	end
-
-	if pcs_hairbsh = 0 or (pcs_makeup > 0 and kosmetica > 0) or (lipbalm > 0 and pcs_lipbalm <= 0):
-		act 'Do the works': gt 'portmirror', 'works'
-	end
-
-	!!New makeup setting
-	!!This imforms the person what makeup they have pre selected
-	!! 0 - none, 1 - light, 2 - moderate, 3 - heavy
-
-	'Select level for auto make-up: <a href="exec:makeupSetting = 0 & gt ''portmirror'', ''start''">none</a>, <a href="exec:makeupSetting = 1 & gt ''portmirror'', ''start''">light</a>, <a href="exec:makeupSetting = 2 & gt ''portmirror'', ''start''">vibrant</a>, <a href="exec:makeupSetting = 3 & gt ''portmirror'', ''start''">thick</a>.'
-
-	if makeupSetting = 0:
-		'Currently you have no make-up set.'
-	elseif makeupSetting = 1:
-		'Currently the level you have set is for light make-up.'
-	elseif makeupSetting = 2:
-		'Currently the level you have set is for vibrant make-up.'
-	elseif makeupSetting = 3:
-		'Currently the level you have set is for thick make-up.'
-	end
-
-	act 'Move away from the mirror':gt '<<$gt1>>', '<<$gt2>>'
-end
-
-if $ARGS[0] = 'brush':
-	cla
-	minut += 3
-	pcs_hairbsh = 1
-	*pl $brushHair
-	act 'View results':gt 'portmirror', 'start'
-end
-
-if $ARGS[0] = 'works':
-	cla
-	if kosmetica <= 0:
-		'You don''t have any makeup.'
-	elseif pcs_makeup = 1 and kosmetica >= makeupSetting:
-		*clr
-		'<center><img <<$set_imgh>> src="images/pc/mop.jpg"></center>'
-		*nl
-		*pl 'You consider for a moment which look you want to go for.'
-		*nl
-		if makeupSetting = 1:
-			'Without thinking, you instantly apply a sutle amount of makeup to your face.'
-			minut += 3
-			makupskl_exp += rand(1,3)
-			kosmetica -= 1
-			pcs_makeup = 2
-			*pl $makeupLight
-		elseif makeupSetting = 2:
-			'Without thinking, you instantly apply a moderate amount of makeup to your face.'
-			minut += 5
-			makupskl_exp += rand(1,3)
-			kosmetica -= 2
-			pcs_makeup = 3
-			*pl $makeupNatural
-		elseif makeupSetting = 3:
-			'Without thinking, you instantly apply a heavy amount of makeup to your face.'
-			minut += 10
-			makupskl_exp += rand(1,3)
-			kosmetica -= 3
-			vidageday -= 1
-			pcs_makeup = 4
-			*pl $makeupHeavy
-		else
-			if kosmetica > 0:
-				act 'Light make-up':
-					cla
-					minut += 3
-					makupskl_exp += rand(1,3)
-					kosmetica -= 1
-					pcs_makeup = 2
-					*pl $makeupLight
-					act 'View results':gt 'portmirror', 'start'
-				end
-			end
-
-			if kosmetica > 1:
-				act 'Natural makeup':
-					cla
-					minut += 5
-					makupskl_exp += rand(1,3)
-					kosmetica -= 2
-					pcs_makeup = 3
-					*pl $makeupNatural
-					act 'View results':gt 'portmirror', 'start'
-				end
-			end
-
-			if kosmetica > 2:
-				act 'Heavy makeup':
-					cla
-					minut += 10
-					makupskl_exp += rand(1,3)
-					kosmetica -= 3
-					vidageday -= 1
-					pcs_makeup = 4
-					*pl $makeupHeavy
-					act 'View results':gt 'portmirror', 'start'
-				end
-			end
-		end
-	elseif kosmetica < makeupSetting:
-		'You don''t have enough makeup to apply your chosen option.'
-	end
-	if pcs_hairbsh = 0:
-		minut += 3
-		pcs_hairbsh = 1
-		*pl $brushHair
-	end
-
-	if lipbalm > 0 and pcs_lipbalm <= 0:
-		minut += 10
-		lipbalm -= 1
-		lipkoef += rand(0, 1)
-		if lipkoef > 50:
-			lipkoef = 0
-			pcs_lip += 1
-		end
-		pcs_lipbalm += 8
-		*pl $applyLipbalm
-	end
-
-	act 'View results':gt 'portmirror', 'start'
-end
-
---- portmirror ---------------------------------
-

+ 5 - 14
locations/sexshop

@@ -478,15 +478,12 @@ if $ARGS[0] = 'podval':
 end
 
 if $ARGS[0] = 'toi':
-	$metkaM = $ARGS[0]
-	$locM = $CURLOC
 	$metka = $ARGS[0]
 	$loc = $CURLOC
-	$gt1 = 'sexshop'
-	$gt2 = 'toi'
-    $location_type = 'bathroom'
+	$location_type = 'bathroom'
+	$locM = 'sexshop'
+	$metkaM = 'toi'
 	cla
-	clr
 	*clr
 	minut += 5
 	gs 'stat'
@@ -503,14 +500,8 @@ if $ARGS[0] = 'toi':
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
 	''
 
-	act 'Look in the mirror':
-		cla
-		gt 'portmirror', 'start'
-	end
-
-	if pcs_hairbsh = 0:
-		act 'Brush your hair': gt 'portmirror', 'brush'
-	end
+	act 'Look in the mirror': gt 'mirror', 'start'
+	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
 	if (cumloc[6] = 1 or cumloc[7] = 1):
 		act 'Wipe the cum off your clothes (0:10)':

+ 5 - 12
locations/stwork

@@ -95,24 +95,17 @@ if $ARGS[0] = 'guard':
 end
 
 if $ARGS[0] = 'toilet':
-    $location_type = 'bathroom'
-	cls
-	$gt1 = 'stwork'
-	$gt2 = 'toilet'
+	$location_type = 'bathroom'
+	$locM = 'stwork'
+	$metkaM = 'toilet'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/toilet.jpg"></center>'
 	'Dirty and smelly toilet that seems to have never been cleaned'
 
 	dynamic $basin
 
-	act 'Look in the mirror':
-		cla
-		gt 'portmirror', 'start'
-	end
-
-	if pcs_hairbsh = 0:
-		act 'Brush your hair': gt 'portmirror', 'brush'
-	end
+	act 'Look in the mirror': gt 'mirror', 'start'
+	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
 	dynamic $shower
 	dynamic $quickwash

+ 4 - 10
locations/zaprF

@@ -97,8 +97,8 @@ if $ARGS[0] = 'toilet':
 	$metka = 'toilet'
 	$loc = 'zaprF'
 	$location_type = 'bathroom'
-	$gt1 = 'zaprF'
-	$gt2 = 'toilet'
+	$locM = 'zaprF'
+	$metkaM = 'toilet'
 	minut += 2
 	gs 'stat'
 
@@ -106,14 +106,8 @@ if $ARGS[0] = 'toilet':
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/toilet.jpg"></center>'
 	'You are in a dirty gas station toilet. At least it provides some privacy.'
 
-	act 'Look in the mirror':
-		cla
-		gt 'portmirror', 'start'
-	end
-
-	if pcs_hairbsh = 0:
-		act 'Brush your hair': gt 'portmirror', 'brush'
-	end
+	act 'Look in the mirror': gt 'mirror', 'start'
+	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
 	if (cumloc[6] = 1 or cumloc[7] = 1):
 		act 'Wipe the cum off your clothes (0:10)':