Browse Source

Merge branch 'master' of https://git.catrenelle.com/sovietmercader/glife

julzor 5 years ago
parent
commit
27c1532c57
2 changed files with 1 additions and 2 deletions
  1. 0 1
      locations/Gaddvor.qsrc
  2. 1 1
      locations/Meadow.qsrc

+ 0 - 1
locations/Gaddvor.qsrc

@@ -81,7 +81,6 @@ if $ARGS[0]='':
 
 		act 'Go to the barn':minut += 1 & gt 'Gadsarai'
 		act 'Go to the garden':minut += 1 & gt'Gadgarden','garden'
-		if meadow > 0 and hour >= 6 and hour < 20 and month >= 4 and month <= 10:act 'Go to the meadow':minut += 20 & gt 'Meadow', 'start'
 		act '<b>Go to Gadukino</b>':minut += 5 & gt 'gadukino'
 
 		mira_temp = rand(1,5)

+ 1 - 1
locations/Meadow.qsrc

@@ -94,7 +94,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		'It''s currently raining. You could do some exercises here if the weather improves..'
 	end
 
-	act 'Leave':minut += 20 & MiraLoc = 0 & gt 'Gaddvor'
+	act 'Leave':minut += 20 & MiraLoc = 0 & gt 'gadroad'
 end
 
 if $ARGS[0] = 'Mira':