Browse Source

fix the composite variable names related to "_h"

rachels 3 years ago
parent
commit
76f7f152f4

+ 2 - 2
locations/changingroom.qsrc

@@ -69,14 +69,14 @@ if $ARGS[0] = 'view_swim_item':
 	FUNC('$clothing_name', $ARGS[1], ARGS[2])
 	FUNC('$clothing_name', $ARGS[1], ARGS[2])
 
 
 	$RESULT = '(strength '
 	$RESULT = '(strength '
-	dynamic '$RESULT += <<$ARGS[1]>>H[<<ARGS[2]>>]'
+	dynamic '$RESULT += <<$ARGS[1]>>_h[<<ARGS[2]>>]'
 	$RESULT += ')'
 	$RESULT += ')'
 	'<<$RESULT>>'
 	'<<$RESULT>>'
 
 
 	act 'Return':gt 'changingroom', 'view_swim_list'
 	act 'Return':gt 'changingroom', 'view_swim_list'
 	
 	
 	!! if the clothing is worn out
 	!! if the clothing is worn out
-	if dyneval('RESULT = <<$ARGS[1]>>H[<<ARGS[2]>>]') <= 0:
+	if dyneval('RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]') <= 0:
 		'This item is worn and is not suitable for further wear.'
 		'This item is worn and is not suitable for further wear.'
 		act 'Throw it away':
 		act 'Throw it away':
 			dynamic '<<$ARGS[1]>>[<<ARGS[2]>>] = 0'
 			dynamic '<<$ARGS[1]>>[<<ARGS[2]>>] = 0'

+ 5 - 5
locations/clothing.qsrc

@@ -22,7 +22,7 @@ $clothing_list_line = {
 	gs 'clothing_attributes', $ARGS[1], ARGS[2]
 	gs 'clothing_attributes', $ARGS[1], ARGS[2]
 
 
 	if $ARGS[1] ! 'school' or ARGS[2] ! 6:
 	if $ARGS[1] ! 'school' or ARGS[2] ! 6:
-		$RESULT += '<TD>' + dyneval '$RESULT += <<$ARGS[1]>>H[<<ARGS[2]>>]' + '</TD>'
+		$RESULT += '<TD>' + dyneval '$RESULT += <<$ARGS[1]>>_h[<<ARGS[2]>>]' + '</TD>'
 
 
 		if $ARGS[1] ! 'exercise' and $ARGS[1] ! 'coat' and CloStyle ! 5:
 		if $ARGS[1] ! 'exercise' and $ARGS[1] ! 'coat' and CloStyle ! 5:
 			$RESULT += '<TD>' + dyneval '$RESULT += <<$ARGS[1]>>B[<<ARGS[2]>>]' + '</TD>'
 			$RESULT += '<TD>' + dyneval '$RESULT += <<$ARGS[1]>>B[<<ARGS[2]>>]' + '</TD>'
@@ -59,7 +59,7 @@ $clothing_list_line = {
 	if $ARGS[0] ! 'sell' and $ARGS[0] ! 'resize':
 	if $ARGS[0] ! 'sell' and $ARGS[0] ! 'resize':
 		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $ARGS[1] = 'school' and ARGS[2] = 6:
 		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $ARGS[1] = '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>'
 			$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[1] ! 'coat' and $ARGS[1] ! 'swimwear' and $ARGS[1] ! 'beach') and dyneval('RESULT = <<$ARGS[1]>>H[<<ARGS[2]>>]') > 0:
+		elseif ($ARGS[1] ! 'coat' and $ARGS[1] ! 'swimwear' and $ARGS[1] ! 'beach') and dyneval('RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]') > 0:
 			if $ARGS[1] ! 'exercise' 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):
 			if $ARGS[1] ! 'exercise' 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>'
 				$RESULT += '</TD>'
 			else
 			else
@@ -582,7 +582,7 @@ if $ARGS[0] = 'view_clothing_item':
 
 
 	if $ARGS[1] ! 'shop' and ($ARGS[2] ! 'school' or ARGS[3] ! 6):
 	if $ARGS[1] ! 'shop' and ($ARGS[2] ! 'school' or ARGS[3] ! 6):
 		$RESULT = '(strength '
 		$RESULT = '(strength '
-		dynamic '$RESULT += <<$ARGS[2]>>H[<<ARGS[3]>>]'
+		dynamic '$RESULT += <<$ARGS[2]>>_h[<<ARGS[3]>>]'
 		if $ARGS[2] ! 'exercise' and $ARGS[2] ! 'coat' and CloStyle ! 5:
 		if $ARGS[2] ! 'exercise' and $ARGS[2] ! 'coat' and CloStyle ! 5:
 			$RESULT += ', hip size '
 			$RESULT += ', hip size '
 			dynamic '$RESULT += <<$ARGS[2]>>B[<<ARGS[3]>>]'
 			dynamic '$RESULT += <<$ARGS[2]>>B[<<ARGS[3]>>]'
@@ -678,7 +678,7 @@ if $ARGS[0] = 'view_clothing_item':
 
 
 		if $ARGS[2] ! 'school' or ARGS[3] ! 6:
 		if $ARGS[2] ! 'school' or ARGS[3] ! 6:
 			!! if the clothing is worn out
 			!! if the clothing is worn out
-			if dyneval('RESULT = <<$ARGS[2]>>H[<<ARGS[3]>>]') <= 0:
+			if dyneval('RESULT = <<$ARGS[2]>>_h[<<ARGS[3]>>]') <= 0:
 				'This item is worn and is not suitable for further wear.'
 				'This item is worn and is not suitable for further wear.'
 				if pcs_sewng >= 60 and tkan > 0:
 				if pcs_sewng >= 60 and tkan > 0:
 					cla
 					cla
@@ -783,7 +783,7 @@ if $ARGS[0] = 'view_clothing_item':
 		act 'Keep item':gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
 		act 'Keep item':gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
 
 
 		!! value is based on the strength remaining
 		!! value is based on the strength remaining
-		dynamic 'RESULT = <<$ARGS[2]>>H[<<ARGS[3]>>]'
+		dynamic 'RESULT = <<$ARGS[2]>>_h[<<ARGS[3]>>]'
 		if RESULT > 45:
 		if RESULT > 45:
 			'You can sell this item for 500 <b>₽</b>.'
 			'You can sell this item for 500 <b>₽</b>.'
 			act 'Sell':
 			act 'Sell':

+ 1 - 1
locations/ender.qsrc

@@ -220,7 +220,7 @@ if $ARGS[0] = 'loss':
 		gs 'pain', 5, 'cheeks', 'hit'
 		gs 'pain', 5, 'cheeks', 'hit'
 		gs 'pain', 5, 'thighs', 'kick'
 		gs 'pain', 5, 'thighs', 'kick'
 		gs 'pain', 5, 'hair', 'stretch'
 		gs 'pain', 5, 'hair', 'stretch'
-		dynamic '<<$clothingworntype>>H[<<clothingwornnumber>>] = 0'
+		dynamic '<<$clothingworntype>>_h[<<clothingwornnumber>>] = 0'
 		'<<$streetev_title>>'
 		'<<$streetev_title>>'
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/lostfight.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/lostfight.jpg"></center>'
 		'You do your best, but there are just too many of them. Eventually they get you down on the ground and beat you, ripping out handfuls of your hair and tearing your clothes.'
 		'You do your best, but there are just too many of them. Eventually they get you down on the ground and beat you, ripping out handfuls of your hair and tearing your clothes.'

+ 1 - 1
locations/gadforest.qsrc

@@ -575,7 +575,7 @@ if $ARGS[0] = 'torncloth':
 			'<font color="red">Your clothes get caught on some brush and tear slightly.</font>'
 			'<font color="red">Your clothes get caught on some brush and tear slightly.</font>'
 			dynamic $clothingworntype + 'H[<<clothingwornnumber>>] -= 1'
 			dynamic $clothingworntype + 'H[<<clothingwornnumber>>] -= 1'
 			!add remove clothes if worn out
 			!add remove clothes if worn out
-			if dyneval('RESULT = <<$clothingworntype>>H[<<clothingwornnumber>>]') <= 0:
+			if dyneval('RESULT = <<$clothingworntype>>_h[<<clothingwornnumber>>]') <= 0:
 				'<font color="red">Your clothes were barely holding together, but now they have fallen apart completely. You discard the remains and are left naked.</font>'
 				'<font color="red">Your clothes were barely holding together, but now they have fallen apart completely. You discard the remains and are left naked.</font>'
 				gadforest_clothestorn = 1
 				gadforest_clothestorn = 1
 				gs 'clothing', 'strip', 'gadforest'
 				gs 'clothing', 'strip', 'gadforest'

+ 1 - 1
locations/metro_events.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'a':
 				*clr & cla
 				*clr & cla
 				frot += 1
 				frot += 1
 				gs 'cum_call', 'pantyrear', 'stranger on the metro', 0, 0, spot, svol
 				gs 'cum_call', 'pantyrear', 'stranger on the metro', 0, 0, spot, svol
-				dynamic '<<$clothingworntype>>H[<<clothingwornnumber>>] -= 1'
+				dynamic '<<$clothingworntype>>_h[<<clothingwornnumber>>] -= 1'
 				clr
 				clr
 				gs 'stat'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotc'+ rand(1,2) +'.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotc'+ rand(1,2) +'.jpg"></center>'

+ 1 - 1
locations/outdoors.qsrc

@@ -367,7 +367,7 @@ if $ARGS[0] = 'main':
 
 
 				gs 'sweat', 'add', 10
 				gs 'sweat', 'add', 10
 				if pcs_mood > 20: pcs_mood -= 20
 				if pcs_mood > 20: pcs_mood -= 20
-				dynamic '<<$clothingworntype>>H[<<clothingwornnumber>>] -= 1'
+				dynamic '<<$clothingworntype>>_h[<<clothingwornnumber>>] -= 1'
 			end
 			end
 
 
 !!Exhibitionism
 !!Exhibitionism

+ 1 - 1
locations/portnoi.qsrc

@@ -2,7 +2,7 @@
 
 
 $batch_sell = {
 $batch_sell = {
 	poshvalldrop += 1
 	poshvalldrop += 1
-	dynamic 'RESULT = <<$ARGS[0]>>H[<<ARGS[1]>>]'
+	dynamic 'RESULT = <<$ARGS[0]>>_h[<<ARGS[1]>>]'
 	if RESULT > 100:
 	if RESULT > 100:
 		dynamic '<<$ARGS[0]>>[<<ARGS[1]>>] = 0'
 		dynamic '<<$ARGS[0]>>[<<ARGS[1]>>] = 0'
 		dynamic '<<$ARGS[0]>>_s[<<ARGS[1]>>] = 0'
 		dynamic '<<$ARGS[0]>>_s[<<ARGS[1]>>] = 0'

+ 1 - 1
locations/starenie.qsrc

@@ -27,7 +27,7 @@ j = 1
 	dynamic "
 	dynamic "
 		if <<$loc_clothestypes[j]>>W[i] = 1:
 		if <<$loc_clothestypes[j]>>W[i] = 1:
 			<<$loc_clothestypes[j]>>W[i] = 0
 			<<$loc_clothestypes[j]>>W[i] = 0
-			<<$loc_clothestypes[j]>>H[i] -= 1
+			<<$loc_clothestypes[j]>>_h[i] -= 1
 		end
 		end
 	"
 	"
 	i += 1
 	i += 1

+ 2 - 2
locations/wardrobe.qsrc

@@ -213,7 +213,7 @@ if $ARGS[0] = 'default_entry_wear':
 			gt 'wardrobe', 'start'
 			gt 'wardrobe', 'start'
 		end
 		end
 	!! strength of clothing is less than or equal to 0
 	!! strength of clothing is less than or equal to 0
-	elseif dyneval('RESULT = <<$defclothingtype[default_entry]>>H[<<defclothingnumber[default_entry]>>]') <= 0:
+	elseif dyneval('RESULT = <<$defclothingtype[default_entry]>>_h[<<defclothingnumber[default_entry]>>]') <= 0:
 		cls
 		cls
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip16.mp4"></video></center>'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip16.mp4"></video></center>'
 		'Your <<$def_clothing_name[default_entry]>> outfit has worn out and can''t be used anymore. Guess you will have to find something else to wear.'
 		'Your <<$def_clothing_name[default_entry]>> outfit has worn out and can''t be used anymore. Guess you will have to find something else to wear.'
@@ -575,7 +575,7 @@ if $ARGS[0] = 'school_outfit':
 	end
 	end
 
 
 	! if no uniform found or the one selected is worn out, use the default one
 	! if no uniform found or the one selected is worn out, use the default one
-	if schtype = 0 or dyneval('RESULT = <<$schbrand>>H[<<schtype>>]') <= 0:
+	if schtype = 0 or dyneval('RESULT = <<$schbrand>>_h[<<schtype>>]') <= 0:
 		schtype = 6
 		schtype = 6
 		$schbrand = 'school'
 		$schbrand = 'school'
 	end
 	end