Browse Source

Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

Kevin_Smarts 2 năm trước cách đây
mục cha
commit
1afe6db43c
3 tập tin đã thay đổi với 76 bổ sung76 xóa
  1. 2 2
      locations/ApperanceSystem.qsrc
  2. 65 65
      locations/body_desc.qsrc
  3. 9 9
      locations/city_hotel.qsrc

+ 2 - 2
locations/ApperanceSystem.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = '':
 	!STD check. STD will make appearance automatically -10
 	if Gerpes >= 3 or Sifilis >= 21 or Triper > 2:
 		pcs_apprnc = -10
-	else:
+	else
 		clothingBonus = func($this, 'CalcClothingBonus')
 		accessoriesBonus = func($this, 'CalcAccessoriesBonus', bonusZ, PShoQuality)
 		groomingBonus = func($this, 'CalcGroomingBonus')
@@ -43,7 +43,7 @@ if $args[0] = 'UpdateBaseAppearnce':
 	elseif vidage > 30: 
 		vidageBonus = 160 - (2 * vidage)
 	else
-		vinageBonus = 100
+		vidageBonus = 100
 	end
 
 	skinBonus = (pcs_skin * 2 / 5)

+ 65 - 65
locations/body_desc.qsrc

@@ -10,24 +10,24 @@
 }
 
 if $ARGS[0] = '':
-    $this = 'body_desc'
-    gs $this, 'throat'
-    gs $this, 'pussy'
-    gs $this, 'anus'
+	$this = 'body_desc'
+	gs $this, 'throat'
+	gs $this, 'pussy'
+	gs $this, 'anus'
 	if dounspell = 0: gs $this, 'butt' & gs $this, 'breasts' & gs $this, 'BMI'
 	gs $this, 'lips'
 	gs $this, 'hair'
-    gs $this, 'tan'
-    gs $this, 'skin'
-    gs $this, 'eye_color'
+	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, 'eye_size'
+	gs $this, 'makeup'
+	gs $this, 'nipples'
+	gs $this, 'clit'
+	gs $this, 'pubes'
+	gs $this, 'legs'
 	gs $this, 'appearance'
 end
 
@@ -41,7 +41,7 @@ if $ARGS[0] = 'ChooseDescWord':
 end
 
 if $ARGS[0] = 'throat':
-    if pcs_throat = 0:
+	if pcs_throat = 0:
 		$pcs_throat = 'You have a chaste <a href="exec:view''images/pc/body/throat/th0.jpg''">mouth</a>.'
 		$pc_desc['throat'] = 'virgin'
 		$pc_descWordy['throat'] = 'virginal, unused'
@@ -82,7 +82,7 @@ if $ARGS[0] = 'throat':
 end
 
 if $ARGS[0] = 'pussy':
-    if vgape >= 4:
+	if vgape >= 4:
 		if rand(0,1) = 0:
 			$pcs_vag = 'Your regularly-fucked <a href="exec:view''images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg''">playground</a> can take most things you force up there.'
 		else
@@ -126,7 +126,7 @@ if $ARGS[0] = 'pussy':
 end
 
 if $ARGS[0] = 'anus':
-    !! The original variables are all named for ass, but really, this is just all about the asshole.
+	!! The original variables are all named for ass, but really, this is just all about the asshole.
 	if analplugIN = 0:
 		if agape >= 4:
 			anpic = 5
@@ -175,7 +175,7 @@ if $ARGS[0] = 'anus':
 		$pc_descWordy['anus'] = 'plug-stuffed'
 		$anustipe = 'plugged'
 		if $pantyworntype ! 'none':
-			$pcs_ass = 'Your <a href="exec:view''images/pc/body/analplug.jpg''">anus</a> is currently filled with your butt plug.'	
+			$pcs_ass = 'Your <a href="exec:view''images/pc/body/analplug.jpg''">anus</a> is currently filled with your butt plug.'
 		else
 			if pirsG > 0 and pirsG < 10000:
 				$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/pirs' + rand(1,3) + '.jpg''">anus</a> is currently filled with your butt plug.'
@@ -190,19 +190,19 @@ if $ARGS[0] = 'BMI':
 	!!BMI Descriptions
 	if pcs_bmi < 16:
 		$bmi_desc = 'You are severely underweight.'
-	elseif pcs_bmi >= 16 and pcs_bmi < 19:
+	elseif pcs_bmi < 19:
 		$bmi_desc = 'You are underweight'
-	elseif pcs_bmi >= 19 and pcs_bmi < 25:
+	elseif pcs_bmi < 25:
 		$bmi_desc = 'You have a normal, healthy weight.'
-	elseif pcs_bmi >= 25 and pcs_bmi < 30:
+	elseif pcs_bmi < 30:
 		$bmi_desc = 'You are overweight.'
-	elseif pcs_bmi >= 30 and pcs_bmi < 35:
+	elseif pcs_bmi < 35:
 		$bmi_desc = 'You are moderately obese.'
-	elseif pcs_bmi >= 35 and pcs_bmi < 40:
+	elseif pcs_bmi < 40:
 		$bmi_desc = 'You are severely obese.'
-	elseif pcs_bmi >= 40 and bmi_pcs_bmicalc < 45:
+	elseif pcs_bmi < 45:
 		$bmi_desc = 'You are very severely obese.'
-	elseif pcs_bmi >= 45:
+	else
 		$bmi_desc = 'You are morbidly obese.'
 	end
 end
@@ -264,7 +264,7 @@ if $ARGS[0] = 'breasts':
 		$pcdesc_breastsqualifierinsertive = ''
 		pcdesc_breastimplantcheck = 0
 	end
-	
+
 	!! These will not be used below, but can be referenced by descriptive writers in case they want to be able to quickly reference whether or not the PC has implants, as in "He reaches up and cups your<<$pcdesc_breastsfakeinsertive>> breasts."
 	if pcdesc_breastimplantcheck = 1:
 		$pcdesc_breastsfakeinsertive = ' fake'
@@ -407,13 +407,13 @@ end
 
 if $ARGS[0] = 'butt':
 	!natural butt
-	if pcs_butt <= 4: 
+	if pcs_butt <= 4:
 		$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/1.jpg''">ass</a> is square and as flat as a plank.  It can be considered very masculine looking and isn''t very impressive.'
-	elseif pcs_butt <= 8: 
+	elseif pcs_butt <= 8:
 		$pcs_butt = 'You have an average, feminine looking <a href="exec:view''images/pc/body/ass/2.jpg''">ass</a>. While it''s not flat, it''s nothing special either.'
-	elseif pcs_butt <= 12: 
+	elseif pcs_butt <= 12:
 		$pcs_butt = 'Your tight <a href="exec:view''images/pc/body/ass/3.jpg''">ass</a> is a little bigger, rounder and firmer than average. You often draw the stares of guys around you.'
-	elseif pcs_butt <= 16: 
+	elseif pcs_butt <= 16:
 		$pcs_butt = 'You have a large and natural bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk. Guys hungrily fixate on you with their tongues hanging out and other girls are often envious of your booty.'
 	end
 
@@ -449,7 +449,7 @@ if $ARGS[0] = 'lips':
 		$pc_descWordy['lip size'] = 'plush, pillowy and inviting'
 	end
 	!! Lip balm is used OVER makeup, and given the descriptions already provided for what it does to lips, I feel with some certainty it is meant to be lip gloss, not lip BALM. Still, cannot change the old variables...
-	!! $pcdesc_lipglossed is used for a past-tense descriptive, present-tense descriptives will use $pcdesc_lipgloss. In most cases, the lip balm descriptors should only add options when looking at random choices, as the additional random options are merely indicative of 
+	!! $pcdesc_lipglossed is used for a past-tense descriptive, present-tense descriptives will use $pcdesc_lipgloss. In most cases, the lip balm descriptors should only add options when looking at random choices, as the additional random options are merely indicative of
 	!! a more suggestive lip shape and fullness, not necessarily a different type of gloss. Only shiny is culled past 1, because it is boring. $pcs_lipbalm is left for backwards compatibility.
 	if pcs_lipbalm > 0:
 		$pc_desc['lip gloss'] = func($this, 'ChooseDescWord', 'shiny', 'glossy', 'juicy', 'slippery')
@@ -480,7 +480,7 @@ if $ARGS[0] = 'lips':
 
 	$lip = 'You have <<$pcs_lipSize>>, <<$pc_desc[''lip gloss'']>> ' + iif(pcs_lip = 4, 'suggestively full ', '') +  'lips. <<$pirsB>> <<$pirsA>>'
 
-    !! A pair of ready-made lip strings for writers to use if they are unsure how to construct them themselves. Again, these are not great and should preferably not be relied on, but they are here.
+	!! A pair of ready-made lip strings for writers to use if they are unsure how to construct them themselves. Again, these are not great and should preferably not be relied on, but they are here.
 	$pc_desc['lips'] = '<<$pc_desc[''lip size'']>> <<$pc_desc[''lip gloss'']>>'
 	$pc_descWordy['lips'] = '<<$pc_desc[''lip gloss'']>>, <<$pc_descWordy[''lip size'']>>'
 end
@@ -516,7 +516,7 @@ if $ARGS[0] = 'tan':
 end
 
 if $ARGS[0] = 'skin':
-    if pcs_skin < 20:
+	if pcs_skin < 20:
 		$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>>'
@@ -573,7 +573,7 @@ if $ARGS[0] = 'eyelashes':
 		if false_lashes >= 1:
 			$pcs_lashes = 'with lavish, fluttery false lashes'
 			$pc_descWordy['eyelashes'] = 'lavish, attention-grabbing false'
-		else	
+		else
 			$pcs_lashes = 'with lavishly seductive lash extensions'
 			$pc_descWordy['eyelashes'] = 'lavish, seductively dark'
 		end
@@ -614,7 +614,7 @@ if $ARGS[0] = 'glasses':
 end
 
 if $ARGS[0] = 'eye_color':
-    if pcs_eyecol = 0:
+	if pcs_eyecol = 0:
 		$pc_desc['eye colour'] = func($this, 'ChooseDescWord', 'brown', 'hazel')
 		$pc_descWordy['eye colour'] = 'warm, hazel'
 		$pcs_eyecol = 'brown'
@@ -638,7 +638,7 @@ if $ARGS[0] = 'eye_color':
 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.
+	!! 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:
 		$pc_desc['eye size'] = ''
 		$pc_descWordy['eye size'] = 'little'
@@ -660,7 +660,7 @@ if $ARGS[0] = 'eye_size':
 end
 
 if $ARGS[0] = 'pierrcing':
-    !! If, like me, you are confused by the logic of what initially appear to be arbitrary numbers, it turns out the piercing location value is set to a number to indicate which photo it uses, which is tied to what jewelry you have for the piercing. 10000 means pierced, but no jewelry.
+	!! If, like me, you are confused by the logic of what initially appear to be arbitrary numbers, it turns out the piercing location value is set to a number to indicate which photo it uses, which is tied to what jewelry you have for the piercing. 10000 means pierced, but no jewelry.
 	if pirsA > 0 and pirsA < 10000:
 		$pirsA = 'When you talk to people, they can sometimes get a glimpse of your tongue piercing.'
 		rand_tongue = rand(0,1)
@@ -763,25 +763,25 @@ if $ARGS[0] = 'pierrcing':
 end
 
 if $ARGS[0] = 'makeup':
-    if pcs_makeup = 0:
+	if pcs_makeup = 0:
 		$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: 
+	elseif pcs_makeup = 1:
 		$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: 
+	elseif pcs_makeup = 2:
 		$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: 
+	elseif pcs_makeup = 3:
 		$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'
@@ -809,7 +809,7 @@ if $ARGS[0] = 'makeup':
 end
 
 if $ARGS[0] = 'nipples':
-    if pcs_nips < 20:
+	if pcs_nips < 20:
 		$nipplesize = 'You have average <a href="exec:view''images/pc/body/nipples/nipples1.jpg''">nipples</a>.'
 		$pc_desc['nipples'] = func($this, 'ChooseDescWord', 'small', 'tiny', 'little')
 		$pc_descWordy['nipples'] = 'small, tiny'
@@ -834,7 +834,7 @@ if $ARGS[0] = 'nipples':
 end
 
 if $ARGS[0] = 'clit':
-    if clit_size < 20:
+	if clit_size < 20:
 		$pc_descWordy['clit'] = 'small, oft-hidden'
 		$pc_desc['clit'] = func($this, 'ChooseDescWord', 'small', 'tiny')
 		$clitsize = 'You consider your <a href="exec:view''images/pc/body/clit/clit1.jpg''">clitoris</a> to be of an average size.'
@@ -859,9 +859,9 @@ if $ARGS[0] = 'clit':
 end
 
 if $ARGS[0] = 'pubes':
-    if lashair = 0:
+	if lashair = 0:
 		if pcs_pubes <= 3:
-			lobkoef = 3 
+			lobkoef = 3
 			$pcs_pubes = 'You have a smoothly <a href="exec:view''<<FUNC(''$pube_image'')>>''">shaved pussy</a>. <<$pirspiz>><br><<$clitsize>>'
 			$pc_desc['pubes'] = func($this, 'ChooseDescWord', 'silky', 'hairless', 'smooth-shaven', 'freshly-shaven')
 			$pc_descWordy['pubes'] = 'silky, freshly-shaven'
@@ -901,7 +901,7 @@ if $ARGS[0] = 'pubes':
 			$pc_desc['pubes'] = func($this, 'ChooseDescWord', 'thickly-furred', 'very hairy', 'ill-maintained')
 			$pc_descWordy['pubes'] = 'hairy, wild-maned'
 		end
-    elseif lashair = 1:
+	elseif lashair = 1:
 		$pc_desc['pubes'] = func($this, 'ChooseDescWord', 'hairless', 'smooth', 'bald', 'silky-smooth')
 		$pc_descWordy['pubes'] = 'eternally silky-smooth'
 		$pcs_pubes = 'You have a smooth, <a href="exec:view''<<FUNC(''$pube_image'')>>''">bald pussy</a>. <<$pirspiz>><br><<$clitsize>>'
@@ -909,7 +909,7 @@ if $ARGS[0] = 'pubes':
 end
 
 if $ARGS[0] = 'legs':
-    if pcs_leghair <= 0:
+	if pcs_leghair <= 0:
 		$pc_desc['legs'] = func($this, 'ChooseDescWord', 'smooth', 'silky', 'soft')
 		$pc_descWordy['legs'] = 'soft and silky-smooth'
 		$pcs_leghair = 'You have smooth legs.'
@@ -1071,57 +1071,57 @@ if $ARGS[0] = 'hair':
 		$pcs_haircol = 'pink'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'bubblegum-pink', 'Barbie pink', 'fuchsia', 'pink', 'bright pink')
 		$pc_descWordy['hair colour'] = 'bright, bubblegum-pink'
-	
+
 	elseif pcs_haircol = 13:
 		$pcs_haircol = 'light pink'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'light pink', 'pale pink', 'babydoll pink', 'China pink', 'cotton-candy pink', 'candy-floss pink')
 		$pc_descWordy['hair colour'] = 'pale, cotton-candy pink'
-	
+
 	elseif pcs_haircol = 14:
 		$pcs_haircol = 'dark purple'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'dark purple', 'deep purple', 'midnight purple', 'indigo')
 		$pc_descWordy['hair colour'] = 'deep, bluish-purple'
-	
+
 	elseif pcs_haircol = 15:
 		$pcs_haircol = 'purple'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'purple', 'plum purple', 'royal purple')
 		$pc_descWordy['hair colour'] = 'rich, royal purple'
-	
+
 	elseif pcs_haircol = 16:
 		$pcs_haircol = 'light purple'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'light purple', 'pale purple', 'amethyst coloured', 'lavender')
 		$pc_descWordy['hair colour'] = 'pale, floral purple'
-	
+
 	elseif pcs_haircol = 17:
 		$pcs_haircol = 'light orange'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'light orange', 'pumpkin orange', 'bright orange')
 		$pc_descWordy['hair colour'] = 'bright, fiery orange'
-	
+
 	elseif pcs_haircol = 18:
 		$pcs_haircol = 'dark red'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'dark red', 'wine red', 'auburn')
 		$pc_descWordy['hair colour'] = 'deep, seductive red'
-	
+
 	elseif pcs_haircol = 19:
 		$pcs_haircol = 'medium red'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'medium red', 'cherry red', 'bronze')
 		$pc_descWordy['hair colour'] = 'strong, fiery red'
-	
+
 	elseif pcs_haircol = 20:
 		$pcs_haircol = 'turquoise'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'turquoise', 'ultramarine', 'aquamarine', 'sea green')
 		$pc_descWordy['hair colour'] = 'soft milky blue'
-	
+
 	elseif pcs_haircol = 21:
 		$pcs_haircol = 'medium orange'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'medium orange', 'pumpkin orange', 'carrot orange')
 		$pc_descWordy['hair colour'] = 'strong, fiery orange'
-	
+
 	elseif pcs_haircol = 22:
 		$pcs_haircol = 'dark orange'
 		$pc_desc['hair colour'] = func($this, 'ChooseDescWord', 'dark orange', 'burnt Orange', 'rust')
 		$pc_descWordy['hair colour'] = 'strong, burnt orange'
-	
+
 		!! This below is a catch-all, it should not actually ever wind up occurring, but just in case it does...
 	else
 		$pcs_haircol = 'strangely-coloured'
@@ -1141,7 +1141,7 @@ if $ARGS[0] = 'hair':
 		$pc_desc['hair style'] = 'pigtails'
 		$pc_descWordy['hair style'] = 'youthful, playful and flirty <<$pcs_haircol>> pigtails'
 
-	elseif hbraids > 0:	
+	elseif hbraids > 0:
 		$hairstyle = 'Your hair is beautifully braided.'
 		$pc_desc['hair style'] = 'braid'
 		$pc_descWordy['hair style'] = 'delicately-wound <<$pcs_haircol>> braid'
@@ -1173,33 +1173,33 @@ if $ARGS[0] = 'hair':
 			$hair = 'You have short <<$pcs_haircol>> hair which just covers your ears to their lobes. It''s a modern, classy hairstyle. Currently your hair is <<$pcs_hairbsh>>.'
 			$pc_desc['hair length'] = func($this, 'ChooseDescWord', 'short', 'pixie-cut', 'androgynously short')
 			$pc_descWordy['hair length'] = 'short, page-boy'
-		
+
 		elseif pcs_hairlng > 80 and pcs_hairlng <= 160:
 			$hair = 'You have <<$curly>><<$pcs_haircol>> hair<<$hbangs>>. Your hair goes down to your chin line and can be considered of a medium length, which fits almost all face shapes. Your hair is <<$pcs_hairbsh>> at the moment. <<$hairstyle>>'
 			$pc_desc['hair length'] = func($this, 'ChooseDescWord', 'medium', 'average')
 			$pc_descWordy['hair length'] = 'medium-length'
-		
+
 		elseif pcs_hairlng > 160 and pcs_hairlng <= 260:
 			$hair = 'You have <<$curly>><<$pcs_haircol>> hair<<$hbangs>>. Your hair reaches your shoulders with several strands going just beyond. Currently your hair is <<$pcs_hairbsh>>. <<$hairstyle>>'
 			$pc_desc['hair length'] = 'moderate'
 			$pc_descWordy['hair length'] = 'shoulder-length'
-		
+
 		elseif pcs_hairlng > 260 and pcs_hairlng <= 400:
 			$hair = 'You have <<$curly>><<$pcs_haircol>> hair<<$hbangs>>. As your hair reaches your bra line, hairdressers would consider this a rather long style, yet beautiful looks are created with this length. Your hair is <<$pcs_hairbsh>>. <<$hairstyle>>'
 			$pc_desc['hair length'] = func($this, 'ChooseDescWord', 'long', 'lengthy')
 			$pc_descWordy['hair length'] = 'long, past the shoulders'
-		
+
 		elseif pcs_hairlng > 400 and pcs_hairlng <= 600:
 			$hair = 'You have <<$curly>><<$pcs_haircol>> hair<<$hbangs>>. As your hair reaches your back, hairdressers would consider this a rather long hair style, yet beautiful looks are created with this length. Your hair is <<$pcs_hairbsh>>. <<$hairstyle>>'
 			$pc_desc['hair length'] = func($this, 'ChooseDescWord', 'very long', 'rather lengthy', 'quite long', 'back-length')
 			$pc_descWordy['hair length'] = 'very long, back-length'
-		
+
 		elseif pcs_hairlng > 600 and pcs_hairlng <= 800:
 			$hair = 'You have <<$curly>><<$pcs_haircol>> hair<<$hbangs>>. As your hair reaches your butt, hairdressers would consider this a very long hair style, yet beautiful looks are created with this length. Your hair is <<$pcs_hairbsh>>. <<$hairstyle>>'
 			$pc_desc['hair length'] = func($this, 'ChooseDescWord', 'extremely long', 'waist-length')
 			$pc_descWordy['hair length'] = 'extremely long and waist-length'
-		
-		else 
+
+		else
 			$hair = 'You have extremely long <<$pcs_haircol>> hair<<$hbangs>>. Reaching all the way past your butt, even Rapunzel would be jealous. Your hair is currently <<$pcs_hairbsh>>. <<$hairstyle>>'
 			$pc_desc['hair length'] = func($this, 'ChooseDescWord', 'exceptionally long', 'incredibly lengthy')
 			$pc_descWordy['hair length'] = 'exceptionally lengthy and princess-like'

+ 9 - 9
locations/city_hotel.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			if hotelRoom['city_hotel'] = 2:gt'hotelroom','better'
 			if hotelRoom['city_hotel'] = 3:gt'hotelroom','best'
 		end
-		
+
 	end
 
 	act 'Go to the reception desk': gt 'city_hotel', 'reception'
@@ -63,7 +63,7 @@ if $ARGS[0] = 'reception':
 	'"How can I help you?" she asks.'
 
 	act 'Go back to the foyer': minut += 1 & gt 'city_hotel', 'start'
-	
+
 	act 'See the room descriptions':
 		cla
 		minut += 1
@@ -108,13 +108,13 @@ if $ARGS[0] = 'reception':
 				'Standard room - 500 <b>₽</b> / night;'
 				'Luxury room - 1500 <b>₽</b> / night;'
 				'and the Royal Suite - 10000 <b>₽</b> / night.'
+
 				act'Standard room':
-					*clr
-					cla
+					*clr & cla
 					hotelRoomDays['city_hotel']=input ("For how long would you like to stay?")
 					totalCost = hotelRoomDays['city_hotel'] * 500
 					if hotelRoomDays['city_hotel'] <= 0:gt'city_hotel'
-					
+
 					if totalCost<=money:
 						money-=totalCost
 						hotelRoom['city_hotel']=3
@@ -125,9 +125,9 @@ if $ARGS[0] = 'reception':
 						msg'You can''t afford to stay in the hotel for that long.'
 						gt'city_hotel'
 					end
-				end		'4. Presidential Suite, our most prized room with all the modern necessities. Free room service included.'
-					*clr
-					cla
+				end
+				act 'Luxury room':
+					*clr & cla
 					hotelRoomDays['city_hotel']=input ("For how long would you like to stay?")
 					totalCost = hotelRoomDays['city_hotel'] * 1500
 					if hotelRoomDays['city_hotel'] <= 0:gt'city_hotel'
@@ -150,7 +150,7 @@ if $ARGS[0] = 'reception':
 					hotelRoomDays['city_hotel']=input ("For how long would you like to stay?")
 					totalCost = hotelRoomDays['city_hotel'] * 10000
 					if hotelRoomDays['city_hotel'] <= 0:gt'city_hotel'
-					
+
 					if totalCost<=money:
 						money-=totalCost
 						hotelRoom['city_hotel']=3