[Refactored] Refactored skin and makeup description

locations/body.qsrc

@@ -68,6 +68,7 @@ if $ARGS[0] = '':
 
 	mopkoef = pcs_makupskl / 5
 	if pcs_makeup = 0: mopkoef = -5
+	if pcs_makeup = 1: mopkoef = 0
 	if pcs_makeup = 5: mopkoef = 30
 	if pcs_makeup = 6 and bimbolevel >= 2: extra_supnatvnesh = 2*bimbolevel - 2
 

locations/body_desc.qsrc

@@ -492,80 +492,28 @@ end
 
 if $ARGS[0] = 'skin':
     if pcs_skin < 20:
-		rand_skin = rand(0,3)
-		if rand_skin = 0:
-			$pcdesc_skinrandom = 'terrible'
-		elseif rand_skin = 1:
-			$pcdesc_skinrandom = 'awful'
-		elseif rand_skin = 2:
-			$pcdesc_skinrandom = 'greasy'
-		elseif rand_skin = 3:
-			$pcdesc_skinrandom = 'pimple-strewn'
-		end
-		$pcdesc_skin = 'terrible'
-		$pcdesc_skinwordy = 'awful, greasy and pimply'
+		$pc_desc['skin'] = func($this, 'ChooseDescWord', 'terrible', 'awful', 'greasy', 'pimple-strewn')
+		$pc_descWordy['skin'] = 'awful, greasy and pimply'
 		$skin = 'Your <<$pcs_tan>> skin is rough and covered with pimples and moles. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
 		$skin1 = 'terrible'
 	elseif pcs_skin < 40:
-		rand_skin = rand(0,3)
-		if rand_skin = 0:
-			$pcdesc_skinrandom = 'bad'
-		elseif rand_skin = 1:
-			$pcdesc_skinrandom = 'greasy'
-		elseif rand_skin = 2:
-			$pcdesc_skinrandom = 'rough'
-		elseif rand_skin = 3:
-			$pcdesc_skinrandom = 'unappealing'
-		end
-		$pcdesc_skin = 'bad'
-		$pcdesc_skinwordy = 'poorly-kept, unappealing'
+		$pc_desc['skin'] = func($this, 'ChooseDescWord', 'bad', 'greasy', 'rough', 'unappealing')
+		$pc_descWordy['skin'] = 'poorly-kept, unappealing'
 		$skin = 'Your <<$pcs_tan>> skin is rough and has a few pimples. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
 		$skin1 = 'bad'
 	elseif pcs_skin < 60:
-		rand_skin = rand(0,2)
-		if rand_skin = 0:
-			$pcdesc_skinrandom = 'average'
-		elseif rand_skin = 1:
-			$pcdesc_skinrandom = 'normal'
-		elseif rand_skin = 2:
-			$pcdesc_skinrandom = 'clear'
-		end
-		$pcdesc_skin = 'average'
-		$pcdesc_skinwordy = 'normal, slightly rough'
+		$pc_desc['skin'] = func($this, 'ChooseDescWord', 'average', 'normal', 'clear')
+		$pc_descWordy['skin'] = 'normal, slightly rough'
 		$skin = 'Your <<$pcs_tan>> skin is clear of acne but still slightly rough. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
 		$skin1 = 'average'
 	elseif pcs_skin < 80:
-		rand_skin = rand(0,4)
-		if rand_skin = 0:
-			$pcdesc_skinrandom = 'good'
-		elseif rand_skin = 1:
-			$pcdesc_skinrandom = 'nice'
-		elseif rand_skin = 2:
-			$pcdesc_skinrandom = 'smooth'
-		elseif rand_skin = 3:
-			$pcdesc_skinrandom = 'well-kept'
-		elseif rand_skin = 4:
-			$pcdesc_skinrandom = 'great'
-		end
-		$pcdesc_skin = 'good'
-		$pcdesc_skinwordy = 'smooth, well-kept'
+		$pc_desc['skin'] = func($this, 'ChooseDescWord', 'good', 'nice', 'smooth', 'great', 'well-kept')
+		$pc_descWordy['skin'] = 'smooth, well-kept'
 		$skin = 'You have <<$pcs_tan>>, smooth and well-groomed skin. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
 		$skin1 = 'good'
 	else
-		rand_skin = rand(0,4)
-		if rand_skin = 0:
-			$pcdesc_skinrandom = 'excellent'
-		elseif rand_skin = 1:
-			$pcdesc_skinrandom = 'silken'
-		elseif rand_skin = 2:
-			$pcdesc_skinrandom = 'soft'
-		elseif rand_skin = 3:
-			$pcdesc_skinrandom = 'silky'
-		elseif rand_skin = 4:
-			$pcdesc_skinrandom = 'immaculate'
-		end
-		$pcdesc_skin = 'excellent'
-		$pcdesc_skinwordy = 'immaculate, silky-soft'
+		$pc_desc['skin'] = func($this, 'ChooseDescWord', 'excellent', 'silken', 'soft', 'silky', 'immaculate')
+		$pc_descWordy['skin'] = 'immaculate, silky-soft'
 		$skin = 'You have <<$pcs_tan>> and very smooth skin which almost feels like silk to the touch. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
 		$skin1 = 'excellent'
 	end
@@ -797,102 +745,44 @@ end
 
 if $ARGS[0] = 'makeup':
     if pcs_makeup = 0:
-		rand_makeup = rand(0,2)
-		if rand_makeup = 0:
-			$pcdesc_makeuprandom = 'makeup-ruined'
-		elseif rand_makeup = 1:
-			$pcdesc_makeuprandom = 'makeup-smeared'
-		elseif rand_makeup = 2:
-			$pcdesc_makeuprandom = 'makeup-trashed'
-		end
-		$pcdesc_makeup = 'makeup-smeared'
-		$pcdesc_makeupwordy = 'clownishly makeup-smeared'
-		mopkoef = -5 
+		$pc_desc['makeup'] = func($this, 'ChooseDescWord', 'makeup-ruined', 'makeup-smeared', 'makeup-trashed')
+		$pc_descWordy['makeup'] = 'clownishly makeup-smeared'
 		$pcs_makeup = '<b><font color="red">Your makeup is smeared all over your face</font></b>'
 		$pcs_makeup_msg = 'Your makeup is smeared all over your face.'
 		$pcs_makeup_tooltip = 'Your makeup is ruined.'
 	elseif pcs_makeup = 1: 
-		rand_makeup = rand(0,1)
-		if rand_makeup = 0:
-			$pcdesc_makeuprandom = 'natural'
-		elseif rand_makeup = 1:
-			$pcdesc_makeuprandom = 'bare'
-		end
-		$pcdesc_makeup = 'natural'
-		$pcdesc_makeupwordy = 'bare, natural'
-		mopkoef = 0
+		$pc_desc['makeup'] = func($this, 'ChooseDescWord', 'natural', 'bare')
+		$pc_descWordy['makeup'] = 'bare, natural'
 		$pcs_makeup = 'You''re not wearing any kind of makeup'
 		$pcs_makeup_msg = 'You''re not wearing any kind of makeup.'
 		$pcs_makeup_tooltip = 'You''re not wearing makeup.'
 	elseif pcs_makeup = 2: 
-		rand_makeup = rand(0,1)
-		if rand_makeup = 0:
-			$pcdesc_makeuprandom = 'lightly-accented'
-		elseif rand_makeup = 1:
-			$pcdesc_makeuprandom = 'subtly-highlighted'
-		end
-		$pcdesc_makeup = 'subtly-accented'
-		$pcdesc_makeupwordy = 'almost natural, subtly-accented'
+		$pc_desc['makeup'] = func($this, 'ChooseDescWord', 'lightly-accented', 'subtly-highlighted')
+		$pc_descWordy['makeup'] = 'almost natural, subtly-accented'
 		$pcs_makeup = 'Your makeup is light and subtle, with neutral tones to bring out your natural beauty'
 		$pcs_makeup_msg = 'Your makeup is light and subtle, with neutral tones to bring out your natural beauty.'
 		$pcs_makeup_tooltip = 'Your makeup is light and subtle.'
 	elseif pcs_makeup = 3: 
-		rand_makeup = rand(0,1)
-		if rand_makeup = 0:
-			$pcdesc_makeuprandom = 'colourfully done-up'
-		elseif rand_makeup = 1:
-			$pcdesc_makeuprandom = 'vibrantly done-up'
-		end
-		$pcdesc_makeup = 'vibrantly done-up'
-		$pcdesc_makeupwordy = 'colourful, tastefully done-up'
+		$pc_desc['makeup'] = func($this, 'ChooseDescWord', 'colourfully done-up', 'vibrantly done-up')
+		$pc_descWordy['makeup'] = 'colourful, tastefully done-up'
 		$pcs_makeup = 'Your makeup has some mildly vibrant tones, covering your minor imperfections and enhancing your best features'
 		$pcs_makeup_msg = 'Your makeup has some mildly vibrant tones, covering your minor imperfections and enhancing your best features.'
 		$pcs_makeup_tooltip = 'Your makeup has some mildly vibrant tones.'
 	elseif pcs_makeup = 4:
-		rand_makeup = rand(0,3)
-		if rand_makeup = 0:
-			$pcdesc_makeuprandom = 'painted-on'
-		elseif rand_makeup = 1:
-			$pcdesc_makeuprandom = 'makeup-caked'
-		elseif rand_makeup = 2:
-			$pcdesc_makeuprandom = 'dolled-up'
-		elseif rand_makeup = 3:
-			$pcdesc_makeuprandom = 'sultry, dramatically done-up'
-		end
-		$pcdesc_makeup = 'dolled-up'
-		$pcdesc_makeupwordy = 'heavily dolled-up and painted'
+		$pc_desc['makeup'] = func($this, 'ChooseDescWord', 'painted-on', 'makeup-caked', 'dolled-up', 'sultry, dramatically done-up')
+		$pc_descWordy['makeup'] = 'heavily dolled-up and painted'
 		$pcs_makeup = 'Your makeup is thick enough to cover most imperfections, with rich shades drawing attention to your eyes and lips'
 		$pcs_makeup_msg = 'Your makeup is thick enough to cover most imperfections, with rich shades drawing attention to your eyes and lips.'
 		$pcs_makeup_tooltip = 'Your makeup is thick enough to cover most imperfections.'
 	elseif pcs_makeup = 5:
-		rand_makeup = rand(0,3)
-		if rand_makeup = 0:
-			$pcdesc_makeuprandom = 'painted-on'
-		elseif rand_makeup = 1:
-			$pcdesc_makeuprandom = 'makeup-caked'
-		elseif rand_makeup = 2:
-			$pcdesc_makeuprandom = 'dolled-up'
-		elseif rand_makeup = 3:
-			$pcdesc_makeuprandom = 'sultry, dramatically done-up'
-		end
-		$pcdesc_makeup = 'dolled-up'
-		$pcdesc_makeupwordy = 'heavily dolled-up and painted'
+		$pc_desc['makeup'] = func($this, 'ChooseDescWord', 'painted-on', 'makeup-caked', 'dolled-up', 'sultry, dramatically done-up')
+		$pc_descWordy['makeup'] = 'heavily dolled-up and painted'
 		$pcs_makeup = 'Your makeup is professional grade, covering up any and all imperfections and flawlessly complimenting the natural hues of your eyes, face, and hair'
 		$pcs_makeup_msg = 'Your makeup is professional grade, covering up any and all imperfections and flawlessly complimenting the natural hues of your eyes, face, and hair.'
 		$pcs_makeup_tooltip = 'Your makeup is professional grade.'
 	elseif pcs_makeup = 6:
-		rand_makeup = rand(0,3)
-		if rand_makeup = 0:
-			$pcdesc_makeuprandom = 'bimbo'
-		elseif rand_makeup = 1:
-			$pcdesc_makeuprandom = 'hawt'
-		elseif rand_makeup = 2:
-			$pcdesc_makeuprandom = 'O M G '
-		elseif rand_makeup = 3:
-			$pcdesc_makeuprandom = 'just, the best'
-		end
-		$pcdesc_makeup = 'bimbo'
-		$pcdesc_makeupwordy = 'really fucking bimbo-y'
+		$pc_desc['makeup'] = func($this, 'ChooseDescWord', 'bimbo', 'hawt', 'O M G', 'just, the best')
+		$pc_descWordy['makeup'] = 'really fucking bimbo-y'
 		$pcs_makeup = 'You look, like super hawt and everyone is so jelly because their makeup is boring and ugly.'
 		$pcs_makeup_msg = 'You look, like super hawt and everyone is so jelly because their makeup is boring and ugly.'
 		$pcs_makeup_tooltip = 'OMG! your makeup is sooo bimbo fine.'