[fixes] changed dynamics into goto's and moved the leave option to the top in glake

locations/gLakeNude.qsrc

@@ -7,7 +7,7 @@ $metka = ''
 $menu_loc = 'gLakeNude'
 $menu_arg = ''
 menu_off = 0
-cls
+*clr & cla
 gs'stat'
 
 '<center><H4>Secluded beach</H4></center>'

locations/glake.qsrc

@@ -55,16 +55,34 @@ if month=1 or month=2 or month=12:
 	if pcs_icesktng>0: 'Your ice-skating skill is <<pcs_icesktng>>.'
 end
 
-if ARRSIZE('swimwear') > 0:
-		act 'Use changing room':gt 'changingroom', 'view_swim_list'
+act'Return to Pavlovsk':
+	if konki_cloth = 1:
+		cla
+		'You need to remove your skates. How are you going to walk on the streets in those?'
+		act'Back':gt'glake'
+	elseif $clothingworntype = 'swimwear':
+		cla
+		'You need to get dressed in regular clothing first.'
+		act'Return':gt'glake'
+	elseif $clothingworntype ! 'nude':
+		minut += 5
+		gt'pavResidential'
 	else
-		*nl
-		'You should probably buy some swimwear if you intend of spending time at the beach'
-		*nl
+		cla
+		'You need to wear some clothes. It''s not decent to walk the streets naked.'
+		act'Return':gt'glake'
 	end
+end
 
-if $clothingworntype = 'nude':
+if ARRSIZE('swimwear') > 0:
+	act 'Use changing room':gt 'changingroom', 'view_swim_list'
+else
+	*nl
+	'You should probably buy some swimwear if you intend of spending time at the beach'
+	*nl
+end
 
+if $clothingworntype = 'nude':
 	act'Put your clothes back on':
 		cla
 		menu_off = 1
@@ -163,7 +181,6 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 
 		'You walk along the beach for an hour, enjoying the feeling of the sun on your body.'
 		act 'Continue':gt'glake'
-
 	end
 
 	if $clothingworntype ! 'nude' and (pcs_inhib >= 60 or (exhibitionist_lvl > 1 and pcs_horny >= 60)):
@@ -180,7 +197,6 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 		end
 	end
 
-
 	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 		act 'Go swim in the lake (1:00)':
 			cla
@@ -380,37 +396,32 @@ if month = 12 or month = 1 or month = 2:
 	if hour >= 8 and hour <= 17:
 		if konki > 0 and konki_cloth ! 1:
 			act'Put your skates on':
-				cla
-				*clr
+				*clr & cla
 				menu_off = 1
 				minut += 5
 				konki_cloth = 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/konki0,0.jpg"></center>'
 				'You take off your shoes, and put your skates on. Now you''re ready to go ice skating.'
-				act'Done':gt'glake'
+				act 'Continue': gt'glake'
 			end
 		end
-		if konki_cloth = 1:
-			act'Skate on the ice rink': dynamic $katok_base
-		end
+		if konki_cloth = 1: act'Skate on the ice rink': gt 'glake', 'skating_start'
 	end
 end
 
-$katok_base = {
-	cla
-	*clr
+if $ARGS[0] = 'skating_start':
+	*clr & cla
 	minut += 3
 	menu_off = 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/katok0,'+rand(0,3)+'.jpg"></center>'
 	'You slowly make your way over to the ice rink, where a lot of people are already skating. Some people are really good at skating and basically fly around the lake on their skates, while others carefully shuffle around, doing their best to just stay on their skates without falling.'
-	act'Skate on the rink':dynamic $katok_start
 	act'Leave the rink':gt'glake'
-}
+	act'Skate on the rink': gt 'glake', 'skating'
+end
 
-$katok_start = {
-	cla
-	*clr
+if $ARGS[0] = 'skating':
+	*clr & cla
 	menu_off = 1
 	pcs_willpwr += 5
 	fat -= 1
@@ -420,7 +431,6 @@ $katok_start = {
 	react_exp += 1
 	icesktng_exp += 1
 	minut += 30
-	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/katok_do0,'+rand(0,7)+'.jpg"></center>'
 	if pcs_icesktng <= 10:
 		pcs_mood -= 10
@@ -434,53 +444,35 @@ $katok_start = {
 			'While you''re trying some new things, you suddenly figure out how to do a certain move properly. It definitely improves your skating skills.'
 		end
 	elseif pcs_icesktng <= 50:
-		pcs_mood+=5
+		pcs_mood += 5
 		'At long last, you finally manage to skate for a full 100 meters without falling. It''s definitely going a lot better. Some of the other regulars who have seen you struggle before notice how much better you''re doing, and congratulate you on your progress.'
 		'You become a bit more daring as you continue to ride, almost never falling any more.'
-		if rand(1,3)=1:
+		if rand(1,3) = 1:
 			icesktng_exp += 2
 			'You fall down, just this once. One of the more experienced skaters notices, and helps you up. Once you''re up on your skates again, he explains what you did wrong. His explanation will go a long way in you not making the same mistake again, and you feel like you''re a better skater for it. You thank him as you skate off, trying to apply the trick he just taught you.'
 		end
 	elseif pcs_icesktng<=70:
-		pcs_mood+=10
+		pcs_mood += 10
 		'You''re getting better and better at ice skating. You basically never fall any more, and enjoy the flow of the wind on your face as you dare to go faster and faster.'
-		if rand(1,3)=1:
+		if rand(1,3) = 1:
 			icesktng_exp += 3
 			'As you ride you watch the more experienced skaters, trying to pick up new tricks. You try to copy some of the things they are doing, and notice that those moves are indeed more efficient than how you were doing it before.'
 		end
 	else
-		pcs_mood+=15
+		pcs_mood += 15
 		'You''ve pretty much mastered ice skating now, and won''t get any better without professional training. Occasionally you do some tricks while you skate around the rink, and others admire your skills as you fly past them.'
 	end
 
+	gs'stat'
+	
 	if hour <= 17:
-		act'Skate some more':dynamic $katok_start
-		act'Leave the rink':gt'glake'
+		act 'Leave the rink': gt'glake'
+		act 'Skate some more': gt 'glake', 'skating'
 	else
-		cla
-		*clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/katok0,'+rand(0,3)+'.jpg"></center>'
 		'It''s too dark to go ice skating now, and the rink is closed.'
-		act'Leave':gt'glake'
-	end
-}
-
-act'Return to Pavlovsk':
-	if konki_cloth = 1:
-		cla
-		'You need to remove your skates. How are you going to walk on the streets in those?'
-		act'Back':gt'glake'
-	elseif $clothingworntype = 'swimwear':
-		cla
-		'You need to get dressed in regular clothing first.'
-		act'Return':gt'glake'
-	elseif $clothingworntype ! 'nude':
-		minut += 5
-		gt'pavResidential'
-	else
-		cla
-		'You need to wear some clothes. It''s not decent to walk the streets naked.'
-		act'Return':gt'glake'
+		act 'Leave': gt'glake'
 	end
 end