Browse Source

[fixes] moved the leave option to the top in gadriver

julzor 6 years ago
parent
commit
90efe7374d
1 changed files with 28 additions and 27 deletions
  1. 28 27
      locations/gadriver.qsrc

+ 28 - 27
locations/gadriver.qsrc

@@ -188,6 +188,34 @@ if $ARGS[0] = 'gadbitch':
 
 	if MiraLoc ! 1 and npc_QW['A63'] >= 13 and RAND(0,10) = 0 and hour >= 8 and hour < 20 and month >= 5 and month <= 9 and temper >= 15 and sunWeather = 1:'<a href="exec: gt ''gadriver'', ''GuysRiver'' ">Bob Colby</a> is resting on the riverbank.'
 
+	act 'Go back to the river':
+		cla
+		if $clothingworntype = 'swimwear':
+			cla
+			'You need to dress in regular clothes first.'
+			act'Return':gt'gadriver', 'gadbitch'
+		elseif $clothingworntype = 'nude':
+			'You need to put some clothes on first.'
+			act'Return':gt'gadriver', 'gadbitch'
+		else
+			minut += 5
+			gt 'gadriver', 'start'
+		end
+	end
+	
+	if ARRSIZE('swimwear') > 0: act 'Get changed':gt 'changingroom', 'view_swim_list'
+	
+	if $clothingworntype = 'nude':
+		act 'Get dressed':
+			clothesAtLocation = FUNC('lost_clothes_here','VillageRiver')
+			cla
+			minut += 5
+			gs 'underwear', 'wear'
+			if clothesAtLocation = 1: gs 'clothing', 'recover_lost_clothes', 'VillageRiver', 1
+				act 'Continue': gt 'gadriver', 'gadbitch'
+		end
+	end
+	
 	if temper >= 15 and month >= 5 and month <= 9:
 		temp_gr = RAND(0,9)
 		if $clothingworntype ! 'nude' and (pcs_inhib >= 25 or exhibitionist_lvl > 1):
@@ -564,34 +592,7 @@ if $ARGS[0] = 'gadbitch':
 			end
 		end
 	end
-	if ARRSIZE('swimwear') > 0:
-		act 'Get changed':gt 'changingroom', 'view_swim_list'
-	end
-	if $clothingworntype = 'nude':
-		act 'Get dressed':
-			clothesAtLocation = FUNC('lost_clothes_here','VillageRiver')
-			cla
-			minut += 5
-			gs 'underwear', 'wear'
-			if clothesAtLocation = 1: gs 'clothing', 'recover_lost_clothes', 'VillageRiver', 1
-				act 'Continue': gt 'gadriver', 'gadbitch'
-		end
-	end
 
-	act 'Leave':
-		cla
-		if $clothingworntype = 'swimwear':
-			cla
-			'You need to dress in regular clothes first.'
-			act'Return':gt'gadriver', 'gadbitch'
-		elseif $clothingworntype = 'nude':
-			'You need to put some clothes on first.'
-			act'Return':gt'gadriver', 'gadbitch'
-		else
-			minut += 5
-			gt 'gadriver', 'start'
-		end
-	end
 !! extraordinary events at the river beach. Be aware, this part has to be at the end because it removes actions, which were set before.
 	if (mira_go_blok = 0 and MiraLoc = 1 and rand(1,10) = 5) or (MiraLoc = 1 and hour >= 20):
 		*clr & cla