Browse Source

[fixed] make it so that the Gustav agility/reaction/endurance trainings actually take an hour like they say they do instead of an hour and fifteen minutes. also extract their shared code to a gs call since the logic is identical outside of what exp they give

Spackled Lanturn 3 years ago
parent
commit
13ca1c527b
1 changed files with 19 additions and 59 deletions
  1. 19 59
      locations/tatiana_lab.qsrc

+ 19 - 59
locations/tatiana_lab.qsrc

@@ -94,68 +94,28 @@ if $ARGS[0] = 'Gustav':
 	act 'Leave':gt 'tatiana_lab', 'start'
 
 	if gustavday ! daystart:
-		act 'Develop strength (1:00)':
-			cla
-			timemult = 4
-			loopcount = 1
-			:timeloop1
-			gs 'exercise', 'tier2', 0, 'stren_exp'
-			if loopcount < timemult: loopcount += 1 & jump 'timeloop1'
-			loopcount = 0
-			timemult = 0
-			gustavday = daystart
-			'You do exercises under the guidance of Gustav.'
-
-			act 'Leave':gt 'tatiana_lab', 'Gustav'
-		end
-
-		act 'Develop agility (1:00)':
-			cla
-			timemult = 5
-			loopcount = 1
-			:timeloop2
-			gs 'exercise', 'tier2', 0, 'agil_exp'
-			if loopcount < timemult: loopcount += 1 & jump 'timeloop2'
-			loopcount = 0
-			timemult = 0
-			gustavday = daystart
-			'You do exercises under the guidance of Gustav.'
-
-			act 'Leave':gt 'tatiana_lab', 'Gustav'
-		end
-
-		act 'Develop reactions (1:00)':
-			cla
-			timemult = 5
-			loopcount = 1
-			:timeloop3
-			gs 'exercise', 'tier2', 0, 'react_exp'
-			if loopcount < timemult: loopcount += 1 & jump 'timeloop3'
-			loopcount = 0
-			timemult = 0
-			gustavday = daystart
-			'You do exercises under the guidance of Gustav.'
-
-			act 'Leave':gt 'tatiana_lab', 'Gustav'
-		end
-
-		act 'Develop endurance (1:00)':
-			cla
-			timemult = 5
-			loopcount = 1
-			:timeloop4
-			gs 'exercise', 'tier2', 0, 'vital_exp'
-			if loopcount < timemult: loopcount += 1 & jump 'timeloop4'
-			loopcount = 0
-			timemult = 0
-			gustavday = daystart
-			'You do exercises under the guidance of Gustav.'
-
-			act 'Leave':gt 'tatiana_lab', 'Gustav'
-		end
+		act 'Develop strength (1:00)':gs 'tatiana_lab', 'GustavDevelop', 'stren_exp'
+		act 'Develop agility (1:00)':gs 'tatiana_lab', 'GustavDevelop', 'agil_exp'
+		act 'Develop reactions (1:00)':gs 'tatiana_lab', 'GustavDevelop', 'react_exp'
+		act 'Develop endurance (1:00)':gs 'tatiana_lab', 'GustavDevelop', 'vital_exp'
 	end
 end
 
+if $ARGS[0] = 'GustavDevelop':
+	cla
+	timemult = 4
+	loopcount = 1
+	:timeloop
+	gs 'exercise', 'tier2', 0, $ARGS[1]
+	if loopcount < timemult: loopcount += 1 & jump 'timeloop'
+	loopcount = 0
+	timemult = 0
+	gustavday = daystart
+	'You do exercises under the guidance of Gustav.'
+
+	act 'Leave':gt 'tatiana_lab', 'Gustav'
+end
+
 if $ARGS[0] = 'BodyModActuate':
 	! Does the actual modification
 	!	 ARGS[1] = Mana cost