Browse Source

[fixes] References to swimwear to include those from Sandalicious so you can swim in them and not escape the beaches in them through events anymore.

KevinSmarts 3 years ago
parent
commit
dcb5e9cee3

+ 1 - 1
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'

+ 2 - 2
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>'

+ 1 - 1
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 = 'beach' or $clothingworntype = 'nude':
 	act'Get dressed':
 		cla
 		*clr

+ 5 - 5
locations/city_lake.qsrc

@@ -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

+ 3 - 3
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'
@@ -1649,7 +1649,7 @@ if $ARGS[0] = 'pos53':
 		if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'swimwear':
 			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

+ 1 - 1
locations/fit.qsrc

@@ -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'

+ 29 - 35
locations/gLakeNude.qsrc

@@ -132,7 +132,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 		pcs_mood += 5
 		gs 'stat'
 
-		if $clothingworntype = 'swimwear' and pcs_hips<=90:
+		if ($clothingworntype = 'swimwear' and pcs_hips<=90) or $clothingworntype = 'beach':
 			'<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:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,0.jpg"></center>'
@@ -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,35 +182,29 @@ 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':
-				*clr & cla
-				minut = minut + 30
-				if pcs_sweat < 35 : gs 'sweat', 'add', 5
-				pcs_mood += 5
-				if $clothingworntype = 'swimwear':
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/sunbath.jpg"></center>'
-					if pcs_inhib < 50:inhib_exp += rand(1,2)
-				else
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/sunbathnude.jpg"></center>'
-					inhib_exp += rand(1,3)
-				end
-				if krem = 0:
-					pcs_tan += 1
-					'You lie down on your towel for some sunbathing and hopefully a nicer tan, and enjoy the warm rays of the sun on your body.'
-				else
-					krem -= 1
-					pcs_tan += 3
-					'You smear your body with sunscreen and lie down on your towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun on your body.'
-				end
-				act 'Continue': gt 'gLakeNude'
+			*clr & cla
+			minut = minut + 30
+			if pcs_sweat < 35 : gs 'sweat', 'add', 5
+			pcs_mood += 5
+			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
-				cla
-				'You have to take off your clothes before you can lay down to sunbathe.'
-				act 'Continue': gt 'gLakeNude'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/sunbathnude.jpg"></center>'
+				inhib_exp += rand(1,3)
+			end
+			if krem = 0:
+				pcs_tan += 1
+				'You lie down on your towel for some sunbathing and hopefully a nicer tan, and enjoy the warm rays of the sun on your body.'
+			else
+				krem -= 1
+				pcs_tan += 3
+				'You smear your body with sunscreen and lie down on your towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun on your body.'
 			end
+			act 'Continue': gt 'gLakeNude'
 		end
 	end
 	
@@ -350,7 +344,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 +376,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 +399,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 +410,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 +448,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 +460,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 +491,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

+ 8 - 8
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'
@@ -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'
@@ -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>'

+ 5 - 5
locations/glake.qsrc

@@ -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':
@@ -219,7 +219,7 @@ 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' and pcs_hips<=90) or $clothingworntype = 'beach':
 			'<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:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.walk.bikini.fat0,0.jpg"></center>'
@@ -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

+ 1 - 1
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

+ 2 - 2
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

+ 13 - 13
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
@@ -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
@@ -1147,7 +1147,7 @@ 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 = '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
 

+ 3 - 3
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 = 'beach' or $clothingworntype = 'nude':
 			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 = 'beach' or $clothingworntype = 'nude':
 		act 'Change back into clothes':
 			minut += 5
 			gs 'underwear', 'wear'
@@ -156,7 +156,7 @@ if $ARGS[0] = 'roof':
 		if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'swimwear':
 			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

+ 3 - 3
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'
@@ -159,7 +159,7 @@ if $ARGS[0] = 'roof':
 		if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'swimwear':
 			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

+ 3 - 3
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'
@@ -281,7 +281,7 @@ if $ARGS[0] = 'roof':
 		if ARRSIZE('swimwear') > 0 and $clothingworntype ! 'swimwear':
 			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

+ 24 - 9
locations/stat_display.qsrc

@@ -321,8 +321,12 @@ $stat_bra_text = ''
 
 if $clothingworntype ! 'nude':
 	if CloThinness = 6:
-		if $clothingworntype = 'swimwear':
-			$stat_bra_msg = 'Your breasts are clearly showing through your transparent swimsuit.'
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+			if CloBra = 2:
+				$stat_bra_msg = 'Your breasts are clearly on display in your topless swimwear.'
+			else
+				$stat_bra_msg = 'Your breasts are clearly showing through your transparent swimsuit.'
+			end
 			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'exhibitionist':
 			$stat_bra_msg = 'Your breasts are fully on display through your transparent bra and top.'
@@ -335,8 +339,12 @@ if $clothingworntype ! 'nude':
 			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
 		end
 	elseif CloThinness = 5:
-		if $clothingworntype = 'swimwear':
-			$stat_bra_msg = 'Your nipples are fully outlined through your swimsuit.'
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+			if CloBra = 2:
+				$stat_bra_msg = 'Your breasts are clearly on display in your topless swimwear.'
+			else
+				$stat_bra_msg = 'Your nipples are fully outlined through your swimsuit.'
+			end
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'exhibitionist':
 			$stat_bra_msg = 'Your nipples are being fully outlined through the thin fabric of your top and bra.'
@@ -358,8 +366,12 @@ if $clothingworntype ! 'nude':
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		end
 	elseif CloThinness = 4:
-		if $clothingworntype = 'swimwear':
-			$stat_bra_msg = 'Your nipples are slightly poking through your swimsuit.'
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':
+			if CloBra = 2:
+				$stat_bra_msg = 'Your breasts are clearly on display in your topless swimwear.'
+			else
+				$stat_bra_msg = 'Your nipples are slightly poking through your swimsuit.'
+			end
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'exhibitionist':
 			$stat_bra_msg = 'You are wearing such a thin bra that your nipples are still being fainly outlined through your top.'
@@ -380,8 +392,11 @@ if $clothingworntype ! 'nude':
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		end
 	elseif CloBra = 1:
-			$stat_bra_msg = 'Your top is replacing a bra.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+		$stat_bra_msg = 'Your top is replacing a bra.'
+		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+	elseif CloBra = 2 and $braworntype = 'none':
+		$stat_bra_msg = 'Your breasts are fully exposed.'
+		$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
 	elseif $braworntype = 'none' and pcs_horny >= 50:
 		$stat_bra_msg = 'You are not wearing a bra and your aroused nipples are rock hard.'
 		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
@@ -513,7 +528,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.'

+ 1 - 1
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

+ 2 - 2
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']))
@@ -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: