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

locations/panties.qsrc

@@ -28,13 +28,11 @@ if $ARGS[0] = 'wear':
 	panty_none = 0
 	if $ARGS[1] = '':
 		if dyneval('RESULT = <<$lastwornbratype>>_pantiesS[<<lastwornbranumber>>]') = 0 and $lastwornbratype ! '':
-			if $lastwornpantytype ! '':
-				$pantyworntype = $lastwornpantytype
-				pantywornnumber = lastwornpantynumber
-			else
-				$pantyworntype = 'none'
-				pantywornnumber = 0
-			end
+			$pantyworntype = $lastwornpantytype
+			pantywornnumber = lastwornpantynumber
+		else
+			$pantyworntype = 'none'
+			pantywornnumber = 0
 		end
 	else
 		if dyneval('RESULT = <<$ARGS[1]>>_pantiesS[<<ARGS[2]>>]') = 0:

locations/shop_nerdvana.qsrc

@@ -196,8 +196,10 @@ if $ARGS[0] = 'bikinis':
 
 	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality3
+	!!To filter just this set
+	clo_i = 0
+	:loopnerdvana_bikinis_filter
+
 	i = 1
 
 		:loopnerdvana_bikinis
@@ -205,14 +207,20 @@ if $ARGS[0] = 'bikinis':
 				gs 'clothing_attributes', 'nerdvana_bikinis', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_nerdvana'', ''bikini1''"><img src="images/pc/items/nerdvana/swim/two/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_nerdvana'', ''bikini1''"><img src="images/pc/items/nerdvana/swim/two/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 30:jump 'loopnerdvana_bikinis'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopnerdvana_bikinis_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopnerdvana_bikinis_filter'
+	end
 end
 
 if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'nerdvana_bikinis',i, 1750, 'shop'