Browse Source

[fixes] added a time restriction and exercise shoe requirement to running in the city park
[added] information in gskver, gschool_grounds, park and gadroad for the player that a run is possible in a location if the action is hidden
[fixes] gave the run in gadroad a different tracking variable as the park

julzor 5 years ago
parent
commit
06eabcdbcc
4 changed files with 12 additions and 4 deletions
  1. 4 2
      locations/gadroad.qsrc
  2. 2 0
      locations/gschool_grounds.qsrc
  3. 3 1
      locations/park.qsrc
  4. 3 1
      locations/parkivent.qsrc

+ 4 - 2
locations/gadroad.qsrc

@@ -27,14 +27,14 @@ end
 
 act 'Take a detour to the field':minut += 10 & gt'gadfield','field'
 act 'Go into the woods':minut += 30 & gt'gadforest','1'
-if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour >= 6 and hour < 22 and daybegskver ! daystart:
+if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour >= 6 and hour < 22 and daygadrun ! daystart:
 	act 'Go for a run (1:00)':
 		cls
 		minut += 60
 		fat -= RAND(5,15)
 		run_exp += RAND(3,6)
 		pcs_sweat += 20
-		daybegskver = daystart
+		daygadrun = daystart
 		gs'stat'
 		!gs'time'
 		if month <= 3 or month >= 11:
@@ -52,6 +52,8 @@ if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour >= 6 a
 
 		act 'Further':gt'gadroad'
 	end
+elseif ($clothingworntype ! 'exercise' or $shoeworntype ! 'trainers') and hour >= 6 and hour < 22 and daygadrun ! daystart:
+	'You could go for a run here if you were wearing sports clothes and shoes.'
 end
 act 'Go to Gadukino':minut += 20 & gt'gadukino'
 

+ 2 - 0
locations/gschool_grounds.qsrc

@@ -311,6 +311,8 @@ if $ARGS[0] = 'sports':
 
 			act 'Continue': gt 'gschool_grounds', 'sports'
 		end
+	elseif schoolrunday ! daystart and ($clothingworntype ! 'exercise' or $shoeworntype ! 'trainers'):
+		'You could go for a run here if you were wearing sports clothes and shoes.'
 	end
 
 	if hour >= 9 and hour < 18 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0:

+ 3 - 1
locations/park.qsrc

@@ -122,7 +122,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if $clothingworntype = 'exercise' and parkrunday ! daystart:
+	if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour > 5 and hour < 23 and parkrunday ! daystart:
 		act 'Jog through the park (1:00)':
 			cla
 			*clr
@@ -195,6 +195,8 @@ if $ARGS[0] = 'start':
 
 			act 'Complete jog':gt 'park', 'start'
 		end
+	elseif ($clothingworntype ! 'exercise' or $shoeworntype = 'trainers') and hour > 5 and hour < 23 and parkrunday ! daystart:
+		'You could go for a run in the park if you were wearing sports clothes and shoes.'
 	end
 
 	if hour <= 7 or hour >= 21:

+ 3 - 1
locations/parkivent.qsrc

@@ -787,7 +787,7 @@ if $ARGS[0] = '9':
 end
 
 if $ARGS[0] = 'run':
-	if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour > 5 and hour < 22 and daybegskver ! daystart:
+	if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour > 5 and hour < 23 and daybegskver ! daystart:
 		act 'Go for a run in the park (1:00)':
 			cls
 			gs 'exercise', 'tier1', 60, 'run_exp'
@@ -818,6 +818,8 @@ if $ARGS[0] = 'run':
 				act 'Continue': gt $loc, $metka
 			end
 		end
+	elseif ($clothingworntype ! 'exercise' or $shoeworntype ! 'trainers') and hour > 5 and hour < 23 and daybegskver ! daystart:
+		'You could go for a run in the park if you were wearing sports clothes and shoes.'
 	end
 end