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

locations/Cheatmenu_din.qsrc

@@ -1945,7 +1945,13 @@ $cheatmenu['status'] = {
 	else
 		'Status Display mode: Currently Scale Bar - <a href="exec:ETOmenu = 1 & dynamic $cheatmenu[''status''] & gs ''stat''">Select Text</a>'
 	end
-
+	
+	if cheatStatusIcons = 0:
+		'Status icons: Click to <a href="exec: $cheatStatusIcons = ''Currently OFF'' & cheatStatusIcons = 1 & gs ''stat'' & dynamic $cheatmenu[''status'']">hide</a> them.'
+	elseif cheatStatusIcons = 1:
+		'Status icons: Click to <a href="exec: cheatStatusIcons = 0 & gs ''stat'' & dynamic $cheatmenu[''status'']">shown</a> them.'
+	end
+	
 	if Enable_scalepic = 1:
 		'Scalebar is now as <b>Image</b>, you can switch to <a href="exec:Enable_scalepic = 0 & dynamic $cheatmenu[''status''] & gs ''stat''">Character</a> or <a href="exec:Enable_scalepic = 2 & dynamic $cheatmenu[''status''] & gs ''stat''">Table</a>'
 		if Enable_scalewidth > 0:

locations/Cum_Manage.qsrc

@@ -502,46 +502,32 @@ if $ARGS[0] = 'cumgather':
 
 		if cloc = 0:
 			$part = 'pussy'
-
 		elseif cloc = 1:
 			$part = 'pussylips'
-
 		elseif cloc = 2 or cloc = 5:
 			$part = 'your panties'
-
 		elseif cloc = 3:
 			$part = 'anus'
-
 		elseif cloc = 4:
 			$part = 'buttocks'
-
 		elseif cloc = 6 or cloc = 7:
 			$part = 'clothes'
-
 		elseif cloc = 8:
 			$part = 'back'
-
 		elseif cloc = 9:
 			$part = 'legs'
-
 		elseif cloc = 10:
 			$part = 'arms'
-
 		elseif cloc = 11:
 			$part = 'face'
-
 		elseif cloc = 14:
 			$part = 'stomach'
-
 		elseif cloc = 15:
 			$part = 'breasts'
-
 		elseif cloc = 16:
 			$part = 'hair'
-
 		else
 			$part = 'unknown'
-
 		end
 
 		if salfetka > 0:
@@ -550,13 +536,17 @@ if $ARGS[0] = 'cumgather':
 			'You use a wipe to clean the sperm from your <<$part>>.'
 			gs 'cum_cleanup', 'cleanloc', cloc
 			gs 'stat'
-
 		end
-
 	end
-
 end
 
+if $ARGS[0] = 'cumeater_icon':
+	*nl
+	j = 0
+	:cumeater_icon_jump
+	if cumloc[j] > 0: gs 'cum_manage', 'cumeater', j
+	if j < 17: j += 1 & jump 'cumeater_icon_jump'
+end
 
 if $ARGS[0] = 'cumeater':
 	cloc = ARGS[1]
@@ -570,74 +560,53 @@ if $ARGS[0] = 'cumeater':
 		if cloc = 13:
 			gs 'cum_cleanup', 'cleanloc', cloc
 			'You carefully lick the sperm residue from both hands, enjoying the tart taste of semen.'
-
 		else
-
 			if cloc = 0:
 				$part = 'pussy'
-
 			elseif cloc = 1:
 				$part = 'pussylips'
-
 			elseif cloc = 2 or cloc = 5:
 				$part = 'your panties'
 				gs 'cum_cleanup', 'cleanloc', 2
 				gs 'cum_cleanup', 'cleanloc', 5
-
 			elseif cloc = 3:
 				$part = 'anus'
-
 			elseif cloc = 4:
 				$part = 'buttocks'
-
 			elseif cloc = 6 or cloc = 7:
 				$part = 'clothes'
 				gs 'cum_cleanup', 'cleanloc', 6
 				gs 'cum_cleanup', 'cleanloc', 7
-
 			elseif cloc = 8:
 				$part = 'back'
-
 			elseif cloc = 9:
 				$part = 'legs'
-
 			elseif cloc = 10:
 				$part = 'arms'
-
 			elseif cloc = 11:
 				$part = 'face'
-
 			elseif cloc = 14:
 				$part = 'stomach'
-
 			elseif cloc = 15:
 				$part = 'breasts'
-
 			elseif cloc = 16:
 				$part = 'hair'
-
 			else
 				$part = 'unknown'
-
 			end
 
 			if rand(0, 1) = 0:
 				'You collect a handful of sperm from your <<$part>> in your hand and lick it all up, enjoying the tart taste of semen.'
-
 			else
 				'You collect the sperm from your <<$part>> with your fingers and lick them, enjoying the tart taste of semen.'
-
 			end
 
 			gs 'cum_cleanup', 'cleanloc', cloc
-
 		end
 
-		minut += 5
+		minut += 2
 		gs 'stat'
-
 	end
-
 end
 
 --- Cum_Manage ---------------------------------

locations/body.qsrc

@@ -1846,6 +1846,7 @@ if pcs_makeup = 0:
 	$pcdesc_makeupwordy = 'clownishly makeup-smeared'
 	mopkoef = -5 
 	$pcs_makeup = '<b><font color="red">Your makeup is smeared all over your face</font></b>'
+	$pcs_makeup_tooltip = 'Your makeup is ruined.'
 elseif pcs_makeup = 1: 
 	rand_makeup = rand(0,1)
 	if rand_makeup = 0:
@@ -1857,6 +1858,7 @@ elseif pcs_makeup = 1:
 	$pcdesc_makeupwordy = 'bare, natural'
 	mopkoef = 0
 	$pcs_makeup = '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:
@@ -1867,6 +1869,7 @@ elseif pcs_makeup = 2:
 	$pcdesc_makeup = 'subtly-accented'
 	$pcdesc_makeupwordy = 'almost natural, subtly-accented'
 	$pcs_makeup = '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:
@@ -1877,6 +1880,7 @@ elseif pcs_makeup = 3:
 	$pcdesc_makeup = 'vibrantly done-up'
 	$pcdesc_makeupwordy = 'colourful, tastefully done-up'
 	$pcs_makeup = '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:
@@ -1891,6 +1895,7 @@ elseif pcs_makeup = 4:
 	$pcdesc_makeup = 'dolled-up'
 	$pcdesc_makeupwordy = '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_tooltip = 'Your makeup is thick enough to cover most imperfections.'
 elseif pcs_makeup = 5:
 	rand_makeup = rand(0,3)
 	if rand_makeup = 0:

locations/foto.qsrc

@@ -286,6 +286,9 @@ if $ARGS[0] = 'studio':
 			elseif pcs_skin < 40:
 				'"Girl, your face is covered in acne unless you improve your appearance there is no chance of working here."'
 				act 'Leave':minut += 1 & gt 'down'
+			elseif hotcat < 6:
+				'"Girl, your face is fine, but unless you improve your overall appearance there is no chance of working here."'
+				act 'Leave':minut += 1 & gt 'down'
 			elseif bmi_calc >= foto_weight and foto_weight > 0:
 				'You walk up to the front desk and find the same man who interviewed you previously. He looks up at you from his computer as you approach and frowns.'
 				'Before you can say anything, he sternly says, "Girl, I told you to lose weight, not put it on! Now get out of here until you slim down some!"'

locations/gLakeNude.qsrc

@@ -290,10 +290,10 @@ if temper >= 15 and month >= 5 and month <= 9:
 					act 'Continue': gt'gLakeNude'
 				end
 			end
-		end
 		else
 			act 'Spy on other nudists on the beach (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
+	end
 	if voyeurism >= 17 and voyeurism_start = 2:
 		if voyeurism_forest = 0:
 			act 'Explore the forest': gt 'gLakeNudeForest'

locations/glake.qsrc

@@ -286,7 +286,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 				if pcs_apprnc >= rand(1,400):
 					tipelakeboyrand = rand(1,100)
 					if tipelakeboyrand <= 5:
-						if npc_QW['A113'] > 0:
+						if npc_QW['A113'] = 1:
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
 							'While you are sunbathing, you see Vadim Bely and his brother sitting not far away from you. The brother points at you, and moments later Vadim walks over to you and sits down next to you. He idly scratches his tattoo covered belly as he asks: "Hello <<$pcs_nickname>>, want to go for a ride with me?"'
 							'The greedy look in his eyes tells you that when he says ''ride'', he doesn''t just mean in his car.'

locations/gschool_lessonsev1.qsrc

@@ -611,7 +611,7 @@ if $ARGS[0] = 'computer':
 	*clr & cla
 	menu_off = 1
 	if fuckornot = 2 and fuckornot_day < daystart - 1:
-!!ToDo: Needs an image
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/computer/computer_class.jpg"></center>'
 		'While working on your computer assignment you get a message from someone, no name is listed. Just has a school ID, you look around to see who might have sent it but no one seems to be paying attention to you, so you can''t tell. All the message says is "Where do you rate?" With a link to a web page.'
 		act 'Ignore it and focus on your school work.': fuckornot_day = daystart + rand(0,2) & gt 'gschool_lessons', 'short_break'
 		act 'Click on the link': $view_location = 'school' & gt 'komp', 'fuckornot'

locations/gschool_lessonsev3.qsrc

@@ -478,7 +478,7 @@ if $ARGS[0] = 'english':
 		school_event_hour = 1
 		scooltiperand = rand(1,5)
 		if scooltiperand = 1:
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big158.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big154.jpg"></center>'
 			'During class, you overhear Radomir bragging to a group a girls about his musical talents, and they''re hanging on his every word. "It''s crazy that you''re not signed to a company yet, Radomir," a girl says dreamily as the other girls sing a chorus of praise and agreement.'
 			*nl
 			'Radomir scoffs and nods his head, "They need to get their shit together because they''re missing out. I''d make them millions!"'

locations/lact_lib.qsrc

@@ -443,6 +443,84 @@ if $ARGS[0] = 'breast_stat_disp':
 	end
 end
 
+if $ARGS[0] = 'breast_stat_icons':
+!! breast status icons
+	if lactation['active'] <= 0 and lactation['growthsoreness_on'] > 0:
+		$stat_lact_msg = 'Your breasts feel sore and swollen.'
+		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+	elseif lactation['active'] > 0 and lactation['pc_aware'] > 0:
+		if lactation['engorgement'] > 0 and lactation['lactmess'] < 1:
+			$stat_lact_msg = 'Your breasts are so full they hurt.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 3 and $clothingworntype = 'nude':
+			$stat_lact_msg = 'Your breasts are so full they hurt and you can feel milk seeping out, causing you to have a little milk residue around your nipples.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 6 and $clothingworntype = 'nude':
+			$stat_lact_msg = 'Your breasts are so full they hurt and you can feel your milk comming out causing you to have a lot of milk around your nipples.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] > 0 and lactation['lactmess'] >= 6 and $clothingworntype = 'nude':
+			$stat_lact_msg = 'Your breasts are so full they hurt and you can feel your milk spraying out. Your breasts covered with your breast milk.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 3:
+			$stat_lact_msg = 'Your breasts are so full they hurt and you can feel milk seeping out, causing small wet spots on your top.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 6:
+			$stat_lact_msg = 'Your breasts are so full they hurt and you can feel your milk comming out making visible wet circles on your top.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] > 0 and lactation['lactmess'] >= 6:
+			$stat_lact_msg = 'Your breasts are so full they hurt and you can feel your milk spraying out. Your top is drenched with your breast milk.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > lactation['breastmm']*9/10:
+			$stat_lact_msg = 'Your breasts are firm and full from your milk.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > lactation['breastmm']/2:
+			$stat_lact_msg = 'Your breasts are heavy with your milk.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > lactation['breastmm']/4:
+			$stat_lact_msg = 'Your breasts feel slightly heavy from the milk inside.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > 0:
+			$stat_lact_msg = 'Your feel an easy pressure in your breasts from your milk.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		end
+	elseif lactation['active'] > 0 and lactation['pc_aware'] < 1:
+		if lactation['engorgement'] > 0 and lactation['lactmess'] < 1:
+			$stat_lact_msg = 'Your breasts hurt with pressure in them.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 3 and $clothingworntype = 'nude':
+			$stat_lact_msg = 'Your breasts hurt and your nipples are wet.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 6 and $clothingworntype = 'nude':
+			$stat_lact_msg = 'Your breasts hurt and they feel wet, some white liquid around your nipples.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] > 0 and lactation['lactmess'] >= 6 and $clothingworntype = 'nude':
+			$stat_lact_msg = 'Your breasts hurt and a white liquid is spraying out, covering your breasts.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 3:
+			$stat_lact_msg = 'Your breasts hurt and your nipples tingle a little. There are small wet spots on your top.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 6:
+			$stat_lact_msg = 'Your breasts hurt and your nipples tingle. There are visible wet circles on your top.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] > 0 and lactation['lactmess'] >= 6:
+			$stat_lact_msg = 'Your breasts hurt and your nipples tingle a lot. Your top is drenched with a warm liquid.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > lactation['breastmm']*9/10:
+			$stat_lact_msg = 'Your breasts feel firm and under pressure.' 
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > lactation['breastmm']/2:
+			$stat_lact_msg = 'Your breasts feel heavy.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > lactation['breastmm']/4:
+			$stat_lact_msg = 'Your breasts feel slightly heavy.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > 0:
+			$stat_lact_msg = 'Your feel an easy pressure in your breasts.'
+			$statusIconBarTab_2 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		end
+	end
+end
+
 !!	function for breast engorment, used in breastcycle
 if $ARGS[0] = 'breast_engorment':
 	!!	relatively easy. if the breasts get full, engorgement will happen.