Explorar el Código

[fixed] i could sometimes get overwritten so replaced with unique index variable

Kevin_Smarts hace 9 meses
padre
commit
426df0b072
Se han modificado 1 ficheros con 38 adiciones y 38 borrados
  1. 38 38
      locations/exercise.qsrc

+ 38 - 38
locations/exercise.qsrc

@@ -266,7 +266,7 @@ end
 
 if $ARGS[0] = 'matrix':
 	*clr & cla
-	exer_stam[i] = exer_stam0[i] + exer_stam1[i] + exer_stam2[i] + exer_stam3[i] + exer_stam4[i] + exer_stam5[i]
+	exer_stam[stamindx] = exer_stam0[stamindx] + exer_stam1[stamindx] + exer_stam2[stamindx] + exer_stam3[stamindx] + exer_stam4[stamindx] + exer_stam5[stamindx]
 	
 	act'Confirm': gt 'exercise', 'setup'
 
@@ -281,65 +281,65 @@ if $ARGS[0] = 'matrix':
 
 	'</center></table>'
 	*nl
-	'Total stamina required - <<exer_stam[i]>>'
+	'Total stamina required - <<exer_stam[stamindx]>>'
 end
 
 if $ARGS[0] = 'matrixdata':
 	'<TR>'
 	*p '<TD><<$ARGS[2]>></TD>'
 
-	if dyneval('RESULT = exer_rout<<ARGS[1]>>[<<i>>]') = 0:
-		dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 0'
+	if dyneval('RESULT = exer_rout<<ARGS[1]>>[<<stamindx>>]') = 0:
+		dynamic 'exer_stam<<ARGS[1]>>[<<stamindx>>] = 0'
 		*p '<TD>Selected</TD>'
 	else
-		*p '<TD><a href="exec:dynamic ''exer_rout<<ARGS[1]>>[i] = 0'' & gt ''exercise'', ''matrix''">Select</a></TD>'
+		*p '<TD><a href="exec:dynamic ''exer_rout<<ARGS[1]>>[stamindx] = 0'' & gt ''exercise'', ''matrix''">Select</a></TD>'
 	end
 
-	if dyneval('RESULT = exer_rout<<ARGS[1]>>[<<i>>]') = 1:
+	if dyneval('RESULT = exer_rout<<ARGS[1]>>[<<stamindx>>]') = 1:
 		if ARGS[1] >= 3:
-			dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 5 * (10 - sport_clothes_exercise_bonus)'
+			dynamic 'exer_stam<<ARGS[1]>>[<<stamindx>>] = 5 * (10 - sport_clothes_exercise_bonus)'
 		else
-			dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = (15 * (10 - sport_clothes_exercise_bonus)) / 2'
+			dynamic 'exer_stam<<ARGS[1]>>[<<stamindx>>] = (15 * (10 - sport_clothes_exercise_bonus)) / 2'
 		end
 		*p '<TD>Selected</TD>'
 	else
-		*p '<TD><a href="exec:dynamic ''exer_rout<<ARGS[1]>>[i] = 1'' & gt ''exercise'', ''matrix''">Select</a></TD>'
+		*p '<TD><a href="exec:dynamic ''exer_rout<<ARGS[1]>>[stamindx] = 1'' & gt ''exercise'', ''matrix''">Select</a></TD>'
 	end
 
-	if dyneval('RESULT = exer_rout<<ARGS[1]>>[<<i>>]') = 2:
+	if dyneval('RESULT = exer_rout<<ARGS[1]>>[<<stamindx>>]') = 2:
 		if ARGS[1] >= 3:
-			dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 10 * (10 - sport_clothes_exercise_bonus)'
+			dynamic 'exer_stam<<ARGS[1]>>[<<stamindx>>] = 10 * (10 - sport_clothes_exercise_bonus)'
 		else
-			dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = (30 * (10 - sport_clothes_exercise_bonus)) / 2'
+			dynamic 'exer_stam<<ARGS[1]>>[<<stamindx>>] = (30 * (10 - sport_clothes_exercise_bonus)) / 2'
 		end
 		*p '<TD>Selected</TD>'
 	else
-		*p '<TD><a href="exec:dynamic ''exer_rout<<ARGS[1]>>[i] = 2'' & gt ''exercise'', ''matrix''">Select</a></TD>'
+		*p '<TD><a href="exec:dynamic ''exer_rout<<ARGS[1]>>[stamindx] = 2'' & gt ''exercise'', ''matrix''">Select</a></TD>'
 	end
 
-	if dyneval('RESULT = exer_rout<<ARGS[1]>>[<<i>>]') = 3:
+	if dyneval('RESULT = exer_rout<<ARGS[1]>>[<<stamindx>>]') = 3:
 		if ARGS[1] >= 3:
-			dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 15 * (10 - sport_clothes_exercise_bonus)'
+			dynamic 'exer_stam<<ARGS[1]>>[<<stamindx>>] = 15 * (10 - sport_clothes_exercise_bonus)'
 		else
-			dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = (45 * (10 - sport_clothes_exercise_bonus)) / 2'
+			dynamic 'exer_stam<<ARGS[1]>>[<<stamindx>>] = (45 * (10 - sport_clothes_exercise_bonus)) / 2'
 		end
 		*p '<TD>Selected</TD>'
 	else
-		*p '<TD><a href="exec:dynamic ''exer_rout<<ARGS[1]>>[i] = 3'' & gt ''exercise'', ''matrix''">Select</a></TD>'
+		*p '<TD><a href="exec:dynamic ''exer_rout<<ARGS[1]>>[stamindx] = 3'' & gt ''exercise'', ''matrix''">Select</a></TD>'
 	end
 
-	if dyneval('RESULT = exer_rout<<ARGS[1]>>[<<i>>]') = 4:
+	if dyneval('RESULT = exer_rout<<ARGS[1]>>[<<stamindx>>]') = 4:
 		if ARGS[1] >= 3:
-			dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = 20 * (10 - sport_clothes_exercise_bonus)'
+			dynamic 'exer_stam<<ARGS[1]>>[<<stamindx>>] = 20 * (10 - sport_clothes_exercise_bonus)'
 		else
-			dynamic 'exer_stam<<ARGS[1]>>[<<i>>] = (60 * (10 - sport_clothes_exercise_bonus)) / 2'
+			dynamic 'exer_stam<<ARGS[1]>>[<<stamindx>>] = (60 * (10 - sport_clothes_exercise_bonus)) / 2'
 		end
 		*p '<TD>Selected</TD>'
 	else
-		*p '<TD><a href="exec:dynamic ''exer_rout<<ARGS[1]>>[i] = 4'' & gt ''exercise'', ''matrix''">Select</a></TD>'
+		*p '<TD><a href="exec:dynamic ''exer_rout<<ARGS[1]>>[stamindx] = 4'' & gt ''exercise'', ''matrix''">Select</a></TD>'
 	end
 
-	exer_stam[i] = exer_stam0[i] + exer_stam1[i] + exer_stam2[i] + exer_stam3[i] + exer_stam4[i] + exer_stam5[i]
+	exer_stam[stamindx] = exer_stam0[stamindx] + exer_stam1[stamindx] + exer_stam2[stamindx] + exer_stam3[stamindx] + exer_stam4[stamindx] + exer_stam5[stamindx]
 end
 
 if $ARGS[0] = 'butt':
@@ -533,10 +533,10 @@ if $ARGS[0] = 'tier1':
 	else
 		i = 2
 		:exploop1
-		if $ARGS[i] ! '':
-			gs 'exp_gain', $ARGS[i], rand(0,1), steroid_dose
-			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
-				gs 'exp_gain', $ARGS[i], rand(0,steroid_dose)
+		if $ARGS[stamindx] ! '':
+			gs 'exp_gain', $ARGS[stamindx], rand(0,1), steroid_dose
+			if $ARGS[stamindx] = 'vital' or $ARGS[stamindx] = 'stren': 
+				gs 'exp_gain', $ARGS[stamindx], rand(0,steroid_dose)
 				steroidcheck = 1
 			end
 			i += 1
@@ -581,10 +581,10 @@ if $ARGS[0] = 'tier2':
 	else
 		i = 2
 		:exploop2
-		if $ARGS[i] ! '':
-			gs 'exp_gain', $ARGS[i], rand(1,2), steroid_dose
-			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
-				gs 'exp_gain', $ARGS[i], rand(0,steroid_dose)
+		if $ARGS[stamindx] ! '':
+			gs 'exp_gain', $ARGS[stamindx], rand(1,2), steroid_dose
+			if $ARGS[stamindx] = 'vital' or $ARGS[stamindx] = 'stren': 
+				gs 'exp_gain', $ARGS[stamindx], rand(0,steroid_dose)
 				steroidcheck = 1
 			end
 			i += 1
@@ -629,10 +629,10 @@ if $ARGS[0] = 'tier3':
 	else
 		i = 2
 		:exploop3
-		if $ARGS[i] ! '':
-			gs 'exp_gain', $ARGS[i], rand(2,3), steroid_dose
-			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
-				gs 'exp_gain', $ARGS[i], rand(0,steroid_dose)
+		if $ARGS[stamindx] ! '':
+			gs 'exp_gain', $ARGS[stamindx], rand(2,3), steroid_dose
+			if $ARGS[stamindx] = 'vital' or $ARGS[stamindx] = 'stren': 
+				gs 'exp_gain', $ARGS[stamindx], rand(0,steroid_dose)
 				steroidcheck = 1
 			end
 			i += 1
@@ -677,10 +677,10 @@ if $ARGS[0] = 'tier4':
 	else
 		i = 2
 		:exploop4
-		if $ARGS[i] ! '':
-			gs 'exp_gain', $ARGS[i], rand(3,5), steroid_dose
-			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
-				gs 'exp_gain', $ARGS[i], rand(0,steroid_dose)
+		if $ARGS[stamindx] ! '':
+			gs 'exp_gain', $ARGS[stamindx], rand(3,5), steroid_dose
+			if $ARGS[stamindx] = 'vital' or $ARGS[stamindx] = 'stren': 
+				gs 'exp_gain', $ARGS[stamindx], rand(0,steroid_dose)
 				steroidcheck = 1
 			end
 			i += 1