Procházet zdrojové kódy

[fixed] New higher inhib clothing wasn't being included in sort by "inhibition"

Kevin_Smarts před 1 rokem
rodič
revize
b29f658f5e
2 změnil soubory, kde provedl 30 přidání a 27 odebrání
  1. 24 24
      locations/clothing.qsrc
  2. 6 3
      locations/clothing_attributes.qsrc

+ 24 - 24
locations/clothing.qsrc

@@ -287,7 +287,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_filter'
 				jump 'loopgm_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_filter'
 				jump 'loopgm_filter'
 			end
 			end
 		end
 		end
@@ -324,7 +324,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_office_filter'
 				jump 'loopgm_office_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_office_filter'
 				jump 'loopgm_office_filter'
 			end
 			end
 		end
 		end
@@ -361,7 +361,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_maid_filter'
 				jump 'loopgm_maid_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_maid_filter'
 				jump 'loopgm_maid_filter'
 			end
 			end
 		end
 		end
@@ -398,7 +398,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_server_filter'
 				jump 'loopgm_server_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_server_filter'
 				jump 'loopgm_server_filter'
 			end
 			end
 		end
 		end
@@ -440,7 +440,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopgm_school_filter'
 				jump 'loopgm_school_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopgm_school_filter'
 				jump 'loopgm_school_filter'
 			end
 			end
 		end
 		end
@@ -477,7 +477,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopmisc_filter'
 				jump 'loopmisc_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopmisc_filter'
 				jump 'loopmisc_filter'
 			end
 			end
 		end
 		end
@@ -527,7 +527,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopcats_filter'
 				jump 'loopcats_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopcats_filter'
 				jump 'loopcats_filter'
 			end
 			end
 		end
 		end
@@ -577,7 +577,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopflamingos_filter'
 				jump 'loopflamingos_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopflamingos_filter'
 				jump 'loopflamingos_filter'
 			end
 			end
 		end
 		end
@@ -627,7 +627,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopcoco_filter'
 				jump 'loopcoco_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopcoco_filter'
 				jump 'loopcoco_filter'
 			end
 			end
 		end
 		end
@@ -677,7 +677,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopfashionista_filter'
 				jump 'loopfashionista_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopfashionista_filter'
 				jump 'loopfashionista_filter'
 			end
 			end
 		end
 		end
@@ -727,7 +727,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopmoncheri_filter'
 				jump 'loopmoncheri_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopmoncheri_filter'
 				jump 'loopmoncheri_filter'
 			end
 			end
 		end
 		end
@@ -777,7 +777,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopscandalicious_filter'
 				jump 'loopscandalicious_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopscandalicious_filter'
 				jump 'loopscandalicious_filter'
 			end
 			end
 		end
 		end
@@ -828,7 +828,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopscandalicious_swim_filter'
 				jump 'loopscandalicious_swim_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopscandalicious_swim_filter'
 				jump 'loopscandalicious_swim_filter'
 			end
 			end
 		end
 		end
@@ -879,7 +879,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopallure_filter'
 				jump 'loopallure_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopallure_filter'
 				jump 'loopallure_filter'
 			end
 			end
 		end
 		end
@@ -916,7 +916,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopfancy_filter'
 				jump 'loopfancy_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopfancy_filter'
 				jump 'loopfancy_filter'
 			end
 			end
 		end
 		end
@@ -981,7 +981,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'looperoto__filter'
 				jump 'looperoto__filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'looperoto__filter'
 				jump 'looperoto__filter'
 			end
 			end
 		end
 		end
@@ -1032,7 +1032,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopsalacious_filter'
 				jump 'loopsalacious_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopsalacious_filter'
 				jump 'loopsalacious_filter'
 			end
 			end
 		end
 		end
@@ -1083,7 +1083,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopdolls_filter'
 				jump 'loopdolls_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopdolls_filter'
 				jump 'loopdolls_filter'
 			end
 			end
 		end
 		end
@@ -1133,7 +1133,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopbomba_filter'
 				jump 'loopbomba_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopbomba_filter'
 				jump 'loopbomba_filter'
 			end
 			end
 		end
 		end
@@ -1210,7 +1210,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopnerdvana_filter'
 				jump 'loopnerdvana_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopnerdvana_filter'
 				jump 'loopnerdvana_filter'
 			end
 			end
 		end
 		end
@@ -1261,7 +1261,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopdanilovich_outfits_filter'
 				jump 'loopdanilovich_outfits_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopdanilovich_outfits_filter'
 				jump 'loopdanilovich_outfits_filter'
 			end
 			end
 		end
 		end
@@ -1298,7 +1298,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopmarket_outfits_filter'
 				jump 'loopmarket_outfits_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopmarket_outfits_filter'
 				jump 'loopmarket_outfits_filter'
 			end
 			end
 		end
 		end
@@ -1335,7 +1335,7 @@ if $ARGS[0] = 'clothing_list':
 			clo_i += 1
 			clo_i += 1
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 			if clothingfilter['quality'] = 0 and clo_i <= 7:
 				jump 'loopmaterinstvo_dress_filter'
 				jump 'loopmaterinstvo_dress_filter'
-			elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+			elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 				jump 'loopmaterinstvo_dress_filter'
 				jump 'loopmaterinstvo_dress_filter'
 			end
 			end
 		end
 		end
@@ -1348,7 +1348,7 @@ if $ARGS[0] = 'clothing_list':
 		clo_i += 1
 		clo_i += 1
 		if clothingfilter['quality'] = 0 and clo_i <= 7:
 		if clothingfilter['quality'] = 0 and clo_i <= 7:
 			jump 'loopfilter_all'
 			jump 'loopfilter_all'
-		elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		elseif clothingfilter['inhibition'] = 0 and clo_i <= 50:
 			jump 'loopfilter_all'
 			jump 'loopfilter_all'
 		end
 		end
 		act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 		act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'

+ 6 - 3
locations/clothing_attributes.qsrc

@@ -81,14 +81,17 @@
 !!				1 Breasts can barely be seen through material if you look hard enough, inc. fine mesh
 !!				1 Breasts can barely be seen through material if you look hard enough, inc. fine mesh
 !!
 !!
 !!	Figures for CloInhibit values, these are the maximums for each range. Currently all set to lowest figure in range but to add random element when time permits
 !!	Figures for CloInhibit values, these are the maximums for each range. Currently all set to lowest figure in range but to add random element when time permits
-!!0:	dress:1					pants:1		top:2			thickness:2
+!!0:	dress:1					pants:1		top:2			thickness:2			
 !!5:	dress:2					pants:3		top:2			thickness:3
 !!5:	dress:2					pants:3		top:2			thickness:3
 !!10:	dress:3					pants:4		top:2			thickness:4
 !!10:	dress:3					pants:4		top:2			thickness:4
 !!15:	dress:3					pants:4		top:3			thickness:4
 !!15:	dress:3					pants:4		top:3			thickness:4
 !!20:	dress:4 				pants:4		top:3			thickness:4
 !!20:	dress:4 				pants:4		top:3			thickness:4
 !!25:	dress:4 and CloPanties	pants:5		top:4			thickness:5
 !!25:	dress:4 and CloPanties	pants:5		top:4			thickness:5
-!!30:	dress:5					pants:6		top: - CloBra	thickness:5
-!!35:	dress:6					pants:6		top: - CloBra	thickness:6
+!!30:	dress:5					pants:6		top: - CloBra	thickness:5									CloCoverTop:2
+!!35:	dress:6					pants:6		top: - CloBra	thickness:6			CloCoverFront:1			CloCoverTop:2
+!!40:																			CloCoverFront:2			CloCoverTop:3
+!!45:																			CloCoverFront:3			CloCoverTop:4
+!!50:																			CloCoverFront:4
 !!40-60:	All but Exhibit
 !!40-60:	All but Exhibit
 !!60+:	Can wear Exhibitionist clothing
 !!60+:	Can wear Exhibitionist clothing