Ver código fonte

[fixed] an edge case ... 'Continue looking for the road' would do nothing in the highly unlikely case of goforest = lostrand

julzor 5 anos atrás
pai
commit
36d9539d02
1 arquivos alterados com 12 adições e 22 exclusões
  1. 12 22
      locations/gadforestlost.qsrc

+ 12 - 22
locations/gadforestlost.qsrc

@@ -26,7 +26,8 @@ if $ARGS[0] = 'forestrescue':
 	'Suddenly you spot a man dressed as a forest ranger.'
 	'He walks up to you and says, "And here is our lost girl. Your grandfather and grandmother are very worried about you. They asked me to help find you. Follow me, I will take you home."'
 
-	!rescued during rest
+	!rescued during rest 
+	!is this possible? isn''t $loc = 'gadforestlost' ??? (julzor)
 	if $loc = 'gadforestrelax':
 		!have fire
 		if bonfire = 1:
@@ -119,8 +120,7 @@ if $ARGS[0] = '2':
 	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
 
 	act 'Look for the road':
-		cla
-		*clr
+		*clr & cla
 		menu_off = 1
 		minut += 60
 		pcs_mood -= 5
@@ -163,8 +163,7 @@ if $ARGS[0] = '3':
 	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
 
 	act 'Look for the road':
-		cla
-		*clr
+		*clr & cla
 		menu_off = 1
 		minut += 60
 		pcs_mood -= 5
@@ -198,9 +197,7 @@ if $ARGS[0] = '4':
 	gs 'gadukino_event', 'sound'
 	gs'stat'
 
-	cla
-	*clr
-
+	*clr & cla
 
 	wolfrand = rand(1,10)
 	huntrand = rand(1,10)
@@ -212,8 +209,7 @@ if $ARGS[0] = '4':
 	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
 
 	act 'Look for the road':
-		cla
-		*clr
+		*clr & cla
 		menu_off = 1
 		minut += 60
 		pcs_mood -= 5
@@ -224,7 +220,7 @@ if $ARGS[0] = '4':
 
 		gs 'gadforestlost', 'lostclothes'
 		act 'Continue looking for the road':
-			if goforest > lostrand: gs 'gadforestlost', 'gadforestlostfinish4'
+			if goforest >= lostrand: gs 'gadforestlost', 'gadforestlostfinish4'
 			if goforest < lostrand and temp > 7:gt 'gadforestswamp','1'
 			if goforest < lostrand and temp <= 7:gt 'gadforestlost','4'
 		end
@@ -289,8 +285,7 @@ if $ARGS[0] = 'gadforestlostfinish':
 end
 
 if $ARGS[0] = 'gadforestlostfinish1':
-	cls
-	*clr
+	*clr & cla
 	menu_off = 1
 	temp = RAND(1,3)
 	lost = 0
@@ -302,12 +297,10 @@ if $ARGS[0] = 'gadforestlostfinish1':
 	if temp = 1:act 'Leave the woods':minut += 15 & gt'gadforest','1'
 	if temp = 2:act 'Leave the woods':minut += 15 & gt'gadfield','field'
 	if temp = 3:act 'Leave the woods':minut += 15 & gt'gadroad'
-
 end
 
 if $ARGS[0] = 'gadforestlostfinish2':
-	cls
-	*clr
+	*clr & cla
 	menu_off = 1
 	temp = RAND(1,5)
 	lost = 0
@@ -324,8 +317,7 @@ if $ARGS[0] = 'gadforestlostfinish2':
 end
 
 if $ARGS[0] = 'gadforestlostfinish3':
-	cls
-	*clr
+	*clr & cla
 	menu_off = 1
 	temp = RAND(1,7)
 	lost = 0
@@ -344,8 +336,7 @@ if $ARGS[0] = 'gadforestlostfinish3':
 end
 
 if $ARGS[0] = 'gadforestlostfinish4':
-	cls
-	*clr
+	*clr & cla
 	menu_off = 1
 	temp = RAND(1,9)
 	lost = 0
@@ -369,8 +360,7 @@ end
 if $ARGS[0] = 'searchfood':
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10:
 		act 'Look for mushrooms and berries':
-			cla
-			*clr
+			*clr & cla
 			menu_off = 1
 			minut += 30
 			new_boletus += rand(1,2)