Browse Source

[changed] weather changes

sovietmercader 4 years ago
parent
commit
2020cc67e8
2 changed files with 33 additions and 29 deletions
  1. 32 28
      locations/outdoors.qsrc
  2. 1 1
      locations/stat.qsrc

+ 32 - 28
locations/outdoors.qsrc

@@ -1,34 +1,34 @@
 # outdoors
 
-weatherGrM[1] = -15
-weatherGrM[2] = -10
-weatherGrM[3] = -5
+weatherGrM[1] = -10
+weatherGrM[2] = -5
+weatherGrM[3] = 0
 weatherGrM[4] = 10
-weatherGrM[5] = 15
-weatherGrM[6] = 20
+weatherGrM[5] = 10
+weatherGrM[6] = 15
 weatherGrM[7] = 25
-weatherGrM[8] = 25
-weatherGrM[9] = 20
+weatherGrM[8] = 20
+weatherGrM[9] = 15
 weatherGrM[10]= 10
-weatherGrM[11]= -5
-weatherGrM[12]= -10
+weatherGrM[11]= 0
+weatherGrM[12]= -5
 
 weatherGrDelta = 5
 
-weatherFallM[1] = 60
-weatherFallM[2] = 20
-weatherFallM[3] = 20
-weatherFallM[4] = 30
-weatherFallM[5] = 30
-weatherFallM[6] = 20
-weatherFallM[7] = 15
-weatherFallM[8] = 15
-weatherFallM[9] = 30
-weatherFallM[10]= 50
-weatherFallM[11]= 60
-weatherFallM[12]= 30
-
-weatherFallDelta = 20
+weatherFallM[1] = 50
+weatherFallM[2] = 40
+weatherFallM[3] = 30
+weatherFallM[4] = 20
+weatherFallM[5] = 20
+weatherFallM[6] = 10
+weatherFallM[7] = 10
+weatherFallM[8] = 10
+weatherFallM[9] = 20
+weatherFallM[10]= 20
+weatherFallM[11]= 30
+weatherFallM[12]= 40
+
+weatherFallDelta = 10
 
 DayLengthMin = 177 &! Minutes from dawn to noon
 DayLengthMax = 563
@@ -41,12 +41,16 @@ if $ARGS[0] = 'weather':
 	if (weatherHour ! hour) or (weatherDay ! daystart):
 		weatherDay = DayInYear
 		weatherHour = hour
-
+		
 		temper = hour
-		if temper < 2 : temper = 24 + temper
-		temper -= 14
-		if temper > 0 : temper = -temper
-		temper += 6
+		if temper <= 2:
+			temper = temper + (6 - (temper * 2))
+		elseif temper >= 3 and temper <= 15:
+			temper = temper
+		elseif temper >= 16:
+			temper = (temper - 30) * -1
+		end
+		
 		temper = weatherTemper + (weatherGrDelta*100/6*temper)/100
 		
 		if chWeather = 0:

+ 1 - 1
locations/stat.qsrc

@@ -603,7 +603,7 @@ if minut >= 60:
 
 	gs 'traits', 'hourly'
 
-	gs 'outdoors', 'weather'
+	if (hour mod 2) = 0: gs 'outdoors', 'weather'
 
 	if minut >= 60:jump 'loopmin'
 end