Browse Source

Merge branch 'master' of http://git.tfgamessite.com/rachels/girllife-ecv

KevinSmarts 7 years ago
parent
commit
b60dd5e16f
2 changed files with 6 additions and 5 deletions
  1. 5 5
      locations/exercise
  2. 1 0
      locations/gschool_lunch

+ 5 - 5
locations/exercise

@@ -351,7 +351,7 @@ if $ARGS[0] = 'hula':
 		'<center><img <<$set_imgh>> src="images/pc/activities/obruch.gif"></center>'
 		'<center><img <<$set_imgh>> src="images/pc/activities/obruch.gif"></center>'
 	end
 	end
 	'You develop your dexterity by using your hula hoop for <<$timestring>> minutes.'
 	'You develop your dexterity by using your hula hoop for <<$timestring>> minutes.'
-
+	gs 'stat'
 	if exer_auto = 1:
 	if exer_auto = 1:
 		act 'Continue': gt 'exercise', 'auto_end'
 		act 'Continue': gt 'exercise', 'auto_end'
 	else
 	else
@@ -382,7 +382,7 @@ if $ARGS[0] = 'yoga':
 	end
 	end
 
 
 	'You meditate for <<$timestring>> minutes, developing your will.'
 	'You meditate for <<$timestring>> minutes, developing your will.'
-
+	gs 'stat'
 	if exer_auto = 1:
 	if exer_auto = 1:
 		act 'Continue': gt 'exercise', 'auto4'
 		act 'Continue': gt 'exercise', 'auto4'
 	else
 	else
@@ -409,7 +409,7 @@ if $ARGS[0] = 'rope':
 	end
 	end
 
 
 	'You jump rope for <<$timestring>> minutes, developing your speed.'
 	'You jump rope for <<$timestring>> minutes, developing your speed.'
-
+	gs 'stat'
 	if exer_auto = 1:
 	if exer_auto = 1:
 		act 'Continue': gt 'exercise', 'auto3'
 		act 'Continue': gt 'exercise', 'auto3'
 	else
 	else
@@ -436,7 +436,7 @@ if $ARGS[0] = 'press':
 	end
 	end
 
 
 	'You do a series of abdominal exercises for <<$timestring>> minutes, developing your endurance.'
 	'You do a series of abdominal exercises for <<$timestring>> minutes, developing your endurance.'
-
+	gs 'stat'
 	if exer_auto = 1:
 	if exer_auto = 1:
 		act 'Continue': gt 'exercise', 'auto2'
 		act 'Continue': gt 'exercise', 'auto2'
 	else
 	else
@@ -466,7 +466,7 @@ if $ARGS[0] = 'push':
 	'<br>You managed to do <<pushnum>> push-ups. Your previous record is <<pushrecord>>.'
 	'<br>You managed to do <<pushnum>> push-ups. Your previous record is <<pushrecord>>.'
 
 
 	if pushrecord < pushnum:pushrecord = pushnum & 'This is a new record!'
 	if pushrecord < pushnum:pushrecord = pushnum & 'This is a new record!'
-
+	gs 'stat'
 	if exer_auto = 1:
 	if exer_auto = 1:
 		act 'Continue': gt 'exercise', 'auto1'
 		act 'Continue': gt 'exercise', 'auto1'
 	else
 	else

+ 1 - 0
locations/gschool_lunch

@@ -399,6 +399,7 @@ if $ARGS[0] = 'events':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
 		'As you stop by your locker after lunch, Anushka comes over to you and leans against the locker next to yours. She leans in close to you "Hey <<$pcs_nickname>> want to have some fun? The boys got some stuff and they are waiting for us in one of the unused classrooms." By the look in her eye and the way she is acting, you know exactly what she means by having fun with the boys.'
 		'As you stop by your locker after lunch, Anushka comes over to you and leans against the locker next to yours. She leans in close to you "Hey <<$pcs_nickname>> want to have some fun? The boys got some stuff and they are waiting for us in one of the unused classrooms." By the look in her eye and the way she is acting, you know exactly what she means by having fun with the boys.'
 		act 'Not today':
 		act 'Not today':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/45.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/45.jpg"></center>'
 			'You think about it a moment but decided you have other things you need to do. So you shake your head. "Sorry not today, maybe some other time, I got some stuff I need to do."'
 			'You think about it a moment but decided you have other things you need to do. So you shake your head. "Sorry not today, maybe some other time, I got some stuff I need to do."'
 			'She shrugs slightly "Whatever." With that she turns and walks off. Leaving you behind wondering if you made the right decision.'
 			'She shrugs slightly "Whatever." With that she turns and walks off. Leaving you behind wondering if you made the right decision.'