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

locations/AlbStars.qsrc

@@ -169,13 +169,13 @@ if $ARGS[0] = 'albina4':
 					*clr & cla
 					minut += 5
 					gs 'stat'
-					if (grupTipe=5 or ((grupTipe=4 or grupTipe=3) and (pcs_danc < 50 and hotcat < 7))):
+					if (grupTipe=5 or ((grupTipe=4 or grupTipe=3) and hotcat < 7)):
 						!! If Sveta is an outcast or does not meet the nerd/gopnik requirements
 						'"Well, am I good enough to join?" you ask.'
 						'Albina thinks about it and looks at the other girls; some shake their heads, others shrug in indifference.'
 						'Finally, she answers. "I don''t doubt that you could <i>eventually</i> reach our level, but you''re not exactly, how do I put it, ''socially desirable.''"'
 						'"Try improving your skills and appearance first and then get back to us." She turns and leaves with the rest of the troupe.'
-					elseif 	((grupTipe=1 or ((grupTipe=4 or grupTipe=3) and (pcs_danc >= 50 and hotcat >= 7))) and pcs_vag = 0 and stat['vaginal'] = 0):
+					elseif 	((grupTipe=1 or ((grupTipe=4 or grupTipe=3) and hotcat >= 7)) and pcs_vag = 0 and stat['vaginal'] = 0):
 						!! If Sveta is popular/non dancer or meets the nerd/gopnik requirements and is virgin
 						'"Well, am I good enough to join?" you ask.'
 						'Albina thinks about it and looks at the other girls; some nod, others shrug.'

locations/BelSex.qsrc

@@ -418,7 +418,7 @@ if $ARGS[0] = 'shower':
 				end
 			end
 
-			if $clothingworntype = 'swimwear': gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+			if $clothingworntype = 'swimwear' or $clothingworntype = 'beach': gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 
 			gs 'arousal', 'end'
 			gs 'stat'

locations/LakeBoyZ.qsrc

@@ -95,7 +95,7 @@ $gL_boy_z = {
 							act 'Follow him to his house':
 								if $clothingworntype = 'nude':
 									gs 'clothing', 'wear_last_worn'
-									if $clothingworntype = 'swimwear':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+									if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 									gt 'LBZhouse'
 								else
 									gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
@@ -112,7 +112,7 @@ $gL_boy_z = {
 							if $clothingworntype = 'nude':
 								gs 'clothing', 'wear_last_worn'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/changenude.jpg"></center>'
-								if $clothingworntype = 'swimwear':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+								if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 							else
 								gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/changebikini.jpg"></center>'

locations/Nudelake.qsrc

@@ -11,7 +11,7 @@ $location_type = 'secluded'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/lake/nudelake.jpg"></center>'
 'The nudist beach - clothing optional.'
 
-if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+if $clothingworntype = 'swimwear' or $clothingworntype = 'nude' or $clothingworntype = 'beach':
 	act'Get dressed':
 		cla
 		*clr
@@ -25,7 +25,7 @@ if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 end
 
 if temper >= 15 and month >= 5 and month <= 9:
-	if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'swimwear':
+	if func('changingroom','count_swim_item') > 0 and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 		act'Change into your swimwear':
 			menu_off = 1
 			cla

locations/Snpc.qsrc

@@ -521,7 +521,7 @@ end
 
 !!Natasha Belova Botha
 if numnpc = 16:
-	if npc_rel['A16'] >= 50 and NatbelQW['QWstage'] = 0 and npc_rel['A<<numnpc>>'] >= 80:
+	if npc_rel['A16'] >= 50 and NatbelQW['QWstage'] = 0:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 

locations/changingroom.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'view_swim_list':
 		i = 1
 		h = 0
 		:loopbeach
-			if beach[i] = 1 and swimwearS[i] = 0 and ($clothingworntype ! 'beach' or clothingwornnumber ! i):h += 1 & *p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''beach'', <<i>>"><img <<$set_imgh>> src="images/pc/clothing/12swimwear/<<i>>.jpg" 	height="250" /></a>'
+			if beach[i] = 1 and beachS[i] = 0 and ($clothingworntype ! 'beach' or clothingwornnumber ! i):h += 1 & *p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''beach'', <<i>>"><img <<$set_imgh>> src="images/pc/clothing/12swimwear/<<i>>.jpg" 	height="250" /></a>'
 			i += 1
 		if i <= ARRSIZE('beach'):jump 'loopbeach'
 
@@ -94,5 +94,31 @@ if $ARGS[0] = 'view_swim_item':
 	end
 end
 
+
+!! following function counts all available swim and beach wear including the one which could be dressed already.
+!! you can add 'swim' or 'beach' if you want to count just one of them
+!! use func('changingroom','count_swim_item') or func('changingroom','count_swim_item','swim') or func('changingroom','count_swim_item','beach')
+
+if $ARGS[0] = 'count_swim_item':
+	h = 0
+	if $ARGS[1] = 'swim' or $ARGS[1] = '':
+		i = 1
+		:loopcountswimwear
+			if swimwear[i] = 1 and swimwearS[i] = 0 :h += 1
+			i += 1
+		if i <= ARRSIZE('swimwear'):jump 'loopcountswimwear'
+	end
+
+	if $ARGS[1] = 'beach' or $ARGS[1] = '':
+		i = 1
+		:loopcountbeach
+			if beach[i] = 1 and beachS[i] = 0 :h += 1
+			i += 1
+		if i <= ARRSIZE('beach'):jump 'loopcountbeach'
+	end
+	result = h
+	killvar 'i'
+	killvar 'h'
+end
 --- changingroom ---------------------------------
 

locations/cikl.qsrc

@@ -120,13 +120,7 @@ if husbandMark = 1 and husband <= 10:
 	'<b><font color="red">Your husband has filed for a divorce.</font></b>'
 end
 
-if katjaPreg = 0 and month >= 2:
-	if school_year = 2001 and year > 2016:
-		katjaPreg = 1
-	elseif school_year = 2000 and year > 2017:
-		katjaPreg = 1
-	end
-end
+if katjaPreg = 0 and month >= 2 and year > 2017: katjaPreg = 1
 
 !! after having surgery you will be in recuperation for a few days
 
@@ -1374,7 +1368,7 @@ if storyline = 1:
 				end
 			end
 		elseif month = 5:
-			if (school_year = 2000 and year = 2017) or (school_year = 2001 and year = 2018):
+			if year = 2017:
 				if day = 25:
 					kanikuli = 6
 					SchoolAtestat = -1

locations/city_lake.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/lake2.jpg"></center>'
 
 	'A large lake close to the city, it is a favorite destination of residents in the summer.'
-	if $clothingworntype ! 'swimwear':
+	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 		'There is a winding <a href="exec:gt ''city_lake_path'',''start''">path</a> leading to the railway station in the city industrial region.'
 	else
 		'You can see the winding path to the railway station in the city industrial region, you should get properly dressed if you want to go there.'
@@ -36,7 +36,7 @@ if $ARGS[0] = 'start':
 		'At the lake stands <a href="exec:GS ''carF'', ''start''">your <<$car>></a>.'
 	end
 
-	if ARRSIZE('swimwear') > 0:
+	if func('changingroom','count_swim_item') > 0:
 		act 'Use changing room':gt 'changingroom', 'view_swim_list'
 	else
 		*nl
@@ -44,10 +44,10 @@ if $ARGS[0] = 'start':
 		*nl
 	end
 
-	if npc_QW['A192'] = 3 and temper >= 15 and $clothingworntype = 'swimwear' and hour >= 6 and hour <= 20:'Waving her hand at you is <a href="exec:gt ''nastja'', ''pos14''">Anastasia</a>.'
+	if npc_QW['A192'] = 3 and temper >= 15 and ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and hour >= 6 and hour <= 20:'Waving her hand at you is <a href="exec:gt ''nastja'', ''pos14''">Anastasia</a>.'
 
 	act 'Leave':
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			cla
 			'You need to get dressed in regular clothing first.'
 			act'Return':gt 'city_lake','start'
@@ -58,10 +58,10 @@ if $ARGS[0] = 'start':
 	end
 
 	if hour >= 6 and hour <= 20:
-		'Nearby are various '+iif($clothingworntype = 'swimwear','<a href="exec:gt ''city_lake'', ''aquapark''">water attractions</a>.','water attractions, but you need to put on some swimwear before you go there.')+''
+		'Nearby are various '+iif($clothingworntype = 'swimwear' or $clothingworntype = 'beach','<a href="exec:gt ''city_lake'', ''aquapark''">water attractions</a>.','water attractions, but you need to put on some swimwear before you go there.')+''
 		'You can go for a ride on a <a href="exec:gt ''city_lake'', ''horse''">horse</a> along the beach.'
 		'And a short walk from here there is even a '+iif(pcs_inhib >= 30 or (exhibitionist_lvl > 1 and pcs_horny > 60),'<a href="exec:gt ''Nudelake''">nudist beach</a>','nudist beach, but you are''t confident enough to go in that direction.')+''
-		if temper >= 15 and $clothingworntype = 'swimwear':
+		if temper >= 15 and ($clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 			'Also you can sunbathe or swim.'
 
 			act 'Walk on the beach':
@@ -978,7 +978,7 @@ if $ARGS[0] = 'stasValera4':
 						StasValeraKnow = 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/stasValera.jpg"></center>'
-						if $clothingworntype = 'swimwear':
+						if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 							gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 							'You go to the changing room and quickly get out of your swimwear and dress in your regular clothes.'
 						end

locations/city_musicstore.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'musicshop':
 		act 'Shop for guitars and amps': gt 'city_musicstore_stock', 'acoustic'
 		act 'Try some guitars': 
 !!			TODO: Better scenes here			
-			if pcs_instrmusic < 30 and pcs_performing < 10:
+			if pcs_instrmusic < 30 and pcs_perform < 10:
 				'You pick up a guitar to try it, but you are too shy and after strumming a few chords you put it back on it''s stand'
 			else
 				'Some texts here depending on music skill and performing skill'			
@@ -101,7 +101,7 @@ if $ARGS[0] = 'cameback':
 	act 'Shop for guitars and amps': gt 'city_musicstore_stock', 'acoustic'
 	act 'Try some guitars': 
 !!			TODO: Better scenes here			
-		if pcs_instrmusic < 30 and pcs_performing < 10:
+		if pcs_instrmusic < 30 and pcs_perform < 10:
 			'You pick up a guitar to try it, but you are too shy and after strumming a few chords you put it back on it''s stand'
 		else
 			'Some texts here depending on music skill and performing skill'			

locations/clothing.qsrc

@@ -59,7 +59,7 @@ $clothing_list_line = {
 	if $ARGS[0] ! 'sell' and $ARGS[0] ! 'resize':
 		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $ARGS[1] = 'school' and ARGS[2] = 6:
 			$RESULT += ' <a href="exec:gs ''clothing'', ''wear'', ''<<$ARGS[1]>>'', <<ARGS[2]>> & gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Wear</a></TD>'
-		elseif ($ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear') and $ARGS[1] ! 'beach' and dyneval('RESULT = <<$ARGS[1]>>H[<<ARGS[2]>>]') > 0:
+		elseif ($ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear' and $ARGS[1] ! 'beach') and dyneval('RESULT = <<$ARGS[1]>>H[<<ARGS[2]>>]') > 0:
 			if $ARGS[1] ! 'exercise' and CloStyle ! 5 and (dyneval('RESULT = <<$ARGS[1]>>B[<<ARGS[2]>>]') < (pcs_hips - 8) or dyneval('RESULT = <<$ARGS[1]>>B[<<ARGS[2]>>]') > (pcs_hips + 8)) or (ARRPOS('$CloLosTyp', $ARGS[1]) ! -1 and ARRPOS('CloLosNum',ARGS[2]) ! -1):
 				$RESULT += '</TD>'
 			else
@@ -325,7 +325,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopbeach
-				if beach[i] = 1 and formalS[i] = cloc and ($clothingworntype ! 'beach' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'beach', i)
+				if beach[i] = 1 and beachS[i] = cloc and ($clothingworntype ! 'beach' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'beach', i)
 				i += 1
 			if i <= ARRSIZE('beach'):jump 'loopbeach'
 

locations/etoexhib.qsrc

@@ -1628,7 +1628,7 @@ if $ARGS[0] = 'pos53':
 	'The roof of your apartment building.'
 
 	act 'Go down to the attic':
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 			msg '<center><font color = red>You need to get dressed first</font></center>'
 			gt 'etoexhib','pos53'
 		else
@@ -1637,7 +1637,7 @@ if $ARGS[0] = 'pos53':
 		end
 	end
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 		act 'Change back into clothes':
 			minut += 5
 			gs 'underwear', 'wear'
@@ -1646,10 +1646,10 @@ if $ARGS[0] = 'pos53':
 		end
 	end
 	if temper >= 15 and hour >= 8 and hour <= 20:
-		if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'swimwear':
+		if func('changingroom','count_swim_item') > 0 and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 			act 'Change into a bikini':gt 'changingroom', 'view_swim_list'
 		end
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			act 'Sunbathe (1:00)':
 				cla
 				*clr

locations/family_schedule.qsrc

@@ -8,8 +8,8 @@ anyaloc = 0
 kolloc = 0
 
 !!---ANYA---------------------------------------
-!! sister_opr_indorf = 1 means Anya is in the village
-if sister_opr_indorf = 0:
+!! sister_indorf = 1 means Anya is in the village
+if sister_indorf = 0:
 	if week <= 5:
 		if (hour < 6) or (hour = 6 and minut < 45):
 			!!Asleep
@@ -21,7 +21,7 @@ if sister_opr_indorf = 0:
 			!!Helping mom clean up
 			anyaloc = 3
 		elseif hour < 8:
-			!!In Bedroom
+			!!In Bedroom getting ready
 			anyaloc = 4
 		elseif hour = 8 and minut < 20:
 			!!Shower*
@@ -36,8 +36,13 @@ if sister_opr_indorf = 0:
 			!!Walk home from work
 			anyaloc = 8
 		elseif hour < 18:
-			!!Personal activities: Relaxing in bedroom, working out at the community center, etc (this is also the time frame Roma comes over some times)
-			anyaloc = func('shortgs', 'rand_pick', '', 9, 10, 11)
+			if sisboyday + 1 = daystart:
+				!! Roma visiting
+				anyaloc = 11
+			else
+				!!Personal activities: Relaxing in bedroom 9, working out at the community center 10
+				anyaloc = func('shortgs', 'rand_pick', '', 9, 10)
+			end
 		elseif sisboyday + 1 = daystart and hour = 18:
 			!!in bedroom with Roma
 			anyaloc = 25
@@ -45,7 +50,7 @@ if sister_opr_indorf = 0:
 			!!Family dinner
 			anyaloc = 12
 		elseif hour < 22:
-			!!Goes out to hang out with friends/Roma (this could be random so sometimes she stays home to give Sveta more time to talk to her)
+			!!Goes out to hang out with friends 13/Roma 14 (this could be random so sometimes she stays home to give Sveta more time to talk to her 15)
 			anyaloc = func('shortgs', 'rand_pick', '', 13, 14, 15)
 		else
 			!!In her room
@@ -71,8 +76,13 @@ if sister_opr_indorf = 0:
 			!!In Bedroom
 			anyaloc = 4
 		elseif hour < 16:
-			!!On nice days goes to the beach, sometimes goes to the city with friends, or stays at home watching tv or reading etc
-			anyaloc = rand(17,19)
+			if temp > 15 and sunWeather = 1:
+				!!On nice days goes to the beach
+				anyaloc = 17
+			else
+				!!Stays at home
+				anyaloc = 19
+			end
 		elseif hour = 16 and minut < 15:
 			!!Walk to community center
 			anyaloc = 20
@@ -257,7 +267,7 @@ if indorf = 0:
 			momloc = 15
 			momloc['athome'] = 0
 		elseif hour < 17:
-			!!Helping out Sergey/Luda, going to Kolka's games?
+			!!Helping out Sergey/Luda, going to Kolka''s games?
 			momloc = rand(14,15)
 			momloc['athome'] = 0
 		elseif hour < 18:
@@ -273,7 +283,7 @@ if indorf = 0:
 			momloc = 13
 			momloc['athome'] = 1
 		elseif hour < 21:
-			!!Says she goes to see her sister, in reality sometimes see's her sister of fucks around with different people. - Sunday goes to evening mass
+			!!Says she goes to see her sister, in reality sometimes see''s her sister of fucks around with different people. - Sunday goes to evening mass
 			momloc['athome'] = 0
 			if week = 5:
 				momloc = 17

locations/fit.qsrc

@@ -104,7 +104,7 @@ if $ARGS[0] = 'dressing room':
 	end
 
 	act 'Exit the locker room':
-        if $clothingworntype ! 'nude' and $clothingworntype ! 'swimwear':
+        if $clothingworntype ! 'nude' and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
             if Fit['FMR'] = 0 and vidage <= 40 and hotcat >=6 and city_sport >=10:
                 gt 'fit', 'FMR'
             else
@@ -148,7 +148,7 @@ if $ARGS[0] = 'dressing room':
 		gt 'wardrobe', 'start'
 	end
 
-	if $clothingworntype = 'swimwear':
+	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 		act 'Use the pool': gt 'bass', 'start'
 	else
 		act 'Change into swimwear': gt 'changingroom', 'view_swim_list'

locations/gLakeNude.qsrc

@@ -61,7 +61,7 @@ end
 act'Leave the secluded beach': minut += 10 & gt 'glake'
 
 if month >= 5 and month <= 9:
-	if arrsize('swimwear') > 0:
+	if func('changingroom','count_swim_item') > 0:
 		act 'Use changing room':gt 'changingroom', 'view_swim_list'
 	else
 		*nl
@@ -132,11 +132,11 @@ if temper >= 15 and month >= 5 and month <= 9:
 		pcs_mood += 5
 		gs 'stat'
 
-		if $clothingworntype = 'swimwear' and pcs_hips<=90:
+		if ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips<=90:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini0,'+rand(0,3)+'.jpg"></center>'
-		elseif $clothingworntype = 'swimwear' and pcs_hips >= 90 and pcs_hips<=110:
+		elseif ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips >= 90 and pcs_hips<=110:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,0.jpg"></center>'
-		elseif $clothingworntype = 'swimwear' and pcs_hips>=110:
+		elseif ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips>=110:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,1.jpg"></center>'
 			if pcs_inhib < 50:inhib_exp += rand(1,2)
 		elseif $clothingworntype = 'nude':
@@ -150,7 +150,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 		act 'Continue':gt'gLakeNude'
 	end
 	
-	if hour >= 6 and hour <= 20 and ($clothingworntype = 'swimwear' or $clothingworntype = 'nude'):
+	if hour >= 6 and hour <= 20 and ($clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude'):
 		act 'Go swimming (30 minutes)':
 			menu_off = 1
 			*clr & cla
@@ -160,7 +160,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 			pcs_mood += 5
 			! Seems appropriate. Potentially worth revisiting
 			if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
-			if $clothingworntype = 'swimwear':
+			if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 				if pcs_inhib < 50:inhib_exp += rand(1,2)
 			elseif $clothingworntype = 'nude':
 				inhib_exp += rand(1,3)
@@ -182,15 +182,15 @@ if temper >= 15 and month >= 5 and month <= 9:
 		end
 	end
 	
-	if sunWeather = 1 and hour >= 6 and hour <= 20  and ($clothingworntype = 'swimwear' or $clothingworntype = 'nude'):
+	if sunWeather = 1 and hour >= 6 and hour <= 20  and ($clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude'):
 		act 'Go sunbathing (30 minutes)':
 			menu_off = 1
-			if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+			if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 				*clr & cla
 				minut = minut + 30
 				if pcs_sweat < 35 : gs 'sweat', 'add', 5
 				pcs_mood += 5
-				if $clothingworntype = 'swimwear':
+				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/sunbath.jpg"></center>'
 					if pcs_inhib < 50:inhib_exp += rand(1,2)
 				else
@@ -319,7 +319,7 @@ if $ARGS[0] = 'sauna':
 		end
 	end
 	
-	if arrsize('swimwear') > 0:
+	if func('changingroom','count_swim_item') > 0:
 		act 'Use changing room':gt 'changingroom', 'view_swim_list'
 	else
 		*nl
@@ -350,7 +350,7 @@ if $ARGS[0] = 'sauna':
 		end
 	end
 	
-	if $clothingworntype = 'nude' or $clothingworntype = 'swimwear':	
+	if $clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 		act 'Go to the womens section':
 			*clr & cla
 			menu_off = 1
@@ -382,7 +382,7 @@ if $ARGS[0] = 'sauna':
 					pcs_skin += rand(2,4)
 					pcs_willpwr += 3
 				end
-				if $clothingworntype = 'swimwear':
+				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
 					if pcs_inhib < 40: inhib_exp += rand(0,1)
 				else
@@ -405,7 +405,7 @@ if $ARGS[0] = 'sauna':
 			'It appears to be empty at the moment.'
 			act 'Leave': gt 'gLakeNude', 'sauna'
 			gs 'willpower', 'exhib', 'self', 'hard'
-			if saunarand < 4 or $clothingworntype = 'swimwear': will_cost = 3
+			if saunarand < 4 or $clothingworntype = 'swimwear' or $clothingworntype = 'beach': will_cost = 3
 			if will_cost <= pcs_willpwr:
 				act 'Use the sauna (<<will_cost>> Willpower)':
 					*clr & cla
@@ -416,7 +416,7 @@ if $ARGS[0] = 'sauna':
 						pcs_skin += rand(2,4)
 						pcs_willpwr += 3
 					end
-					if $clothingworntype = 'swimwear':
+					if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
 						if pcs_inhib < 40: inhib_exp += rand(0,1)
 					else
@@ -454,9 +454,9 @@ if $ARGS[0] = 'sauna':
 				end
 			end
 			gs 'willpower', 'exhib', 'self', 'easy'
-			if saunarand < 4 or $clothingworntype = 'swimwear': will_cost = 0
+			if saunarand < 4 or $clothingworntype = 'swimwear' or $clothingworntype = 'beach': will_cost = 0
 			if will_cost <= pcs_willpwr:
-				act iif(saunarand < 4 or $clothingworntype = 'swimwear', 'Use the sauna', 'Use the sauna (<<will_cost>> Willpower)'):
+				act iif(saunarand < 4 or $clothingworntype = 'swimwear' or $clothingworntype = 'beach', 'Use the sauna', 'Use the sauna (<<will_cost>> Willpower)'):
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
 					minut += 30
@@ -466,7 +466,7 @@ if $ARGS[0] = 'sauna':
 						pcs_skin += rand(2,4)
 						pcs_willpwr += 3
 					end
-					if $clothingworntype = 'swimwear':
+					if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
 						if pcs_inhib < 40: inhib_exp += rand(0,1)
 					else
@@ -497,7 +497,7 @@ if $ARGS[0] = 'ice_plunge':
 		minut += 10
 		pcs_mood += 10
 		if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/icedipbikini.jpg"></center>'
 			if pcs_inhib < 50:inhib_exp += rand(0,1)
 		else

locations/gadriver.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'gadbitch':
 
 	act 'Go back to the river (0:05)':
 		cla
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			cla
 			'You need to dress in regular clothes first.'
 			act'Return':gt'gadriver', 'gadbitch'
@@ -205,7 +205,7 @@ if $ARGS[0] = 'gadbitch':
 		end
 	end
 
-	if ARRSIZE('swimwear') > 0: act 'Get changed':gt 'changingroom', 'view_swim_list'
+	if func('changingroom','count_swim_item') > 0: act 'Get changed':gt 'changingroom', 'view_swim_list'
 
 	if $clothingworntype = 'nude':
 		act 'Get dressed':
@@ -230,7 +230,7 @@ if $ARGS[0] = 'gadbitch':
 				act 'Continue': gt 'gadriver', 'gadbitch'
 			end
 		end
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			act 'Go for a swim':
 				cla
 				*clr
@@ -368,7 +368,7 @@ if $ARGS[0] = 'gadbitch':
 			end
 		end
 		if hour >= 8 and hour < 20 and sunWeather = 1:
-			if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+			if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 				act 'Sunbathe (1:00)':
 					if Mira_no = 0 and npc_rel['A60'] > 0 and MiraLoc ! 1 and rand(1,10) > 7 and hour > 8 and hour < 20 and sunWeather = 1 and temper >= 15:
 						cla
@@ -503,7 +503,7 @@ if $ARGS[0] = 'gadbitch':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/horse_river.jpg"></center>'
 				'You see Desperado happily walking around in the river.'
 
-				if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 					act 'Wash Desperado':
 						*clr & cla
 
@@ -519,7 +519,7 @@ if $ARGS[0] = 'gadbitch':
 
 						if $clothingworntype = 'nude':
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/wash_horse_nude.jpg"></center>'
-						elseif $clothingworntype = 'swimwear':
+						elseif $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/wash_horse_swim.jpg"></center>'
 						end
 						'You jump in the river and swim over to Desperado. You take your time, washing his beautiful chestnut coat.'
@@ -548,7 +548,7 @@ if $ARGS[0] = 'gadbitch':
 
 							if $clothingworntype = 'nude':
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/wash_horse_mira_nude.jpg"></center>'
-							elseif $clothingworntype = 'swimwear':
+							elseif $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 								'<center><img <<$set_imgh>> src="images/characters/village/mira/wash_horse_mira_swim.jpg"></center>'
 							end
 							'You invite Mira to wash Desperado with you; having nothing better to do she agrees.'
@@ -571,7 +571,7 @@ if $ARGS[0] = 'gadbitch':
 		end
 		if grandpaQW['chore_bathe_horse_prog'] = 2:
 			act 'Lead Desperado back home (0:30)':
-				if $clothingworntype = 'swimwear':
+				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 					cla
 					'You need to dress in regular clothes first.'
 					act'Return':gt'gadriver', 'gadbitch'
@@ -634,7 +634,7 @@ if $ARGS[0] = 'gadbitch':
 					*nl
 					'"Wait Mira, I have to change out of my clothes!" you cry in response, although she could hardly hear you as she is already splashing around in the river.'
 					'You start to take off your clothes.'
-					if ARRSIZE('swimwear') > 0:
+					if func('changingroom','count_swim_item') > 0:
 						act 'Change into swimwear':
 							gs 'gadriver','get_changed','start'
 						end
@@ -686,7 +686,7 @@ if $ARGS[0] = 'get_changed':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/river/undressbch.jpg"></center>'
 		*nl
 		'You put on our swimwear and neatly fold your clothes before putting them down in a pile, now you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			act 'Swim':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirls.jpg"></center>'
@@ -714,7 +714,7 @@ if $ARGS[0] = 'second_thoughts':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mirariver.jpg"></center>'
 	*nl
-	if ARRSIZE('swimwear') = 0:
+	if func('changingroom','count_swim_item') = 0:
 		'"Actually Mira, I can''t come in right now, as I didn''t bring a swimsuit" you replied you her. "I''m going to stay on the shore for a bit."'
 		*nl
 		'You should probably buy some swimwear if you intend of spending time at the beach'

locations/glake.qsrc

@@ -12,7 +12,7 @@ $location_type = 'public_outdoors'
 gs'stat'
 
 ! --- meynold event --- !. edit to month 5~10
-if $clothingworntype ! 'swimwear' and $clothingworntype ! 'nude' and temper >= 5 and sunWeather = 1 and month >= 5 and month <= 10 and hour < 20 and ((hour >= 10 and week >= 6) or (hour >= 14 and week < 6)) and mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart: gt 'mey_vika_events', 'beach_event1'
+if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach' and $clothingworntype ! 'nude' and temper >= 5 and sunWeather = 1 and month >= 5 and month <= 10 and hour < 20 and ((hour >= 10 and week >= 6) or (hour >= 14 and week < 6)) and mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart: gt 'mey_vika_events', 'beach_event1'
 
 '<center><H4>Lake</H4></center>'
 
@@ -73,7 +73,7 @@ act'Return to Pavlovsk':
 	if konki_cloth = 1:
 		'You need to remove your skates. How are you going to walk on the streets in those?'
 		act'Back':gt'glake'
-	elseif $clothingworntype = 'swimwear':
+	elseif $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 		'You need to get dressed in regular clothing first.'
 		act'Return':gt'glake'
 	elseif $clothingworntype ! 'nude':
@@ -87,7 +87,7 @@ end
 
 if month >= 5 and month <= 9:
 
-	if arrsize('swimwear') > 0:
+	if func('changingroom','count_swim_item') > 0:
 		act 'Use changing room':gt 'changingroom', 'view_swim_list'
 	else
 		*nl
@@ -219,11 +219,11 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 		pcs_mood += 5
 		gs'stat'
 
-		if $clothingworntype = 'swimwear' and pcs_hips<=90:
+		if ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips<=90:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini0,'+rand(0,3)+'.jpg"></center>'
-		elseif $clothingworntype = 'swimwear' and pcs_hips >= 90 and pcs_hips<=110:
+		elseif ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips >= 90 and pcs_hips<=110:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,0.jpg"></center>'
-		elseif $clothingworntype = 'swimwear' and pcs_hips>=110:
+		elseif ($clothingworntype = 'swimwear' or $clothingworntype = 'beach') and pcs_hips>=110:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,1.jpg"></center>'
 			if pcs_inhib < 50:inhib_exp += rand(1,2)
 		elseif $clothingworntype = 'nude':
@@ -237,7 +237,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 		act 'Continue':gt'glake'
 	end
 	
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 		act 'Go swim in the lake (30 minutes)':
 			*clr & cla
 			menu_off = 1
@@ -269,7 +269,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 				if pcs_sweat < 35 : gs 'sweat', 'add', 5
 				pcs_mood += 5
 				gs'stat'
-				if $clothingworntype = 'swimwear':
+				if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/sunbath.jpg"></center>'
 					if pcs_inhib < 50:inhib_exp += rand(1,2)
 				else
@@ -296,7 +296,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 							if $clothingworntype = 'nude':
 								act 'Get dressed and go with him':
 									gs 'clothing', 'wear_last_worn'
-									if $clothingworntype = 'swimwear':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+									if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 									gt 'LakeBoyDy', 'ride'
 								end
 							else

locations/grandpahelp.qsrc

@@ -85,7 +85,7 @@ if $ARGS[0] = 'start':
 		gt 'grandpahelp', 'leadcows'
 	elseif grandpaQW['chore_type'] = 8 and hour >= 6 and hour < 9:
 		gt 'grandpahelp', 'grazecows'
-	elseif grandpaQW['chore_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5 and ARRSIZE('swimwear') > 0:
+	elseif grandpaQW['chore_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5 and func('changingroom','count_swim_item') > 0:
 		gt 'grandpahelp', 'washhorse'
 	elseif grandpaQW['chore_type'] = 10 and boletus_stored <= 18:
 		gt 'grandpahelp', 'pickforest_mushrooms'

locations/katjaEv.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = '':
 		dummy = rand(1,6)
 		gs 'stat'
 
-		if npc_rel['A14'] >= 50 and dummy = 1: minut += 5 & gt 'katjaEv','TamVal'
+		if meynoldQW = 1 and npc_rel['A14'] >= 50 and dummy = 1: minut += 5 & gt 'katjaEv','TamVal'
 
 
 		if meynoldQW > 1 and pcs_makeup <= 1:
@@ -97,7 +97,7 @@ if $ARGS[0] = '':
 		else
 			gt 'KatjaEv','kathan'
 		end
-    end
+	end
 	if meynoldQW >= 2: act '"Let''s going to do our homework, Katja"': minut += 5 & gt 'katjaEV','1'
 end
 
@@ -821,7 +821,7 @@ if $ARGS[0] = 'kathan':
 						end
 						'You decide to pass some time at the secluded beach, but as you approach, a question surges into your mind. Go there naked? Katja is pretty body-conscientious, so... maybe going full nudist isn''t a good idea. What can you do? Push her to go naked or just put on your swimwear?'
 
-						if arrsize('swimwear') > 0:
+						if func('changingroom','count_swim_item') > 0:
 							act 'Put on your swimwear':
 								*clr & cla
 								if KatjaSlut >= 20 and KatjaHorny >= 20:
@@ -914,7 +914,7 @@ if $ARGS[0] = 'kathan':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/sauna.jpg"></center>'
 					'You decide to pass some time in the public sauna, but as you approach, a question surges into your mind. Go naked? Katja is pretty body-conscientious, so maybe going butt-naked isn''t a good idea. What can you do? Push her to go naked or just put on your swimwear?'
 
-					if arrsize('swimwear') > 0:
+					if func('changingroom','count_swim_item') > 0:
 						act 'Put on your swimwear':
 							*clr & cla
 							if KatjaSlut >= 20 and KatjaHorny >= 20:
@@ -1013,8 +1013,8 @@ if $ARGS[0] = 'kathan':
 end
 
 if $ARGS[0] = 'kathanlakesw1':
-    *clr & cla
-	if $clothingworntype ! 'swimwear':
+	*clr & cla
+	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 		minut +=10
 		$loc = 'katjaEV'
 		$loc_arg = 'kathanlakesw1'
@@ -1034,8 +1034,8 @@ end
 
 
 if $ARGS[0] = 'kathanlakesw2':
-    *clr & cla
-	if $clothingworntype ! 'swimwear':
+	*clr & cla
+	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 		$loc = 'katjaEV'
 		$loc_arg = 'kathanlakesw2'
 		gs 'changingroom', 'view_swim_list'
@@ -1058,8 +1058,8 @@ if $ARGS[0] = 'kathanlakesw2':
 end
 
 if $ARGS[0] = 'kathansaunasw1':
-    *clr & cla
-	if $clothingworntype ! 'swimwear':
+	*clr & cla
+	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 		$loc = 'katjaEV'
 		$loc_arg = 'kathansaunasw1'
 		gs 'changingroom', 'view_swim_list'
@@ -1071,8 +1071,8 @@ if $ARGS[0] = 'kathansaunasw1':
 end
 
 if $ARGS[0] = 'kathansaunasw2':
-    *clr & cla
-	if $clothingworntype ! 'swimwear':
+	*clr & cla
+	if $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 		$loc = 'katjaEV'
 		$loc_arg = 'kathansaunasw2'
 		gs 'changingroom', 'view_swim_list'
@@ -1085,7 +1085,7 @@ if $ARGS[0] = 'kathansaunasw2':
 		'Groaning in frustration, you get naked and put on your swimwear, as sweet... candid... Katja... get hers, and exaggeratedly sighs giving you sensuall eyes.'
 		'"Bitch!"'
 		'You varelly whisper your insult and take the gigling bimbo wannabe towards the sauna .'
-										
+
 		act 'Go to the sauna':gt 'katjaEv','kathan10'
 	end
 end

locations/korrPar.qsrc

@@ -76,9 +76,9 @@ act '<b>Leave and go to the courtyard</b>':
 end
 
 if blockBedrPar = 0:
-	if sisboyday + 1 = daystart and hour = 18 and sisboytrioQW = 1:
+	if anyaloc = 11 and sisboytrioQW = 1:
 		act 'Go to your room':gt 'sisterQW', 'sisboytrioQW_bedroom'
-	elseif sisboyday + 1 = daystart and hour = 18 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or npc_QW['A33'] >= 9):
+	elseif anyaloc = 11 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or npc_QW['A33'] >= 9):
 		act 'Go to your room':gt 'sisterQW', 'sisboyQW_bedroom'
 	else
 		act 'Go to your room':gt 'bedrPar'
@@ -122,7 +122,7 @@ if momloc = 1:
 							*clr & cla
 							gs 'willpower', 'pay', 'self'
 							gs 'stat'
-							gt 'bedPar2', 'peek'
+							gt 'bedrPar2', 'peek'
 						end
 					else
 						act 'Peek (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/mey_home.qsrc

@@ -234,7 +234,7 @@ if $ARGS[0] = '3':
 	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	act 'Return to the hallway':
-		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 			*clr
 			'<center><img <<$set_imgh>> src="'+'images/pc/clothing/'+iif($pantyworntype = 'none','0','tanga')+'.jpg'+'"></center>'
 			*nl

locations/mey_vika_events.qsrc

@@ -898,9 +898,9 @@ end
 
 if $ARGS[0] = 'beach_ender':
 	act 'Go':
-		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'): gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
+		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'): gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 		! on vsjak the fireman still wears check whether gg
-		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'): gs 'zz_clothing', 'fix_emergency'
+		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'): gs 'zz_clothing', 'fix_emergency'
 		gt 'pav_residential'
 	end
 end

locations/miroslava.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						if npc_rel['A60'] < 15:npc_rel['A60'] += 1
 						MiraLoc = 0
 						mira_guest = 0
-						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 							gs 'underwear', 'wear'
 							gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 						end
@@ -240,7 +240,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				meadow = 2
 				MiraLoc = 2
 				mira_guest = 0
-				if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+				if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 					gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 					gs 'underwear', 'wear'
 				end
@@ -261,7 +261,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						if npc_rel['A60'] < 50:npc_rel['A60'] += 1
 						MiraLoc = 2
 						mira_guest = 0
-						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 							gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 							gs 'underwear', 'wear'
 						end
@@ -297,7 +297,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				npc_rel['A60'] += 1
 				MiraLoc = 5
 				mira_guest = 0
-				if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+				if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 					gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 					gs 'underwear', 'wear'
 				end
@@ -317,7 +317,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					minut += 5
 					if npc_rel['A60'] < 20:npc_rel['A60'] += 1
 					MiraLoc = 5
-					if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+					if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 						gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 						gs 'underwear', 'wear'
 					end
@@ -353,7 +353,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						minut += 10
 						if npc_rel['A60'] < 50:npc_rel['A60'] += 1
 						mira_guest = 1
-						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 							gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 							gs 'underwear', 'wear'
 						end
@@ -396,7 +396,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						minut += 2
 						if npc_rel['A60'] < 30:npc_rel['A60'] += 1
 						mira_guest = 0
-						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 							gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 							gs 'underwear', 'wear'
 						end
@@ -439,7 +439,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 						if npc_rel['A60'] < 30:npc_rel['A60'] += 1
 						mira_guest = 0
 						MiraLoc = 3
-						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+						if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 							gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 							gs 'underwear', 'wear'
 						end
@@ -498,7 +498,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'You are tired of hanging around on the street and you decided to invite Mira to dinner.'
 
 					act'Go home':
-						if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):
+						if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach'):
 							minut += 15 & gt 'gadhouse', 'start'
 						else
 							*clr & cla
@@ -576,7 +576,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				'"<<$pcs_nickname>>, it''s so boring here," Mira pouts, "I know! Let''s go to your place." Mira suggests brightly.'
 
 				act'Agree':
-					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):
+					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach'):
 						mira_go_blok = 1
 						mira_guest = 1
 						minut += 15
@@ -655,7 +655,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					mira_guest = 0
 					MiraLoc = 2
 					mira_go_blok = 1
-					if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+					if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 						gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 						gs 'underwear', 'wear'
 					end
@@ -685,7 +685,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				mira_go_blok = 1
 				MiraLoc = 5
 				mira_guest = 0
-				if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+				if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 					gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 					gs 'underwear', 'wear'
 				end
@@ -748,7 +748,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					mira_guest = 0
 					MiraLoc = 1
 					mira_go_blok = 1
-					if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+					if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 						gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 						gs 'underwear', 'wear'
 					end
@@ -778,7 +778,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				*clr & cla
 				minut += 2
 				mira_guest = 0
-				if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+				if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 					gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 					gs 'underwear', 'wear'
 				end
@@ -1146,8 +1146,8 @@ if $ARGS[0] = 'miraclothes':
 end
 
 if $ARGS[0] = 'mira_river':
-	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear'):'<center><img <<$set_imgh>> src="images/characters/village/mira/mirarivertalk.jpg"></center>'
-	if $clothingworntype = 'swimwear':'<center><img <<$set_imgh>> src="images/characters/village/mira/mirarivertalkbikini.jpg"></center>'
+	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach'):'<center><img <<$set_imgh>> src="images/characters/village/mira/mirarivertalk.jpg"></center>'
+	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':'<center><img <<$set_imgh>> src="images/characters/village/mira/mirarivertalkbikini.jpg"></center>'
 	if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/mirarivernudetalk.jpg"></center>'
 end
 

locations/natkolEv.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'kolkabj':
 		*clr & cla
 		minut += 5
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/natnudebed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/natnudebed2.jpg"></center>'
 		'A few minutes later, you hear the front door open and then close as Kolka calls out. "Hello?"'
 		'"In the bedroom!" You call out to him.'
 		'When Kolka enters the room, Natasha immediately tries to cover herself with her hands. He stops dead when he sees Natasha naked and stares at her.'

locations/npcstatic1.qsrc

@@ -7,11 +7,7 @@ $npc_firstname['A<<npctemp>>'] = 'Dmitriy'
 $npc_nickname['A<<npctemp>>'] = 'Dimka'
 $npc_lastname['A<<npctemp>>'] = 'Nosov'
 $npc_usedname['A<<npctemp>>'] = 'Dimka'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19991020
-else
-	npc_dob['A<<npctemp>>'] = 20001020
-end
+npc_dob['A<<npctemp>>'] = 19991020
 $npc_notes['A<<npctemp>>'] = 'Dimka Nosov is a cute guy and all the girls adore him, he is considered the coolest kid in school. The guys tend to either befriend him or loath him. He comes from a fairly wealthy family, and is always dressed in expensive stylish clothes. Despite his pleasant smile and friendly demeanor, there are rumors saying he is a sadist bastard that always gets what he wants.'
 !!set gender before calling npcstaticdefaults, override values you don''t like afterwards
 npc_gender['A<<npctemp>>'] = 0
@@ -112,11 +108,7 @@ $npc_firstname['A<<npctemp>>'] = 'Dmitriy'
 $npc_nickname['A<<npctemp>>'] = 'Dimka'
 $npc_lastname['A<<npctemp>>'] = 'Nosov'
 $npc_usedname['A<<npctemp>>'] = 'Dimka'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19991020
-else
-	npc_dob['A<<npctemp>>'] = 20001020
-end
+npc_dob['A<<npctemp>>'] = 19991020
 $npc_notes['A<<npctemp>>'] = 'Dimka Nosov is a cute guy and all the girls adore him, he is considered the coolest kid in school. The guys tend to either befriend him or loath him. He comes from a fairly wealthy family, and is always dressed in expensive stylish clothes. Despite his pleasant smile and friendly demeanor, there are rumors saying he is a sadist bastard that always gets what he wants.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -134,11 +126,7 @@ $npc_firstname['A<<npctemp>>'] = 'Artyom'
 $npc_nickname['A<<npctemp>>'] = 'Artem'
 $npc_lastname['A<<npctemp>>'] = 'Chebotarev'
 $npc_usedname['A<<npctemp>>'] = 'Artem'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000209
-else
-	npc_dob['A<<npctemp>>'] = 20010209
-end
+npc_dob['A<<npctemp>>'] = 20000209
 $npc_notes['A<<npctemp>>'] = 'Artem Chebotarev is a typical geek but one could easily be deceived by his looks as he is actually not that bad looking. He does very well in school and is popular with the other geeks, not to mention that thanks to his looks he has befriended a lot of jocks as he is also their tutor outside of school.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -156,11 +144,7 @@ $npc_firstname['A<<npctemp>>'] = 'Ivan'
 $npc_nickname['A<<npctemp>>'] = 'Ivan'
 $npc_lastname['A<<npctemp>>'] = 'Prokhorov'
 $npc_usedname['A<<npctemp>>'] = 'Ivan'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19990717
-else
-	npc_dob['A<<npctemp>>'] = 20000717
-end
+npc_dob['A<<npctemp>>'] = 19990717
 $npc_notes['A<<npctemp>>'] = 'Ivan Prokhorov is a talented athlete who is able to succeed in any sport he takes part of. He is mostly into boxing and running at this time and is considered to be very good looking by the girls in school. He spends a lot of time training and regularly is away competing. He isn''t very sociable and, other than when he is training, tends to keep to himself, a true lone wolf. He is calm and collected by nature, some might even say apathetic.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -176,11 +160,7 @@ $npc_firstname['A<<npctemp>>'] = 'Igor'
 $npc_nickname['A<<npctemp>>'] = 'Igor'
 $npc_lastname['A<<npctemp>>'] = 'Kruglov'
 $npc_usedname['A<<npctemp>>'] = 'Igor'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19991222
-else
-	npc_dob['A<<npctemp>>'] = 20001222
-end
+npc_dob['A<<npctemp>>'] = 19991222
 $npc_notes['A<<npctemp>>'] = 'Igor Kruglov is Dimka''s best friends and whenever you see one of them the other is usually not too far away. With a small stature, high pitched voice, and pretty face many consider him to be very feminine. Normally a boy like him would be mocked but his friendship with Dimka, the most popular boy in school, shields him from such abuse. Many wonder about their friendship as Igor follows Dimka around so often and they seem to have always been friends. Some would even say that Igor is overly attached to Dimka. Other than Dimka though Igor doesn''t seem to have any other close friends.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -197,11 +177,7 @@ $npc_firstname['A<<npctemp>>'] = 'Fyodor'
 $npc_nickname['A<<npctemp>>'] = 'Fedor'
 $npc_lastname['A<<npctemp>>'] = 'Kozlov'
 $npc_usedname['A<<npctemp>>'] = 'Fedor'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000324
-else
-	npc_dob['A<<npctemp>>'] = 20010324
-end
+npc_dob['A<<npctemp>>'] = 20000324
 $npc_notes['A<<npctemp>>'] = 'Fedor Kozlov is a decent athlete. He often trains with his good friend Ivan, but lacks the level of talent that Ivan does have. He is decent looking and often is seen chasing Ivan''s leftovers.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -220,11 +196,7 @@ $npc_firstname['A<<npctemp>>'] = 'Peter'
 $npc_nickname['A<<npctemp>>'] = 'Petka'
 $npc_lastname['A<<npctemp>>'] = 'Klyuyev'
 $npc_usedname['A<<npctemp>>'] = 'Petka'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19990915
-else
-	npc_dob['A<<npctemp>>'] = 20000915
-end
+npc_dob['A<<npctemp>>'] = 19990915
 $npc_notes['A<<npctemp>>'] = 'Petka Klyuyev is a nerd who usually doesn''t interact with other people, he mostly spends his time reading. He''s good friends with Artem and you can usually hear them recommending what to read to each other.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -242,11 +214,7 @@ $npc_firstname['A<<npctemp>>'] = 'Lesco'
 $npc_nickname['A<<npctemp>>'] = 'Lesco'
 $npc_lastname['A<<npctemp>>'] = 'Tsarev'
 $npc_usedname['A<<npctemp>>'] = 'Lesco'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19990703
-else
-	npc_dob['A<<npctemp>>'] = 20000703
-end
+npc_dob['A<<npctemp>>'] = 19990703
 $npc_notes['A<<npctemp>>'] = 'Everyone at school always bullies Lesco about anything and everything. He is the nephew of Mr. Tsarev and cousin of Lera. He resides with the Tsarev''s after his mother abandoned him for a week on one of her drug binges.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -265,11 +233,7 @@ $npc_firstname['A<<npctemp>>'] = 'Svyatoslav'
 $npc_nickname['A<<npctemp>>'] = 'Svyatoslav'
 $npc_lastname['A<<npctemp>>'] = 'Voinov'
 $npc_usedname['A<<npctemp>>'] = 'Svyatoslav'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000503
-else
-	npc_dob['A<<npctemp>>'] = 20010503
-end
+npc_dob['A<<npctemp>>'] = 20000503
 $npc_notes['A<<npctemp>>'] = 'Svyatoslav Voinov is an athletic guy with a very competitive spirit. He is always engaged in sports one way or another. He runs track and often competes with Ivan to be the fastest boy at school. His other focus is football as well as many other sports the school offers. He''s always trying to one up Ivan but rarely manages to beat him at anything.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -287,11 +251,7 @@ $npc_firstname['A<<npctemp>>'] = 'Viktor'
 $npc_nickname['A<<npctemp>>'] = 'Vitek'
 $npc_lastname['A<<npctemp>>'] = 'Kotov'
 $npc_usedname['A<<npctemp>>'] = 'Vitek'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19991125
-else
-	npc_dob['A<<npctemp>>'] = 20001125
-end
+npc_dob['A<<npctemp>>'] = 19991125
 $npc_notes['A<<npctemp>>'] = 'Vitek Kotov is an aggressive and strong guy, who considers himself a gangsta. He is very loud, obnoxious and not very attractive. Lena is his twin-sister, whom he is overly protective of and that has caused more than a fair share of drama. He is the local leader of the Gopniks and as such is the most feared boy in school. Even some adults are afraid of him. He is even rumored to be involved with the local organized crime selling drugs.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -308,11 +268,7 @@ $npc_firstname['A<<npctemp>>'] = 'Denis'
 $npc_nickname['A<<npctemp>>'] = 'Dan'
 $npc_lastname['A<<npctemp>>'] = 'Ryzhov'
 $npc_usedname['A<<npctemp>>'] = 'Dan'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19990728
-else
-	npc_dob['A<<npctemp>>'] = 20000728
-end
+npc_dob['A<<npctemp>>'] = 19990728
 $npc_notes['A<<npctemp>>'] = 'Dan Ryzhov is a tall and skinny guy, whose body language screams his disdain and contempt for others. He''s a very stubborn guy who will never let an argument be. He''s best friends with Vitek and Vasily, and is considered to be the smartest one of the bunch. Though most consider that to not be much of a feat.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -329,11 +285,7 @@ $npc_firstname['A<<npctemp>>'] = 'Vasily'
 $npc_nickname['A<<npctemp>>'] = 'Shulga'
 $npc_lastname['A<<npctemp>>'] = 'Shulgin'
 $npc_usedname['A<<npctemp>>'] = 'Shulga'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000425
-else
-	npc_dob['A<<npctemp>>'] = 20010425
-end
+npc_dob['A<<npctemp>>'] = 20000425
 $npc_notes['A<<npctemp>>'] = 'Vasily is always hanging out with Dan and Vitek, who are his best friends. His nickname is Shulga. He''s physically considered the weakest one of the bunch, but is a bit of a prankster and is always making the other ones laugh. He was raised just by his father, after his mother left when he was still an infant.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -353,11 +305,7 @@ $npc_firstname['A<<npctemp>>'] = 'Julia'
 $npc_nickname['A<<npctemp>>'] = 'Julia'
 $npc_lastname['A<<npctemp>>'] = 'Milov'
 $npc_usedname['A<<npctemp>>'] = 'Julia'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000330
-else
-	npc_dob['A<<npctemp>>'] = 20010330
-end
+npc_dob['A<<npctemp>>'] = 20000330
 $npc_notes['A<<npctemp>>'] = 'Julia is a diligent and silent girl. She''s very nerdy, and doesn''t really have any friends in school. She seems to like keeping to herself, but has sometimes been caught eyeing the other girls while they changing after the gym lessons.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
@@ -380,11 +328,7 @@ if zverSlutQW = 2:
 else
 	$npc_notes['A<<npctemp>>'] = 'Lariska is a very athletic girl, with an exceptional talent for volleyball. She has a very weak personality though, and is very dependent on other people''s opinions of her. Her best friend is Christina and one can often see Lariska chasing after Christina.'
 end
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000603
-else
-	npc_dob['A<<npctemp>>'] = 20010603
-end
+npc_dob['A<<npctemp>>'] = 20000603
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'jock'
@@ -401,11 +345,7 @@ $npc_firstname['A<<npctemp>>'] = 'Ekaterina'
 $npc_nickname['A<<npctemp>>'] = 'Katja'
 $npc_lastname['A<<npctemp>>'] = 'Meynold'
 $npc_usedname['A<<npctemp>>'] = 'Katja'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000224
-else
-	npc_dob['A<<npctemp>>'] = 20010224
-end
+npc_dob['A<<npctemp>>'] = 20000224
 $npc_notes['A<<npctemp>>'] = 'Katja Meynold is a very attractive and petite girl; a redhead with a special interest in fashion and cosmetics. She and her twin sister, Vicky, are like two sides of the same coin. As a quiet and sensible girl, Katja is shy and intelligent, but at times can also be impulsive. She can often be found at the disco with her sister.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
@@ -423,11 +363,7 @@ $npc_firstname['A<<npctemp>>'] = 'Viktoria'
 $npc_nickname['A<<npctemp>>'] = 'Vicky'
 $npc_lastname['A<<npctemp>>'] = 'Meynold'
 $npc_usedname['A<<npctemp>>'] = 'Vicky'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000224
-else
-	npc_dob['A<<npctemp>>'] = 20010224
-end
+npc_dob['A<<npctemp>>'] = 20000224
 $npc_notes['A<<npctemp>>'] = 'Vicky Meynold is the opposite of her sister, on one side a smart ass and on the other a cheerful girl. She is very sociable, being friends with many of the students in school and is considered to be one of the most popular girls in school. With a passionate love for dancing, Vicky can often be found at the disco with her sister and good friend Vanya Yanka. A good humored girl she loves bright and crazy colored clothing. As a child she took gymnastics and as a result has excellent flexibility. A bit flighty and unpredictable, you never know what thoughts she will come up with next. Logic and reason were never her strong suit as she lives by her emotions and feelings, making decisions from her heart rather than her head more often than not. Despite her flighty and unpredictable nature her liveliness and spontaneity make her fun to hang out with.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
@@ -446,11 +382,7 @@ $npc_firstname['A<<npctemp>>'] = 'Natasha'
 $npc_nickname['A<<npctemp>>'] = 'Natasha'
 $npc_lastname['A<<npctemp>>'] = 'Belova'
 $npc_usedname['A<<npctemp>>'] = 'Natasha'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19990706
-else
-	npc_dob['A<<npctemp>>'] = 20000706
-end
+npc_dob['A<<npctemp>>'] = 19990706
 $npc_notes['A<<npctemp>>'] = 'Natasha is an excellent student and one of the smartest people in your school. Even though you are living in the same building, her parents are very poor, and it shows as Natasha is always dressed in second-hand clothes and can never afford to do anything fun. As a result, she doesn''t have many friends, as most of the other girls shun her or mock her poor clothing.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
@@ -468,11 +400,7 @@ $npc_firstname['A<<npctemp>>'] = 'Irina'
 $npc_nickname['A<<npctemp>>'] = 'Inna'
 $npc_lastname['A<<npctemp>>'] = 'Devyatova'
 $npc_usedname['A<<npctemp>>'] = 'Irina'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000329
-else
-	npc_dob['A<<npctemp>>'] = 20010329
-end
+npc_dob['A<<npctemp>>'] = 20000329
 $npc_notes['A<<npctemp>>'] = 'Inna Devyatova is a tall and pretty girl, she knows it and takes full advantage of it. She has a very arrogant and haughty personality hidden behind her sweet smile. She often makes the boys do her dirty work.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
@@ -495,11 +423,7 @@ if zverSlutQW = 2:
 else
 	$npc_notes['A<<npctemp>>'] = 'Christina is one of your school''s best athletes, and is the strongest girl you know. She has leadership abilities that, together with her tenacity and intelligence, make her having a dominant presence wherever she goes. She is also more than a bit of a bully to most of the other girls in school.'
 end
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19991226
-else
-	npc_dob['A<<npctemp>>'] = 20001226
-end
+npc_dob['A<<npctemp>>'] = 19991226
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 $npc_firstpart['A<<npctemp>>'] = 'A69'
@@ -522,11 +446,7 @@ $npc_firstname['A<<npctemp>>'] = 'Avelina'
 $npc_nickname['A<<npctemp>>'] = 'Lina'
 $npc_lastname['A<<npctemp>>'] = 'Starov'
 $npc_usedname['A<<npctemp>>'] = 'Lina'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000224
-else
-	npc_dob['A<<npctemp>>'] = 20010224
-end
+npc_dob['A<<npctemp>>'] = 20000224
 $npc_notes['A<<npctemp>>'] = 'Lina Starov is a mediocre athlete. She''s sort of Christina''s friend... but not really, the right term you would use is Christina''s lapdog. She usually does anything Christina wants her to do as if she doesn''t have a mind of her own.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
@@ -544,11 +464,7 @@ $npc_firstname['A<<npctemp>>'] = 'Yalena'
 $npc_nickname['A<<npctemp>>'] = 'Lena'
 $npc_lastname['A<<npctemp>>'] = 'Kotov'
 $npc_usedname['A<<npctemp>>'] = 'Lena'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19991125
-else
-	npc_dob['A<<npctemp>>'] = 20001125
-end
+npc_dob['A<<npctemp>>'] = 19991125
 $npc_notes['A<<npctemp>>'] = 'Lena Kotov is Vitek''s twin sister. Just like her brother, she is one of the local Gopniks. With a chip on her shoulder, she can be aggressive and unpredictable. She''s best friends with Lera, and they can often be found together smoking in the school''s restrooms during school, or hanging out together after school.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
@@ -566,11 +482,7 @@ $npc_firstname['A<<npctemp>>'] = 'Valeria'
 $npc_nickname['A<<npctemp>>'] = 'Lera'
 $npc_lastname['A<<npctemp>>'] = 'Tsarev'
 $npc_usedname['A<<npctemp>>'] = 'Lera'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19990702
-else
-	npc_dob['A<<npctemp>>'] = 20000702
-end
+npc_dob['A<<npctemp>>'] = 19990702
 $npc_notes['A<<npctemp>>'] = 'Lera Tsarev comes from a poor family, her father works at the school as a teacher. She often hangs out with the Gopniks in your class and is liked by them. She''s best friends with Lena, and they can often be found together smoking in the school''s restrooms, or hanging out together after school. She is protective of Lena and always takes Lena''s lead.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'group', 'gopnik'

locations/npcstatic2.qsrc

@@ -137,7 +137,7 @@ $npc_nickname['A<<npctemp>>'] = 'Mira'
 $npc_usedname['A<<npctemp>>'] = 'Mira'
 $npc_lastname['A<<npctemp>>'] = 'Maximova'
 $npc_notes['A<<npctemp>>'] = 'Girl from Gadukino. Daughter of Afanasiy'
-npc_dob['A<<npctemp>>'] = ((school_year - 1) * 10000) + 0805
+npc_dob['A<<npctemp>>'] = 20000805
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 npc_bust['A<<npctemp>>'] = 9
@@ -150,7 +150,7 @@ $npc_firstname['A<<npctemp>>'] = 'Kolyamba'
 $npc_nickname['A<<npctemp>>'] = 'Kolyamba'
 $npc_usedname['A<<npctemp>>'] = 'Kolyamba'
 $npc_lastname['A<<npctemp>>'] = 'Rostislav'
-npc_dob['A<<npctemp>>'] = (school_year * 10000) + 65
+npc_dob['A<<npctemp>>'] = 20000065
 $npc_notes['A<<npctemp>>'] = 'Boy from Gadukino'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -165,7 +165,7 @@ $npc_nickname['A<<npctemp>>'] = 'Vasyan'
 $npc_usedname['A<<npctemp>>'] = 'Vasyan'
 $npc_lastname['A<<npctemp>>'] = 'Makarovich'
 $npc_notes['A<<npctemp>>'] = 'Boy from Gadukino'
-npc_dob['A<<npctemp>>'] = (school_year * 10000) + 96
+npc_dob['A<<npctemp>>'] = 20000096
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'thicker than average'
@@ -179,7 +179,7 @@ $npc_nickname['A<<npctemp>>'] = 'Mitka'
 $npc_usedname['A<<npctemp>>'] = 'Mitka'
 $npc_lastname['A<<npctemp>>'] = 'Ruslanov'
 $npc_notes['A<<npctemp>>'] = 'He is barely older than you, you remember him from your childhood.  You both used to swim in the local river together.'
-npc_dob['A<<npctemp>>'] = (school_year * 10000) + 117
+npc_dob['A<<npctemp>>'] = 20000117
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'thick'
@@ -209,7 +209,7 @@ $npc_nickname['A<<npctemp>>'] = 'Vitaliy'
 $npc_usedname['A<<npctemp>>'] = 'Vitaliy'
 $npc_lastname['A<<npctemp>>'] = 'Maximov'
 $npc_notes['A<<npctemp>>'] = 'Mira''s Brother'
-npc_dob['A<<npctemp>>'] = (school_year * 10000) + 643
+npc_dob['A<<npctemp>>'] = 20000643
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'thick'

locations/npcstatic4.qsrc

@@ -532,11 +532,7 @@ $npc_nickname['A<<npctemp>>'] = 'Niko'
 $npc_lastname['A<<npctemp>>'] = 'Volkov'
 $npc_usedname['A<<npctemp>>'] = 'Niko'
 $npc_notes['A<<npctemp>>'] = 'Nikolai Volkov is suave and clever but always finds ways of getting into trouble. When he is not drinking and partying then he is hanging out with Roman Yakovlev. Many students say that he only keeps Roman around as his own personal attack dog. Niko always seems confident, well spoken and knows how to get what he wants but when angered, Niko can become erratic and unstable.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000405
-else
-	npc_dob['A<<npctemp>>'] = 20010405
-end
+npc_dob['A<<npctemp>>'] = 20000405
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'gopnik'
@@ -554,11 +550,7 @@ $npc_nickname['A<<npctemp>>'] = 'Yurik'
 $npc_lastname['A<<npctemp>>'] = 'Volkov'
 $npc_usedname['A<<npctemp>>'] = 'Yurik'
 $npc_notes['A<<npctemp>>'] = 'Yurik Volkov is a burly biker, who spends most of his time customizing, upgrading and tuning his motorcycle when he is not on the road. He is the older brother of Nikolai Volkov. Yurik is 5 years older then Niko, and tries his best to advise, and provide a future for his brother even though Niko continuously pushes him away, still blaming him for their sister''s death.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19951116
-else
-	npc_dob['A<<npctemp>>'] = 19961116
-end
+npc_dob['A<<npctemp>>'] = 19951116
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_firstpart['A<<npctemp>>'] = 'V'
@@ -575,11 +567,7 @@ $npc_nickname['A<<npctemp>>'] = 'Bella'
 $npc_lastname['A<<npctemp>>'] = 'Belova'
 $npc_usedname['A<<npctemp>>'] = 'Isabella'
 $npc_notes['A<<npctemp>>'] = 'Your classmate Natasha''s mother, Isabella Belova.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19820922
-else
-	npc_dob['A<<npctemp>>'] = 19830922
-end
+npc_dob['A<<npctemp>>'] = 19820922
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 npc_bust['A<<npctemp>>'] = 23
@@ -603,11 +591,7 @@ $npc_nickname['A<<npctemp>>'] = 'Alexei'
 $npc_lastname['A<<npctemp>>'] = 'Radimov'
 $npc_usedname['A<<npctemp>>'] = 'Porn actor Alexei Steel'
 $npc_notes['A<<npctemp>>'] = 'Alexei works as a porn actor ever since he lost his job as a steel worker. He has a son and a daughter, and happily married. He planned porn as a temporary thing, but it become permanent, since he can spend more time with his family doing this, earning more money than with any other physical job. And he is sellable, being almost two meters tall and built like a blond, blue eyed, braided viking.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19851110
-else
-	npc_dob['A<<npctemp>>'] = 19861110
-end
+npc_dob['A<<npctemp>>'] = 19851110
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'monstrous'
@@ -626,11 +610,7 @@ $npc_nickname['A<<npctemp>>'] = 'Seryozha'
 $npc_lastname['A<<npctemp>>'] = 'Tatarov'
 $npc_usedname['A<<npctemp>>'] = 'Porn actor Sergei Stone'
 $npc_notes['A<<npctemp>>'] = 'Sergei is smooth, charming and handsome, but a real ass. Nobody likes to work with him, but he is a true professional and a really good actor. There are rumors about him raping a schoolgirl, but nobody knows anything.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19960311
-else
-	npc_dob['A<<npctemp>>'] = 19970311
-end
+npc_dob['A<<npctemp>>'] = 19960311
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'
@@ -650,11 +630,7 @@ $npc_nickname['A<<npctemp>>'] = 'Egori'
 $npc_lastname['A<<npctemp>>'] = 'Klyuyev'
 $npc_usedname['A<<npctemp>>'] = 'Porn actor George Drake'
 $npc_notes['A<<npctemp>>'] = 'Egor''s wife has been passed away for three years, he was cooped up in his home alone and his pension was really low when he saw a porn movie about an old guy fucking schoolgirls. He thought he would like to try out this, because he missed female company and the pay must be good too. He tried it out, and sticked with it. Everyone likes him, being a nice old grandpa who proudly shows his grandson''s pictures to everyone.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19550311
-else
-	npc_dob['A<<npctemp>>'] = 19560311
-end
+npc_dob['A<<npctemp>>'] = 19550311
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'slim'
@@ -674,11 +650,7 @@ $npc_nickname['A<<npctemp>>'] = 'Ignat'
 $npc_lastname['A<<npctemp>>'] = 'Vedenin'
 $npc_usedname['A<<npctemp>>'] = 'Porn actor Jason Black'
 $npc_notes['A<<npctemp>>'] = 'Ignat is from Kaliningrad and he lives in his own rented apartment near campus. He is a university student, and he thought this is a good way to make money and fuck girls at the same time. He is athletic, handsome and intelligent.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19980501
-else
-	npc_dob['A<<npctemp>>'] = 19990501
-end
+npc_dob['A<<npctemp>>'] = 19980501
 npc_vital['A<<npctemp>>'] = rand(40,50)
 npc_stren['A<<npctemp>>'] = rand(40,50)
 npc_intel['A<<npctemp>>'] = rand(40,50)
@@ -705,11 +677,7 @@ $npc_nickname['A<<npctemp>>'] = 'Syoma'
 $npc_lastname['A<<npctemp>>'] = 'Rodionov'
 $npc_usedname['A<<npctemp>>'] = 'Porn actor Simon Lee'
 $npc_notes['A<<npctemp>>'] = 'Symoa appears quite average: not athletic, average height, brown hair and brown eyes. He was a clerk at a store before he quit and traveled to the city looking for a new job. One of the actresses recommended him to try porn, because he appears inexhaustible in bed, capable to do it for hours, and his refactory period is nonexistent, meaning he could come in a girl and keep going without break. He obviously always has a job.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19941212
-else
-	npc_dob['A<<npctemp>>'] = 19951212
-end
+npc_dob['A<<npctemp>>'] = 19941212
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'

locations/npcstatic5.qsrc

@@ -689,11 +689,7 @@ $npc_firstname['A<<npctemp>>'] = 'Natalia'
 $npc_nickname['A<<npctemp>>'] = 'Nat'
 $npc_lastname['A<<npctemp>>'] = 'Pavlova'
 $npc_usedname['A<<npctemp>>'] = 'Natalia'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000330
-else
-	npc_dob['A<<npctemp>>'] = 20010330
-end
+npc_dob['A<<npctemp>>'] = 20000330
 $npc_notes['A<<npctemp>>'] = 'Natalia is a very smart but weak willed girl. She constantly struggles to maintain friendships but her good looks and eagerness to help others, prevents her from being an outcast. She is rarely seen with anyone but one thing she always keeps with her, is a special notebook that she never lets anyone touch.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'

locations/pav_complexb2.qsrc

@@ -136,7 +136,7 @@ if $ARGS[0] = 'roof':
 	'<center>The roof is fairly flat, with the roof access door in a raised part in the middle of the roof. Along one of the walls is another door to some type of storage or maintenances access. There is several ventilation stacks on the roof as well.</center>'
 
 	act 'Go down to the fifth floor':
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'nude' or $clothingworntype = 'beach':
 			msg '<center><font color = red>You need to get dressed first</font></center>'
 			gt 'pav_complexb2','roof'
 		else
@@ -144,7 +144,7 @@ if $ARGS[0] = 'roof':
 			gt 'pav_complexb2','etaj_5'
 		end
 	end
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude' or $clothingworntype = 'beach':
 		act 'Change back into clothes':
 			minut += 5
 			gs 'underwear', 'wear'
@@ -153,10 +153,10 @@ if $ARGS[0] = 'roof':
 		end
 	end
 	if temper >= 15 and hour >= 8 and hour <= 20:
-		if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'swimwear':
+		if func('changingroom','count_swim_item') > 0 and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 			act 'Change into a bikini':gt 'changingroom', 'view_swim_list'
 		end
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			act 'Sunbathe (1:00)':
 				cla
 				*clr

locations/pav_complexb3.qsrc

@@ -139,7 +139,7 @@ if $ARGS[0] = 'roof':
 	'<center>The roof is fairly flat, with the roof access door in a raised part in the middle of the roof. Along one of the walls is another door to some type of storage or maintenances access. There is several ventilation stacks on the roof as well.</center>'
 
 	act 'Go down to the fifth floor':
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 			msg '<center><font color = red>You need to get dressed first</font></center>'
 			gt 'pav_complexb3','roof'
 		else
@@ -147,7 +147,7 @@ if $ARGS[0] = 'roof':
 			gt 'pav_complexb3','etaj_5'
 		end
 	end
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 		act 'Change back into clothes':
 			minut += 5
 			gs 'underwear', 'wear'
@@ -156,10 +156,10 @@ if $ARGS[0] = 'roof':
 		end
 	end
 	if temper >= 15 and hour >= 8 and hour <= 20:
-		if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'swimwear':
+		if func('changingroom','count_swim_item') > 0 and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 			act 'Change into a bikini':gt 'changingroom', 'view_swim_list'
 		end
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			act 'Sunbathe (1:00)':
 				cla
 				*clr

locations/pod_ezd.qsrc

@@ -260,7 +260,7 @@ if $ARGS[0] = 'roof':
 	'<center>The roof is fairly flat, with the roof access door in a raised part in the middle of the roof. Along one of the walls is another door to some type of storage or maintenances access. There is several ventilation stacks on the roof as well.</center>'
 
 	act 'Go down to the fifth floor':
-		if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 			msg '<center><font color = red>You need to get dressed first</font></center>'
 			gt 'pod_ezd','roof'
 		else
@@ -269,7 +269,7 @@ if $ARGS[0] = 'roof':
 		end
 	end
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
-	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+	if $clothingworntype = 'swimwear' or $clothingworntype = 'beach' or $clothingworntype = 'nude':
 		act 'Change back into clothes':
 			minut += 5
 			gs 'underwear', 'wear'
@@ -278,10 +278,10 @@ if $ARGS[0] = 'roof':
 		end
 	end
 	if temper >= 15 and hour >= 8 and hour <= 20:
-		if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'swimwear':
+		if func('changingroom','count_swim_item') > 0 and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 			act 'Change into a bikini':gt 'changingroom', 'view_swim_list'
 		end
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			act 'Sunbathe (1:00)':
 				*clr & cla
 				minut += 60

locations/preCUST.qsrc

@@ -194,7 +194,6 @@ if $ARGS[0] = 'Done':
 			birthyear = year - age
 			birthmonth = 4
 			birthday = 1
-			school_year = 1998
 		end
 
 !!		Body
@@ -253,7 +252,6 @@ if $ARGS[0] = 'Done':
 			birthyear = year - age
 			birthmonth = 4
 			birthday = 1
-			school_year = 1998
 		end
 
 !!		Body

locations/preSYS.qsrc

@@ -71,7 +71,6 @@ if $ARGS[0] = 'CSBStart':
 	if birthday = 0: birthday = 1
 	
 	birthyear = 2000
-	school_year = 2000
 	yearlefttemp = 1
 	
 	!!Looks
@@ -190,7 +189,6 @@ if $ARGS[0] = 'SGStart':
 	StoryLine = 1
 
 	birthyear = 2000
-	school_year = 2000
 	yearlefttemp = 1
 	
 	if player_avatar = 0:

locations/saveupdater.qsrc

@@ -600,11 +600,7 @@ if $npc_firstname['A191'] ! 'Isabella':
 	$npc_lastname['A<<npctemp>>'] = 'Belova'
 	$npc_usedname['A<<npctemp>>'] = 'Isabella'
 	$npc_notes['A<<npctemp>>'] = 'Your classmate Natasha''s mother, Isabella Belova.'
-	if school_year = 2000:
-		npc_dob['A<<npctemp>>'] = 19820922
-	else
-		npc_dob['A<<npctemp>>'] = 19830922
-	end
+	npc_dob['A<<npctemp>>'] = 19820922
 	npc_gender['A<<npctemp>>'] = 1
 	gs 'npcstaticdefaults', 'defaults'
 	npc_bust['A<<npctemp>>'] = 23
@@ -848,11 +844,13 @@ if ml_update_1 = 0:
 	ml_update_1 = 1
 end
 
-!! changed $metkaM to $locM_arg and $metka to $loc_arg in the code
-$locM_arg = $metkaM
-$loc_arg = $metka
-killvar '$metkaM'
-killvar '$metka'
+!! changed $metkaM to $locM_arg and $metka to $loc_arg in the code - needed for correction saves saved prior to version 0.8.1
+if arrsize('$metkaM') > 0 or arrsize('$metka') > 0:
+	$locM_arg = $metkaM
+	$loc_arg = $metka
+	killvar '$metkaM'
+	killvar '$metka'
+end
 !!---------------------------------------------------------------
 
 --- saveupdater ---------------------------------

locations/stat_display.qsrc

@@ -321,7 +321,7 @@ $stat_bra_text = ''
 
 if $clothingworntype ! 'nude':
 	if CloThinness = 6:
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			$stat_bra_msg = 'Your breasts are clearly showing through your transparent swimsuit.'
 			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'exhibitionist':
@@ -335,7 +335,7 @@ if $clothingworntype ! 'nude':
 			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
 		end
 	elseif CloThinness = 5:
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			$stat_bra_msg = 'Your nipples are fully outlined through your swimsuit.'
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'exhibitionist':
@@ -358,7 +358,7 @@ if $clothingworntype ! 'nude':
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		end
 	elseif CloThinness = 4:
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			$stat_bra_msg = 'Your nipples are slightly poking through your swimsuit.'
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'exhibitionist':
@@ -397,7 +397,7 @@ end
 $stat_panty_msg = ''
 $stat_panty_text = ''
 
-if $pantyworntype = 'none' and $clothingworntype ! 'swimwear':
+if $pantyworntype = 'none' and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 	if PCloStyle = 4:
 		$stat_panty_msg = 'You are not wearing panties, but you are dressed as a hooker, so that''s hardly surprising.'
 		$stat_panty_text = '<BR><font color= #FF00FF><<$stat_panty_msg>></font>'
@@ -423,7 +423,7 @@ if $pantyworntype = 'none' and $clothingworntype ! 'swimwear':
 		$stat_panty_msg = 'You are not wearing '+iif($braworntype = 'none', 'any underwear.', 'panties.')
 		$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
 	end
-elseif $pantyworntype = 'exhibitionist' and $clothingworntype ! 'swimwear':
+elseif $pantyworntype = 'exhibitionist' and $clothingworntype ! 'swimwear' and $clothingworntype ! 'beach':
 	if PCloStyle = 4:
 		$stat_panty_msg = 'You are wearing see-through panties, but you are dressed as a hooker, so that''s hardly surprising.'
 		$stat_panty_text = '<BR><font color= #FF00FF><<$stat_panty_msg>></font>'
@@ -513,7 +513,7 @@ elseif $clothingworntype = 'exercise':
 		$stat_clothes_tooltip = 'Normal gym outfit.'
 		$stat_clothes_style = 'exercise'
 	end
-elseif $clothingworntype = 'swimwear':
+elseif $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 	if (PCloInhibit >= 50 or PCloThinness = 6) and PCloBimbo = 1 and cheatBimbo = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are dressed as a bimbo</font>'
 		$stat_clothes_msg = 'You''re wearing an exhibitionist swimsuit a bimbo would wear.'

locations/swamphouse.qsrc

@@ -559,7 +559,7 @@ if $ARGS[0] = 'tub':
 		dynamic $enema
 	end
 		
-	if hotwater = 1 and ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):
+	if hotwater = 1 and ($clothingworntype = 'nude' or $clothingworntype = 'swimwear' or $clothingworntype = 'beach'):
 		act 'Bathe in the tub (0:30)':
 			cla
 			*clr

locations/telefon.qsrc

@@ -57,7 +57,7 @@ $telefon['footer'] = {
 	$telefon['backButton'] = 'gs ''telefon'', ''Phone_menu'''
 }
 
-!! This is how we print the screnn on to the Additional Dscription window
+!! ''''This is how we print the screen on to the Additional Dscription window
 $telefon['print'] = {
 	clr
 	pl func('cleanHTML',dyneval($telefon['header']) + $telefon['body'] + dyneval($telefon['footer']))
@@ -1223,8 +1223,8 @@ if $ARGS[0] = 'Phone_notebook':
 			if m1 = 1 and d1 = 15:$calendarday += $list + 'Last day of Winter break.'
 			if m1 = 3 and d1 = 20:$calendarday += $list + 'First day of Spring break.'
 			if m1 = 3 and d1 = 26:$calendarday += $list + 'Last day of Spring break.'
-			if school_year = 2003 and y1 = 2020 and m1 = 5 and d1 = 25:$calendarday += $list + 'Graduation Day!'
-			if school_year = 2004 and y1 = 2021 and m1 = 6 and d1 = 1:$calendarday += $list + 'First day of Summer break.'
+			if y1 = 2017 and m1 = 5 and d1 = 25:$calendarday += $list + 'Graduation Day!'
+			if m1 = 6 and d1 = 1:$calendarday += $list + 'First day of Summer break.'
 			if m1 = 8 and d1 = 31:$calendarday += $list + 'Last day of Summer break.'
 			if m1 = 11 and d1 = 4:$calendarday += $list + 'First day of Autumn break.'
 			if m1 = 11 and d1 = 11:$calendarday += $list + 'Last day of Autumn break.'
@@ -1329,7 +1329,7 @@ end
 }
 if $ARGS[0] = 'Phone_selfie_image':
 	if $ARGS[2] = '':
-		if $clothingworntype = 'swimwear':
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
 			!!changing to and unmixed variable so the rng will work
 			dynamic 'temp_swim = <<selfieSwimtot[arrpos(1, ''$selfieLoc'', $ARGS[1])]>>'
 			if temp_swim > 0: