Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/fame.qsrc

@@ -8,8 +8,44 @@
 !!ARGS[2] is the value of the increase and should be an integer, its hard to put a value on fame but lets go with:
 !! 1-5 for small regular stuff and 10-50 for things with big impact like modelling
 
-if $ARGS[0] ! 'deg':
+if $ARGS[0] = 'deg':
+!!degradation calculation applied overnight 
+	$fametown = 'pav'
+
+	:famedegloop
+
+	if dyneval('RESULT = <<$fametown>>_acting') > 2: dynamic '<<$fametown>>_acting -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_dance') > 2: dynamic '<<$fametown>>_dance -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_painting') > 2: dynamic '<<$fametown>>_painting -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_music') > 2: dynamic '<<$fametown>>_music -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_ballet') > 2: dynamic '<<$fametown>>_ballet -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_modelling') > 2: dynamic '<<$fametown>>_modelling -= rand(-1,3)'
+
+	if dyneval('RESULT = <<$fametown>>_porn') > 2: dynamic '<<$fametown>>_porn -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_stripping') > 2: dynamic '<<$fametown>>_stripping -= rand(-1,3)'
+
+	if dyneval('RESULT = <<$fametown>>_sex') > 2: dynamic '<<$fametown>>_sex -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_prostitute') > 2: dynamic '<<$fametown>>_prostitute -= rand(-1,3)'
+
+	if dyneval('RESULT = <<$fametown>>_kickboxing') > 2: dynamic '<<$fametown>>_kickboxing -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_running') > 2: dynamic '<<$fametown>>_running -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_volleyball') > 2: dynamic '<<$fametown>>_volleyball -= rand(-1,3)'
+
+	if dyneval('RESULT = <<$fametown>>_chess') > 2: dynamic '<<$fametown>>_chess -= rand(-1,3)'
+	if dyneval('RESULT = <<$fametown>>_teaching') > 2: dynamic '<<$fametown>>_teaching -= rand(-1,3)'
+
+	if dyneval('RESULT = <<$fametown>>_media') > 2: dynamic '<<$fametown>>_media -= rand(-1,3)'
+
 
+	if $fametown = 'pav':
+		$fametown = 'city'
+		jump 'famedegloop'
+	elseif $fametown = 'city':
+		$fametown = 'village'
+		jump 'famedegloop'
+	end
+else
+!!main fame calculation
 	dynamic '<<$ARGS[0]>>_<<$ARGS[1]>> += <<ARGS[2]>>'
 
 	fame_performer = 0
@@ -141,42 +177,5 @@ if $ARGS[0] ! 'deg':
 	end
 end
 
-if $ARGS[0] = 'deg':
-	$fametown = 'pav'
-
-	:famedegloop
-
-	if dyneval('RESULT = <<$fametown>>_acting') > 2: dynamic '<<$fametown>>_acting -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_dance') > 2: dynamic '<<$fametown>>_dance -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_painting') > 2: dynamic '<<$fametown>>_painting -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_music') > 2: dynamic '<<$fametown>>_music -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_ballet') > 2: dynamic '<<$fametown>>_ballet -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_modelling') > 2: dynamic '<<$fametown>>_modelling -= rand(-1,3)'
-
-	if dyneval('RESULT = <<$fametown>>_porn') > 2: dynamic '<<$fametown>>_porn -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_stripping') > 2: dynamic '<<$fametown>>_stripping -= rand(-1,3)'
-
-	if dyneval('RESULT = <<$fametown>>_sex') > 2: dynamic '<<$fametown>>_sex -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_prostitute') > 2: dynamic '<<$fametown>>_prostitute -= rand(-1,3)'
-
-	if dyneval('RESULT = <<$fametown>>_kickboxing') > 2: dynamic '<<$fametown>>_kickboxing -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_running') > 2: dynamic '<<$fametown>>_running -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_volleyball') > 2: dynamic '<<$fametown>>_volleyball -= rand(-1,3)'
-
-	if dyneval('RESULT = <<$fametown>>_chess') > 2: dynamic '<<$fametown>>_chess -= rand(-1,3)'
-	if dyneval('RESULT = <<$fametown>>_teaching') > 2: dynamic '<<$fametown>>_teaching -= rand(-1,3)'
-
-	if dyneval('RESULT = <<$fametown>>_media') > 2: dynamic '<<$fametown>>_media -= rand(-1,3)'
-
-
-	if $fametown = 'pav':
-		$fametown = 'city'
-		jump 'famedegloop'
-	elseif $fametown = 'city':
-		$fametown = 'village'
-		jump 'famedegloop'
-	end
-end
-
 --- fame ---------------------------------
 

locations/gKristinaZv.qsrc

@@ -63,7 +63,7 @@ if $ARGS[0] = '0':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 	
@@ -82,7 +82,7 @@ if $ARGS[0] = '1':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 
@@ -101,7 +101,7 @@ if $ARGS[0] = '2':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 
@@ -141,7 +141,7 @@ if $ARGS[0] = '4':
 		gs 'arousal', 'bj', 10, 'sub', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 
@@ -161,7 +161,7 @@ if $ARGS[0] = '5':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 
@@ -224,7 +224,7 @@ if $ARGS[0] = '6':
 				gs 'stat'
 				
 			end
-			act 'Continue': gt 'gschool_lessons2', 'postphys2'
+			act 'Continue': gt 'gschool_lessons4', 'postphys2'
 		else
 			if zverhumiliation < 7:zverhumiliation += 1
 			pcs_vag += 1
@@ -253,7 +253,7 @@ if $ARGS[0] = '6':
 			gs 'arousal', 'end'
 			gs 'stat'
 			
-			act 'Continue': gt 'gschool_lessons2', 'postphys2'
+			act 'Continue': gt 'gschool_lessons4', 'postphys2'
 		end
 	end
 end
@@ -289,7 +289,7 @@ if $ARGS[0] = '7':
 		gs 'arousal', 'end'
 		gs 'stat'
 			
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 	
@@ -325,7 +325,7 @@ if $ARGS[0] = '8':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 	
@@ -361,7 +361,7 @@ if $ARGS[0] = '9':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 	
@@ -397,7 +397,7 @@ if $ARGS[0] = '10':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 	
@@ -432,7 +432,7 @@ if $ARGS[0] = '11':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 	
@@ -468,7 +468,7 @@ if $ARGS[0] = '12':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 	
@@ -508,7 +508,7 @@ if $ARGS[0] = '13':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 	
@@ -541,7 +541,7 @@ if $ARGS[0] = '14':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 	
@@ -564,7 +564,7 @@ if $ARGS[0] = '15':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 
@@ -572,7 +572,7 @@ if $ARGS[0] = 'default':
 	'Christina grins as you walk up to her meekly, expecting your punishment: "Sorry bitch, I''m busy today. You''ll have to do without punishment today."'
 	'She quickly gets dressed and leaves the locker room, and for a second you feel unsure as to what to do. The other girls of your class smirk at your behaviour; you''d gotten so used to Christina''s abuse, that you have no idea how to posture yourself when she''s not here. You''re deeply embarrassed when you try to imagine what they must think of you, and you do your best to ignore them.'
 
-	act 'Continue': gt 'gschool_lessons2', 'postphys2'
+	act 'Continue': gt 'gschool_lessons4', 'postphys2'
 end
 
 --- gKristinaZv ---------------------------------

locations/gschool_lessonsev1.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'fiz_rand':
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/wedgie.jpg"></center>'
 		'During a break in gym class, you are chatting with several other girls when you feel someone''s hands reach down the back of your shorts, grabbing a hold of your panties and sharply yanking them up. Dan yanks your panties up so hard that your feet actually lift off the ground for a moment. You cry out in pain, quickly turn around and see Dan laughing while several others are watching and laughing as well.'
-		act 'Don''t retaliate': grupvalue[4] -= 2 & gt 'gschool_lessons2', 'postphys'
+		act 'Don''t retaliate': grupvalue[4] -= 2 & gt 'gschool_lessons4', 'postphys'
 		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Kick him (<<will_cost>> Willpower)':
@@ -60,7 +60,7 @@ if $ARGS[0] = 'fiz_rand':
 				gs 'stat'
 				grupvalue[2] +=1
 				'He starts to back up but you manage to kick him hard in the shin, causing him to hop around on one leg while holding his shin in pain, which just got the others laughing harder. A couple of the other girls move over to give you moral support and give the guys dirty looks. Plus they use their bodies to shield you from the rest of the class so you can peel your panties out of your ass and twat, putting everything back in it''s proper place.'
-				act 'End of lesson':gt 'gschool_lessons2', 'postphys'
+				act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 			end
 		else
 			act 'Kick him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -98,7 +98,7 @@ if $ARGS[0] = 'fiz_rand':
 			gs 'arousal', 'end'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage1.jpg"></center>'
 			'Once you have the equipment you duck out of the room as quickly as you can, not looking back at him.'
-			act 'End of lesson':gt 'gschool_lessons2', 'postphys'
+			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 		end
 		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
@@ -110,7 +110,7 @@ if $ARGS[0] = 'fiz_rand':
 				gs 'arousal', 'foreplay', 5, 'sub'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'End of lesson': gt 'gschool_lessons2', 'postphys'
+				act 'End of lesson': gt 'gschool_lessons4', 'postphys'
 			end
 		else
 			act 'Tease him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/gschool_sex.qsrc

@@ -831,7 +831,7 @@ if $ARGS[0] = 'storagesex_cum':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic2.jpg"></center>'
 			'You take your clothes out of your locker and start putting them on. With no one else here to distract you it doesn''t take to long to get dressed.'
 			'You can choose another outfit while you''re here.'
-			act 'Continue': gt 'gschool_lessons2', 'post_dress'
+			act 'Continue': gt 'gschool_lessons4', 'post_dress'
 		end
 	end
 end
@@ -903,7 +903,7 @@ if $ARGS[0] = 'lazar_lockeroom_cum':
 	gs 'cum_call', 'face', 'A149'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+	act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 end
 	
 if $ARGS[0] = 'vd_lockeroom':
@@ -958,7 +958,7 @@ if $ARGS[0] = 'vd_lockeroom':
 					minut -=3
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+					act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 				end
 			end
 		end
@@ -1138,7 +1138,7 @@ if $ARGS[0] = 'petka_lockeroom':
 															gs 'arousal', 'voyeur_sex', 3, 'dom', 'group'
 															gs 'arousal', 'end'
 															gs 'stat'
-															act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+															act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 														end
 													end
 												end
@@ -1364,7 +1364,7 @@ if $ARGS[0] = 'petka_homework':
 	gs 'arousal', 'voyeur', 3
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+	act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 end
 	
 if $ARGS[0] = 'petka_home':
@@ -1378,7 +1378,7 @@ if $ARGS[0] = 'petka_home':
 	gs 'arousal', 'voyeur', 3
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+	act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 end
 
 if $ARGS[0] = 'petka_homenaked':
@@ -1391,7 +1391,7 @@ if $ARGS[0] = 'petka_homenaked':
 	gs 'arousal', 'voyeur', 3
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+	act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 end
 	
 if $ARGS[0] = 'albina_lockeroom':
@@ -1480,7 +1480,7 @@ if $ARGS[0] = 'albina_lockeroom69':
 			'You nod. "Sure thing, see you at practice."'
 		end
 		'Then with you both dressed she heads out of the locker room. "Seeya later <<$pcs_nickname>>."'
-		act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+		act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 	end
 end
 
@@ -1502,7 +1502,7 @@ if $ARGS[0] = 'victor_lockeroom':
 			'He pauses a moment and then throws his hands up. "Fine!" Then he turns and leaves.'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+			act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 		end
 	else
 		act 'Refuse and tell him to leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1524,7 +1524,7 @@ if $ARGS[0] = 'victor_lockeroom':
 				'He pauses a moment, then pulls up his shorts, before throwing his hands up. "Fine!" Then he turns and leaves.'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+				act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 			end
 		else
 			act 'Refuse and tell him to leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1612,7 +1612,7 @@ if $ARGS[0] = 'victor_lockeroom_cum':
 	gs 'cum_call', 'breasts', 'A131'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+	act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 end
 
 --- gschool_sex ---------------------------------