[changed] added the class schedule to the journal and the school icon, moved the close latch action (requested by nutluck), and a fix here and there

locations/body.qsrc

@@ -1914,7 +1914,9 @@ elseif pcs_makeup = 5:
 	end
 	$pcdesc_makeup = 'dolled-up'
 	$pcdesc_makeupwordy = '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 = '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.'
 	mopkoef = 30
 end
 

locations/gLakeNude.qsrc

@@ -9,7 +9,6 @@ $locclass = 'beach'
 menu_off = 0
 *clr & cla
 gs 'stat'
-!!check to make sure I did the sound call correct
 if sound = 0: PLAY 'sound/lakeshore2.mp3',20
 '<center><H4>Secluded beach</H4></center>'
 if month >= 3 and month <= 5:
@@ -53,18 +52,7 @@ if storyline = 1 and month >= 3 and month <= 8:
 	end
 end
 
-$tmp_lakenude_leave = iif($clothingworntype = 'nude', ' without changing', '')
-act'Leave the secluded beach<<$tmp_lakenude_leave>>':
-	if $clothingworntype ! 'nude' or ($clothingworntype = 'nude' and pcs_inhib >= 60):
-		cla
-		minut += 10
-		gt 'glake'
-	else
-		msg '<center>You are not willing to show off your naked body on the main beach, what would people say?</center>'
-		gt 'gLakeNude'
-	end
-end
-killvar '$tmp_lakenude_leave'
+act'Leave the secluded beach': minut += 10 & gt 'glake'
 
 if month >= 5 and month <= 9:
 	if arrsize('swimwear') > 0:
@@ -76,39 +64,35 @@ if month >= 5 and month <= 9:
 	end
 		
 	if $clothingworntype ! 'nude' and (pcs_inhib > 30 or (exhibitionist_lvl > 1 and pcs_horny >= 60)):
-		gs 'willpower', 'exhib', 'self', 'easy'
+		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Take off your clothes (<<will_cost>> Willpower)':
+				*clr & cla
+				minut += 5
+				menu_off = 1
+				sauna_stripped = 0
+				if pcs_inhib < 60: inhib_exp += rand(1,3)
 				gs 'willpower', 'exhib', 'self', 'easy'
 				gs 'willpower', 'pay', 'self'
-				menu_off = 1
-				if pcs_inhib > 30:
-					*clr & cla
-					minut += 5
-					inhib_exp += rand(1,3)
-					gs 'clothing', 'strip'
-					gs 'underwear', 'remove'
-					if pcs_horny >= 80 and exhibitionist_lvl > 1:
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
-						'You strip off. A couple of passing men do a double-take and pause a moment to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
-					elseif pcs_inhib >= 60:
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
-						'Not caring if anyone is looking at you, you slowly take off your clothes. You peel off each item like a stripper. Soon, you are completely naked.'
-					elseif pcs_inhib < 60:
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
-						'You quickly check to see if anyone is watching, and when you''re satisfied no one is paying you undue attention, you take off your clothes. You''re naked now.'
-					end
-				else
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/shyness.jpg"></center>'
-					'Even though no one is around, you don''t feel confident enough to actually take your clothes off. What if someone would see you nude?'
+				gs 'clothing', 'strip'
+				gs 'underwear', 'remove'
+				gs 'stat'
+				if pcs_horny >= 80 and exhibitionist_lvl > 1:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
+					'You strip off. A couple of passing men do a double-take and pause a moment to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
+				elseif pcs_inhib >= 60:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
+					'Not caring if anyone is looking at you, you slowly take off your clothes. You peel off each item like a stripper. Soon, you are completely naked.'
+				elseif pcs_inhib < 60:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
+					'You quickly check to see if anyone is watching, and when you''re satisfied no one is paying you undue attention, you take off your clothes. You''re naked now.'
 				end
 				act 'Continue': gt 'gLakeNude'
 			end
 		else
 			act 'Take off your clothes (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-	elseif $clothingworntype = 'nude':
+	elseif $clothingworntype = 'nude' and sauna_stripped = 0:
 		act 'Put your clothes back on':
 			*clr & cla
 			menu_off = 1
@@ -251,6 +235,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 				gs 'willpower', 'voyeur', 'self'
 				gs 'willpower', 'pay', 'self'
 				menu_off = 1
+				gs 'stat'
 				if voyeurism = 0:
 					gs 'arousal', 'voyeur_sex', 5
 					voyeurism += 1
@@ -313,14 +298,17 @@ if $ARGS[0] = 'sauna':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/sauna.jpg"></center>'
 	'You walk up the small trail from the beach to the sauna, it is newly built. They say it was built for the tourist, but if that is true, you wonder why they put it on the secluded beach and even then a little ways back from the beach. Surely no tourist would ever find it, either way you and many others are glad they built it. It is well built and nice inside and out, there is three areas to the sauna. The mens section, womens section, and a co-ed section, to use the sauna you need a bikini or some people use it naked.'
 	
-	act 'Go back to the beach': 
-		if pcs_inhib > 30 or $clothingworntype ! 'nude':
-			gt 'gLakeNude'
+	if $clothingworntype ! 'nude':
+		act 'Go back to the beach': gt 'gLakeNude'
+	else
+		gs 'willpower', 'exhib', 'self'
+		if will_cost <= pcs_willpwr:
+			act 'Go back to the beach (<<will_cost>> Willpower)': 
+				gs 'willpower', 'pay', 'self'
+				gt 'gLakeNude'
+			end
 		else
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/sauna.jpg"></center>'
-			'Even though no one is around, you don''t feel confident enough to walk around with your clothes off. You put your clothes back on before leaving '
-			act 'Continue': gt 'gLakeNude', 'sauna'
+			act 'Go back to 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
 	
@@ -336,13 +324,14 @@ if $ARGS[0] = 'sauna':
 			*clr & cla
 			menu_off = 1
 			minut +=  5
+			sauna_stripped = 1
 			gs 'clothing', 'strip'
 			gs 'underwear', 'remove'
 			gs 'stat'
 			'You strip out of your clothes, folding them neatly and placing them in one of the open shelves.'
 			act 'Continue': gt 'gLakeNude', 'sauna'
 		end
-	else
+	elseif sauna_stripped = 1:
 		act 'Put your clothes back on':
 			cla
 			menu_off = 1

locations/glake.qsrc

@@ -93,14 +93,15 @@ if month >= 5 and month <= 9:
 	end
 
 	if $clothingworntype ! 'nude' and (pcs_inhib > 30 or (exhibitionist_lvl > 1 and pcs_horny >= 60)):
-		gs 'willpower', 'exhib', 'self', 'easy'
+		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Strip naked (<<will_cost>> Willpower)':
 				*clr & cla
 				gs 'willpower', 'pay', 'self'
 				menu_off = 1
 				minut += 5
-				inhib_exp += rand(1,2)
+				sauna_stripped = 0
+				if pcs_inhib < 60: inhib_exp += rand(1,3)
 				gs 'underwear', 'remove'
 				gs 'clothing', 'strip'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/strip.jpg"></center>'
@@ -111,7 +112,7 @@ if month >= 5 and month <= 9:
 		else
 			act 'Strip naked (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-	elseif $clothingworntype = 'nude':
+	elseif $clothingworntype = 'nude' and sauna_stripped = 0:
 		act 'Put your clothes back on':
 			*clr & cla
 			menu_off = 1

locations/journal.qsrc

@@ -326,6 +326,20 @@ if $ARGS[0] = 'school':
 		'<font color="red">You are on the outs with your clique, you''re in danger of being outcast.</font>'
 	end
 	
+	'<center><h2>Class schedule</h2></center>'
+	
+	if week = 1:
+		'Monday: Math, Russian, Literature, Art, Biology, P.E'
+	elseif week = 2:
+		'Tuesday: English, Geography, Science, Shop, Computer, Music'
+	elseif week = 3:
+		'Wednesday: Math, Russian, Biology, History, Computer and P.E.'
+	elseif week = 4:
+		'Thursday: English, Geography, Science, Shop, Computer, Music'
+	elseif week = 5:
+		'Friday: Math, Russian, Literature, Art, History and P.E.'	
+	end
+	
 	'<center><h2>Students & Teachers</h2></center>'
 	
 	'<center><h2>Cool kids</h2></center>'

locations/stat_display.qsrc

@@ -230,7 +230,11 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 	$stat_hotcat_msg = 'People would rate your appearance as a <<hotcat>> out of 10.<br><img src="<<FUNC(''$face_image'')>>">'
 	$statusIconBarTab += '<td><a href="exec:msg $stat_hotcat_msg"><img title="You are a <<hotcat>> out of 10." height = 54 src="images/system/icon/status_icons/appearance.png"></a></td>'
 	
-	$statusIconBarTab += '<td><a href="exec:msg $pcs_makeup_msg"><img title="<<$pcs_makeup_tooltip>>" height = 54 src="images/system/icon/status_icons/makeup_'+pcs_makeup+'.png"></a></td>'
+	if pcs_makeup < 5:
+		$statusIconBarTab += '<td><a href="exec:msg $pcs_makeup_msg"><img title="<<$pcs_makeup_tooltip>>" height = 54 src="images/system/icon/status_icons/makeup_'+pcs_makeup+'.png"></a></td>'
+	elseif pcs_makeup = 5:
+		$statusIconBarTab += '<td><a href="exec:msg $pcs_makeup_msg"><img title="<<$pcs_makeup_tooltip>>" height = 54 src="images/system/icon/status_icons/makeup_4.png"></a></td>'
+	end
 	
 	if greben = 0 or pcs_hairbsh = 1:
 		$stat_brush_msg = 'Your hair is <<$pcs_hairbsh>>.'
@@ -530,7 +534,24 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 	
 	if $stat_court_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_court_msg"><img title="<<$stat_court_tooltip>>" height = 54 src="images/system/icon/status_icons/court.png"></a></td>'
 
-	if $stat_school_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_school_msg"><img title="<<$stat_school_tooltip>>" height = 54 src="images/system/icon/status_icons/school.png"></a></td>'
+	if week = 1:
+		$stat_school_schedule = ' Today you have the following lessons math, russian, literature, art, biology and P.E.'
+	elseif week = 2:
+		$stat_school_schedule = ' Today you have the following lessons english, geography, science, shop, computer, music.'
+	elseif week = 3:
+		$stat_school_schedule = ' Today you have the following lessons math, russian, biology, history, computer and P.E.'
+	elseif week = 4:
+		$stat_school_schedule = ' Today you have the following lessons english, geography, science, shop, computer and music.'
+	elseif week = 5:
+		$stat_school_schedule = ' Today you have the following lessons math, russian, literature, art, history and P.E.'
+	else
+		$stat_school_schedule = ''	
+	end
+
+	if $stat_school_msg ! '': 
+		$stat_school_msg += $stat_school_schedule
+		$statusIconBarTab += '<td><a href="exec:msg $stat_school_msg"><img title="<<$stat_school_tooltip>>" height = 54 src="images/system/icon/status_icons/school.png"></a></td>'
+	end
 
 	if work > 0 or model > 0 or pornstack > 0: $statusIconBarTab += '<td><a href="exec: gt ''journal'', ''records''"><img title="You have a job. Click to find out more." height = 54 src="images/system/icon/status_icons/work.png"></a></td>'
 	

locations/vanrPar.qsrc

@@ -26,15 +26,12 @@ if $ARGS[0] = '':
 		else
 			act 'Return to the hallway': gt 'korrPar'
 		end
+		act '<b>Close the latch on the door</b>': vanr_lock = 1 & gt 'vanrPar'
+	elseif vanr_lock = 1:
+		act '<b>Open the latch on the door</b>': vanr_lock = 0 & gt 'vanrPar'
 	end
 
 	gs 'din_van', 'private'
-
-	if vanr_lock = 0:
-		act'<b>Close the latch on the door</b>': vanr_lock = 1 & gt 'vanrPar'
-	elseif vanr_lock = 1:
-		act'<b>Open the latch on the door</b>': vanr_lock = 0 & gt 'vanrPar'
-	end
 end
 
 if $ARGS[0] = 'peek':