Browse Source

Running and waiting on bench fixes

KevinSmarts 7 years ago
parent
commit
ac6d93c5f1
3 changed files with 10 additions and 10 deletions
  1. 3 4
      locations/park
  2. 3 4
      locations/parkivent
  3. 4 2
      locations/parks

+ 3 - 4
locations/park

@@ -113,10 +113,9 @@ if $ARGS[0] = 'start':
 			cla
 			cla
 			*clr
 			*clr
 			parkrunday = daystart
 			parkrunday = daystart
-			minut += 60
-			fat -= rand(2, 7)
-			run_exp += rand(0, 2)
-			pcs_sweat += 20
+			gs 'exercise', 'tier1', 60, 'run_exp'
+			fat -= rand(0, 4)
+			pcs_sweat += 5
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
 			'You randomly take the paths, you run them up and down and about an hour later, you are out of breath and heavily sweating.'
 			'You randomly take the paths, you run them up and down and about an hour later, you are out of breath and heavily sweating.'
 
 

+ 3 - 4
locations/parkivent

@@ -826,10 +826,9 @@ if $ARGS[0] = 'run':
 	if $clothingworntype = 'exercise' and hour > 5 and hour < 22 and daybegskver ! daystart:
 	if $clothingworntype = 'exercise' and hour > 5 and hour < 22 and daybegskver ! daystart:
 		act 'Go for a run in the park (1:00)':
 		act 'Go for a run in the park (1:00)':
 			cls
 			cls
-			minut += 60
-			fat -= rand(2, 7)
-			run_exp += rand(0, 2)
-			pcs_sweat += 20
+			gs 'exercise', 'tier1', 60, 'run_exp'
+			fat -= rand(0, 4)
+			pcs_sweat += 5
 			daybegskver = daystart
 			daybegskver = daystart
 			gs 'stat'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'

+ 4 - 2
locations/parks

@@ -41,13 +41,15 @@ if $ARGS[0] = 'start':
 
 
 				waiting = input ("How many minutes of sitting? (Not more 120 minutes)")
 				waiting = input ("How many minutes of sitting? (Not more 120 minutes)")
 
 
-				if waiting <= 0 or waiting > 120:
+				if waiting > 120:
 					minut = minut + 15
 					minut = minut + 15
-				elseif waiting > 0 and waiting <= 120:
+				elseif waiting > 0:
 					minut = minut + waiting
 					minut = minut + waiting
 					pcs_mood += 10
 					pcs_mood += 10
 					pcs_willpwr = pcs_willpwr + 10
 					pcs_willpwr = pcs_willpwr + 10
 					if pcs_sleep < 90:pcs_sleep += 10
 					if pcs_sleep < 90:pcs_sleep += 10
+				else
+					'Invalid time.'
 				end
 				end
 
 
 				act 'Consult a watch': gt 'parks', 'start'
 				act 'Consult a watch': gt 'parks', 'start'