Browse Source

[Refactored] Refactored eyes description

ADCSux 2 years ago
parent
commit
0eff605e7d
1 changed files with 92 additions and 227 deletions
  1. 92 227
      locations/body_desc.qsrc

+ 92 - 227
locations/body_desc.qsrc

@@ -11,14 +11,14 @@ if $ARGS[0] = '':
     gs $this, 'tan'
     gs $this, 'skin'
     gs $this, 'eye_color'
+	gs $this, 'eyelashes'
+	gs $this, 'glasses'
     gs $this, 'eye_size'
     gs $this, 'makeup'
     gs $this, 'nipples'
     gs $this, 'clit'
     gs $this, 'pubes'
     gs $this, 'legs'
-	gs $this, 'eyelashes'
-	gs $this, 'glasses'
 end
 
 if $ARGS[0] = 'ChooseDescWord':
@@ -572,53 +572,98 @@ if $ARGS[0] = 'skin':
     killvar 'rand_skin'
 end
 
+if $ARGS[0] = 'eyelashes':
+	!! extended lash functionality; pcs_lashes = n are: {2, largest natural size}, {3, with temporary false lashes on or basic 2D lash extensions}, {4, with ornate false lashes on or lavish 4D extensions}, {5, with extremely ornate, 6D-style extensions} - xerya
+	!! If players do not have a pcs_naturallashes value, extrapolate one as best as possible from what they currently have.
+	if pcs_naturallashes <= 0 and pcs_lashes <= 2 and retroactivenaturallashes <= 0:
+		pcs_naturallashes = pcs_lashes
+		retroactivenaturallashes = 1
+	end
+
+	if pcs_lashes >= 5:
+		$pc_desc['eyelashes'] = func($this, 'ChooseDescWord', 'long, jewel-dusted', 'incredibly extravagant','overwhelmingly indulgent','jewel-sparkled, showgirl')
+		$pc_descWordy['eyelashes'] = 'incredibly extravagant, jewel-dusted'
+		$pcs_lashes = 'with over-the-top, jewel-dusted eyelash extensions'
+	elseif pcs_lashes = 4:
+		if false_lashes >= 1:
+			$pc_desc['eyelashes'] = func($this, 'ChooseDescWord', 'mink-feathered', 'attention-grabbing','intoxicatingly seductive false','wildly flirtatious false')
+			$pcs_lashes = 'with fabulous, mink-feathered false lashes'
+			$pc_descWordy['eyelashes'] = 'fabulous, mink-feathered false'
+		else
+			$pc_desc['eyelashes'] = func($this, 'ChooseDescWord', 'amazingly lengthy', 'show-stealing','incredibly lush','stunningly dark and full')
+			$pcs_lashes = 'with stunningly dark and full lash extensions'
+			$pc_descWordy['eyelashes'] = 'stunningly dark and full, show-stealing'
+		end
+
+	elseif pcs_lashes = 3:
+		$pc_desc['eyelashes'] = func($this, 'ChooseDescWord', 'lavish', 'lush, dark','seductively-curled','flirtatiously lengthy')
+
+		if false_lashes >= 1:
+			$pcs_lashes = 'with lavish, fluttery false lashes'
+			$pc_descWordy['eyelashes'] = 'lavish, attention-grabbing false'
+		else	
+			$pcs_lashes = 'with lavishly seductive lash extensions'
+			$pc_descWordy['eyelashes'] = 'lavish, seductively dark'
+		end
+
+	elseif pcs_lashes = 2:
+		$pc_desc['eyelashes'] = func($this, 'ChooseDescWord', 'lengthy', 'long','fluttery','seductive')
+		$pc_descWordy['eyelashes'] = 'long, fluttery'
+		$pcs_lashes = 'with long eyelashes'
+
+	elseif pcs_lashes = 1:
+		$pc_desc['eyelashes'] = 'average'
+		$pc_descWordy['eyelashes'] = 'average'
+		$pcs_lashes = 'with average eyelashes'
+
+	elseif pcs_lashes = 0:
+		$pc_desc['eyelashes'] = func($this, 'ChooseDescWord', 'short', 'scarce','faint')
+		$pc_descWordy['eyelashes'] = 'short, barely-noticeable'
+		$pcs_lashes = 'with short eyelashes'
+	end
+end
+
+if $ARGS[0] = 'glasses':
+	!!!CV edition: from glassvnesh = 5 to glassvnesh = 0
+	!! I changed glassvnesh back to 5 for wearing basic glasses. Boys do not make passes at girls who wear glasses.
+	!! Most of these descriptive variables are for describing cum, they would not be reliable for much else. They are used in the context of looking through something.
+	if glass >= 2:
+		$pc_desc['vision'] = func($this, 'ChooseDescWord', 'glasses', 'lenses')
+		$pc_descWordy['vision'] = 'chic, stylish glasses'
+		$glass = ' You wear glasses.'
+		glassvnesh = 0
+	elseif glass = 1:
+		$pc_desc['vision'] = func($this, 'ChooseDescWord', 'glasses', 'lenses', 'dorky glasses', 'geeky lenses')
+		$pc_descWordy['vision'] = 'cheap, utilitarian glasses'
+		$glass = ' You wear silly glasses in a cheap frame.'
+		glassvnesh = 10
+	else
+		glass = 0
+		$glass = ''
+		glassvnesh = 0
+	end
+end
+
 if $ARGS[0] = 'eye_color':
     if pcs_eyecol = 0:
-		rand_eyecol = rand(0,1)
-		if rand_eyecol = 0:
-			$pcdesc_eyecolourrandom = 'brown'
-		elseif rand_eyecol = 1:
-			$pcdesc_eyecolourrandom = 'hazel'
-		end
-		$pcdesc_eyecolour = 'brown'
-		$pcdesc_eyecolourwordy = 'warm, hazel'
+		$pc_desc['eye colour'] = func($this, 'ChooseDescWord', 'brown', 'hazel')
+		$pc_descWordy['eye colour'] = 'warm, hazel'
 		$pcs_eyecol = 'brown'
 	elseif pcs_eyecol = 1:
-		rand_eyecol = rand(0,2)
-		if rand_eyecol = 0:
-			$pcdesc_eyecolourrandom = 'pale'
-		elseif rand_eyecol = 1:
-			$pcdesc_eyecolourrandom = 'grey'
-		elseif rand_eyecol = 2:
-			$pcdesc_eyecolourrandom = 'silvery'
-		end
-		$pcdesc_eyecolour = 'grey'
-		$pcdesc_eyecolourwordy = 'pale, silvery-grey'
+		$pc_desc['eye colour'] = func($this, 'ChooseDescWord', 'pale', 'grey', 'silvery')
+		$pc_descWordy['eye colour'] = 'pale, silvery-grey'
 		$pcs_eyecol = 'grey'
 	elseif pcs_eyecol = 2:
-		rand_eyecol = rand(0,1)
-		if rand_eyecol = 0:
-			$pcdesc_eyecolourrandom = 'green'
-		elseif rand_eyecol = 1:
-			$pcdesc_eyecolourrandom = 'emerald'
-		end
-		$pcdesc_eyecolour = 'green'
-		$pcdesc_eyecolourwordy = 'sparkling green'
+		$pc_desc['eye colour'] = func($this, 'ChooseDescWord', 'green', 'emerald')
+		$pc_descWordy['eye colour'] = 'sparkling green'
 		$pcs_eyecol = 'green'
 	elseif pcs_eyecol = 3:
-		rand_eyecol = rand(0,1)
-		if rand_eyecol = 0:
-			$pcdesc_eyecolourrandom = 'blue'
-		elseif rand_eyecol = 1:
-			$pcdesc_eyecolourrandom = 'sapphire'
-		end
-		$pcdesc_eyecolour = 'blue'
-		$pcdesc_eyecolourwordy = 'vibrant, crystal blue'
+		$pc_desc['eye colour'] = func($this, 'ChooseDescWord', 'blue', 'sapphire')
+		$pc_descWordy['eye colour'] = 'vibrant, crystal blue'
 		$pcs_eyecol = 'blue'
 	else
-		$pcdesc_eyecolourrandom = 'attractive'
-		$pcdesc_eyecolour = 'attractive'
-		$pcdesc_eyecolourwordy = 'attractive'
+		$pc_desc['eye colour'] = 'attractive'
+		$pc_descWordy['eye colour'] = 'attractive'
 		$pcs_eyecol = 'attractive'
 	end
     killvar 'rand_eyecol' 
@@ -627,52 +672,21 @@ end
 if $ARGS[0] = 'eye_size':
     !! Most of these sound really terrible. Would REALLY recommend only using the insertive context, as the less-flowery versions will simply not return anything at all.
 	if pcs_eyesize = 0:
-		$pcdesc_eyesizerandom = 'tiny'
-		$pcdesc_eyesize = 'small'
-		$pcdesc_eyesizeinsertive = ''
-		$pcdesc_eyesizewordy = 'little'
+		$pc_desc['eye size'] = ''
+		$pc_descWordy['eye size'] = 'little'
 		$glaza = 'You have little <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
 	elseif pcs_eyesize = 1:
-		rand_eyesize = rand(0,1)
-		if rand_eyesize = 0:
-			$pcdesc_eyesizerandom = 'medium'
-		elseif rand_eyesize = 1:
-			$pcdesc_eyesizerandom = 'average-sized'
-		end
-		$pcdesc_eyesize = 'medium-sized'
-		$pcdesc_eyesizeinsertive = ''
-		$pcdesc_eyesizewordy = 'medium-sized'
+		$pc_desc['eye size'] = ''
+		$pc_descWordy['eye size'] = 'medium-sized'
 		$glaza = 'You have medium-sized <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
 	elseif pcs_eyesize = 2:
-		rand_eyesize = rand(0,3)
-		if rand_eyesize = 0:
-			$pcdesc_eyesizerandom = 'big'
-		elseif rand_eyesize = 1:
-			$pcdesc_eyesizerandom = 'expressive'
-		elseif rand_eyesize = 2:
-			$pcdesc_eyesizerandom = 'wide'
-		elseif rand_eyesize = 3:
-			$pcdesc_eyesizerandom = 'large'
-		end
-		$pcdesc_eyesize = 'large'
-		$pcdesc_eyesizeinsertive = ' large,'
-		$pcdesc_eyesizewordy = 'large, expressive'
+		$pc_desc['eye size'] = ' large,'
+		$pc_descWordy['eye size'] = 'large, expressive'
 		$glaza = 'You have large <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
 	else
 		pcs_eyesize = 3
-		rand_eyesize = rand(0,3)
-		if rand_eyesize = 0:
-			$pcdesc_eyesizerandom = 'wide'
-		elseif rand_eyesize = 1:
-			$pcdesc_eyesizerandom = 'huge'
-		elseif rand_eyesize = 2:
-			$pcdesc_eyesizerandom = 'doll-like'
-		elseif rand_eyesize = 3:
-			$pcdesc_eyesizerandom = 'incredibly expressive'
-		end
-		$pcdesc_eyesize = 'huge'
-		$pcdesc_eyesizeinsertive = ' big, doll-like'
-		$pcdesc_eyesizewordy = 'huge'
+		$pc_desc['eye size'] = 'huge'
+		$pc_descWordy['eye size'] = 'huge'
 		$glaza = 'You have huge <<$pcs_eyecol>> eyes that almost look like they''re out of an anime, <<$pcs_lashes>>.<<$glass>>'
 	end
     killvar 'rand_eyesize'
@@ -1297,153 +1311,4 @@ if $ARGS[0] = 'hair':
 	$pc_descWordy['hair'] = '<<$pc_desc[''hair status'']>>, <<$pc_descWordy[''hair length'']>> <<$pc_descWordy[''hair texture'']>> of <<$pc_descWordy[''hair colour'']>>'
 end
 
-if $ARGS[0] = 'eyelashes':
-	!! extended lash functionality; pcs_lashes = n are: {2, largest natural size}, {3, with temporary false lashes on or basic 2D lash extensions}, {4, with ornate false lashes on or lavish 4D extensions}, {5, with extremely ornate, 6D-style extensions} - xerya
-	!! If players do not have a pcs_naturallashes value, extrapolate one as best as possible from what they currently have.
-	if pcs_naturallashes <= 0 and pcs_lashes <= 2 and retroactivenaturallashes <= 0:
-		pcs_naturallashes = pcs_lashes
-		retroactivenaturallashes = 1
-	end
-
-	if pcs_lashes >= 5:
-		rand_lashes = rand(0,3)
-		if rand_lashes = 0:
-			$pcdesc_lashesrandom = 'long, jewel-dusted'
-		elseif rand_lashes = 1:
-			$pcdesc_lashesrandom = 'incredibly extravagant'
-		elseif rand_lashes = 2:
-			$pcdesc_lashesrandom = 'overwhelmingly indulgent'
-		elseif rand_lashes = 3:
-			$pcdesc_lashesrandom = 'jewel-sparkled, showgirl'
-		end
-		$pcdesc_lashes = 'long, jewel-dusted'
-		$pcdesc_lasheswordy = 'incredibly extravagant, jewel-dusted'
-		$pcs_lashes = 'with over-the-top, jewel-dusted eyelash extensions'
-	elseif pcs_lashes = 4:
-		rand_lashes = rand(0,3)
-		if false_lashes >= 1:
-			if rand_lashes = 0:
-				$pcdesc_lashesrandom = 'mink-feathered'
-			elseif rand_lashes = 1:
-				$pcdesc_lashesrandom = 'attention-grabbing'
-			elseif rand_lashes = 2:
-				$pcdesc_lashesrandom = 'intoxicatingly seductive false'
-			elseif rand_lashes = 3:
-				$pcdesc_lashesrandom = 'wildly flirtatious false'
-			end
-			$pcdesc_lashes = 'mink-feathered false'
-			$pcs_lashes = 'with fabulous, mink-feathered false lashes'
-			$pcdesc_lasheswordy = 'fabulous, mink-feathered false'
-		else
-			if rand_lashes = 0:
-				$pcdesc_lashesrandom = 'amazingly lengthy'
-			elseif rand_lashes = 1:
-				$pcdesc_lashesrandom = 'show-stealing'
-			elseif rand_lashes = 2:
-				$pcdesc_lashesrandom = 'incredibly lush'
-			elseif rand_lashes = 3:
-				$pcdesc_lashesrandom = 'stunningly dark and full'
-			end
-			$pcdesc_lashes = 'show-stealing'
-			$pcs_lashes = 'with stunningly dark and full lash extensions'
-			$pcdesc_lasheswordy = 'stunningly dark and full, show-stealing'
-		end
-	elseif pcs_lashes = 3:
-		rand_lashes = rand(0,3)
-		if rand_lashes = 0:
-			$pcdesc_lashesrandom = 'lavish'
-		elseif rand_lashes = 1:
-			$pcdesc_lashesrandom = 'lush, dark'
-		elseif rand_lashes = 2:
-			$pcdesc_lashesrandom = 'seductively-curled'
-		elseif rand_lashes = 3:
-			$pcdesc_lashesrandom = 'flirtatiously lengthy'
-		end
-		$pcdesc_lashes = 'lavish'
-		if false_lashes >= 1:
-			$pcs_lashes = 'with lavish, fluttery false lashes'
-			$pcdesc_lasheswordy = 'lavish, attention-grabbing false'
-		else	
-			$pcs_lashes = 'with lavishly seductive lash extensions'
-			$pcdesc_lasheswordy = 'lavish, seductively dark'
-		end
-	elseif pcs_lashes = 2:
-		rand_lashes = rand(0,3)
-		if rand_lashes = 0:
-			$pcdesc_lashesrandom = 'lengthy'
-		elseif rand_lashes = 1:
-			$pcdesc_lashesrandom = 'long'
-		elseif rand_lashes = 2:
-			$pcdesc_lashesrandom = 'fluttery'
-		elseif rand_lashes = 3:
-			$pcdesc_lashesrandom = 'seductive'
-		end
-		$pcdesc_lashes = 'long'
-		$pcdesc_lasheswordy = 'long, fluttery'
-		$pcs_lashes = 'with long eyelashes'
-	elseif pcs_lashes = 1:
-		$pcdesc_lashesrandom = 'average'
-		$pcdesc_lashes = 'average'
-		$pcdesc_lasheswordy = 'average'
-		$pcs_lashes = 'with average eyelashes'
-	else
-		pcs_lashes = 0
-		rand_lashes = rand(0,2)
-		if rand_lashes = 0:
-			$pcdesc_lashesrandom = 'short'
-		elseif rand_lashes = 1:
-			$pcdesc_lashesrandom = 'scarce'
-		elseif rand_lashes = 2:
-			$pcdesc_lashesrandom = 'faint'
-		end
-		$pcdesc_lashes = 'short'
-		$pcdesc_lasheswordy = 'short, barely-noticeable'
-		$pcs_lashes = 'with short eyelashes'
-	end
-end
-
-if $ARGS[0] = 'glasses':
-	!!!CV edition: from glassvnesh = 5 to glassvnesh = 0
-	!! I changed glassvnesh back to 5 for wearing basic glasses. Boys do not make passes at girls who wear glasses.
-	!! Most of these descriptive variables are for describing cum, they would not be reliable for much else. They are used in the context of looking through something.
-	if glass >= 2:
-		rand_vision = rand(0,1)
-		if rand_vision = 0:
-			$pcdesc_visionrandom = 'glasses'
-		elseif rand_vision = 1:
-			$pcdesc_visionrandom = 'lenses'
-		end
-		$pcdesc_vision = 'glasses'
-		$pcdesc_visionwordy = 'chic, stylish glasses'
-		$glass = ' You wear glasses.'
-		glassvnesh = 0
-	elseif glass = 1:
-		rand_vision = rand(0,3)
-		if rand_vision = 0:
-			$pcdesc_visionrandom = 'glasses'
-		elseif rand_vision = 1:
-			$pcdesc_visionrandom = 'lenses'
-		elseif rand_vision = 2:
-			$pcdesc_visionrandom = 'dorky glasses'
-		elseif rand_vision = 3:
-			$pcdesc_visionrandom = 'geeky lenses'
-		end
-		$pcdesc_vision = 'nerdy glasses'
-		$pcdesc_visionwordy = 'cheap, utilitarian glasses'
-		$glass = ' You wear silly glasses in a cheap frame.'
-		glassvnesh = 10
-	else
-		glass = 0
-		rand_vision = rand(0,1)
-		if rand_vision = 0:
-			$pcdesc_visionrandom = 'lashes'
-		elseif rand_vision = 1:
-			$pcdesc_visionrandom = 'eyelashes'
-		end
-		$pcdesc_vision = 'lashes'
-		$pcdesc_visionwordy = '<<$pcdesc_lasheswordy>> lashes'
-		$glass = ''
-		glassvnesh = 0
-	end
-end
 --- body_desc ---------------------------------