Browse Source

S -> _s, H -> _h, B -> _b (beach, swimwear, coat)

rachels 3 years ago
parent
commit
1b1373c37d

+ 2 - 2
locations/changingroom.qsrc

@@ -104,7 +104,7 @@ if $ARGS[0] = 'count_swim_item':
 	if $ARGS[1] = 'swim' or $ARGS[1] = '':
 		i = 1
 		:loopcountswimwear
-			if swimwear[i] = 1 and swimwearS[i] = 0 :h += 1
+			if swimwear[i] = 1 and swimwear_s[i] = 0 :h += 1
 			i += 1
 		if i <= ARRSIZE('swimwear'):jump 'loopcountswimwear'
 	end
@@ -112,7 +112,7 @@ if $ARGS[0] = 'count_swim_item':
 	if $ARGS[1] = 'beach' or $ARGS[1] = '':
 		i = 1
 		:loopcountbeach
-			if beach[i] = 1 and beachS[i] = 0 :h += 1
+			if beach[i] = 1 and beach_s[i] = 0 :h += 1
 			i += 1
 		if i <= ARRSIZE('beach'):jump 'loopcountbeach'
 	end

+ 1 - 1
locations/cikl.qsrc

@@ -159,7 +159,7 @@ Clothingstock[i] = rand (0,500)
 i += 1
 if i <= 147:jump 'loopprice'
 
-if coatH[defaultcoat] <= 0: defaultcoat = 0
+if coat_h[defaultcoat] <= 0: defaultcoat = 0
 
 !! Abortion and pregnancy recovery resets if finished
 

+ 6 - 6
locations/cloakroom.qsrc

@@ -18,13 +18,13 @@ $coat_list_line = {
 
 	$RESULT +='<TD><a href="exec:gt ''cloakroom'', ''view_coat_item'', <<ARGS[0]>>"><img src="<<FUNC(''$clothing_image'', ''coat'', ARGS[0])>>" width="<<clothing_temp>>"></a></TD>'
 
-	$RESULT += '<TD>Coat # <<ARGS[0]>><br>strength: ' + dyneval '$RESULT += coatH[<<ARGS[0]>>]'+'</TD>'
+	$RESULT += '<TD>Coat # <<ARGS[0]>><br>strength: ' + dyneval '$RESULT += coat_h[<<ARGS[0]>>]'+'</TD>'
 
 	$RESULT += '<TD>' + FUNC('$clothing_name', 'coat', ARGS[0]) + '</TD>'
 
 	$RESULT += '<TD><a href="exec:gt ''cloakroom'', ''view_coat_item'', <<ARGS[0]>>">View</a></TD>'
 
-	if coatH[i] > 0:
+	if coat_h[i] > 0:
 		$RESULT += '<TD><a href="exec:defaultcoat = ''<<i>>'' & gt ''cloakroom'', ''view_coat_list''">Wear</a></TD>'
 	end
 
@@ -35,19 +35,19 @@ $coat_list_line = {
 	$RESULT += '</TD>'
 
 	$RESULT += '<TD>'
-	if dyneval('RESULT = coatS[<<ARGS[0]>>]') = 0:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest'', <<ARGS[0]>>">Keep</a>'
-	if dyneval('RESULT = coatS[<<ARGS[0]>>]') = 2:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest1'', <<ARGS[0]>>">Unwanted</a>'
+	if dyneval('RESULT = coat_s[<<ARGS[0]>>]') = 0:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest'', <<ARGS[0]>>">Keep</a>'
+	if dyneval('RESULT = coat_s[<<ARGS[0]>>]') = 2:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest1'', <<ARGS[0]>>">Unwanted</a>'
 	$RESULT += '</TD>'}
 
 if $ARGS[0] = 'dest':
 	*clr
-	dynamic 'coatS[<<ARGS[1]>>] = 2'
+	dynamic 'coat_s[<<ARGS[1]>>] = 2'
 	gt 'cloakroom', 'view_coat_list'
 end
 
 if $ARGS[0] = 'dest1':
 	*clr
-	dynamic 'coatS[<<ARGS[1]>>] = 0'
+	dynamic 'coat_s[<<ARGS[1]>>] = 0'
 	gt 'cloakroom', 'view_coat_list'
 end
 

+ 3 - 3
locations/clothing.qsrc

@@ -403,7 +403,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopbeach
-				if beach[i] = 1 and beachS[i] = cloc and ($clothingworntype ! 'beach' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'beach', i)
+				if beach[i] = 1 and beach_s[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'
 
@@ -496,7 +496,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 			i = 1
 			:loopswimwear
-				if swimwear[i] = 1 and swimwearS[i] = cloc :*P dyneval($clothing_list_line, $ARGS[1], 'swimwear', i)
+				if swimwear[i] = 1 and swimwear_s[i] = cloc :*P dyneval($clothing_list_line, $ARGS[1], 'swimwear', i)
 				i += 1
 			if i <= ARRSIZE('swimwear'):jump 'loopswimwear'
 
@@ -773,7 +773,7 @@ if $ARGS[0] = 'view_clothing_item':
 
 		if $ARGS[2] ! 'coat':
 			act 'Move back to wardrobe':
-				dynamic $ARGS[2] + 'S[<<ARGS[3]>>] = 0'
+				dynamic $ARGS[2] + '_s[<<ARGS[3]>>] = 0'
 				gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
 			end
 		end

+ 1 - 1
locations/clothing_QV.qsrc

@@ -626,7 +626,7 @@ if $ARGS[0] = 'cloak':
 	i = 1
 	:loopcoat
 	if coat[i] = 1:
-		if coatH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''coat'', <<i>>"><img src="images/pc/clothing/11coat/<<i>>.jpg" 	height="250" /></a>'
+		if coat_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''coat'', <<i>>"><img src="images/pc/clothing/11coat/<<i>>.jpg" 	height="250" /></a>'
 	end
 	i += 1
 	if i <= ARRSIZE('coat'):jump 'loopcoat'

+ 3 - 3
locations/portnoi.qsrc

@@ -143,19 +143,19 @@ selltot = 0
 
 	i = 1
 	:coatmet
-		if coat[i] = 1 and coatS[i] = 2:dynamic($batch_sell, 'coat', i)
+		if coat[i] = 1 and coat_s[i] = 2:dynamic($batch_sell, 'coat', i)
 		i += 1
 	if i <= ARRSIZE('coat'):jump 'coatmet'
 
 	i = 1
 	:swimwearmet
-		if swimwear[i] = 1 and swimwearS[i] = 2:dynamic($batch_sell, 'swimwear', i)
+		if swimwear[i] = 1 and swimwear_s[i] = 2:dynamic($batch_sell, 'swimwear', i)
 		i += 1
 	if i <= ARRSIZE('swimwear'):jump 'swimwearmet'
 
 	i = 1
 	:beachmet
-		if beach[i] = 1 and beachS[i] = 2:dynamic($batch_sell, 'beach', i)
+		if beach[i] = 1 and beach_s[i] = 2:dynamic($batch_sell, 'beach', i)
 		i += 1
 	if i <= ARRSIZE('beach'):jump 'beachmet'
 

+ 4 - 4
locations/portnoi2.qsrc

@@ -88,13 +88,13 @@ if i <= ARRSIZE('gm_uniform'):jump 'yuniformmet'
 
 i = 1
 :yswimwearmet
-	if swimwear[i] = 1 and ((swimwearB[i] > pcs_hips + 8) or (swimwearB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if swimwear[i] = 1 and ((swimwear_b[i] > pcs_hips + 8) or (swimwear_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('swimwear'):jump 'yswimwearmet'
 
 i = 1
 :ybeachmet
-	if beach[i] = 1 and ((beachB[i] > pcs_hips + 8) or (beachB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if beach[i] = 1 and ((beach_b[i] > pcs_hips + 8) or (beach_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('beach'):jump 'ybeachmet'
 
@@ -230,13 +230,13 @@ elseif money >= poshvalldrop:
 
 	i = 1
 	:xswimwearmet
-		if swimwear[i] = 1 and ((swimwearB[i] > pcs_hips + 8) or (swimwearB[i] < pcs_hips - 8)):swimwearB[i] = pcs_hips
+		if swimwear[i] = 1 and ((swimwear_b[i] > pcs_hips + 8) or (swimwear_b[i] < pcs_hips - 8)):swimwear_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('swimwear'):jump 'xswimwearmet'
 
 	i = 1
 	:xbeachmet
-		if beach[i] = 1 and ((beachB[i] > pcs_hips + 8) or (beachB[i] < pcs_hips - 8)):beachB[i] = pcs_hips
+		if beach[i] = 1 and ((beach_b[i] > pcs_hips + 8) or (beach_b[i] < pcs_hips - 8)):beach_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('beach'):jump 'xbeachmet'
 

+ 3 - 0
locations/saveupdater.qsrc

@@ -860,6 +860,9 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 		killvar 'officeH' & killvar 'officeS' & killvar 'office'
 		killvar 'schoolH' & killvar 'schoolS' & killvar 'school'
 		killvar 'uniformH' & killvar 'uniformS' & killvar 'uniform'
+		killvar 'beachS' & killvar 'beachH' & killvar 'beachB'
+		killvar 'swimwearS' & killvar 'swimwearH' & killvar 'swimwearB'
+		killvar 'coatS' & killvar 'coatH'
 
 		gm_outfits[50] = 1
 		gm_outfits_h[50] = 100

+ 3 - 3
locations/shop.qsrc

@@ -389,8 +389,8 @@ if $shoplocation = 'clothing':
 						cla
 						money -= 1000
 						swimwear[4] = 1
-						swimwearH[4] = 60
-						swimwearB[4] = pcs_hips
+						swimwear_h[4] = 60
+						swimwear_b[4] = pcs_hips
 						gt 'shop', '<font color="green">You bought <b>swimwear 4</b>.</font>'
 					end
 				end
@@ -413,7 +413,7 @@ if $shoplocation = 'clothing':
 						cla
 						money -= 1400
 						coat[1] = 1
-						coatH[1] = 60
+						coat_h[1] = 60
 						gt 'shop', '<font color="green">You bought <b>coat 1</b>.</font>'
 					end
 				end