City gym dance class fix

locations/danceclass

@@ -16,65 +16,68 @@ end
 '<center><img src="images/locations/city/citycenter/gym/dance/danceclass.jpg"></center>'
 'A big, open room with good lighting and huge mirrors, perfect for developing dance skills.'
 
-act 'Modern dance class (0:30)':
-	cla
-	*clr
-	timemult = 2
-	loopcount = 1
-	:timeloop
-	gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'danc_exp'
-	if loopcount < timemult: loopcount += 1 & jump 'timeloop'
-	loopcount = 0
-	timemult = 0
-	abonement -= 1
-	'<center><img src="images/locations/shared/gym/fit1.jpg"></center>'
-
-	if danc_lvl < 100:'You studied modern dance, which is very popular in clubs.'
-	if danc_lvl >= 100:'Though you worked hard, you realize there is nothing more worth learning from this class.'
-
-	act 'Leave':gt 'fit', 'dressing room'
-end
-
-act 'Striptease class (0:30)':
-	cla
-	*clr
-	gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'danc_exp', 'dancero_exp'
-	abonement -= 1
-	'<center><img src="images/characters/pavlovsk/school/girl/albina/stripdance.jpg"></center>'
+act 'Leave':gt 'fit', 'dressing room'
+if abonement > 0:
+	act 'Modern dance class (0:30)':
+		cla
+		*clr
+		abonement -= 1
+		timemult = 2
+		loopcount = 1
+		:timeloop
+		gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'danc_exp'
+		if loopcount < timemult: loopcount += 1 & jump 'timeloop'
+		loopcount = 0
+		timemult = 0
+		'<center><img src="images/locations/shared/gym/fit1.jpg"></center>'
 
-	if danc_lvl >= 50:
-		gs 'exercise', 'tier2', 0, 'dancero_exp'
-		'You studied the art of burlesque, imaging yourself stripping to the music.'
+		if danc_lvl < 100:'You studied modern dance, which is very popular in clubs.'
+		if danc_lvl >= 100:'Though you worked hard, you realize there is nothing more worth learning from this class.'
 
-		if pcs_dancero >= 100:'But there is nothing more worth learning, since you have already mastered the art.'
-	else
-		gs 'exercise', 'tier2', 0, 'danc_exp'
-		'This isn''t just taking clothes off, it''s a difficult dance style and your basics aren''t upto the task. The teacher instead helps you work on your modern dancing.'
+		act 'Finish':gt 'fit', 'danceclass'
 	end
 
-	act 'Leave':gt 'fit', 'dressing room'
-end
-
-if pcs_stren >=40 or needstrength = 0:
-	act 'Pole dancing class (0:30)':
+	act 'Striptease class (0:30)':
 		cla
 		*clr
-		gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'dancpol_exp'
+		gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'danc_exp', 'dancero_exp'
 		abonement -= 1
-		'<center><img src="images/locations/city/citycenter/gym/dance/poledance.jpg"></center>'
+		'<center><img src="images/characters/pavlovsk/school/girl/albina/stripdance.jpg"></center>'
 
-		if dancero_lvl >= 50 and pcs_stren >= 40:
-			gs 'exercise', 'tier2', 0, 'dancpol_exp'
-			'You studied various acrobatics on the pole.'
+		if danc_lvl >= 50:
+			gs 'exercise', 'tier2', 0, 'dancero_exp'
+			'You studied the art of burlesque, imaging yourself stripping to the music.'
 
-			if dancpol_lvl >= 100:'But you could not learn anything new, you''re already a master of the art.'
+			if pcs_dancero >= 100:'But there is nothing more worth learning, since you have already mastered the art.'
 		else
-			'It''s not pretty and you bang your head on the pole. This is far harder than it looks. It will help if you improve your modern dancing or striptease but you did learn a little.'
-
-			if pcs_stren < 40:'The instructor tries to be patient, but it is clear that you are too weak for this sort of dance.' & needstrength = 1
+			gs 'exercise', 'tier2', 0, 'danc_exp'
+			'This isn''t just taking clothes off, it''s a difficult dance style and your basics aren''t upto the task. The teacher instead helps you work on your modern dancing.'
 		end
 
-		act 'Leave':gt 'fit', 'dressing room'
+		act 'Finish':gt 'fit', 'danceclass'
+	end
+
+	if pcs_stren >=40 or needstrength = 0:
+		act 'Pole dancing class (0:30)':
+			cla
+			*clr
+			gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'dancpol_exp'
+			abonement -= 1
+			'<center><img src="images/locations/city/citycenter/gym/dance/poledance.jpg"></center>'
+
+			if dancero_lvl >= 50 and pcs_stren >= 40:
+				gs 'exercise', 'tier2', 0, 'dancpol_exp'
+				'You studied various acrobatics on the pole.'
+
+				if dancpol_lvl >= 100:'But you could not learn anything new, you''re already a master of the art.'
+			else
+				'It''s not pretty and you bang your head on the pole. This is far harder than it looks. It will help if you improve your modern dancing or striptease but you did learn a little.'
+
+				if pcs_stren < 40:'The instructor tries to be patient, but it is clear that you are too weak for this sort of dance.' & needstrength = 1
+			end
+
+			act 'Finish':gt 'fit', 'danceclass'
+		end
 	end
 end
 

locations/fit

@@ -61,10 +61,7 @@ if $ARGS[0] = 'dressing room':
 	'Classifieds'
 	'Recruiting girls for local track team, the winners will receive cash prizes.'
 	'Attention, visitors to the sports section must wear suitable clothing.'
-	if fitday ! daystart:
-		razdtumbler = 1
-		fitday = daystart
-	end
+
 	! WD: Uninitialised ~ 'razdrand'
 	! if razdrand = 0 and tanznak = 0 and tanday ! daystart:
 	if tanznak = 0 and tanday ! daystart:
@@ -257,6 +254,7 @@ if $ARGS[0] = 'gym':
 	act 'Aerobics (Burn fat)':
 		cla
 		*clr
+		abonement -= 1
 		timemult = 2
 		loopcount = 1
 		:timeloop1
@@ -272,6 +270,9 @@ if $ARGS[0] = 'gym':
 			*nl
 			'You are too tired to do any more exercise and will have to rest and regain some stamina.'
 			gs 'fit', 'exercise end'
+		elseif abonement <= 0:
+			'Your subscription has run out, you will need to buy more lessons in the reception.'
+			gs 'fit', 'exercise end'
 		else
 			act'Continue': gt 'fit', 'gym'
 		end
@@ -280,6 +281,7 @@ if $ARGS[0] = 'gym':
 	act 'Free weights (Build muscle)':
 		cla
 		*clr
+		abonement -= 1
 		timemult = 2
 		loopcount = 1
 		:timeloop2
@@ -295,6 +297,9 @@ if $ARGS[0] = 'gym':
 			*nl
 			'You are too tired to do any more exercise and will have to rest and regain some stamina.'
 			gs 'fit', 'exercise end'
+		elseif abonement <= 0:
+			'Your subscription has run out, you will need to buy more lessons in the reception.'
+			gs 'fit', 'exercise end'
 		else
 			act'Continue': gt 'fit', 'gym'
 		end
@@ -303,6 +308,7 @@ if $ARGS[0] = 'gym':
 	act 'Cross trainer (endurance)':
 		cla
 		*clr
+		abonement -= 1
 		timemult = 2
 		loopcount = 1
 		:timeloop3
@@ -318,6 +324,9 @@ if $ARGS[0] = 'gym':
 			*nl
 			'You are too tired to do any more exercise and will have to rest and regain some stamina.'
 			gs 'fit', 'exercise end'
+		elseif abonement <= 0:
+			'Your subscription has run out, you will need to buy more lessons in the reception.'
+			gs 'fit', 'exercise end'
 		else
 			act'Continue': gt 'fit', 'gym'
 		end
@@ -326,6 +335,7 @@ if $ARGS[0] = 'gym':
 	act 'Tennis practice (agility)':
 		cla
 		*clr
+		abonement -= 1
 		timemult = 2
 		loopcount = 1
 		:timeloop4
@@ -341,6 +351,9 @@ if $ARGS[0] = 'gym':
 			*nl
 			'You are too tired to do any more exercise and will have to rest and regain some stamina.'
 			gs 'fit', 'exercise end'
+		elseif abonement <= 0:
+			'Your subscription has run out, you will need to buy more lessons in the reception.'
+			gs 'fit', 'exercise end'
 		else
 			act'Continue': gt 'fit', 'gym'
 		end
@@ -349,6 +362,7 @@ if $ARGS[0] = 'gym':
 	act 'Tennis practice (reactions)':
 		cla
 		*clr
+		abonement -= 1
 		timemult = 2
 		loopcount = 1
 		:timeloop5
@@ -364,6 +378,9 @@ if $ARGS[0] = 'gym':
 			*nl
 			'You are too tired to do any more exercise and will have to rest and regain some stamina.'
 			gs 'fit', 'exercise end'
+		elseif abonement <= 0:
+			'Your subscription has run out, you will need to buy more lessons in the reception.'
+			gs 'fit', 'exercise end'
 		else
 			act'Continue': gt 'fit', 'gym'
 		end
@@ -373,7 +390,6 @@ if $ARGS[0] = 'gym':
 end
 
 if $ARGS[0] = 'exercise end':
-	abonement -= 1
 	RESULT = rand(0, 19)
 
 	act 'Leave':