Browse Source

[changed] image checks based on hour to image checks based on daystage variable which automatically adjusts with changing seasons

hornguy6 3 năm trước cách đây
mục cha
commit
1e0d82feb6

+ 2 - 2
locations/city_center.qsrc

@@ -37,13 +37,13 @@ if streetevent_hour ! hour:gt 'street_event','city_center', 'main'
 '<center><h2>St. Petersburg</h2></center>'
 '<center><b>City Center</b></center>'
 if month >= 11 or month <= 3:
-	if hour >= 8 and hour <= 21:
+	if daystage = 2 or daystage = 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/downw.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/downwn.jpg"></center>'
 	end
 else
-	if hour >= 8 and hour <= 21:
+	if daystage = 2 or daystage = 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/down.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/down_night.jpg"></center>'

+ 2 - 2
locations/city_industrial.qsrc

@@ -26,13 +26,13 @@ if $ARGS[0] = '':
 	'<center><h2>St. Petersburg</h2></center>'
 	'<center><b>Industrial Region</b></center>'
 	if month >= 11 or month <= 3:
-		if hour >= 8 and hour <= 21:
+		if daystage = 2 or daystage = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/industw.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/industwn.jpg"></center>'
 		end
 	else
-		if hour >= 8 and hour <= 21:
+		if daystage = 2 or daystage = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/nord.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/nord2.jpg"></center>'

+ 2 - 2
locations/city_island.qsrc

@@ -21,13 +21,13 @@ gs 'stat'
 '<center><h2>St. Petersburg</h2></center>'
 '<center><b>Vasilyevsky Island</b></center>'
 if month >= 11 or month <= 3:
-	if hour >= 8 and hour <= 21:
+	if daystage = 2 or daystage = 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/island/islandw.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/island/islandwn.jpg"></center>'
 	end
 else
-	if hour >= 8 and hour <= 21:
+	if daystage = 2 or daystage = 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/island/island.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/island/islandn.jpg"></center>'

+ 2 - 2
locations/city_residential.qsrc

@@ -26,13 +26,13 @@ if streetevent_hour + 2 < hour:gt'street_event','city_residential', 'main'
 '<center><h2>St. Petersburg</h2></center>'
 '<center><b>Residential Area</b></center>'
 if month >= 11 or month <= 3:
-	if hour >= 8 and hour <= 21:
+	if daystage = 2 or daystage = 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/streetw.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/streetwn.jpg"></center>'
 	end
 else
-	if hour >= 8 and hour <= 21:
+	if daystage = 2 or daystage = 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/street.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/street_night.jpg"></center>'

+ 1 - 1
locations/pav_commcenter.qsrc

@@ -12,7 +12,7 @@ gs 'stat'
 
 act 'Leave': minut += 2 & gt 'pav_residential'
 
-if hour >= 9 and hour < 20:
+if daystage = 2 or daystage = 3:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk.jpg"></center>'
 else
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'

+ 2 - 2
locations/pav_commercial.qsrc

@@ -34,13 +34,13 @@ if streetevent_hour + 2 < hour:gt'street_event','pav_commercial', 'main'
 
 '<center><h2>Pavlovsk</h2></center>'
 if month >= 11 or month <= 3:
-	if hour >= 8 and hour <= 21:
+	if daystage = 2 or daystage = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodokw.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavbuswn.jpg"></center>'
 	end
 else
-	if hour >= 8 and hour <= 21:
+	if daystage = 2 or daystage = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavbusn.jpg"></center>'

+ 4 - 4
locations/pav_park.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if month=3 or month=4 or month=5:
-		if hour>=6 and hour<=17:
+		if daystage = 2 or daystage = 3:
 			'<center><h2>Pavlovsk Park</h2></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.spring.jpg"></center>'
 			*nl
@@ -41,7 +41,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	if month=6 or month=7 or month=8:
-		if hour>=6 and hour<=19:
+		if daystage = 2 or daystage = 3:
 			'<center><h2>Pavlovsk Park</h2></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver.jpg"></center>'
 			*nl
@@ -58,7 +58,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	if month=9 or month=10 or month=11:
-		if hour>=6 and hour<=18:
+		if daystage = 2 or daystage = 3:
 			'<center><h2>Pavlovsk Park</h2></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.autumn.jpg"></center>'
 			*nl
@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	if month=1 or month=2 or month=12:
-		if hour>=7 and hour<=16:
+		if daystage = 2 or daystage = 3:
 			'<center><h2>Pavlovsk Park</h2></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.jpg"></center>'
 			*nl

+ 2 - 2
locations/pav_residential.qsrc

@@ -31,13 +31,13 @@ if streetevent_hour + 2 < hour:gt'street_event','pav_residential', 'main'
 
 '<center><h2>Pavlovsk</h2></center>'
 if month >= 11 or month <= 3:
-	if hour >= 8 and hour <= 21:
+	if daystage = 2 or daystage = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavreswinter.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavreswintern.jpg"></center>'
 	end
 else
-	if hour >= 8 and hour <= 21:
+	if daystage = 2 or daystage = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavres.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavresn_'+ rand(1,2) +'.jpg"></center>'