Parcourir la source

Merge branch 'master' of LinaHirata/glife into master

[fixed] the i's have it thanks to お茶, Felix, The
Kevin_Smarts il y a 9 mois
Parent
commit
bc09de14fe
1 fichiers modifiés avec 21 ajouts et 21 suppressions
  1. 21 21
      locations/exercise.qsrc

+ 21 - 21
locations/exercise.qsrc

@@ -222,31 +222,31 @@ if $ARGS[0] = 'setup':
 	exer_menu = 1
 	gs 'exercise', 'routines'
 	act 'Return': gt 'exercise', 'workout'
-	act 'Define <<$excer_name[1]>>':i = 1 & gt 'exercise', 'matrix'
+	act 'Define <<$excer_name[1]>>':stamindx = 1 & gt 'exercise', 'matrix'
 	act 'Rename <<$excer_name[1]>>':
 		$excer_name[1] = input ('<center>Enter name for exercise routine 1<br>Leave blank to restore default name.</center>')
 		gs 'exercise', 'rename'
 		gt 'exercise', 'setup'
 	end
-	act 'Define <<$excer_name[2]>>':i = 2 & gt 'exercise', 'matrix'
+	act 'Define <<$excer_name[2]>>':stamindx = 2 & gt 'exercise', 'matrix'
 	act 'Rename <<$excer_name[2]>>':
 		$excer_name[2] = input ('<center>Enter name for exercise routine 2<br>Leave blank to restore default name.</center>')
 		gs 'exercise', 'rename'
 		gt 'exercise', 'setup'
 	end
-	act 'Define <<$excer_name[3]>>':i = 3 & gt 'exercise', 'matrix'
+	act 'Define <<$excer_name[3]>>':stamindx = 3 & gt 'exercise', 'matrix'
 	act 'Rename <<$excer_name[3]>>':
 		$excer_name[3] = input ('<center>Enter name for exercise routine 3<br>Leave blank to restore default name.</center>')
 		gs 'exercise', 'rename'
 		gt 'exercise', 'setup'
 	end
-	act 'Define <<$excer_name[4]>>':i = 4 & gt 'exercise', 'matrix'
+	act 'Define <<$excer_name[4]>>':stamindx = 4 & gt 'exercise', 'matrix'
 	act 'Rename <<$excer_name[4]>>':
 		$excer_name[4] = input ('<center>Enter name for exercise routine 4<br>Leave blank to restore default name.</center>')
 		gs 'exercise', 'rename'
 		gt 'exercise', 'setup'
 	end
-	act 'Define <<$excer_name[5]>>':i = 5 & gt 'exercise', 'matrix'
+	act 'Define <<$excer_name[5]>>':stamindx = 5 & gt 'exercise', 'matrix'
 	act 'Rename <<$excer_name[5]>>':
 		$excer_name[5] = input ('<center>Enter name for exercise routine 5<br>Leave blank to restore default name.</center>')
 		gs 'exercise', 'rename'
@@ -533,10 +533,10 @@ if $ARGS[0] = 'tier1':
 	else
 		i = 2
 		:exploop1
-		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)
+		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)
 				steroidcheck = 1
 			end
 			i += 1
@@ -581,10 +581,10 @@ if $ARGS[0] = 'tier2':
 	else
 		i = 2
 		:exploop2
-		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)
+		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)
 				steroidcheck = 1
 			end
 			i += 1
@@ -629,10 +629,10 @@ if $ARGS[0] = 'tier3':
 	else
 		i = 2
 		:exploop3
-		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)
+		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)
 				steroidcheck = 1
 			end
 			i += 1
@@ -677,10 +677,10 @@ if $ARGS[0] = 'tier4':
 	else
 		i = 2
 		:exploop4
-		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)
+		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)
 				steroidcheck = 1
 			end
 			i += 1