Merge branch 'master' of zaba/glife into master

[fixed] a few small fixes, mostly wrong variable usage

locations/Cheatmenu_din.qsrc

@@ -428,7 +428,7 @@ $cheatmenu['cumtrait_block'] = {
 	if cumeater_cheat = 0:
 		cumeater_cheat = 1
 		dynamic $cheatmenu['permanent']
-		trait['cumeater'] = 0
+		pcs_traits['cumeater'] = 0
 	elseif cumeater_cheat = 1:
 		cumeater_cheat = 0
 		dynamic $cheatmenu['permanent']
@@ -1004,24 +1004,44 @@ $cheatmenu['vneshpara'] = {
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	*nl
 	'Appearance Parameters'
-	'vidage = <<vidage>>'
-	'pcs_naturallashes = <<pcs_naturallashes>>'
-	'pcs_eyesize = <<pcs_eyesize>>'
-	'pcs_lip = <<pcs_lip>>'
+	*nl
+	'Base Appearance'
+	'pcs_skin = <<pcs_skin>> and skin_bonus = <<skinBonus>> (between 0 and 100)'
+	'bodyShapeBonus = <<bodyShapeBonus>> (between -158 and 70)'
+	'visableAgePenalty = <<visibleAgePenalty>> (-2.5 for every year below 20)'
+	'pcs_teeth = <<pcs_teeth>> and teethPenalty = <<teethPenalty>>  (10*(pcs_teeth +pcs_missing_teeth)'
+	'attributeBonus = <<attributeBonus>> (pcs_agil / 5) + (pcs_vital / 5)'
+	'these are adjusted by BMI if it is outside <18 and >29'
 	'pcs_apprncbase = <<pcs_apprncbase>>'
+	*nl
+	*nl
+
+	'Bonus'
+	'groomingBonus = <<func(''AppearanceSystem'',''CalcGroomingBonus'')>> (pcs_breath and makeup)'
+	'groomingPenalty = <<func(''AppearanceSystem'',''CalcGroomingPenalty'')>> '
+	'(lipbalm, hair brushed, hair length, deo, sweat, glasses, hair color fade, leg hair..)'
+	'accessoriesBonus = <<func(''AppearanceSystem'',''CalcAccessoriesBonus'')>> '
+	'CalcClothingBonus = <<func(''AppearanceSystem'',''CalcClothingBonus'')>> '
+	'((PXCloThinness + PXCloTopCut + PXCloBottomShortness)/2)/ 76 * PCloQuality'
+	*nl
+	*nl
+
+	'coatQualityBonus = <<bonusZ>>'
+	'shoesQualityBonus = <<PShoQualityZ>>'
 	'PXCloThinness = <<PXCloThinness>>'
 	'PXCloTopCut = <<PXCloTopCut>>'
 	'PXCloBottomShortness = <<PXCloBottomShortness>>'
-	'CloTotalBeauty = <<CloTotalBeauty>>'
-	'mopkoef = <<mopkoef>>'
-	'pcs_hairbsh = <<pcs_hairbsh>>'
-	'lipbalmKoef = <<lipbalmKoef>>'
-	'pcs_breath = <<pcs_breath>>'
-	'sweatKoef = <<sweatKoef>>'
-	'glassvnesh = <<glassvnesh>>'
-	'dyevmod = <<dyevmod>>'
-	'hairkoef = <<hairkoef>>'
-	'legkoef = <<legkoef>>'
+	'PCloQuality = <<PCloQuality>>'
+	'lipBalmPenalty = <<lipBalmPenalty>>'
+	'hairPenalty = <<hairPenalty>>'
+	'deodorantPenalty = <<deodorantPenalty>>'
+	'sweatPenalty = <<sweatPenalty>>'
+	'glassesPenalty = <<glassesPenalty>>'
+	'hairDyePenalty = <<hairDyePenalty>>'
+	'legPenalty = <<legPenalty>>'
+
+	'pcs_eyesize = <<pcs_eyesize>>'
+	'pcs_lip = <<pcs_lip>>'
 }
 
 $cheatmenu['tatoo'] = {

locations/brother_voyeur_sex.qsrc

@@ -71,7 +71,7 @@ if $ARGS[0] = 'brother_shower_bj':
 						end
 					end
 
-					if trait['cumeater'] = 1:
+					if pcs_traits['cumeater'] = 1:
 						act'I didn''t want to waste it':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershower.jpg"></center>'
@@ -851,7 +851,7 @@ if $ARGS[0] = 'shower_swallow':
 			end
 		end
 
-		if trait['cumeater'] = 1:
+		if pcs_traits['cumeater'] = 1:
 			act'"Tasty!"':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershower.jpg"></center>'
@@ -1148,7 +1148,7 @@ if $ARGS[0] = 'shower_facial':
 			end
 		end
 
-		if trait['cumeater'] = 1:
+		if pcs_traits['cumeater'] = 1:
 			act'Feels like a waste':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/facial2.jpg"></center>'

locations/event.qsrc

@@ -402,7 +402,6 @@ if $ARGS[0] = 'dima16':
 	cls
 	minut += 30
 	lobkoef = 3
-	legkoef = 3
 	cumspclnt = 20
 	gs 'cum_cleanup'
 	gs 'stat'

locations/obj_din.qsrc

@@ -344,7 +344,6 @@ if $ARGS[0] = 'description':
 	!! 'pcs_lashes <<pcs_lashes>> a maximum of 2'
 	!! 'pcs_eyesize <<pcs_eyesize>> a maximum of 3'
 	!! 'bodykoef <<bodykoef>> a maximum of 8'
-	!! 'legkoef <<legkoef>> a maximum of 3'
 	!! 'lobkoef <<lobkoef>> a maximum of 3'
 	!! 'odevnesh <<odevnesh>> a maximum of 15'
 	!! 'pcs_sweat <<pcs_sweat>> the maximum 0'

locations/pav_clinic.qsrc

@@ -288,7 +288,7 @@ if $ARGS[0] = '':
 				if glass ! 0:
 					if money < 75000 and karta < 75000:
 						*nl
-						'You can not afford the laser eye correction surgery.'
+						'You can not afford the laser eye correction surgery. (75,000 <b>₽</b>)'
 					else
 						if money >= 75000:
 							act 'Pay for laser correction (75,000 <b>₽</b>) (cash)':

locations/pav_parkev.qsrc

@@ -1737,7 +1737,7 @@ if $ARGS[0] = 'drinking_game':
 	player_tol = (pcs_health/4)/10
 	
 
-	if traits['alko_status'] ! 1:
+	if pcs_traits['alko_status'] ! 1:
 	 !lightweight
 		player_time = rand(player_tol,99) - 29
 	else 

locations/saveupdater.qsrc

@@ -1515,6 +1515,7 @@ if traits > 0 or trait > 0:
 	pcs_traits['alko_status'] = traits['alko_status']
 	pcs_traits['alko_points'] = traits['alko_points']
 	pcs_traits['buttslut_lvl'] = traits['buttslut_lvl']
+	pcs_traits['buttslut_exp'] = traits['buttslut_exp']
 	pcs_traits['nerd_lernHome'] = traits['nerd_lernHome']
 	pcs_traits['nerd_points'] = traits['nerd_points']
 	pcs_traits['nerd_lessons'] = traits['nerd_lessons']

locations/sleep.qsrc

@@ -388,12 +388,12 @@ if $ARGS[0] = 'dream':
 	!! Ensuring single exit point instead of multiple ones.
 	if wake_up = 0: jump 'loopson_bed'
 
-	if stime < 300:
+	if pcs_condition['lack_of_sleep'] >= 10:
 	!!Worsening of skin quality if you do not sleep enough.
 		skinDailyPenalty += 2
-	elseif stime < 360:
+	elseif pcs_condition['lack_of_sleep'] >= 2:
 		skinDailyPenalty += 1
-	elseif stime < 420:
+	elseif pcs_condition['lack_of_sleep'] > 0:
 		skinDailyPenalty += 0
 	else
 		skinDailyPenalty -= 1