[fixed] Nerdavana swimsuit now will work as swimsuits. + a file missing from my last commit.

locations/_body_image.qsrc

@@ -94,6 +94,12 @@ if $ARGS[0] = 'clothes':
 			elseif $clothingworntype = 'allure_bikinis':
 				FUNC('$attributes_allure_swim_two', $clothingworntype, clothingwornnumber)
 				$swimwear_description
+			elseif $clothingworntype = 'nerdvana_swimsuit':
+				FUNC('$attributes_nerdvana_swim_one', $clothingworntype, clothingwornnumber)
+				$swimwear_description
+			elseif $clothingworntype = 'nerdvana_bikinis':
+				FUNC('$attributes_nerdvana_swim_two', $clothingworntype, clothingwornnumber)
+				$swimwear_description
 			end
 		end
 

locations/changingroom.qsrc

@@ -5,7 +5,7 @@ menu_off = 1
 
 if $ARGS[0] = 'view_swim_list':
 
-	if ARRSIZE('danilovich_swimsuit') = 0 and ARRSIZE('scandalicious_swimsuit') = 0 and ARRSIZE('scandalicious_bikinis') = 0 and ARRSIZE('allure_swimsuit') = 0 and ARRSIZE('allure_bikinis') = 0:
+	if ARRSIZE('danilovich_swimsuit') = 0 and ARRSIZE('scandalicious_swimsuit') = 0 and ARRSIZE('scandalicious_bikinis') = 0 and ARRSIZE('allure_swimsuit') = 0 and ARRSIZE('allure_bikinis') = 0 and ARRSIZE('nerdvana_swimsuit') = 0 and ARRSIZE('nerdvana_bikinis') = 0:
 		'<center>You do not own any swimwear.</center>'
 	elseif $loc = 'fit' or $loc = 'bass' or temper >= 15:
 		if PCloswimwear = 0:
@@ -62,6 +62,24 @@ if $ARGS[0] = 'view_swim_list':
 
 		if $clothingworntype = 'swimwear' or $clothingworntype = 'scandalicious_swimsuit' or $clothingworntype = 'scandalicious_bikinis': '<center>You are wearing swimwear.</center>'
 
+		*nl
+
+		i = 1
+		:loopnerdvana_swimsuit
+			if nerdvana_swimsuit[i] = 1 and nerdvana_swimsuit_s[i] = 0 and ($clothingworntype ! 'nerdvana_swimsuit' or clothingwornnumber ! i):*p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''nerdvana_swimsuit'', <<i>>"><img <<$set_imgh>> src="images/pc/items/nerdvana/swim/one/<<i>>.jpg" 	height="250" /></a>'
+			i += 1
+		if i <= ARRSIZE('nerdvana_swimsuit'):jump 'nerdvana_swimsuit'
+
+		*nl
+
+		i = 1
+		:loopnerdvana_bikinis
+			if nerdvana_bikinis[i] = 1 and nerdvana_bikinis_s[i] = 0 and ($clothingworntype ! 'nerdvana_bikinis' or clothingwornnumber ! i):*p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''nerdvana_bikinis'', <<i>>"><img <<$set_imgh>> src="images/pc/items/nerdvana/swim/two/<<i>>.jpg" 	height="250" /></a>'
+			i += 1
+		if i <= ARRSIZE('nerdvana_bikinis'):jump 'loopnerdvana_bikinis'
+
+		if $clothingworntype = 'swimwear' or $clothingworntype = 'scandalicious_swimsuit' or $clothingworntype = 'scandalicious_bikinis': '<center>You are wearing swimwear.</center>'
+
 	elseif temper < 15:
 		'<center>It''s below 15C - far too cold to get changed into swimwear. You should wait until the weather warms up.</center>'
 	end
@@ -101,6 +119,12 @@ if $ARGS[0] = 'view_swim_item':
 	elseif $ARGS[1] = 'allure_bikinis':
 		FUNC('$attributes_allure_swim_two', $ARGS[1], ARGS[2])
 		$swimwear_description
+	elseif $ARGS[1] = 'nerdvana_swimsuit':
+		FUNC('$attributes_nerdvana_swim_one', $ARGS[1], ARGS[2])
+		$swimwear_description
+	elseif $ARGS[1] = 'nerdvana_bikinis':
+		FUNC('$attributes_nerdvana_swim_two', $ARGS[1], ARGS[2])
+		$swimwear_description
 	end
 
 	$RESULT = '(strength '
@@ -175,6 +199,22 @@ if $ARGS[0] = 'count_swim_item':
 			i += 1
 		if i <= ARRSIZE('allure_bikinis'):jump 'loopcount_allure_bikinis'
 	end
+
+	if $ARGS[1] = 'nerdvana_swimsuit' or $ARGS[1] = '':
+		i = 1
+		:loopcount_nerdvana_swimsuit
+			if nerdvana_swimsuit[i] = 1 and nerdvana_swimsuit_s[i] = 0 :h += 1
+			i += 1
+		if i <= ARRSIZE('nerdvana_swimsuit'):jump 'loopcount_nerdvana_swimsuit'
+	end
+
+	if $ARGS[1] = 'nerdvana_bikinis' or $ARGS[1] = '':
+		i = 1
+		:loopcount_nerdvana_bikinis
+			if nerdvana_bikinis[i] = 1 and nerdvana_bikinis_s[i] = 0 :h += 1
+			i += 1
+		if i <= ARRSIZE('nerdvana_bikinis'):jump 'loopcount_nerdvana_bikinis'
+	end
 	result = h
 	killvar 'i'
 	killvar 'h'

locations/city_lake.qsrc

@@ -30,7 +30,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 ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis':
+	if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis' and $clothingworntype ! 'nerdvana_swimsuit' and $clothingworntype ! 'nerdvana_bikinis':
 		'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.'
@@ -44,7 +44,7 @@ if $ARGS[0] = 'start':
 
 	if car > 0 and cardrive = 4:
 		cardrive = 4
-		if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis':
+		if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis' and $clothingworntype ! 'nerdvana_swimsuit' and $clothingworntype ! 'nerdvana_bikinis':
 			'At the lake stands <a href="exec:GS ''carF'', ''start''">your <<$car>></a>.'
 		else
 			'At the lake stands your <<$car>>, you should get properly dressed if you want to drive away.'

locations/clothing.qsrc

@@ -60,7 +60,7 @@ $clothing_list_line = {
 	if $ARGS[0] ! 'sell' and $ARGS[0] ! 'resize':
 		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $ARGS[1] = 'gm_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[2] ! 'danilovich_swimsuit' and $ARGS[2] ! 'scandalicious_bikinis' and $ARGS[2] ! 'scandalicious_swimsuit' and $ARGS[2] ! 'allure_bikinis' and $ARGS[2] ! 'allure_bikinis' and dyneval('RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]') > 0:
+		elseif $ARGS[2] ! 'danilovich_swimsuit' and $ARGS[2] ! 'scandalicious_bikinis' and $ARGS[2] ! 'scandalicious_swimsuit' and $ARGS[2] ! 'allure_bikinis' and $ARGS[2] ! 'allure_bikinis' and $ARGS[2] ! 'nerdvana_bikinis' and $ARGS[2] ! 'nerdvana_swimsuit' and dyneval('RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]') > 0:
 			if $ARGS[1] ! 'danilovich_outfits' 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
@@ -233,7 +233,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 		if ARRSIZE('bomba_outfits') > 0 or ARRSIZE('nerdvana_cosplay') > 0:'<center><a href="exec:$ward_list_store = ''bomba'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''bomba''"><img src="images/locations/pushkin/bomba/shop_name.png"></a></center>'
 
-		if ARRSIZE('nerdvana_outfits') > 0 or ARRSIZE('nerdvana_cosplay') > 0:'<center><a href="exec:$ward_list_store = ''nerdvana'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''nerdvana''"><img src="images/locations/city/island/nerdvana/shop_name.png"></a></center>'
+		if ARRSIZE('nerdvana_outfits') > 0 or ARRSIZE('nerdvana_cosplay') > 0 or ARRSIZE('nerdvana_bikinis') > 0 or ARRSIZE('nerdvana_swimsuit') > 0:'<center><a href="exec:$ward_list_store = ''nerdvana'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''nerdvana''"><img src="images/locations/city/island/nerdvana/shop_name.png"></a></center>'
 
 		if ARRSIZE('danilovich_outfits') > 0:'<center><a href="exec:$ward_list_store = ''sports'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
 
@@ -595,8 +595,24 @@ if $ARGS[0] = 'view_clothing_list':
 
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 			gs 'clothing', 'clothwidth'
-		end
 
+			i = 1
+			:loopnerdvana_bikinis
+				if nerdvana_bikinis[i] = 1 and nerdvana_bikinis_s[i] = cloc and ($clothingworntype ! 'nerdvana_bikinis' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'nerdvana_bikinis', i)
+				i += 1
+			if i <= ARRSIZE('nerdvana_bikinis'):jump 'loopnerdvana_bikinis'
+
+			$ward_list_store = $ARGS[2]
+			i = 1
+			:loopnerdvana_swimsuit
+				if nerdvana_swimsuit[i] = 1 and nerdvana_swimsuit_s[i] = cloc and ($clothingworntype ! 'nerdvana_swimsuit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'nerdvana_swimsuit', i)
+				i += 1
+			if i <= ARRSIZE('nerdvana_swimsuit'):jump 'loopnerdvana_swimsuit'
+
+			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
+			gs 'clothing', 'clothwidth'
+		end
+		
 		if $ARGS[2] = 'sports':
 			$ward_list_store = $ARGS[2]
 			i = 1
@@ -1183,7 +1199,7 @@ if $ARGS[0] = 'wear':
 
 	if PCloPanties = 1: PXCloBottomShortness = 400
 
-	if $clothingworntype = 'danilovich_swimsuit' or $clothingworntype = 'scandalicious_swimsuit' or $clothingworntype = 'scandalicious_bikinis' or $clothingworntype = 'allure_swimsuit' or $clothingworntype = 'allure_bikinis': PCloswimwear = 1
+	if $clothingworntype = 'danilovich_swimsuit' or $clothingworntype = 'scandalicious_swimsuit' or $clothingworntype = 'scandalicious_bikinis' or $clothingworntype = 'allure_swimsuit' or $clothingworntype = 'allure_bikinis' or $clothingworntype = 'nerdvana_swimsuit' or $clothingworntype = 'nerdvana_bikinis' : PCloswimwear = 1
 end
 
 if $ARGS[0] = 'wear_last_worn':

locations/praiders_garage.qsrc

@@ -59,7 +59,7 @@ if $ARGS[0] = 'band_garage':
 		end
 	else
 		'<center>Five Eight Estate - Garages</center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garages.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garage/garages.jpg"></center>'
 		'You go to the garage and find it locked up, you can''t hear any noise from inside. It looks like no one is currently here.'
 		act 'Leave':gt 'pav_complex', 'garages'
 	end

locations/underwear.qsrc

@@ -11,7 +11,7 @@ end
 
 if $ARGS[0] = 'remove':
 	!!check for swimwear to prevent duplicate stripping stopping Sveta putting underwear on when she puts her clothes on
-	if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
+	if $clothingworntype ! 'danilovich_swimsuit' and $clothingworntype ! 'scandalicious_swimsuit' and $clothingworntype ! 'scandalicious_bikinis' and $clothingworntype ! 'allure_swimsuit' and $clothingworntype ! 'allure_bikinis' and $clothingworntype ! 'nerdvana_swimsuit' and $clothingworntype ! 'nerdvana_bikinis' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
 		if $pantyworntype = 'none':
 			panty_none = 1
 		else