Ver código fonte

[fixed] Missing end and got the exercise check for manual selection the wrong way around

Kevin_Smarts 1 ano atrás
pai
commit
63aa3eac9b
2 arquivos alterados com 4 adições e 3 exclusões
  1. 3 3
      locations/exercise.qsrc
  2. 1 0
      locations/saveupdater.qsrc

+ 3 - 3
locations/exercise.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'workout':
 		end
 	end
 	if pcs_energy < 20 and pcs_stam < stammax / 5:
-		'You don not have the energy/stamina to exercise currently'
+		'You do not have the energy/stamina to exercise currently'
 	elseif $clothingworntype = 'nude' or $clothingworntype = 'danilovich_outfits':
 		act 'Manual routines': gt 'exercise', 'manual'
 		act 'Define routines': gt 'exercise', 'setup'
@@ -145,6 +145,8 @@ if $ARGS[0] = 'manual':
 	cla
 	act 'Return':gt 'exercise', 'workout'
 	if pcs_energy < 20 and pcs_stam < stammax / 5:
+		'You don''t have the energy/stamina to work out anymore now.'
+	else
 		act 'Do pushups for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'push'
 		act 'Do crunches for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'press'
 		act 'Do squats for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
@@ -193,8 +195,6 @@ if $ARGS[0] = 'manual':
 		if obruch > 0 and $loc ! 'meadow':
 			act 'Use your hula hoop for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'hula'
 		end
-	else
-		'You don''t have the energy/stamina to work out anymore now.'
 	end
 end
 

+ 1 - 0
locations/saveupdater.qsrc

@@ -1682,6 +1682,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 		killvar 'traits'
 		killvar 'trait'
 	end
+end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00080903: