[changed] the exp gained from using the gs 'exercise', 'teir*' will now alos go through the new exp_gain file, these changes the parameter in the exercise calls from name_exp to just name.

locations/Nudelake.qsrc

@@ -185,10 +185,10 @@ if $ARGS[0] = 'swim':
 	gs 'cum_cleanup'
 	minut += 60
 	if $clothingworntype = 'nude':
-		gs 'exercise', 'tier1', 1, 'stren_exp'
+		gs 'exercise', 'tier1', 1, 'stren'
 		inhib_exp += rand(1,3)
 	else
-		gs 'exercise', 'tier1', 1, 'stren_exp'
+		gs 'exercise', 'tier1', 1, 'stren'
 		if pcs_inhib < 50:inhib_exp += rand(1,3)
 	end
 	pcs_sweat = 10 + rand(0,4)

locations/abduction.qsrc

@@ -685,7 +685,7 @@ end
 if $ARGS[0] = 'abdexercise':
 	*clr & cla
 	menu_off = 1
-	gs 'exercise', 'tier2', 30, 'stren_exp'
+	gs 'exercise', 'tier2', 30, 'stren'
 	
 	'<center><video autoplay loop src="images/pc/activities/exercises/push_nude.mp4"></video></center>'
 	*nl
@@ -706,7 +706,7 @@ if $ARGS[0] = 'abdexercise':
 	act 'Continue':
 		*clr & cla
 		menu_off = 1
-		gs 'exercise', 'tier2', 30, 'vital_exp'
+		gs 'exercise', 'tier2', 30, 'vital'
 		
 		'<center><video autoplay loop src="images/pc/activities/exercises/abdominal_nude.mp4"></video></center>'
 		*nl

locations/albina_starlets.qsrc

@@ -253,7 +253,7 @@ if $ARGS[0] = 'starlets':
 
 	AlbinaQW['startletsday'] = daystart
 	starlets_practice = 0
-	gs 'exercise', 'tier2', 120, 'agil_exp', 'dancero_exp'
+	gs 'exercise', 'tier2', 120, 'agil', 'dancero'
 	pcs_mood -= 5
 	inhib_exp += rand(2,4)
 	if perform_lvl < 35: gs 'exp_gain', 'perform', 1
@@ -297,7 +297,7 @@ if $ARGS[0] = 'starlets':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/stage.jpg"></center>'
 			'Albina calls for a car. Once the car arrives, you all bundle in. You arrive at the performance hall and are ushered into a small dressing room, where you all change into your outfits and group up at the edge of the stage.'
 			act 'Dance':
-				gs 'exercise', 'tier2', 120, 'agil_exp', 'danc_exp'
+				gs 'exercise', 'tier2', 120, 'agil', 'danc'
 				money += albpayrand * 1000
 				killvar 'albpayrand'
 				profiDanceTime += 1
@@ -1427,7 +1427,7 @@ if $ARGS[0] = 'parkrally':
 
 	act 'Do the show':
 		*clr & cla
-		gs 'exercise', 'tier2', 0, 'agil_exp', 'danc_exp'
+		gs 'exercise', 'tier2', 0, 'agil', 'danc'
 		profiDanceTime += 1
 		inhib_exp += rand(3,5)
 		noShampoo = 1

locations/albinahome.qsrc

@@ -272,13 +272,13 @@ if $ARGS[0] = 'stripping':
 	if pcs_inhib < 60:inhib_exp += rand(2,3)
 
 	if pcs_danc >= 40:
-		gs 'exercise', 'tier2', 120, 'agil_exp', 'dancero_exp'
+		gs 'exercise', 'tier2', 120, 'agil', 'dancero'
 		gs 'stat'
 		'"Okay, we need some space. Follow me." She leads you down to the home gym, where she teaches you how to passionately dance to the music while stripping.'
 
 		if pcs_dancero >= 100:'You didn''t learn anything new since you already know everything she can teach you.'
 	else
-		gs 'exercise', 'tier3', 120, 'agil_exp', 'danc_exp'
+		gs 'exercise', 'tier3', 120, 'agil', 'danc'
 		gs 'stat'
 		'A striptease is too complex for you. You''re not able to dance and strip at the same time. Albina recommends that you start with learning to dance first.'
 	end
@@ -292,7 +292,7 @@ if $ARGS[0] = 'poledancing':
 	npc_rel['A23'] += 1
 	if pcs_stren >= 40 and pcs_dancero > 50:
 		if pcs_inhib < 60:inhib_exp += rand(2,3)
-		gs 'exercise', 'tier2', 120, 'stren_exp', 'vital_exp', 'dancpol_exp'
+		gs 'exercise', 'tier2', 120, 'stren', 'vital', 'dancpol'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/poledance.jpg"></center>'
 		'Albina leads you down to the home gym, where she teaches you various acrobatic moves on the pole there and the two of you greatly enjoy yourselves.'
@@ -305,7 +305,7 @@ if $ARGS[0] = 'poledancing':
 		'You nod at her and she pulls you to your feet before checking your head. "It might bruise, but otherwise you look fine."'
 		act 'Develop strength (2:00)':
 			*clr & cla
-			gs 'exercise', 'tier2', 120, 'stren_exp', 'vital_exp'
+			gs 'exercise', 'tier2', 120, 'stren', 'vital'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/stren.jpg"></center>'
 			'Albina shows you how to develop your strength using various exercises.'
@@ -319,13 +319,13 @@ if $ARGS[0] = 'poledancing':
 		if pcs_inhib < 60:inhib_exp += rand(2,3)
 		'Albina grins. "You still can''t strip well enough for poledancing. We should practice that first."'
 		if pcs_danc >= 40:
-			gs 'exercise', 'tier2', 120, 'agil_exp', 'dancero_exp'
+			gs 'exercise', 'tier2', 120, 'agil', 'dancero'
 			gs 'stat'
 			'Albina teaches you how to passionately dance to the music while stripping.'
 
 			if pcs_dancero >= 100:'You didn''t learn anything new since you already know everything she can teach you.'
 		else
-			gs 'exercise', 'tier3', 120, 'agil_exp', 'danc_exp'
+			gs 'exercise', 'tier3', 120, 'agil', 'danc'
 			gs 'stat'
 			'A striptease is too complex for you. You''re not able to dance and strip at the same time. Albina recommends that you start with learning to dance first.'
 		end

locations/bass.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'a':
 			*clr
 			kisameQW = 1
 			minut += 60
-			gs 'exercise', 'tier1', 1, 'stren_exp'
+			gs 'exercise', 'tier1', 1, 'stren'
 			pcs_sweat = 10 + rand(0,4)
 							
 			'<center><img <<$set_imgh>> src="images/characters/city/kisame/kisame.jpg"></center>'
@@ -132,7 +132,7 @@ if $ARGS[0] = 'a':
 		pcs_makeup = 1
 		cumspclnt = 10
 		gs 'cum_cleanup'
-		gs 'exercise', 'tier1', 60, 'stren_exp'
+		gs 'exercise', 'tier1', 60, 'stren'
 		pcs_sweat = 10 + rand(0,4)
 		if pcs_inhib < 50:inhib_exp += rand(1,2)
 		if func('body_din','pregnancyVisibility') = 0:

locations/beg.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'start':
 		*clr
 		abonement -= 1
 		pcs_mood += 2
-		gs 'exercise', 'tier2', 30, 'run_exp'
+		gs 'exercise', 'tier2', 30, 'run'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit5.jpg"></center>'
 		'You spend half an hour practising 100 meter dashes to improve your speed, as well as doing several rounds around the stadium to work on your stamina. You are sweaty all over by the end of it, obviously, but you also feel that you''re a little better than before.'
 

locations/beg1.qsrc

@@ -49,7 +49,7 @@ end
 
 if $ARGS[0] = 'br':
 	cla
-	gs 'exercise', 'tier2', 30, 'run_exp'
+	gs 'exercise', 'tier2', 30, 'run'
 
 	begminus = 0
 	if pcs_bmi > 25:
@@ -109,7 +109,7 @@ end
 
 if $ARGS[0] = 'kms':
 	cla
-	gs 'exercise', 'tier2', 30, 'run_exp'
+	gs 'exercise', 'tier2', 30, 'run'
 
 	begminus = 0
 	if pcs_bmi > 25:
@@ -171,7 +171,7 @@ end
 
 if $ARGS[0] = 'ross':
 	cla
-	gs 'exercise', 'tier2', 30, 'run_exp'
+	gs 'exercise', 'tier2', 30, 'run'
 
 	begminus = 0
 	if pcs_bmi > 25:
@@ -233,7 +233,7 @@ end
 
 if $ARGS[0] = 'kval':
 	cla
-	gs 'exercise', 'tier2', 30, 'run_exp'
+	gs 'exercise', 'tier2', 30, 'run'
 	razradbeg += 1
 	minut += 60
 
@@ -300,7 +300,7 @@ end
 
 if $ARGS[0] = 'evro':
 	cla
-	gs 'exercise', 'tier2', 30, 'run_exp'
+	gs 'exercise', 'tier2', 30, 'run'
 	minut += 120
 
 	begminus = 0

locations/city_lake.qsrc

@@ -112,7 +112,7 @@ if $ARGS[0] = 'start':
 				cumspclnt = 4
 				gs 'cum_cleanup'
 				minut += 60
-				gs 'exercise', 'tier1', 1, 'stren_exp'
+				gs 'exercise', 'tier1', 1, 'stren'
 				pcs_sweat = 10 + rand(0,4)
 				if pcs_inhib < 40:inhib_exp += rand(1,2)
 
@@ -1303,7 +1303,7 @@ if $ARGS[0] = 'andrey1':
 		cumspclnt = 4
 		gs 'cum_cleanup'
 		minut += 30
-		gs 'exercise', 'tier1', 1, 'stren_exp'
+		gs 'exercise', 'tier1', 1, 'stren'
 		pcs_sweat = 10 + rand(0,4)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/andrey1/andrey1.jpg"></center>'

locations/city_park.qsrc

@@ -127,7 +127,7 @@ if $ARGS[0] = 'start':
 				*clr & cla
 				menu_off = 1
 				parkrunday = daystart
-				gs 'exercise', 'tier1', 60, 'run_exp'
+				gs 'exercise', 'tier1', 60, 'run'
 				'<center><b><font color="maroon">Park</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
 				'You choose paths randomly, running them up and down, and about an hour later, you are out of breath and heavily sweating.'
@@ -427,7 +427,7 @@ if $ARGS[0] = 'luna':
 					stKo = pcs_stren * 20/100
 					damage = rand(pcs_stren - stKo, pcs_stren + stKo)
 
-					gs 'exercise', 'tier2', 1, 'stren_exp'
+					gs 'exercise', 'tier2', 1, 'stren'
 					
 					'A LED screen lights up and shows you your score:<<damage>>'
 					if damage > maxdamage:

locations/city_sauna.qsrc

@@ -258,7 +258,7 @@ if $ARGS[0] = 'saunafitness':
 	cla
 	*clr
 	'<center><video autoplay loop src="images/pc/activities/exercises/push_nude.mp4"></video></center>'
-	gs 'exercise', 'tier2', 30, 'stren_exp'
+	gs 'exercise', 'tier2', 30, 'stren'
 	'You do push-ups for 30 minutes, improving your strength.'
 
 	randpushfact = rand(-5,5)

locations/crossfit_north_box.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'box':
 				abonement -= 1
 				'You start with the workout.'
 				gs 'crossfit_north_wod', $todays_crossfit_wod
-				gs 'exercise', 'tier4', 20, 'stren_exp', 'vital_exp', 'agil_exp'
+				gs 'exercise', 'tier4', 20, 'stren', 'vital', 'agil'
 				'<center><video autoplay loop src="<<$crossfit_north_image_dir>><<$wod_video[$todays_crossfit_wod]>>.mp4"></video></center>'
 				current_wod_score = max(1,(100 - ((100 * pcs_health * (rand(40,100) + pcs_sleep  + pcs_vital + pcs_agil + pcs_stren))/ (healthmax * 500))))
 				cla

locations/danceclass.qsrc

@@ -12,7 +12,7 @@ gs 'themes', 'indoors'
 if pcs_energy >= 10:
 	act 'Modern dance class (0:30)':
 		*clr & cla
-		gs 'exercise', 'tier2', 30, 'agil_exp', 'stren_exp', 'danc_exp'
+		gs 'exercise', 'tier2', 30, 'agil', 'stren', 'danc'
 		abonement -= 1
 		if pcs_inhib < 40:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/moderndance.jpg"></center>'
@@ -25,18 +25,18 @@ if pcs_energy >= 10:
 
 	act 'Burlesque class (0:30)':
 		*clr & cla
-		gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'danc_exp', 'dancero_exp'
+		gs 'exercise', 'tier2', 0, 'agil', 'stren', 'danc', 'dancero'
 		abonement -= 1
 		if pcs_inhib < 60:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/burlesque.jpg"></center>'
 
 		if pcs_danc >= 50:
-			gs 'exercise', 'tier2', 0, 'dancero_exp'
+			gs 'exercise', 'tier2', 0, 'dancero'
 			'You study the art of burlesque, imaging yourself stripping to the music.'
 
 			if pcs_dancero >= 100:'You''ve finally managed to master the art of burlesque, there is no need taking this class anymore.'
 		else
-			gs 'exercise', 'tier2', 0, 'danc_exp'
+			gs 'exercise', 'tier2', 0, 'danc'
 			'This class isn''t just about taking your clothes off, it''s a difficult dance style and your basics aren''t sufficent. Instead, the teacher helps you with your basic modern dance steps.'
 		end
 
@@ -46,13 +46,13 @@ if pcs_energy >= 10:
 	if pcs_stren >=40 or needstrength = 0:
 		act 'Pole dance class (0:30)':
 			*clr & cla
-			gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'dancpol_exp'
+			gs 'exercise', 'tier2', 0, 'agil_exp', 'stren', 'dancpol'
 			abonement -= 1
 			if pcs_inhib < 60:inhib_exp += rand(1,2)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/dance/poledance.jpg"></center>'
 
 			if pcs_dancero >= 50 and pcs_stren >= 40:
-				gs 'exercise', 'tier2', 0, 'dancpol_exp'
+				gs 'exercise', 'tier2', 0, 'dancpol'
 				'You study various acrobatics on the pole.'
 
 				if pcs_dancpol >= 100:'You''ve already mastered the art of pole dancing, there is nothing more left to teach you.'

locations/etoexhib.qsrc

@@ -542,7 +542,7 @@ if $ARGS[0] = 'pos16':
 			gs 'cum_cleanup'
 			inhib_exp += rand(1,2)
 			minut += 60
-			gs 'exercise', 'tier1', 1, 'stren_exp'
+			gs 'exercise', 'tier1', 1, 'stren'
 			pcs_sweat = 10 + rand(0,4)
 
 			'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_bikini_<<rand(0,8)>>.jpg"></center>'
@@ -561,7 +561,7 @@ if $ARGS[0] = 'pos16':
 			gs 'cum_cleanup'
 			inhib_exp += 3
 			minut += 60
-			gs 'exercise', 'tier1', 1, 'stren_exp'
+			gs 'exercise', 'tier1', 1, 'stren'
 			pcs_sweat = 10 + rand(0,4)
 			gs 'arousal', 'foreplay', 60, 'exhibition'
 			gs 'arousal', 'end'

locations/exercise.qsrc

@@ -6,9 +6,9 @@ $ARGS[0] is the workout tier and the higher the tier, the greater the workout in
 	Values: 'tier1' 'tier2' 'tier3' 'tier4'
 ARG[1] is the time override. By default the tiers are in 15 minute segments if being called from an event with predetermined time set this to 1
 	Values: 0 (default of 15 minutes) 1 (time set to 0)
-$ARGS[2] and on are the stats to be affected by the workout NOTE: use the _exp variant, not the pcs_!!!!
-	Values: 'stren_exp' 'vital_exp' 'agil_exp' 'sprt_exp' 'react_exp'
-	Other stats can be added if desired - for a dance-a-thon you might use gs 'exercise', 'tier1', 0, 'agil_exp', 'danc_exp'
+$ARGS[2] and on are the stats to be affected by the workout NOTE: use the gs 'exp_gain', 'name of varibale' variant, not the pcs_!!!!
+	Values: 'stren' 'vital' 'agil' 'sprt' 'react'
+	Other stats can be added if desired - for a dance-a-thon you might use gs 'exercise', 'tier1', 0, 'agil', 'danc'
 }
 
 if $ARGS[0] = 'start':
@@ -335,7 +335,7 @@ end
 if $ARGS[0] = 'hula':
 	cla
 	*clr
-	gs 'exercise', 'tier2', (timemult*15), 'agil_exp', 'react_exp'
+	gs 'exercise', 'tier2', (timemult*15), 'agil', 'react'
 	timemult = 0
 	if $clothingworntype ! 'nude':
 		if $location_type = 'secluded':
@@ -370,7 +370,7 @@ if $ARGS[0] = 'yoga':
 		pcs_willpwr += rand(1,2)
 		if yoga_counter < min(timemult - 1,4): yoga_counter += 1 & jump 'timeloopyoga'
 	end
-	gs 'exercise', 'tier2', (timemult*15), 'sprt_exp', 'agil_exp'	
+	gs 'exercise', 'tier2', (timemult*15), 'sprt', 'agil'	
 	timemult = 0
 
 	if $clothingworntype ! 'nude':
@@ -397,7 +397,7 @@ end
 if $ARGS[0] = 'rope':
 	cla
 	*clr
-	gs 'exercise', 'tier3', (15*timemult), 'agil_exp', 'react_exp'
+	gs 'exercise', 'tier3', (15*timemult), 'agil', 'react'
 	timemult = 0
 
 	if $clothingworntype ! 'nude':
@@ -420,7 +420,7 @@ end
 if $ARGS[0] = 'press':
 	cla
 	*clr
-	gs 'exercise', 'tier3', (15*timemult), 'vital_exp'
+	gs 'exercise', 'tier3', (15*timemult), 'vital'
 	timemult = 0
 
 	if $clothingworntype ! 'nude':
@@ -443,7 +443,7 @@ end
 if $ARGS[0] = 'push':
 	cla
 	*clr
-	gs 'exercise', 'tier3', (15*timemult), 'stren_exp'
+	gs 'exercise', 'tier3', (15*timemult), 'stren'
 	timemult = 0
 
 	if $clothingworntype ! 'nude':
@@ -493,17 +493,20 @@ if $ARGS[0] = 'tier1':
 	mcnt = 0
 	:timeexploop1
 	if $ARGS[3] = '':
-		dynamic '<<$ARGS[2]>> += 1'
-		if $ARGS[2] = 'vital_exp' or $ARGS[2] = 'stren_exp':
-			dynamic '<<$ARGS[2]>> += rand(0,steroid_dose)'
+		gs 'exp_gain', $ARGS[2], 1
+		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
+			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
 			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
 		end
 	else
 		i = 2
 		:exploop1
 		if $ARGS[i] ! '':
-			dynamic '<<$ARGS[i]>> += rand(0,1)'
-			if $ARGS[i] = 'vital_exp' or $ARGS[i] = 'stren_exp': dynamic '<<$ARGS[i]>> += rand(0,steroid_dose) & steroidcheck = 1'
+			gs 'exp_gain', $ARGS[i], rand(0,1)
+			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
+				gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
+				steroidcheck = 1
+			end
 			i += 1
 			jump 'exploop1'
 		else
@@ -538,17 +541,20 @@ if $ARGS[0] = 'tier2':
 	mcnt = 0
 	:timeexploop2
 	if $ARGS[3] = '':
-		dynamic '<<$ARGS[2]>> += rand(2,3)'
-		if $ARGS[2] = 'vital_exp' or $ARGS[2] = 'stren_exp':
-			dynamic '<<$ARGS[2]>> += rand(0,steroid_dose)'
+		gs 'exp_gain', $ARGS[2], rand(2,3)
+		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
+			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
 			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
 		end
 	else
 		i = 2
 		:exploop2
 		if $ARGS[i] ! '':
-			dynamic '<<$ARGS[i]>> += rand(1,2)'
-			if $ARGS[i] = 'vital_exp' or $ARGS[i] = 'stren_exp': dynamic '<<$ARGS[i]>> += rand(0,steroid_dose) & steroidcheck = 1'
+			gs 'exp_gain', $ARGS[i], rand(1,2)
+			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
+				gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
+				steroidcheck = 1
+			end
 			i += 1
 			jump 'exploop2'
 		else
@@ -583,17 +589,20 @@ if $ARGS[0] = 'tier3':
 	mcnt = 0
 	:timeexploop3
 	if $ARGS[3] = '':
-		dynamic '<<$ARGS[2]>> += rand(3,5)'
-		if $ARGS[2] = 'vital_exp' or $ARGS[2] = 'stren_exp':
-			dynamic '<<$ARGS[2]>> += rand(0,steroid_dose)'
+		gs 'exp_gain', $ARGS[2], rand(3,5)
+		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
+			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
 			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
 		end
 	else
 		i = 2
 		:exploop3
 		if $ARGS[i] ! '':
-			dynamic '<<$ARGS[i]>> += rand(2,3)'
-			if $ARGS[i] = 'vital_exp' or $ARGS[i] = 'stren_exp': dynamic '<<$ARGS[i]>> += rand(0,steroid_dose) & steroidcheck = 1'
+			gs 'exp_gain', $ARGS[i], rand(2,3)
+			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
+				gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
+				steroidcheck = 1
+			end
 			i += 1
 			jump 'exploop3'
 		else
@@ -628,17 +637,20 @@ if $ARGS[0] = 'tier4':
 	mcnt = 0
 	:timeexploop4
 	if $ARGS[3] = '':
-		dynamic '<<$ARGS[2]>> += rand(7,10)'
-		if $ARGS[2] = 'vital_exp' or $ARGS[2] = 'stren_exp':
-			dynamic '<<$ARGS[2]>> += rand(0,steroid_dose)'
+		gs 'exp_gain', $ARGS[2], rand(7,10)
+		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
+			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
 			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
 		end
 	else
 		i = 2
 		:exploop4
 		if $ARGS[i] ! '':
-			dynamic '<<$ARGS[i]>> += rand(3,5)'
-			if $ARGS[i] = 'vital_exp' or $ARGS[i] = 'stren_exp': dynamic '<<$ARGS[i]>> += rand(0,steroid_dose) & steroidcheck = 1'
+			gs 'exp_gain', $ARGS[i], rand(3,5)
+			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
+				gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
+				steroidcheck = 1
+			end
 			i += 1
 			jump 'exploop4'
 		else

locations/fit.qsrc

@@ -349,7 +349,7 @@ if $ARGS[0] = 'gym':
 			cla
 			*clr
 			abonement -= 1
-			gs 'exercise', 'tier1', 30, 'vital_exp', 'react_exp'
+			gs 'exercise', 'tier1', 30, 'vital', 'react'
 			fat -= rand(0,4)
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
 
@@ -369,7 +369,7 @@ if $ARGS[0] = 'gym':
 			cla
 			*clr
 			abonement -= 1
-			gs 'exercise', 'tier3', 30, 'stren_exp'
+			gs 'exercise', 'tier3', 30, 'stren'
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit2.jpg"></center>'
 			'You pump iron, building strength.'
@@ -386,7 +386,7 @@ if $ARGS[0] = 'gym':
 		act 'Cross trainer (endurance)':
 			cla & *clr
 			abonement -= 1
-			gs 'exercise', 'tier3', 30, 'vital_exp'
+			gs 'exercise', 'tier3', 30, 'vital'
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit3.jpg"></center>'
 			'You spend a half hour doing reps on the cross trainer developing your endurance.'
@@ -404,7 +404,7 @@ if $ARGS[0] = 'gym':
 			cla
 			*clr
 			abonement -= 1
-			gs 'exercise', 'tier3', 30, 'agil_exp'
+			gs 'exercise', 'tier3', 30, 'agil'
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit4.jpg"></center>'
 			'You run tennis exercises, concentrating on defensive drills.'
@@ -422,7 +422,7 @@ if $ARGS[0] = 'gym':
 			cla
 			*clr
 			abonement -= 1
-			gs 'exercise', 'tier3', 30, 'react_exp'
+			gs 'exercise', 'tier3', 30, 'react'
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit4.jpg"></center>'
 			'You run tennis exercises, concentrating on court reactions.'
@@ -595,7 +595,7 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		abonement -= 1
-		gs 'exercise', 'tier3', 30, 'jab_exp', 'react_exp'
+		gs 'exercise', 'tier3', 30, 'jab', 'react'
 		if pcs_inhib < 30:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kik1.jpg"></center>'
 		'You practice your jabs on the speed bag and double-end bag, straight punches with a step forward. These strikes are not so powerful, but they are fast.'
@@ -607,7 +607,7 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		abonement -= 1
-		gs 'exercise', 'tier3', 30, 'stren_exp', 'punch_exp'
+		gs 'exercise', 'tier3', 30, 'stren', 'punch'
 		if pcs_inhib < 30:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kik1.jpg"></center>'
 		'You practice your power punches on the heavy bag. These are high impact and powerful, but they are hard to get to their target.'
@@ -619,7 +619,7 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		abonement -= 1
-		gs 'exercise', 'tier3', 30, 'stren_exp', 'kick_exp'
+		gs 'exercise', 'tier3', 30, 'stren', 'kick'
 		if pcs_inhib < 30:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kik1.jpg"></center>'
 		'You practice your powerful kicks on a kickboxing bag. These impacts are very powerful and able to cut down an opponant, but are very difficult to hit with.'
@@ -631,7 +631,7 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		abonement -= 1
-		gs 'exercise', 'tier3', 30, 'def_exp', 'agil_exp'
+		gs 'exercise', 'tier3', 30, 'def', 'agil'
 		if pcs_inhib < 30:inhib_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/kickboxing/kik1.jpg"></center>'
 		'You practice your defense movements.'
@@ -647,7 +647,7 @@ if $ARGS[0] = 'kickboxing':
 		act 'Pick a random partner':
 			abonement -= 1
 			pcs_mood += 2
-			gs 'exercise', 'tier3', 30, 'jab_exp', 'punch_exp', 'kick_exp', 'def_exp'
+			gs 'exercise', 'tier3', 30, 'jab', 'punch', 'kick', 'def'
 			pointKik = 0
 			pointKikV = 0
 			round = 1
@@ -681,7 +681,7 @@ if $ARGS[0] = 'kickboxing':
 		act 'Amateur fight':
 			kickbox['amateur_fight_day'] = daystart
 			pcs_mood += 2
-			gs 'exercise', 'tier3', 30, 'jab_exp', 'punch_exp', 'kick_exp', 'def_exp'
+			gs 'exercise', 'tier3', 30, 'jab', 'punch', 'kick', 'def'
 			pointKik = 0
 			pointKikV = 0
 			round = 1

locations/gadfield.qsrc

@@ -65,7 +65,7 @@ if $ARGS[0] = 'field':
 				'Almost all of the villagers have shown up to help out with the fresh cut hay. You spend most of the day working hard and sweating as you help gather the fresh-cut hay. It is difficult, but you get a great workout and end the day feeling exhausted, but quite satisfied.'
 			end
 
-			gs 'exercise', 'tier1', 60, 'stren_exp', 'vital_exp'
+			gs 'exercise', 'tier1', 60, 'stren', 'vital'
 			minut += 300
 			if sunWeather = 1:pcs_tan += 1
 			grandpaQW['chore_bale_hay'] = 2

locations/gadforestlost.qsrc

@@ -611,7 +611,7 @@ if $ARGS[0] = 'wolves':
 
 	act 'Run away':
 		*clr & cla
-		gs 'exercise', 'tier4', 1, 'run_exp'
+		gs 'exercise', 'tier4', 1, 'run'
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run.jpg"></center>'

locations/gadriver.qsrc

@@ -248,7 +248,7 @@ if $ARGS[0] = 'gadbitch':
 				cumspclnt = 4
 				gs 'cum_cleanup'
 				minut += 30
-				gs 'exercise', 'tier1', 1, 'stren_exp'
+				gs 'exercise', 'tier1', 1, 'stren'
 				if pcs_inhib < 50:inhib_exp += rand(1,3)
 				pcs_sweat = 10 + rand(0,4)
 				if hour >= 22 or hour <= 6:
@@ -674,7 +674,7 @@ if $ARGS[0] = 'gadbitch':
 								temp_gr = rand(0,15)
 								cumspclnt = 4 & gs 'cum_cleanup'
 								minut += 30
-								gs 'exercise', 'tier1', 1, 'stren_exp'
+								gs 'exercise', 'tier1', 1, 'stren'
 								pcs_sweat = 10 + rand(0,4)
 								gs'stat'
 
@@ -713,7 +713,7 @@ if $ARGS[0] = 'get_changed':
 				cumspclnt = 4 & gs 'cum_cleanup'
 				minut += 30
 				if pcs_inhib < 50:inhib_exp += rand(1,2)
-				gs 'exercise', 'tier1', 1, 'stren_exp'
+				gs 'exercise', 'tier1', 1, 'stren'
 				pcs_sweat = 10 + rand(0,4)
 				gs'stat'
 

locations/gdksport.qsrc

@@ -233,7 +233,7 @@ if $ARGS[0] = 'dance2':
 
 	if pcs_danc < 50:
 		gsAboDance -= 1
-		gs 'exercise', 'tier2', 120, 'agil_exp', 'danc_exp'
+		gs 'exercise', 'tier2', 120, 'agil', 'danc'
 		if pcs_inhib < 40:inhib_exp += rand(1,2)
 
 		'You take a lesson in modern dance, which is very popular with people your age.'
@@ -248,7 +248,7 @@ if $ARGS[0] = 'dance2':
 		act 'Leave': gt 'gdksport', 'start'
 	else
 		gsAboDance -= 1
-		gs 'exercise', 'tier2', 120, 'agil_exp'
+		gs 'exercise', 'tier2', 120, 'agil'
 		if pcs_inhib < 40:inhib_exp += rand(1,2)
 		gs 'stat'
 
@@ -275,7 +275,7 @@ if $ARGS[0] = 'racing2':
 	*clr & cla
 	menu_off = 1
 	gsAboBeg -= 1
-	gs 'exercise', 'tier2', 120, 'run_exp'
+	gs 'exercise', 'tier2', 120, 'run'
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
@@ -290,9 +290,9 @@ if $ARGS[0] = 'vball2':
 	gsAboVolley -= 1
 	if alko < 2:
 		npc_rel['A69'] += rand(0,2)
-		gs 'exercise', 'tier2', 120, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
+		gs 'exercise', 'tier2', 120, 'vball', 'run', 'agil', 'stren', 'vital'
 	else
-		gs 'exercise', 'tier1', 120, 'run_exp'
+		gs 'exercise', 'tier1', 120, 'run'
 		if pcs_inhib < 40:inhib_exp += rand(0,1)
 	end
 	gs 'stat'
@@ -317,7 +317,7 @@ if $ARGS[0] = 'vball3':
 	'On Fridays they hold intramural competitions. Scouts for professional teams sometime come to see who the stronger and more talented players are.'
 
 	if alko < 2:
-		gs 'exercise', 'tier2', 120, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
+		gs 'exercise', 'tier2', 120, 'vball', 'run', 'agil', 'stren', 'vital'
 		if pcs_vball < 25:
 			'You were an absolutely lousy player and made constant mistakes. Eventually, the coach had enough and he removed you from the court.'
 		elseif pcs_vball < 50:
@@ -345,7 +345,7 @@ if $ARGS[0] = 'vball4':
 	*clr & cla
 	menu_off = 1
 	volkomday = daystart
-	gs 'exercise', 'tier2', 120, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
+	gs 'exercise', 'tier2', 120, 'vball', 'run', 'agil', 'stren', 'vital'
 	npc_rel['A69'] += 1
 	if pcs_inhib < 40:inhib_exp += rand(0,1)
 	gs 'stat'
@@ -396,7 +396,7 @@ end
 
 if $ARGS[0] = 'volley':
 	menu_off = 1
-	gs 'exercise', 'tier2', 30, 'vball_exp', 'run_exp', 'agil_exp', 'stren_exp', 'vital_exp'
+	gs 'exercise', 'tier2', 30, 'vball', 'run', 'agil', 'stren', 'vital'
 !	minut += 30
 	grupvalue[2] += 1
 	gs 'stat'

locations/gschool_cheerleading.qsrc

@@ -141,7 +141,7 @@ if $ARGS[0] = 'tryouts':
 		act 'Try to follow Albina''s example':
 			*clr & cla
 			!! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else
-			gs 'exercise', 'tier2', 30, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
+			gs 'exercise', 'tier2', 30, 'agil', 'vital', 'cheer', 'cheer', 'danc'
 			!! Success calculation - Contributing factors: social group, cool kids standing, Albina friendship, agility, endurance, dance skill, natural cheerleading talent
 			!!  New game character comparison:
 			!!  Cool kids would just about pass								~250 (100 cool + 55 friendship + 30 agi + 30 end + 20 dance + 15 talent)
@@ -317,7 +317,7 @@ if $ARGS[0] = 'practice':
 		act 'Follow the others into the hall':
 			*clr & cla
 			!! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else
-			gs 'exercise', 'tier2', 90, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
+			gs 'exercise', 'tier2', 90, 'agil', 'vital', 'cheer', 'cheer', 'danc'
             gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/practice.mp4"></video></center>'
 
@@ -486,7 +486,7 @@ if $ARGS[0] = 'game':
 				end
 			end
 
-			gs 'exercise', 'tier2', 0, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
+			gs 'exercise', 'tier2', 0, 'agil', 'vital', 'cheer', 'cheer', 'danc'
 			'Out on the field, you and the girls perform your opening routine flawlessly under Albina''s direction and spend the rest of the game chanting and cheering your team. You see some guys in the crowd appreciating the view of your ass as you are performing right in front of them.'
 
 			gs 'stat'
@@ -511,7 +511,7 @@ if $ARGS[0] = 'game':
 				end
 				minut += 90
 				!! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else
-				gs 'exercise', 'tier2', 0, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
+				gs 'exercise', 'tier2', 0, 'agil', 'vital', 'cheer', 'cheer', 'danc'
 				gs 'stat'
 
 				act 'Take a shower': gt 'gschool_cheerleading', 'shower'

locations/gschool_grounds.qsrc

@@ -354,7 +354,7 @@ if $ARGS[0] = 'sports':
 		act 'Go for a run (1 hour)':
 			*clr & cla
 			menu_off = 1
-			gs 'exercise', 'tier1', 60, 'run_exp'
+			gs 'exercise', 'tier1', 60, 'run'
 			fat -= rand(0,4)
 			gs 'sweat', 'add', 5
 			gs 'stat'

locations/gschool_lessons4.qsrc

@@ -672,7 +672,7 @@ if $ARGS[0] = 'pe':
 			gs 'sweat', 'add', 30
 			gs 'exp_gain', 'run', rand(1, 2)
 			gs 'grades', 'class_activity_skill', 'school', 'pe', pcs_run
-			gs 'exercise', 'tier2', 1, 'vital_exp', 'agil_exp'
+			gs 'exercise', 'tier2', 1, 'vital', 'agil'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra.jpg"></center>'
 			'After the roll call, Coach Pavlovich announces that you will be running today.'
 			act 'Run':
@@ -751,7 +751,7 @@ if $ARGS[0] = 'pe':
 			end
 		elseif fizrarand = 2:
 			gs 'grades', 'class_activity_attributes', 'school', 'pe', pcs_agil
-			gs 'exercise', 'tier2', 1, 'agil_exp'
+			gs 'exercise', 'tier2', 1, 'agil'
 			if pcs_agil >= 60: 
 				grupvalue[2] += 2
 			elseif pcs_agil >= 40: 
@@ -763,7 +763,7 @@ if $ARGS[0] = 'pe':
 			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 		elseif fizrarand = 3:
 			gs 'grades', 'class_activity_attributes', 'school', 'pe', pcs_stren
-			gs 'exercise', 'tier2', 1, 'stren_exp'
+			gs 'exercise', 'tier2', 1, 'stren'
 			gs 'stat'
 			pullup = rand (1,7)
 			if pullup = 1 and $pantyworntype = 'none':
@@ -805,7 +805,7 @@ if $ARGS[0] = 'pe':
 			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 		elseif fizrarand = 4:
 			gs 'grades', 'class_activity_attributes', 'school', 'pe', pcs_stren
-			gs 'exercise', 'tier2', 1, 'stren_exp'
+			gs 'exercise', 'tier2', 1, 'stren'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra7.jpg"></center>'
 			'After the roll call, Coach Nikolaevich announces that you will all be doing sit-ups, but that the boys will also have to do pull-ups. He also says that he will be counting how many each person does, so it''s a bit more stressful than usual.'
@@ -828,7 +828,7 @@ if $ARGS[0] = 'pe':
 			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 		elseif fizrarand = 5:
 			gs 'grades', 'class_activity_attributes', 'school', 'pe', pcs_vital
-			gs 'exercise', 'tier2', 1, 'vital_exp'
+			gs 'exercise', 'tier2', 1, 'vital'
 			'Coach Nikolaevich breaks everyone into small groups and has you compete to see who can jump rope the longest. Many of the boys pay special attention to the girls during their turns.'
 			if pcs_cupsize <= 20:
 				if pcs_vital <= 30:
@@ -880,7 +880,7 @@ if $ARGS[0] = 'pe':
 		elseif fizrarand = 6:
 			*clr & cla
 			gs 'grades', 'class_activity_attributes', 'school', 'pe', pcs_stren
-			gs 'exercise', 'tier2', 1, 'stren_exp'
+			gs 'exercise', 'tier2', 1, 'stren'
 			gs 'stat'
 			if pcs_horny >= 100:
 				pcs_horny = 0
@@ -938,7 +938,7 @@ if $ARGS[0] = 'pe':
 			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 		elseif fizrarand = 7:
 			gs 'grades', 'class_activity_attributes', 'school', 'pe', pcs_vital
-			gs 'exercise', 'tier2', 1, 'vital_exp'
+			gs 'exercise', 'tier2', 1, 'vital'
 			'The teacher breaks everyone into small groups and has you compete to see who can perform jumping jacks the longest. Many of the boys pay special attention to the girls during their turns.'
 			jumpingjacks = rand (1,5)
 			if jumpingjacks = 1:
@@ -953,7 +953,7 @@ if $ARGS[0] = 'pe':
 			end
 		elseif fizrarand = 8:
 			gs 'grades', 'class_activity_attributes', 'school', 'pe', pcs_stren
-			gs 'exercise', 'tier2', 1, 'stren_exp'
+			gs 'exercise', 'tier2', 1, 'stren'
 			'After the roll call, Coach Nikolaevich announces that you will all be taking turns doing push-ups. He also says that he will count how many each person does, so it''s a bit more stressful than usual.'
 			jumpingjacks = rand (1,5)
 			if jumpingjacks = 1:

locations/mother.qsrc

@@ -2085,7 +2085,7 @@ if $ARGS[0] = 'mother_jog_pav':
 	'You are waiting outside in the courtyard when you see your <<$npc_nickname[''A29'']>> appear from around the corner. She does a few stretches before announcing to you that she is ready to get moving. The two of you walk to the park, as you do you chat about a variety of things. Once you get to the park you both do a little stretching before you start jogging.'
 	act 'Go Jogging': 
 		*clr & cla
-		gs 'exercise', 'tier1', 60, 'run_exp'
+		gs 'exercise', 'tier1', 60, 'run'
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/resident/mom/pavrun1.jpg"></center>'
 		'You and your <<$npc_nickname[''A29'']>> start jogging down one of the park paths. It''s not particularly taxing but you are glad to spend time with her. As you run you notice some men leering, but neither of you make a big deal out of it. Running through the park is quite refreshing overall, especially with company.'
@@ -2117,7 +2117,7 @@ if $ARGS[0] = 'mother_yoga_pav':
 		'You see your <<$npc_nickname[''A29'']>> has put on some very light clothing, and you head off towards the park - chatting as you go. It is not long before you arrive, so you quickly get ready to start your routine.'
 		act 'Do some yoga':
 			*clr & cla
-			gs 'exercise', 'tier2', 30, 'sprt_exp', 'agil_exp'	
+			gs 'exercise', 'tier2', 30, 'sprt', 'agil'	
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/mom/pavyoga2.jpg"></center>'
 			'You and your <<$npc_nickname[''A29'']>> do some simple yoga routines together. It isn''t as pressing as when you do them by yourself, but you enjoy being able to spend time with her. Sometimes men walk by and leer at you both for awhile, seeming to enjoy the free show.'
@@ -2144,7 +2144,7 @@ if $ARGS[0] = 'mother_jog_gad':
 	'"Well, I''m ready! Should we set off?"'
 	act 'Let her take the lead': 
 		*clr & cla
-		gs 'exercise', 'tier1', 60, 'run_exp'
+		gs 'exercise', 'tier1', 60, 'run'
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/resident/mom/gadrun1.jpg"></center>'
 		'Your <<$npc_nickname[''A29'']>> leads you out of the house and into the countryside. You let her take the lead since she knows the area well. This also gives you the chance to chat with her as you jog along. You talk about a variety of topics and enjoy spending time with her, as well as getting the chance to jog around the countryside and see all the interesting routes your <<$npc_nickname[''A29'']>> knows about and enjoys taking.'
@@ -2176,7 +2176,7 @@ if $ARGS[0] = 'mother_yoga_gad':
 		'You see your <<$npc_nickname[''A29'']>> has put on some very light clothing and you both head off towards the meadow, chatting as you go. It''s not long before you arrive and you quickly get ready to start your routine.'
 		act 'Do some yoga':
 			*clr & cla
-			gs 'exercise', 'tier2', 30, 'sprt_exp', 'agil_exp'	
+			gs 'exercise', 'tier2', 30, 'sprt', 'agil'	
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/mom/gadyoga2.jpg"></center>'
 			'You and your <<$npc_nickname[''A29'']>> do some simple yoga routines together. It isn''t as pressing as when you do them by yourself but you enjoy being able to spend time with her. The area is quite secluded and private, and you and your <<$npc_nickname[''A29'']>> are left to run your routine in peace and quiet. It is a nice experience and gives you plenty of time to talk whilst going through your poses and stretches.'

locations/pav_train_hall.qsrc

@@ -178,7 +178,7 @@ if $ARGS[0] = 'work':
 		act 'Mop the waiting room floor (1:00)':
 			cls
 			cleZalDay = daystart
-			gs 'exercise', 'tier1', 60, 'stren_exp', 'vital_exp'
+			gs 'exercise', 'tier1', 60, 'stren', 'vital'
 			pcs_mood -= 6
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
@@ -192,7 +192,7 @@ if $ARGS[0] = 'work':
 		act 'Clean the men''s restroom (0:30)':
 			cls
 			cleMTDay = daystart
-			gs 'exercise', 'tier1', 30, 'stren_exp', 'vital_exp'
+			gs 'exercise', 'tier1', 30, 'stren', 'vital'
 			pcs_mood -= 6
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
@@ -208,7 +208,7 @@ if $ARGS[0] = 'work':
 		act 'Clean the women''s restroom (0:30)':
 			cls
 			cleWTDay = daystart
-			gs 'exercise', 'tier1', 30, 'stren_exp', 'vital_exp'
+			gs 'exercise', 'tier1', 30, 'stren', 'vital'
 			pcs_mood -= 6
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'

locations/pet_dog.qsrc

@@ -155,7 +155,7 @@ if $ARGS[0] = 'exercise':
 		pcs_mood += 20
 		sunWeather = 1
 		gs 'sweat', 'add', 20
-		gs 'exercise', 'tier1', 60, 'run_exp'
+		gs 'exercise', 'tier1', 60, 'run'
 		fat -= rand(1,3)
 		'<center><img <<$set_imgh>> src="images/characters/shared/rex/run_'+iif(daystage = 1 or daystage = 3 or daystage = 4 or daystage = 6, 'sunset', rand(0,1))+'.jpg"></center>'
 		'<<$rex[''name'']>> excitedly runs around you as you put on your running shoes. He loves going on runs with you. "Yes," you say with a smile. "We''re going for a run. Are you ready?" He wags his tail. "Alright, let''s go boy!"'

locations/volleyball.qsrc

@@ -40,8 +40,8 @@ if $ARGS[0] = 'team_practice':
 	timemult = 8
 	loopcount = 1
 	:vballtimeloop3
-	gs 'exercise', 'tier2', 0, 'vball_block_exp', 'vball_rec_exp', 'vball_serve_exp', 'vball_set_exp', 'vball_spike_exp'
-	gs 'exercise', 'tier2', 0, 'stren_exp', 'agil_exp', 'prcptn_exp', 'react_exp', 'vital_exp'
+	gs 'exercise', 'tier2', 0, 'vball_block', 'vball_rec', 'vball_serve', 'vball_set', 'vball_spike'
+	gs 'exercise', 'tier2', 0, 'stren', 'agil', 'prcptn', 'react', 'vital'
 	if loopcount < timemult: loopcount += 1 & jump 'vballtimeloop3'
 	loopcount = 0
 	timemult = 0
@@ -181,8 +181,8 @@ if $ARGS[0] = 'block_practice':
 	loopcount = 1
 	:vballtimeloop3
 	vball_block_lvl = pcs_vball['blocking_practice']
-	gs 'exercise', 'tier2', 0, 'vball_block_exp', 'stren_exp', 'vital_exp'
-	gs 'exercise', 'tier3', 0, 'vball_block_exp', 'react_exp'
+	gs 'exercise', 'tier2', 0, 'vball_block', 'stren', 'vital'
+	gs 'exercise', 'tier3', 0, 'vball_block', 'react'
 	if loopcount < timemult: loopcount += 1 & jump 'vballtimeloop3'
 	loopcount = 0
 	timemult = 0
@@ -212,8 +212,8 @@ if $ARGS[0] = 'receive_practice':
 	loopcount = 1
 	:vballtimeloop3
 	vball_rec_lvl = pcs_vball['blocking_practice']
-	gs 'exercise', 'tier2', 0, 'vball_rec_exp', 'vital_exp'
-	gs 'exercise', 'tier3', 0, 'vball_rec_exp', 'agil_exp', 'react_exp'
+	gs 'exercise', 'tier2', 0, 'vball_rec', 'vital'
+	gs 'exercise', 'tier3', 0, 'vball_rec', 'agil', 'react'
 	if loopcount < timemult: loopcount += 1 & jump 'vballtimeloop3'
 	loopcount = 0
 	timemult = 0
@@ -236,8 +236,8 @@ if $ARGS[0] = 'serve_practice':
 	loopcount = 1
 	:vballtimeloop3
 	vball_serve_lvl = pcs_vball['blocking_practice']
-	gs 'exercise', 'tier2', 0, 'stren_exp', 'vital_exp'
-	gs 'exercise', 'tier3', 0, 'vball_serve_exp'
+	gs 'exercise', 'tier2', 0, 'stren', 'vital'
+	gs 'exercise', 'tier3', 0, 'vball_serve'
 	if loopcount < timemult: loopcount += 1 & jump 'vballtimeloop3'
 	loopcount = 0
 	timemult = 0
@@ -293,8 +293,8 @@ if $ARGS[0] = 'set_practice':
 	loopcount = 1
 	:vballtimeloop3
 	vball_set_lvl = pcs_vball['blocking_practice']
-	gs 'exercise', 'tier2', 0, 'agil_exp', 'prcptn_exp'
-	gs 'exercise', 'tier3', 0, 'vball_set_exp'
+	gs 'exercise', 'tier2', 0, 'agil', 'prcptn'
+	gs 'exercise', 'tier3', 0, 'vball_set'
 	if loopcount < timemult: loopcount += 1 & jump 'vballtimeloop3'
 	loopcount = 0
 	timemult = 0
@@ -316,8 +316,8 @@ if $ARGS[0] = 'spike_practice':
 	loopcount = 1
 	:vballtimeloop3
 	vball_spike_lvl = pcs_vball['blocking_practice']
-	gs 'exercise', 'tier2', 0, 'agil_exp', 'stren_exp', 'vital_exp'
-	gs 'exercise', 'tier3', 0, 'vball_spike_exp'
+	gs 'exercise', 'tier2', 0, 'agil', 'stren', 'vital'
+	gs 'exercise', 'tier3', 0, 'vball_spike'
 	if loopcount < timemult: loopcount += 1 & jump 'vballtimeloop3'
 	loopcount = 0
 	timemult = 0