Browse Source

Merge remote-tracking branch 'kevin_smarts/master' into dick_size_stuff

richard_butte 4 years ago
parent
commit
7bd9013135

+ 2 - 0
glife.qproj

@@ -631,6 +631,8 @@
 		<Location name="gschool_lessons"/>
 		<Location name="gschool_lessons1"/>
 		<Location name="gschool_lessons2"/>
+		<Location name="gschool_lessons3"/>
+		<Location name="gschool_lessons4"/>
 		<Location name="gschool_lessonsev1"/>
 		<Location name="gschool_lessonsev2"/>
 		<Location name="gschool_lessonsev3"/>

+ 2 - 0
locations/LakeBoyZ.qsrc

@@ -7,6 +7,7 @@ $gL_boy_z = {
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sunbathe_nudelake.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sunbathe_lake.jpg"></center>'
+		end
 		'He seems nice enough so you decide to give him your name.'
 		randvnesh = rand(40,120)
 		if rand(0,10) = 0 and pcs_apprnc >= randvnesh:
@@ -82,6 +83,7 @@ $gL_boy_z = {
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/kissnude.jpg"></center>'
 							else
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/kissboy.jpg"></center>'
+							end
 							'You passionately kiss <<$boydesc>>, as he continues to caress your body, paying particular interest to your breasts.'
 							'<<$boydesc>> invites you to his house.'
 							gs 'willpower', 'sex', 'resist', 'easy'

+ 1 - 1
locations/anushapt.qsrc

@@ -842,7 +842,7 @@ if $ARGS[0] = 'computer':
 										'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/caughtmast/les2.jpg"></center>'
 										'Once in bed you waste no time in pulling her clothes off, she returns the favor and starts removing your clothes as well. It would go a lot faster if the two of you were''t also passionately kissing and caressing each others bodies. Regardless before long, you are both naked.'
 										gs 'arousal', 'foreplay', 10, 'lesbian'
-										act 'Get pleasured': gt 'anushaev1', 'getpleasured'
+										act 'Get pleasured': gt 'anuskaev1', 'getpleasured'
 									end
 								end
 							else

+ 37 - 38
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 ---------------------------------
 

+ 93 - 43
locations/fight.qsrc

@@ -169,11 +169,11 @@ if $ARGS[0] = 'applyDamage':
 		!!If the target has clones, destroy one
 		if <<$fightAppDam['TargetType']>>_clone[<<fightAppDam['TargetNumber']>>] > 0:
 			<<$fightAppDam['TargetType']>>_clone[<<fightAppDam['TargetNumber']>>] -= 1
-			""<<$fightAppDam['TargetName']>> losses a clone.""
+			""<<$fightAppDam['TargetName']>> loses a clone.""
 		!!if the target has enough shields to mitigate, remove some shields
 		elseif <<$fightAppDam['TargetType']>>_shield[<<fightAppDam['TargetNumber']>>] >= <<fightAppDam['Damage']>>:
 			<<$fightAppDam['TargetType']>>_shield[<<fightAppDam['TargetNumber']>>] -= <<fightAppDam['Damage']>>
-			""<<$fightAppDam['TargetName']>> losses <<fightAppDam['Damage']>> defense.""
+			""<<$fightAppDam['TargetName']>> loses <<fightAppDam['Damage']>> defense.""
 		!!otherwise remove shields to 0 and the remainder comes from health
 		else
 			if <<$fightAppDam['TargetType']>>_shield[<<fightAppDam['TargetNumber']>>] > 0:
@@ -185,7 +185,7 @@ if $ARGS[0] = 'applyDamage':
 			else
 				<<$fightAppDam['TargetType']>>_health[<<fightAppDam['TargetNumber']>>] = 0
 			end
-			""<<$fightAppDam['TargetName']>> losses <<fightAppDam['OverShieldDamage']>> health.""
+			""<<$fightAppDam['TargetName']>> loses <<fightAppDam['OverShieldDamage']>> health.""
 		end
 	"
 	killvar '$fightAppDam'
@@ -204,25 +204,25 @@ if $ARGS[0] = 'start':
 		tableSize = arrsize('opp_health')
 	end
 
-	$HTMLText = '<table>
+	$HTMLText = '<table border=1>
 		<tr>
-			<th align="left">Allies</left></td>
-			<th align="center" valign="center" rowspan=<<tableSize*2+1>> >vs.</center></td>
-			<th align="right">Opponents</right></td>
+			<th align="left"><b><font size=18>Allies</font></b></td>
+			<th align="center" valign="center" rowspan=<<tableSize*2+1>> ><b><font size=18>vs.</font></b></center></td>
+			<th align="right"><b><font size=18>Opponents</font></b></td>
 		</tr>'
 	i = 0
 	:FightPoster
 	if i < tableSize:
 		$HTMLText += '
 		<tr>
-			<td align="left"><img HEIGHT=400 src="<<$pcs_image[i]>>"></left></td>
+			<td align="left"><img HEIGHT=300 src="<<$pcs_image[i]>>"></left></td>
 
-			<td align="right"><img HEIGHT=400 src="<<$opp_image[i]>>"></right></td>
+			<td align="right"><img HEIGHT=300 src="<<$opp_image[i]>>"></right></td>
 		</tr>
 		<tr>
-			<td align="left"><<$pcs_name[i]>></left></td>
+			<td align="left"><b><font size=10><<$pcs_name[i]>></font></b></left></td>
 
-			<td align="right"><<$opp_name[i]>></right></td>
+			<td align="right"><b><font size=10><<$opp_name[i]>></font></b></right></td>
 		</tr>'
 		i += 1
 		jump 'FightPoster'
@@ -247,7 +247,7 @@ if $ARGS[0] = 'start':
 		jump 'OppTimerInit'
 	end
 
-	act 'Engage': gt 'fight', 'main'
+	act 'Fight!': gt 'fight', 'main'
 
 	killvar '$HTMLText'
 	killvar 'tableSize'
@@ -302,7 +302,6 @@ if $ARGS[0] = 'findActiveTimer':
 		i += 1
 		jump 'LowTimerLoop2'
 	end
-
 	killvar 'i'
 end
 
@@ -330,6 +329,8 @@ if $ARGS[0] = 'printStats':
 		fightPStats['Fog'] = opp_fog[i]
 		fightPStats['Clone'] = opp_clone[i]
 		fightPStats['Stun'] = opp_stun[i]
+		fightPStats['Timer'] = opp_timer[i]
+		$fightPStats['Image'] = $opp_image[i]
 	else
 		$fightPStats['Name'] = $pcs_name[i]
 		fightPStats['Health'] = pcs_health[i]
@@ -339,14 +340,41 @@ if $ARGS[0] = 'printStats':
 		fightPStats['Fog'] = pcs_fog[i]
 		fightPStats['Clone'] = pcs_clone[i]
 		fightPStats['Stun'] = pcs_stun[i]
+		fightPStats['Timer'] = pcs_timer[i]
+		$fightPStats['Image'] = $pcs_image[i]
 	end
 
-	'<b><<$fightPStats["Name"]>></b> life <b><font color = red><<fightPStats["Health"]>></font></b>, mana <b><font color = blue><<fightPStats["Mana"]>></font></b>, willpower <b><font color = green><<fightPStats["Willpower"]>></font></b>'
-	if fightPStats['Shield'] > 0:'<b><font color = purple>Protection <<fightPStats["Shield"]>> units</font></b>'
-	if fightPStats['Clone'] > 0:'<b><font color = purple>Clones active <<fightPStats["Clone"]>> </font></b>'
-	if fightPStats['Fog'] > 0:'<b><font color = purple>Obscuring Fog <<fightPStats["Fog"]>> units</font></b>'
-	if fightPStats['Stun'] > 0:'<b><font color = purple>Stunned <<fightPStats["Stun"]>> rounds</font></b>'
-	'<b>= = = = = = = = = = = = = = = = = = = = = = = = = = = = =</b>'
+	$fightStatRowText = "
+	<tr>
+		<td rowspan=4 align=right valign=center>
+			<img HEIGHT=70 src='<<$fightPStats['Image']>>'>
+			<br> <b><<$fightPStats['Name']>></b>
+		</td>
+		<td align=right> Life </td>
+		<td align=right> <b><font color = red><<fightPStats['Health']>></font></b> </td>
+		<td rowspan=4 align=left valign=center>"
+			if fightPStats['Shield'] > 0:$fightStatRowText += "<b><font color = purple>Protection <<fightPStats['Shield']>> units</font></b><br>"
+			if fightPStats['Clone'] > 0:$fightStatRowText += "<b><font color = purple>Clones active <<fightPStats['Clone']>> </font></b><br>"
+			if fightPStats['Fog'] > 0:$fightStatRowText += "<b><font color = purple>Obscuring Fog <<fightPStats['Fog']>> units</font></b><br>"
+			if fightPStats['Stun'] > 0:$fightStatRowText += "<b><font color = purple>Stunned <<fightPStats['Stun']>> rounds</font></b>"
+	$fightStatRowText += "
+		</td>
+	</tr>
+	<tr>
+		<td align=right> Mana </td>
+		<td align=right> <b><font color = blue><<fightPStats['Mana']>></font></b> </td>
+	</tr>
+	<tr>
+		<td align=right> Willpower </td>
+		<td align=right> <b><font color = green><<fightPStats['Willpower']>></font></b> </td>
+	</tr>
+	<tr>
+		<td align=right> Initiative </td>
+		<td align=right> <b><font color = orange><<fightPStats['Timer']>></font></b> </td>
+	</tr><tr><td colspan=4 bgcolor=grey></td></tr>"
+
+	$result = $fightStatRowText
+
 
 	killvar 'i'
 	killvar 'fightPStats'
@@ -354,23 +382,31 @@ if $ARGS[0] = 'printStats':
 end
 
 if $ARGS[0] = 'statDisplay':
-	'<b>= = = = = = = = = = = O p p o n e n t s = = = = = = = = = = =</b>'
+	$fightStatText = "
+	<table border=1><th colspan=4><b><font size=12>Opponents</font></b></th>
+	"
 	j = 0
 	:OppLoopRC1
 	if j < arrsize('opp_health'):
-		gs 'fight', 'printStats', 'opp', j
+		$fightStatText += func('fight', 'printStats', 'opp', j)
 		j += 1
 		jump 'OppLoopRC1'
 	end
+	$fightStatText += "</table>"
+	*pl func('cleanHTML',$fightStatText)
 	*nl
-	'<b>= = = = = = = = = = = = A l l i e s = = = = = = = = = = = = =</b>'
+	$fightStatText = "
+	<table border=1><th colspan=4><b><font size=12>Opponents</font></b></th>
+	"
 	j = 0
 	:PCSLoopRC1
 	if j < arrsize('pcs_health'):
-		gs 'fight', 'printStats', 'pcs', j
+		$fightStatText += func('fight', 'printStats', 'pcs', j)
 		j += 1
 		jump 'PCSLoopRC1'
 	end
+	$fightStatText += "</table>"
+	*pl func('cleanHTML',$fightStatText)
 end
 
 if $ARGS[0] = 'result_check':
@@ -434,6 +470,7 @@ AttackTime[2] = 15
 
 if $ARGS[0] = 'Attack':
 	$fightAtk_Type = $ARGS[1]
+	fightAtk_Type = arrpos('$AttackType',$fightAtk_Type)
 	$fightAtk_TargetType = $ARGS[2]
 	fightAtk_TargetNumber = ARGS[3]
 	fightAtk_AttackerNumber = ARGS[4]
@@ -442,6 +479,8 @@ if $ARGS[0] = 'Attack':
 		$fightAtk_AttackerType = 'pcs'
 		$fightAtk['DefenderName'] = $opp_name[fightAtk_TargetNumber]
 		$fightAtk['AttackerName'] = 'You'
+		!!Add Skill Exp
+		dynamic "<<$AttackSkill[fightAtk_Type]>>_exp += rand(1,3)"
 	elseif $fightAtk_TargetType = 'opp':
 		$fightAtk['AttackerName'] = $pcs_name[fightAtk_AttackerNumber]
 		$fightAtk['DefenderName'] = $opp_name[fightAtk_TargetNumber]
@@ -452,10 +491,10 @@ if $ARGS[0] = 'Attack':
 		$fightAtk['DefenderName'] = $pcs_name[fightAtk_TargetNumber]
 	end
 
-	fightAtk_Type = arrpos('$AttackType',$fightAtk_Type)
 	fightAtk['AttackerSkillValue'] = dyneval('result = <<$fightAtk_AttackerType>>_<<$AttackSkill[fightAtk_Type]>>[<<fightAtk_AttackerNumber>>]')
 	fightAtk['TargetReactValue'] = dyneval('result = iif(<<$fightAtk_TargetType>>_stun[<<fightAtk_TargetNumber>>]>0,0,<<$fightAtk_TargetType>>_react[<<fightAtk_TargetNumber>>])')
 	fightAtk['TargetAgilValue'] = dyneval('result = iif(<<$fightAtk_TargetType>>_stun[<<fightAtk_TargetNumber>>]>0,0,<<$fightAtk_TargetType>>_agil[<<fightAtk_TargetNumber>>])')
+	fightAtk['TargetHealthBefore'] = dyneval('result = <<$fightAtk_TargetType>>_health[<<fightAtk_TargetNumber>>]')
 	fightAtk['MinDamage'] = AttackMin[fightAtk_Type]
 	fightAtk['MaxDamage'] = AttackMax[fightAtk_Type]
 
@@ -470,15 +509,6 @@ if $ARGS[0] = 'Attack':
 		dynamic "fightAtk['Damage'] = <<$fightAtk_AttackerType>>_stren[<<fightAtk_AttackerNumber>>] * rand(<<fightAtk['MinDamage']>>,<<fightAtk['MaxDamage']>>) / 3"
 		!!Apply Damage
 		gs 'fight', 'applyDamage', $fightAtk_TargetType, fightAtk_TargetNumber, fightAtk['Damage']
-		if fightAtk['Damage'] > 25:
-			if $fightAtk_TargetType = 'opp' and fightAtk_AttackerNumber = 0:
-				'The hit is hard and <<$fightAtk["DefenderName"]>> reels in pain.'
-			else
-				'The hit is hard and you reel in pain.'
-			end
-		else
-			'Its a glancing blow, but still hurts.'
-		end
 	elseif rand(0,3) ! 0:
 		!!Always chance to hit if rand = 0
 		if $fightAtk_TargetType = 'pcs' and fightAtk_AttackerNumber = 0:
@@ -489,17 +519,34 @@ if $ARGS[0] = 'Attack':
 	else
 		!!Apply Damage
 		gs 'fight', 'applyDamage', $fightAtk_TargetType, fightAtk_TargetNumber, fightAtk['Damage']
-		if fightAtk['Damage'] > 25:
-			if $fightAtk_TargetType = 'opp' and fightAtk_AttackerNumber = 0:
-				'The hit is hard and <<$fightAtk["DefenderName"]>> reels in pain.'
-			else
-				'The hit is hard and you reel in pain.'
-			end
+	end
+	!! Flavor text for size of the hit.
+	fightAtk['TargetHealthLoss'] = fightAtk['TargetHealthBefore'] - dyneval('result = <<$fightAtk_TargetType>>_health[<<fightAtk_TargetNumber>>]')
+	!! If blow does over half health in damage, causes stun
+	if fightAtk['TargetHealthLoss']*2 > fightAtk['TargetHealthBefore']:
+		if $fightAtk_TargetType = 'pcs' and fightAtk_TargetNumber = 0:
+			'It is a devastating blow. You are stunned.'
 		else
-			'Its a glancing blow, but still hurts.'
+			'It is a devastating blow. <<$fightAtk["DefenderName"]>> is stunned.'
 		end
+		dynamic '<<$fightAtk_TargetType>>_stun[<<fightAtk_TargetNumber>>] += 1'
+		dynamic '<<$fightAtk_TargetType>>_timer[<<fightAtk_TargetNumber>>] += AttackTime[<<fightAtk_Type>>]'
+	!! Very hard hit
+	elseif fightAtk['TargetHealthLoss'] > 50:
+		if $fightAtk_TargetType = 'pcs' and fightAtk_TargetNumber = 0:
+			'The hit is hard and you reel in pain.'
+		else
+			'The hit is hard and <<$fightAtk["DefenderName"]>> reels in pain.'
+		end
+	!! Does physical damage, but not a lot
+	elseif fightAtk['TargetHealthLoss'] > 0:
+		'Its a glancing blow, but still hurts.'
+	!! No physical damage was done.
+	else
+		'Defenses were not pierced.'
 	end
-	dynamic "<<$fightAtk_AttackerType>>_timer += AttackTime[fightAtk_Type]"
+
+	dynamic "<<$fightAtk_AttackerType>>_timer[<<fightAtk_AttackerNumber>>] += AttackTime[<<fightAtk_Type>>]"
 	cla
 	act 'Next': gt 'fight', 'main'
 end
@@ -592,6 +639,9 @@ if $ARGS[0] = 'fightAlgorithm':
 			else
 				gs 'fight', 'Attack', 'Jab', $TargetType, TargetNumber, AttackerNumber
 			end
+		!Spell was cast, so move timer.
+		else
+			dynamic "<<$AttackerType>>_timer[<<AttackerNumber>>] += 50"
 		end
 	!!This should never happen
 	else
@@ -607,7 +657,7 @@ end
 
 if $ARGS[0] = 'opponent':
 	gs 'fight', 'statDisplay'
-	gs 'fight','fightAlgorithm','opp',ARGS[2]
+	gs 'fight','fightAlgorithm','opp',ARGS[1]
 end
 
 if $ARGS[0] = 'player':
@@ -723,7 +773,7 @@ if $ARGS[0] = 'spellcast':
 	*clr
 	cla
 	act 'Next': gt 'fight', 'main'
-	func('spellBook', 'targetable', '$combatSpells', 'gt ''fight'', ''main''', ' ')
+	func('spellBook', 'targetable', '$combatSpells', 'gt ''fight'', ''main''', 'pcs_timer[0] += 50')
 end
 
 

+ 92 - 76
locations/fight_npcdata.qsrc

@@ -3,6 +3,7 @@
 
 	$ARGS[0] = The NPC Name or Type (e.g: tatiana, gustav, rapist, mugger)
 	$ARGS[1] = Team to add the NPC to.  Can be 'pcs' or 'opp'.  Default is 'opp'
+	$ARGS[2] = (Optional) Name to give the NPC, Overrides built in name
 
 	Attributes that can be set:
 		name	= <<name of opponent>>
@@ -57,6 +58,12 @@ $setNPCFightStats = {
 	end
 }
 
+$calcNPCFightHealth = {
+	NPCFightStatStr = dyneval("result=<<$NPCFS_Team>>_stren[<<NPCFS_TeamSlot>>]")
+	NPCFightStatVit = dyneval("result=<<$NPCFS_Team>>_vital[<<NPCFS_TeamSlot>>]")
+	result = NPCFightStatStr*5 + NPCFightStatVit*5
+}
+
 if $args[0] = 'gustav':
 	dynamic $setNPCFightStats, 'name', 'Gustav'
 	dynamic $setNPCFightStats, 'image', 'images/characters/city/jugo/jugopre.jpg'
@@ -70,79 +77,75 @@ if $args[0] = 'gustav':
 	dynamic $setNPCFightStats, 'agil', 60
 	dynamic $setNPCFightStats, 'vital', 200
 	dynamic $setNPCFightStats, 'react', 50
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 3250
 	dynamic $setNPCFightStats, 'willpwr', 50
 	dynamic $setNPCFightStats, 'shoot', 100
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 2
 end
 
 if $args[0] = 'tatiana':
 	dynamic $setNPCFightStats, 'name', 'Tatiana'
 	dynamic $setNPCFightStats, 'image', 'images/characters/city/tatiana/magiclook.jpg'
-	dynamic $setNPCFightStats, 'def', 100
+	dynamic $setNPCFightStats, 'def', 30
 	dynamic $setNPCFightStats, 'run', 75
-	dynamic $setNPCFightStats, 'wrstlng', 50
-	dynamic $setNPCFightStats, 'kick', 75
-	dynamic $setNPCFightStats, 'punch', 100
-	dynamic $setNPCFightStats, 'jab', 100
-	dynamic $setNPCFightStats, 'stren', 60
-	dynamic $setNPCFightStats, 'agil', 100
+	dynamic $setNPCFightStats, 'wrstlng', 10
+	dynamic $setNPCFightStats, 'kick', 50
+	dynamic $setNPCFightStats, 'punch', 50
+	dynamic $setNPCFightStats, 'jab', 50
+	dynamic $setNPCFightStats, 'stren', 30
+	dynamic $setNPCFightStats, 'agil', 75
 	dynamic $setNPCFightStats, 'vital', 100
 	dynamic $setNPCFightStats, 'react', 60
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 1290
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
 	dynamic $setNPCFightStats, 'magik', 1
 	dynamic $setNPCFightStats, 'mana', 200
 	dynamic $setNPCFightStats, 'spells', 'fog,clone,stun,energo'
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 3
 end
 
 if $args[0] = 'prostitute':
 	dynamic $setNPCFightStats, 'name', 'Prostitute'
-	dynamic $setNPCFightStats, 'image', 'images/locations/city/shared/streetwalker/working1.jpg'
-	dynamic $setNPCFightStats, 'def', 30
-	dynamic $setNPCFightStats, 'run', 30
-	dynamic $setNPCFightStats, 'wrstlng', 20
-	dynamic $setNPCFightStats, 'kick', 0
-	dynamic $setNPCFightStats, 'punch', 10
-	dynamic $setNPCFightStats, 'jab', 10
-	dynamic $setNPCFightStats, 'stren', 20
-	dynamic $setNPCFightStats, 'agil', 30
-	dynamic $setNPCFightStats, 'vital', 50
-	dynamic $setNPCFightStats, 'react', 30
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 600
+	dynamic $setNPCFightStats, 'image', 'images/locations/city/shared/streetwalker/working<<rand(1,4)>>.jpg'
+	dynamic $setNPCFightStats, 'def', rand(25,35)
+	dynamic $setNPCFightStats, 'run', rand(25,35)
+	dynamic $setNPCFightStats, 'wrstlng', rand(5,15)
+	dynamic $setNPCFightStats, 'kick', 5
+	dynamic $setNPCFightStats, 'punch', rand(5,15)
+	dynamic $setNPCFightStats, 'jab', rand(5,15)
+	dynamic $setNPCFightStats, 'stren', rand(15,25)
+	dynamic $setNPCFightStats, 'agil', rand(25,35)
+	dynamic $setNPCFightStats, 'vital', rand(45,55)
+	dynamic $setNPCFightStats, 'react', rand(25,35)
 	dynamic $setNPCFightStats, 'willpwr', 50
 	dynamic $setNPCFightStats, 'shoot', 10
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 4
 end
 
 if $args[0] = 'bandit':
 	dynamic $setNPCFightStats, 'name', 'Bandit'
 	dynamic $setNPCFightStats, 'image', 'images/locations/shared/street/mugger.jpg'
-	dynamic $setNPCFightStats, 'def', 10
+	dynamic $setNPCFightStats, 'def', rand(5,15)
 	dynamic $setNPCFightStats, 'run', 30
-	dynamic $setNPCFightStats, 'wrstlng', 10
+	dynamic $setNPCFightStats, 'wrstlng', rand(5,15)
 	dynamic $setNPCFightStats, 'kick', 0
-	dynamic $setNPCFightStats, 'punch', 10
-	dynamic $setNPCFightStats, 'jab', 10
-	dynamic $setNPCFightStats, 'stren', 200
-	dynamic $setNPCFightStats, 'agil', 20
-	dynamic $setNPCFightStats, 'vital', 150
-	dynamic $setNPCFightStats, 'react', 20
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 2500
-	dynamic $setNPCFightStats, 'willpwr', 100
+	dynamic $setNPCFightStats, 'punch', rand(5,15)
+	dynamic $setNPCFightStats, 'jab', rand(5,15)
+	dynamic $setNPCFightStats, 'stren', rand(95,115)
+	dynamic $setNPCFightStats, 'agil', rand(15,25)
+	dynamic $setNPCFightStats, 'vital', rand(65,75)
+	dynamic $setNPCFightStats, 'react', rand(15,25)
+	dynamic $setNPCFightStats, 'willpwr', 50
 	dynamic $setNPCFightStats, 'shoot', 10
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 5
 end
 
 if $args[0] = 'prostitute2':
 	dynamic $setNPCFightStats, 'name', 'Prostitute'
-	dynamic $setNPCFightStats, 'image', 'images/locations/city/shared/streetwalker/working1.jpg'
+	dynamic $setNPCFightStats, 'image', 'images/locations/city/shared/streetwalker/working<<rand(1,4)>>.jpg'
 	dynamic $setNPCFightStats, 'def', 10
 	dynamic $setNPCFightStats, 'run', 50
 	dynamic $setNPCFightStats, 'wrstlng', 10
@@ -153,10 +156,9 @@ if $args[0] = 'prostitute2':
 	dynamic $setNPCFightStats, 'agil', 40
 	dynamic $setNPCFightStats, 'vital', 60
 	dynamic $setNPCFightStats, 'react', 30
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 950
 	dynamic $setNPCFightStats, 'willpwr', 50
 	dynamic $setNPCFightStats, 'shoot', 10
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 6
 end
 
@@ -169,17 +171,16 @@ if $args[0] = 'kisame':
 	dynamic $setNPCFightStats, 'kick', 0
 	dynamic $setNPCFightStats, 'punch', 100
 	dynamic $setNPCFightStats, 'jab', 100
-	dynamic $setNPCFightStats, 'stren', 200
+	dynamic $setNPCFightStats, 'stren', 150
 	dynamic $setNPCFightStats, 'agil', 100
-	dynamic $setNPCFightStats, 'vital', 200
+	dynamic $setNPCFightStats, 'vital', 150
 	dynamic $setNPCFightStats, 'react', 100
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 3000
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
 	dynamic $setNPCFightStats, 'magik', 1
 	dynamic $setNPCFightStats, 'mana', 500
 	dynamic $setNPCFightStats, 'spells', 'leechmana,flood,blister,sharkrockets'
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 7
 end
 
@@ -196,30 +197,28 @@ if $args[0] = 'rapist':
 	dynamic $setNPCFightStats, 'agil', rand(30,50)
 	dynamic $setNPCFightStats, 'vital', rand(40,60)
 	dynamic $setNPCFightStats, 'react', rand(30,50)
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', rand(400,600)+rand(350,450)
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 8
 end
 
 if $args[0] = 'robber':
 	dynamic $setNPCFightStats, 'name', 'Robber'
 	dynamic $setNPCFightStats, 'image', 'images/locations/shared/street/mugger.jpg'
-	dynamic $setNPCFightStats, 'def', 50
-	dynamic $setNPCFightStats, 'run', 50
-	dynamic $setNPCFightStats, 'wrstlng', 10
+	dynamic $setNPCFightStats, 'def', rand(40,60)
+	dynamic $setNPCFightStats, 'run', rand(40,60)
+	dynamic $setNPCFightStats, 'wrstlng', rand(5,15)
 	dynamic $setNPCFightStats, 'kick', 0
-	dynamic $setNPCFightStats, 'punch', 50
-	dynamic $setNPCFightStats, 'jab', 50
-	dynamic $setNPCFightStats, 'stren', 70
-	dynamic $setNPCFightStats, 'agil', 40
-	dynamic $setNPCFightStats, 'vital', 50
-	dynamic $setNPCFightStats, 'react', 40
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 840
+	dynamic $setNPCFightStats, 'punch', rand(40,60)
+	dynamic $setNPCFightStats, 'jab', rand(40,60)
+	dynamic $setNPCFightStats, 'stren', rand(60,80)
+	dynamic $setNPCFightStats, 'agil', rand(30,50)
+	dynamic $setNPCFightStats, 'vital', rand(40,60)
+	dynamic $setNPCFightStats, 'react', rand(30,50)
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	if rand(0,10) < 5:
 		fightEnding = 8
 	else
@@ -230,20 +229,19 @@ end
 if $args[0] = 'snatcher':
 	dynamic $setNPCFightStats, 'name', 'Purse Snatcher'
 	dynamic $setNPCFightStats, 'image', 'images/locations/shared/street/pursesnatch.jpg'
-	dynamic $setNPCFightStats, 'def', 50
-	dynamic $setNPCFightStats, 'run', 50
-	dynamic $setNPCFightStats, 'wrstlng', 10
+	dynamic $setNPCFightStats, 'def', rand(40,60)
+	dynamic $setNPCFightStats, 'run', rand(40,60)
+	dynamic $setNPCFightStats, 'wrstlng', rand(5,15)
 	dynamic $setNPCFightStats, 'kick', 0
-	dynamic $setNPCFightStats, 'punch', 50
-	dynamic $setNPCFightStats, 'jab', 50
-	dynamic $setNPCFightStats, 'stren', 70
-	dynamic $setNPCFightStats, 'agil', 40
-	dynamic $setNPCFightStats, 'vital', 50
-	dynamic $setNPCFightStats, 'react', 40
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 840
+	dynamic $setNPCFightStats, 'punch', rand(40,60)
+	dynamic $setNPCFightStats, 'jab', rand(40,60)
+	dynamic $setNPCFightStats, 'stren', rand(60,80)
+	dynamic $setNPCFightStats, 'agil', rand(30,50)
+	dynamic $setNPCFightStats, 'vital', rand(40,60)
+	dynamic $setNPCFightStats, 'react', rand(30,50)
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 9
 end
 
@@ -260,10 +258,9 @@ if $args[0] = 'dimka':
 	dynamic $setNPCFightStats, 'agil', 40
 	dynamic $setNPCFightStats, 'vital', 50
 	dynamic $setNPCFightStats, 'react', 40
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 900
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 10
 end
 
@@ -280,10 +277,9 @@ if $args[0] = 'stranger':
 	dynamic $setNPCFightStats, 'agil', 10
 	dynamic $setNPCFightStats, 'vital', 50
 	dynamic $setNPCFightStats, 'react', 10
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 900
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 11
 end
 
@@ -300,9 +296,8 @@ if $args[0] = 'christina':
 	dynamic $setNPCFightStats, 'agil', 75
 	dynamic $setNPCFightStats, 'vital', 95
 	dynamic $setNPCFightStats, 'react', 75
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 1325
 	dynamic $setNPCFightStats, 'willpwr', 45
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 12
 end
 
@@ -319,16 +314,34 @@ if $args[0] = 'stallion':
 	dynamic $setNPCFightStats, 'agil', 300
 	dynamic $setNPCFightStats, 'vital', 200
 	dynamic $setNPCFightStats, 'react', 100
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 2500
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 10
 	dynamic $setNPCFightStats, 'magik', 1
 	dynamic $setNPCFightStats, 'mana', 200
 	dynamic $setNPCFightStats, 'spells', 'clone,energo'
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 13
 end
 
+if $args[0] = 'ganggirl':
+	dynamic $setNPCFightStats, 'name', 'Gang Girl'
+	dynamic $setNPCFightStats, 'image', 'images/characters/shared/<<rand(31,60)>>.jpg'
+	dynamic $setNPCFightStats, 'def', rand(5,15)
+	dynamic $setNPCFightStats, 'run', rand(25,35)
+	dynamic $setNPCFightStats, 'wrstlng', rand(5,15)
+	dynamic $setNPCFightStats, 'kick', rand(5,15)
+	dynamic $setNPCFightStats, 'punch', rand(5,15)
+	dynamic $setNPCFightStats, 'jab', rand(5,15)
+	dynamic $setNPCFightStats, 'stren', rand(25,35)
+	dynamic $setNPCFightStats, 'agil', rand(25,35)
+	dynamic $setNPCFightStats, 'vital', rand(45,55)
+	dynamic $setNPCFightStats, 'react', rand(25,35)
+	dynamic $setNPCFightStats, 'willpwr', 50
+	dynamic $setNPCFightStats, 'shoot', rand(25,35)
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
+	fightEnding = 14
+end
+
 if $args[0] = 'girls':
 	dynamic $setNPCFightStats, 'name', 'The group of girls'
 	dynamic $setNPCFightStats, 'image', 'images/locations/shared/street/girlgang.jpg'
@@ -342,12 +355,15 @@ if $args[0] = 'girls':
 	dynamic $setNPCFightStats, 'agil', 60
 	dynamic $setNPCFightStats, 'vital', 60
 	dynamic $setNPCFightStats, 'react', 60
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 1100
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 14
 end
 
+if $ARGS[2] ! '':
+	dynamic $setNPCFightStats, 'name', $ARGS[2]
+end
+
 --- fight_npcdata ---------------------------------
 

+ 31 - 18
locations/gKristinaZv.qsrc

@@ -4,6 +4,19 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	gs 'stat'
 	menu_off = 1
 	'After your gym class you go to the locker room with the rest of the girls. Christina theatrically moves over to you, and the eyes of all the girls in the locker room are on you now.'
+	
+	!! This handles the pictures Christina took of you at the lake. 1 = You begged her, 3 = You fought and lost
+	if christinaphotos = 1 or christinaphotos = 3:
+		if christinaphotos = 1:
+			christinaphotos = 2
+		elseif christinaphotos = 3:
+			christinaphotos = 4
+		end
+		'She leans in close and hisses into your ear: "Time to see if you can keep your promise. Either that or every boy in school is going to see those pictures."'
+		'"B-But what about the girls here?" You ask hesitantly.'
+		'"They''ll do as I say." She says as she reaches for her phone.'
+		'You quickly lay a hand on her arm, "O-Ok." is all you can manage to get out.'
+	end
 
 	if zverhumiliation < 9:
 		gKristinaZvtemp = rand(0,zverhumiliation)
@@ -63,7 +76,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 +95,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 +114,7 @@ if $ARGS[0] = '2':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue': gt 'gschool_lessons2', 'postphys2'
+		act 'Continue': gt 'gschool_lessons4', 'postphys2'
 	end
 end
 
@@ -121,7 +134,7 @@ if $ARGS[0] = '3':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Continue':gt 'gschool_lessons2','postphys2'
+		act 'Continue':gt 'gschool_lessons4', 'postphys2'
 	end
 end
 
@@ -141,7 +154,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 +174,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 +237,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 +266,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 +302,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 +338,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 +374,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 +410,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 +445,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 +481,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 +521,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 +554,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 +577,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 +585,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 ---------------------------------

+ 13 - 7
locations/gLakeNude.qsrc

@@ -46,8 +46,14 @@ elseif month < 3 or month = 12:
 	*nl
 end
 
-if storyline = 1 and month >= 3 and month <= 8:
-	if week >= 6 and hour >= 8 and hour <= 10:
+if storyline = 1 and month >= 3 and month <= 8 and week >= 6 and hour >= 8 and hour <= 10 and ivanfedorseennaked ! daystart and rand(0,3) = 0:
+	if $clothingworntype = 'nude':
+		gs 'exhibitionism', 3
+		gs 'fame', 'pav', 'sex', 3
+		'You''re walking down the secluded beach, enjoying the sensation of feeling free and the cool breeze on your naked body. When all of a sudden you hear some heavy running steps coming up behind you followed by heavy panting. Expecting the worse, you turn around only to see a sweaty Ivan with a huge grin on his face, closely followed by Feodor. As they get a look at your face and realize who you are, they slow down and stop, looking a bit surprised to see... well all of you on display.'
+		act 'Run away': ivanfedorseennaked = daystart & gt 'gLakeNude'
+		act 'Say hi to them': ivanfedorseennaked = daystart & gt 'gschool_socialchg1', 'ivan_fedor_naked'
+	else
 		'You''re walking down the secluded beach, enjoying the tranquility when all of a sudden you hear some heavy running steps coming up behind you followed by heavy panting. Expecting the worse, you turn around only to see a sweaty <a href="exec:gt ''gschool_socialchg1'', ''tIvan''">Ivan</a>, closely followed by <a href="exec:gt ''gschool_socialchg1'', ''tFedor''">Feodor</a>.'
 	end
 end
@@ -169,7 +175,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/swim.jpg"></center>'
 				if pcs_inhib < 40:inhib_exp += rand(1,2)
 			end
-			'You play around and have fun in the lake, enjoying the feel of the warm water on your naked body. The clean lake water refreshes and invigorates you.'
+			'You play around and have fun in the lake, enjoying the feeling of the warm water on your naked body. The clean lake water refreshes and invigorates you.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
 			act 'Get out of the water': gt 'gLakeNude'
@@ -192,17 +198,17 @@ if temper >= 15 and month >= 5 and month <= 9:
 					inhib_exp += rand(1,3)
 				end
 				if krem = 0:
-					pcs_tan = pcs_tan + 1
+					pcs_tan += 1
 					'You lie down on your towel for some sunbathing and hopefully a nicer tan, and enjoy the warm rays of the sun on your body.'
 				else:
-					krem = krem - 1
-					pcs_tan = pcs_tan + 3
+					krem -= 1
+					pcs_tan += 3
 					'You smear your body with sunscreen and lie down on your towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun on your body.'
 				end
 				act 'Continue': gt 'gLakeNude'
 			else
 				cla
-				'You have to take off your clothes before you can lay down to sunbath.'
+				'You have to take off your clothes before you can lay down to sunbathe.'
 				act 'Continue': gt 'gLakeNude'
 			end
 		end

+ 6 - 3
locations/glake.qsrc

@@ -59,9 +59,13 @@ if storyline = 1 and (month <= 2 or month = 12):
 	end
 end
 
-if storyline = 1 and ((month >= 3 and month <= 5) or (month >= 9 and month <= 11)):
-	if week <= 5 and hour >= 18 and hour <= 20:
+!! Why wouldn''t this happen in the summer?
+if storyline = 1 and ((month >= 3 and month <= 5) or (month >= 9 and month <= 11)) and rand(0,4) = 0:
+	if week <= 5 and hour >= 15 and hour <= 20 and $clothingworntype = 'nude' and rand(0,3) = 0 and christinaphotos ! daystart:
+		gt 'gschool_socialchg1', 'chrislina_naked'
+	else
 		'<a href="exec:gt ''gschool_socialchg1'', ''tChristina''">Christina</a> is standing by the beach looking out over the lake. You also notice <a href="exec:gt ''gschool_socialchg1'', ''tLina''">Lina</a> in the background standing next to her, breathing heavily.'
+		act'Walk away':gt'glake'
 	end
 end
 
@@ -106,7 +110,6 @@ if month >= 5 and month <= 9:
 				gs 'clothing', 'strip'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/strip.jpg"></center>'
 				'Without hesitation, despite the fact other people are around, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the lake or just lie down in the sand and do some sunbathing.'
-
 				act'Continue':gt'glake'
 			end
 		else

+ 1 - 1
locations/grandpahelp.qsrc

@@ -85,7 +85,7 @@ if $ARGS[0] = 'start':
 		gt 'grandpahelp', 'grazecows'
 	elseif grandpahelping = 9 and temper >= 15 and sunWeather = 1 and week > 5:
 		gt 'grandpahelp', 'washhorse'
-	elseif grandpahelping >= 10 and grandpahelping < 13 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
+	elseif grandpahelping >= 10 and grandpahelping < 13 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0 and ARRSIZE('swimwear') > 0:
 		gt 'grandpahelp', 'pickforest'
 	elseif grandpahelping = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
 		'"<<$pcs_nickname>>, we need to help out with hay gathering today. We have to go to the field and help out."'

+ 1 - 1
locations/gschool_boys_bathroom.qsrc

@@ -155,7 +155,7 @@ if $ARGS[0] = 'boy2':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big39.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big154.jpg"></center>'
 				'You turn your head, but he just takes it as an invitation to nuzzle your neck instead. You try and push him off, but he is way stronger than you are. "Radomir, no, I don''t want to."'
 				*nl
 				'He starts pulling your clothes off. "Sure you do, every girl wants a strong man to fuck her."'

+ 16 - 0
locations/gschool_events.qsrc

@@ -2359,5 +2359,21 @@ if $ARGS[0] = 'rand_teacher_arg':
 	$rand_teacher = dyneval('$result = $npc_lastname[''A<<r>>'']')
 end
 
+if $ARGS[0] = 'christinaphotos':
+	cla & *clr
+	menu_off = 1
+	mood -= 20
+	grupvalue[1] -= 15
+	grupvalue[2] -= 10
+	grupvalue[3] -= 20
+	christinaphotos = -1
+	gs 'fame', 'pav', 'sex', 40
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/shamewalk.jpg"></center>'
+	'As you walk down the hall everyone is staring at you, several are laughing, many check their phones. A couple of the boys show you their phones with nude pictures of you on it. "Hey since you like walking around naked why don''t you do a little strip tease for us right now." Roman yells out to you, which gets everyone laughing. You hang your head down and try to ignore everyone, luckily Mr. Tsarev comes out and breaks it up and tells everyone to get to class. For the rest of the day you get side long glances and hear snickers as you walk by, you can''t believe Christina would be such a bitch.'
+	act 'Move to next class': gt 'gschool_lessons', 'schedule'
+	act 'Skip next class': school_period += 1 & gt 'gschool_lessons', 'skip'
+end
+
 --- gschool_events ---------------------------------
 

+ 9 - 15
locations/gschool_grounds.qsrc

@@ -116,7 +116,7 @@ if $ARGS[0] = 'main':
 !!	act 'Go to the Principals Office': gt
 
 	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and schoolBlock = 0:
-		if PCloStyle2 = 4 or Enable_sforma = 1:
+		if $clothingworntype = 'school' or Enable_sforma = 1:
 			if hour = 6:
 				if minut < 30:
 					'It''s too early for school now.'
@@ -127,7 +127,7 @@ if $ARGS[0] = 'main':
 			elseif hour = 7:
 				if NikoEv = 10:
 					gt 'NikoDates', 'Walk Of Shame'
-				elseif minut <= 55:
+				elseif minut <= 45:
 					act '<b>Go to class</b>': gt 'gschool_grounds', 'bulding'
 				else
 					'You are late for school, you could rush to class or just skip until the second period.'
@@ -293,11 +293,9 @@ if $ARGS[0] = 'main':
 
 	if strelaDay ! daystart and strelaQW = 1 and hour = 14:
 		*clr & cla
-		gs 'stat'
-		'A Mitsubishi Pajero and a BMW drive up to the school gates. Strong, muscular guys in leather jackets and tracksuits get out of the cars. They have came to meet Vitek, Dan and Vasily. You watch them talk about something, though you''re not close enough to hear what it''s about. Then you notice Fedor Kozlov leaving school; his face all swollen and bruised. Fedor waves his hand at you, "<<$pcs_nickname>>! Come here, you''re my witness!"'
+		'A Mitsubishi Pajero and a BMW drive up to the school gates. Strong, muscular guys in leather jackets and tracksuits get out of the cars. They have come to meet Vitek, Dan and Vasily. You watch them talk about something, though you''re not close enough to hear what it''s about. Then you notice Fedor Kozlov leaving school, his face all swollen and bruised. Fedor waves his hand at you, "<<$pcs_nickname>>! Come here, you''re my witness!"'
 
 		act 'Go and see what Fedor needs': gt 'strela'
-		exit
 	end
 end
 
@@ -395,7 +393,6 @@ if $ARGS[0] = 'bulding':
 	'<center><b><font color="maroon">Inside School</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<rand(0,2)>>.jpg"></center>'
 	'The hallways of the school building are painted with a cheap green paint, which you think may be toxic. Budget cuts.'
-
 	act 'Continue':
 		if hour = 8: late = 1
 		gs 'stat'
@@ -411,9 +408,7 @@ if $ARGS[0] = 'bulding':
 			end
 		end
 	end
-
 	act 'Return to town': minut += 2 & gt 'pavResidential'
-
 	if dimaRevenge = 1:
 		menu_off = 1
 		'You''re in a good mood today as you enter the school. That changes when Dimka stops you in the hall on the way to class.
@@ -460,13 +455,12 @@ if $ARGS[0] = 'KristinaFight':
 
 	zverRageQW = 2
 	'As you cross the school yard after school, you are surprised by a powerful kick in your back. You fall to your hands and knees and rub your sore back for a second, before you turn around and see Christina Zvereva, her face contorted with rage. She yells at you, "You fucking bitch! How dare you spread shit about me like that? I''ll break your fucking face!"'
-
-	gs 'fight','initFight'
-	gs 'boyStat', 'A18'
-
-	gs 'fight_npcdata', 'christina'
-
-	act 'fight': gt 'fight','start'
+!! Fightcheck
+	act 'fight':
+		gs 'fight','initFight'
+		gs 'fight_npcdata', 'christina'
+		gt 'fight', 'start'
+	end
 end
 
 if $ARGS[0] = 'SchoolRun':

+ 3 - 1
locations/gschool_lessons.qsrc

@@ -252,7 +252,9 @@ if $ARGS[0] = 'short_break':
 			nl
 			gs 'gschool_schedule'
 		end
-
+		
+		if christinaphotos > 4: gt 'gschool_events', 'christinaphotos'
+		
 		act 'Move to next class': gt 'gschool_lessons', 'schedule'
 
 		act 'Skip next class': school_period += 1 & gt 'gschool_lessons', 'skip'

+ 3 - 3
locations/gschool_lessons1.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'russian':
 				gs 'willpower', 'pay', 'self'
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 5
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
 				'You notice Svyatoslav glancing over you a few times and decided to play with him. The next time he looks over at you, while Mr. Yenotin back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock as he stares at your exposed <<$titsize>>s. A couple of the others students notice what you are doing, most of them either grin, smile, or laugh at your antics, all but Lesco of course who stares openly with his mouth open.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 			end
@@ -541,7 +541,7 @@ if $ARGS[0] = 'geography':
 				gs 'willpower', 'pay', 'self'
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 5
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
 				'You notice Artem glancing over you a few times and decided to play with him. The next time he looks over at you, while Mr. Yenotin back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock as he stares at your exposed <<$titsize>>s. A couple of the others students notice what you are doing, most of them either grin, smile, or laugh at your antics, all but Lesco of course who stares openly with his mouth open.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 			end
@@ -1032,7 +1032,7 @@ if $ARGS[0] = 'history':
 				gs 'willpower', 'pay', 'self'
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 5
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
 				'You notice Petka glancing over you a few times and decided to play with him. The next time he looks over at you, while Mr. Yenotin back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock as he stares at your exposed <<$titsize>>s. A couple of the others students notice what you are doing, most of them either grin, smile, or laugh at your antics, all but Lesco of course who stares openly with his mouth open.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 			end

+ 4 - 4
locations/gschool_lessons2.qsrc

@@ -55,7 +55,7 @@ if $ARGS[0] = 'computer':
 				gs 'willpower', 'pay', 'self'
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 5
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
 				'You notice Artem glancing over you a few times and decided to play with him. The next time he looks over at you, while Mr. Yenotin back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock as he stares at your exposed <<$titsize>>s. A couple of the others students notice what you are doing, most of them either grin, smile, or laugh at your antics, all but Lesco of course who stares openly with his mouth open. Vasily tries to take a picture but you close your shirt before he gets his phone up. Sonia grins at what you are doing, Zinaida gives you a slightly disgusted look before turning away, Albina and Alyona smile about it, while Lizaveta starts texting on her phone at once. You are sure she is texting everyone what you just did.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 			end
@@ -554,7 +554,7 @@ if $ARGS[0] = 'science':
 				gs 'willpower', 'pay', 'self'
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 5
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
 				'You notice Fedor glancing over you a few times and decided to play with him. The next time he looks over at you, while Mr. Yenotin back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock as he stares at your exposed <<$titsize>>s. A couple of the others students notice what you are doing, most of them either grin, smile, or laugh at your antics, all but Lesco of course who stares openly with his mouth open. Andrey and Vanya smile as they watch, Stasya gives you a annoyed look when Andrey reacts, while Irina starts texting on her phone at once. You are sure she is texting everyone what you just did.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 			end
@@ -928,7 +928,7 @@ if $ARGS[0] = 'music':
 				gs 'willpower', 'pay', 'self'
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 5
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
 				'You notice Petka glancing over you a few times and decided to play with him. The next time he looks over at you, while Mr. Yenotin back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock as he stares at your exposed <<$titsize>>s. A couple of the others students notice what you are doing, most of them either grin, smile, or laugh at your antics, all but Lesco of course who stares openly with his mouth open. Lavrenti tries to take a picture but you close your shirt before he gets his phone up. Katja looks shocked then grins at what you are doing, Bella gives you a slightly disgusted look before turning away, Lariska and Lina smile about it, then Lina starts texting on her phone at once. You are sure she is texting everyone what you just did.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 			end
@@ -1404,7 +1404,7 @@ if $ARGS[0] = 'biology':
 				gs 'willpower', 'pay', 'self'
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 5
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
 				'You notice Fedor glancing over you a few times and decided to play with him. The next time he looks over at you, while Mr. Yenotin back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock as he stares at your exposed <<$titsize>>s. A couple of the others students notice what you are doing, most of them either grin, smile, or laugh at your antics, all but Lesco of course who stares openly with his mouth open. Irina starts texting on her phone at once. You are sure she is texting everyone what you just did.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 			end

+ 7 - 7
locations/gschool_lessons3.qsrc

@@ -345,7 +345,7 @@ if $ARGS[0] = 'literature_late':
 					gs 'arousal', 'foreplay', 3, 'sub', 'humiliation', 'maso'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Take your seat': gt 'gschool_lessons1', 'literature'
+					act 'Take your seat': gt 'gschool_lessons3', 'literature'
 				else
 					gs 'exhibitionism', 2
 					gs 'fame', 'pav', 'sex', 2
@@ -385,7 +385,7 @@ if $ARGS[0] = 'literature_late':
 				gs 'arousal', 'foreplay', 3, 'exhibitionism', 'sub', 'humiliation', 'maso'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Take your seat': gt 'gschool_lessons1', 'literature'
+				act 'Take your seat': gt 'gschool_lessons3', 'literature'
 			end
 		else
 			'When you open the door and walk in Mrs Braakman stops talking and everyone turns their eyes towards you. Mrs Braakman address you in a cold tone. "Your late Miss <<$pcs_lastname>>, I will not tolerate students being late to my class." Several of the kids smirk, a few look annoyed you interrupted class.'
@@ -396,7 +396,7 @@ if $ARGS[0] = 'literature_late':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latel1.jpg"></center>'
 				'You look down a bit. "Sorry I was running late and time just got away from me."'
 				'She shakes his head slightly and frowns. "Very well of course I will still have to report this Miss <<$pcs_lastname>>, now take your seat and might I suggest you set your alarm for earlier."'
-				act 'Take your seat': gt 'gschool_lessons1', 'literature'
+				act 'Take your seat': gt 'gschool_lessons3', 'literature'
 			end
 			act 'Say nothing':
 				*clr & cla
@@ -404,7 +404,7 @@ if $ARGS[0] = 'literature_late':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latel1.jpg"></center>'
 				'You roll your eyes a bit but say nothing in response. She narrows her eyes at you a little and frowns. "I will have to report this Miss <<$pcs_lastname>>, now take your seat. You have interrupted class enough."'
-				act 'Take your seat': gt 'gschool_lessons1', 'literature'
+				act 'Take your seat': gt 'gschool_lessons3', 'literature'
 			end
 		end
 	end
@@ -424,7 +424,7 @@ if $ARGS[0] = 'literature_spanking':
 		gs 'arousal', 'foreplay', 3, 'sub', 'humiliation', 'maso'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Take your seat': gt 'gschool_lessons1', 'literature'
+		act 'Take your seat': gt 'gschool_lessons3', 'literature'
 	end
 end
 
@@ -546,7 +546,7 @@ if $ARGS[0] = 'art':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 5
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
 					'You notice Feofan glancing over you a few times and decided to play with him. The next time he looks over at you, while Mr. Vasilyev back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock, as he stares at your exposed breasts. A couple of the others students notice what you are doing, Svyatoslav tries to take a picture but you close your shirt before he gets his phone up. Anushka grins at what you are doing, Zinaida gives you a slightly disgusted look before turning away, Katja and Albina smile about it.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 				end
@@ -1068,7 +1068,7 @@ if $ARGS[0] = 'shop':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 5
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
 					'You notice Fedor glancing over you a few times and decided to play with him. The next time he looks over at you, while Mr. Kuznetsov back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock, as he stares at your exposed breasts. A couple of the others students notice what you are doing, Dan tries to take a picture but you close your shirt before he gets his phone up. Anushka grins at what you are doing, Viktoria gives you a slightly disgusted look before turning away, Vitek and Paulina smile about it. While Dimka starts texting on his phone likely telling everyone in school what you just did.'
 					act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 				end

+ 108 - 108
locations/gschool_lessons4.qsrc

@@ -359,7 +359,7 @@ if $ARGS[0] = 'math_late':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latem2.jpg"></center>'
 			'You look down a bit. "Sorry I was running late and time just got away from me."'
 			'He shakes his head slightly and sighs a bit. "Very well Miss <<$pcs_lastname>> please take your seat, try not to let it happen again."'
-			act 'Take your seat': gt 'gschool_lessons1', 'math'
+			act 'Take your seat': gt 'gschool_lessons4', 'math'
 		end
 		act 'Say nothing':
 			*clr & cla
@@ -367,7 +367,7 @@ if $ARGS[0] = 'math_late':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/late/latem2.jpg"></center>'
 			'You roll your eyes a bit but say nothing in response. He shakes his head slightly and frowns. "I will have to report this Miss <<$pcs_lastname>>, now please take your seat. You have interrupted class enough."'
-			act 'Take your seat': gt 'gschool_lessons1', 'math'
+			act 'Take your seat': gt 'gschool_lessons4', 'math'
 		end
 	end
 end
@@ -696,7 +696,8 @@ if $ARGS[0] = 'pe':
 		'Coach Pavlovich announces that the inter-school running competition will be held this Saturday at 11:00. If you want to participate, you should come to school between 10:00 and 11:00.'
 	end
 	act 'Continue':
-		fizrarand = rand(1, 5)
+		*clr & cla
+		fizrarand = rand(1, 7)
 		if fizrarand = 1:
 			pcs_mood -= 5
 			if pcs_run >= 60: 
@@ -723,12 +724,12 @@ if $ARGS[0] = 'pe':
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra3.jpg"></center>'
 							'Making sure no one else is near you, you pull up your shirt and reveal your <<$titsize>> boobs to Ivan. You almost immediately notice his erection growing in his tight shorts, and he awkwardly tries to hide his boner. As you pull your shirt back where it belongs you give him a sweet smile and say, "Try hiding that while you''re running past everyone!"'
 							'He grimaces as he sprints away from you, carefully checking to make sure no one is near him. You have a knowing smile on your face when, at the end of the class, his friends ask him why his lap time was so much slower than usual.'
-							act 'Finish run':gt 'gschool_lessons2', 'postphys'
+							act 'Finish run':gt 'gschool_lessons4', 'postphys'
 						end
 						act 'Laugh it off and let him go':
 							cla
 							'"Very funny, Ivan," you tell him as you give him a wink. He salutes you theatrically as he sprints off again, finishing the run well before anyone else.'
-							act 'Finish run':gt 'gschool_lessons2', 'postphys'
+							act 'Finish run':gt 'gschool_lessons4', 'postphys'
 						end
 					elseif runoutside = 2:
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra2.jpg"></center>'
@@ -738,7 +739,7 @@ if $ARGS[0] = 'pe':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra2.jpg"></center>'
 							'You are to focused on your running, you keep your eyes straight ahead. Running as quickly as you can, after a bit you hear who ever it was starting to fall behind.'
-							act 'Finish run':gt 'gschool_lessons2', 'postphys'
+							act 'Finish run':gt 'gschool_lessons4', 'postphys'
 						end
 						act 'Look':
 							*clr & cla
@@ -747,18 +748,18 @@ if $ARGS[0] = 'pe':
 							gs 'arousal', 'voyeur', 5
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Finish run':gt 'gschool_lessons2', 'postphys'
+							act 'Finish run':gt 'gschool_lessons4', 'postphys'
 						end
 					elseif runoutside = 3:
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nopanstretch.jpg"></center>'
 						'"Since the weather is so nice we will be running outside today. Lets go." He leads the class outside to the forest trail on the school grounds, near the old school building. He gives everyone time to do a little stretching before the run, as Lina does some stretching it becomes apparently she forgot her panties. As she stretches her shorts pull to one side showing her pussy off to everyone, before anyone can say anything she stops and stands up obviously to the little show she just gave. Then Coach Pavlovich pulls out his stop watch and says. "Go!" Everyone takes off on the run with that.'
 						'The rest of the run turns out to be a very uneventful and peaceful run, you enjoyed the quiet time to yourself a great deal.'
-						act 'Finish run':gt 'gschool_lessons2', 'postphys'
+						act 'Finish run':gt 'gschool_lessons4', 'postphys'
 					else
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra2.jpg"></center>'
 						'"Since the weather is so nice we will be running outside today. Lets go." He leads the class outside to the forest trail on the school grounds, near the old school building. He gives everyone time to do a little stretching before the run, before he pulls out his stop watch and says. "Go!" Everyone takes off on the run with that.'
 						'It turns out to be a very uneventful and peaceful run, you enjoyed the quiet time to yourself a great deal.'
-						act 'Finish run':gt 'gschool_lessons2', 'postphys'
+						act 'Finish run':gt 'gschool_lessons4', 'postphys'
 					end
 				else
 					runinside = rand(1,5)
@@ -773,7 +774,7 @@ if $ARGS[0] = 'pe':
 						'You join the class in running laps around the gymnasium. Half-way into the fourteenth lap, you wonder if there''s any way gym class could be more boring than this.'
 					end
 					gs 'gschool_lessonsev1', 'fiz_rand'
-					act 'Finish the run':gt 'gschool_lessons2', 'postphys'
+					act 'Finish the run':gt 'gschool_lessons4', 'postphys'
 				end
 			end
 		elseif fizrarand = 2:
@@ -787,7 +788,7 @@ if $ARGS[0] = 'pe':
 			'After the roll call, Mr. Nikolaevich announces that you will be taking turns performing vaults.'
 			'The instructor is actually counting and recording how many each person does, so it''s a bit more stressful than usual.'
 			gs 'gschool_lessonsev1', 'fiz_rand'
-			act 'End of lesson':gt 'gschool_lessons2', 'postphys'
+			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 		elseif fizrarand = 2:
 			gs 'exercise', 'tier2', 1, 'stren_exp'
 			gs 'stat'
@@ -820,7 +821,7 @@ if $ARGS[0] = 'pe':
 				end
 			end
 			gs 'gschool_lessonsev1', 'fiz_rand'
-			act 'End of lesson':gt 'gschool_lessons2', 'postphys'
+			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 		elseif fizrarand = 3:
 			gs 'exercise', 'tier2', 1, 'stren_exp'
 			gs 'stat'
@@ -842,7 +843,7 @@ if $ARGS[0] = 'pe':
 				'You''ve done enough sit-ups in the past that this isn''t too much of a challenge. When you finally stop, you have done more than all the other girls and about half the boys as well.'
 			end
 			gs 'gschool_lessonsev1', 'fiz_rand'
-			act 'End of lesson':gt 'gschool_lessons2', 'postphys'
+			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 		elseif fizrarand = 4:
 			gs 'exercise', 'tier2', 1, 'vital_exp'
 			'For one of the activities, the teacher 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 as they jump rope.'
@@ -892,7 +893,7 @@ if $ARGS[0] = 'pe':
 				end
 			end
 			gs 'gschool_lessonsev1', 'fiz_rand'
-			act 'End of lesson':gt 'gschool_lessons2', 'postphys'
+			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 		elseif fizrarand = 5:
 			*clr & cla
 			gs 'exercise', 'tier2', 1, 'stren_exp'
@@ -950,7 +951,7 @@ if $ARGS[0] = 'pe':
 				end
 			end
 			gs 'gschool_lessonsev1', 'fiz_rand'
-			act 'End of lesson':gt 'gschool_lessons2', 'postphys'
+			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 		elseif fizrarand = 6:
 			gs 'exercise', 'tier2', 1, 'vital_exp'
 			'For one of the activities, the teacher breaks everyone into small groups and has you compete to see who can jumping jacks the longest. Many of the boys pay special attention to the girls as they do jumping jacks.'
@@ -961,9 +962,9 @@ if $ARGS[0] = 'pe':
 				gs 'arousal', 'voyeur', 2
 				gs 'arousal', 'end'
 				gs 'stat'
-				gt 'gschool_lessons2', 'jumping_jacks'
+				act 'Continue': gt 'gschool_lessons4', 'jumping_jacks'
 			else
-				gt 'gschool_lessons2', 'jumping_jacks'
+				gt 'gschool_lessons4', 'jumping_jacks'
 			end
 		elseif fizrarand = 7:
 			gs 'exercise', 'tier2', 1, 'stren_exp'
@@ -975,9 +976,9 @@ if $ARGS[0] = 'pe':
 				gs 'arousal', 'voyeur', 2
 				gs 'arousal', 'end'
 				gs 'stat'
-				gt 'gschool_lessons2', 'pushups'
+				act 'Continue': gt 'gschool_lessons4', 'pushups'
 			else
-				gt 'gschool_lessons2', 'pushups'
+				gt 'gschool_lessons4', 'pushups'
 			end
 		end
 	end
@@ -1002,7 +1003,7 @@ if $ARGS[0] = 'jumping_jacks':
 			'The other girls in your group are surprised at just how jumping jacks you can do. You manage to go the longest in a couple of rounds of the competition.'
 		end
 		gs 'gschool_lessonsev1', 'fiz_rand'
-		act 'End of lesson':gt 'gschool_lessons2', 'postphys'
+		act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 	elseif pcs_cupsize <= 60:
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/jumprb.mp4"></video></center>'
 		if pcs_vital <= 30:
@@ -1019,7 +1020,7 @@ if $ARGS[0] = 'jumping_jacks':
 			'The other girls in your group are surprised at just how jumping jacks you can do. You manage to go the longest in a couple of rounds of the competition. You could actually jump rope for quite a bit longer, but notice that the longer the class goes on, the more boys have found their way over to watch you. Some of the girls you were competing with make snide remarks about just which particular parts of you they are so keen on watching.'
 		end
 		gs 'gschool_lessonsev1', 'fiz_rand'
-		act 'End of lesson':gt 'gschool_lessons2', 'postphys'
+		act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 	else
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/jumph.mp4"></video></center>'
 		if pcs_vital <= 30:
@@ -1037,7 +1038,7 @@ if $ARGS[0] = 'jumping_jacks':
 		end
 	end
 	gs 'gschool_lessonsev1', 'fiz_rand'
-	act 'End of lesson':gt 'gschool_lessons2', 'postphys'
+	act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 end
 
 if $ARGS[0] = 'pushups':
@@ -1059,7 +1060,7 @@ if $ARGS[0] = 'pushups':
 		'You''ve done enough push-ups in the past that this isn''t too much of a challenge. When you finally stop, you have done more than all the other girls and about half the boys as well.'
 	end
 	gs 'gschool_lessonsev1', 'fiz_rand'
-	act 'End of lesson':gt 'gschool_lessons2', 'postphys'
+	act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 end
 
 if $ARGS[0] = 'postphys':
@@ -1069,7 +1070,7 @@ if $ARGS[0] = 'postphys':
 	if zverevaQW = 1:
 		postphys_event = daystart
 		'After class, Coach Pavlovich returns to his office. For some reason, Christina Zvereva is following him while all other students go to the locker rooms as usual.'
-		act 'Ignore it and go to the locker room': gt 'gschool_lessons2', 'postphys2'
+		act 'Ignore it and go to the locker room': gt 'gschool_lessons4', 'postphys2'
 		act 'Listen in on Christina and Coach Pavlovich':
 			*clr & cla
 			gs 'stat'
@@ -1112,7 +1113,7 @@ if $ARGS[0] = 'postphys':
 								'As you see Christina happily start sucking his dick again, you won''t give into his demands, you quietly close the door and leave. It looks like, despite being the better runner, you won''t be going to the regional championships.'
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Go and get changed': gt 'gschool_lessons2', 'postphys2'
+								act 'Go and get changed': gt 'gschool_lessons4', 'postphys2'
 							end
 						else
 							act 'Refuse to suck his dick (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1128,7 +1129,7 @@ if $ARGS[0] = 'postphys':
 							gs 'arousal', 'bj', 10, 'group'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Go and get changed': gt 'gschool_lessons2', 'postphys2'
+							act 'Go and get changed': gt 'gschool_lessons4', 'postphys2'
 						end
 					end
 				else
@@ -1145,12 +1146,12 @@ if $ARGS[0] = 'postphys':
 					gs 'arousal', 'end'
 					gs 'stat'
 !!Event missing for bursting into the room when christina already sucked him off
-					!!act 'Burst into the room':gt 'gschool_lessons2', 'postphys'
+					!!act 'Burst into the room':gt 'gschool_lessons4', 'postphys'
 					act 'Admit defeat':
 						*clr & cla
 						'<center><video autoplay loop src="images/shared/sex/cum/cumf10.mp4"></video></center>'
 						'As you see Christina happily dig her face into his groin, you quietly close the door and leave. It looks like, despite being the better runner, you won''t be going to the regional championships.'
-						act 'Go and get changed': gt 'gschool_lessons2', 'postphys2'
+						act 'Go and get changed': gt 'gschool_lessons4', 'postphys2'
 					end
 				end
 				act 'Admit defeat':
@@ -1159,7 +1160,7 @@ if $ARGS[0] = 'postphys':
 					'Yeah, you''re not willing to do that. As you see Christina happily dig her face into his groin, you quietly close the door and leave. It looks like, despite being the better runner, you won''t be going to the regional championships.'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Go and get changed': gt 'gschool_lessons2', 'postphys2'
+					act 'Go and get changed': gt 'gschool_lessons4', 'postphys2'
 				end
 			end
 		end
@@ -1169,7 +1170,7 @@ if $ARGS[0] = 'postphys':
 		if will_cost <= pcs_willpwr:
 			act 'No thanks (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
-				gt 'gschool_lessons2', 'postphys2'
+				gt 'gschool_lessons4', 'postphys2'
 			end
 		else
 			act 'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1183,31 +1184,31 @@ if $ARGS[0] = 'postphys':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/sex/school/chcoachbj.jpg"></center>'
 			'You follow Christina, and follow her lead as she squats before your teacher. She diligently takes off his clothes and takes his penis in her hand, sucking on it for a little while before offering it to you. You follow her lead and obediently take his cock in your mouth, sucking on it and trying to take it as far down your throat as you are comfortable with. After a while she pushes your face away and closes her lips around it, sucking him off until he shoots his load inside her mouth. Unwilling to share, she swallows it and then goes to the changing room to get dressed.'
-			act 'Go and get changed': gt 'gschool_lessons2', 'postphys2'
+			act 'Go and get changed': gt 'gschool_lessons4', 'postphys2'
 		end
 	else
-		gt 'gschool_lessons2', 'postphys2'
+		gt 'gschool_lessons4', 'postphys2'
 	end
 end
 
 if $ARGS[0] = 'postphys2':
-	if zverRageQW = 10 and postphys_event ! daystart:postphys_event = daystart & gt 'gKristinaZv'
+	if (zverRageQW = 10 or (christinaphotos > 0 and christinaphotos <= 4)) and postphys_event ! daystart:postphys_event = daystart & gt 'gKristinaZv'
 	*clr & cla
-	$menu_loc = 'gschool_lessons2'
+	$menu_loc = 'gschool_lessons4'
 	$menu_arg = 'postphys2'
 	menu_off = 0
 	$metkaM = 'postphys2'
-	$locM = 'gschool_lessons2'
+	$locM = 'gschool_lessons4'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
 	'You enter the girls locker room and find several other girls already inside, undressing, changing, heading for or returning from the showers, or simply chatting with each other. You ignore the young women in various states of undress around you, find your locker, and start to take off your clothes.'
 	gs 'gschool_gossip', 'gym'
 	if shampoo > 0:
-		act 'Have a shower':gt 'gschool_lessons2', 'shower'
+		act 'Have a shower':gt 'gschool_lessons4', 'shower'
 	else
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
-	act 'Get dressed': gt 'gschool_lessons2', 'dress'
+	act 'Get dressed': gt 'gschool_lessons4', 'dress'
 end
 
 if $ARGS[0] = 'shower':
@@ -1218,7 +1219,7 @@ if $ARGS[0] = 'shower':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/change.jpg"></center>'
 	'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the showers; you are greeted by wafts of steam and several girls who are giggling and gossiping among themselves, apparently oblivious to your existence.'
-	act 'Continue': gt 'gschool_lessons2', 'shower2'
+	act 'Continue': gt 'gschool_lessons4', 'shower2'
 end
 
 if $ARGS[0] = 'shower2':
@@ -1247,9 +1248,9 @@ if $ARGS[0] = 'shower2':
 		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After a few moments of basking in this joy of modern civilization and silently thanking providence that you life in an era where this is commonplace, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower.'
 	end
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-	act 'Take a long shower': gt 'gschool_lessons2', 'long_shower'
-	act 'Return to the locker room': gt 'gschool_lessons2', 'post_shower'
-	act 'Check out the other girls': gt 'gschool_lessons2', 'post_shower2'
+	act 'Take a long shower': gt 'gschool_lessons4', 'long_shower'
+	act 'Return to the locker room': gt 'gschool_lessons4', 'post_shower'
+	act 'Check out the other girls': gt 'gschool_lessons4', 'post_shower2'
 end
 
 if $ARGS[0] = 'long_shower':
@@ -1281,7 +1282,7 @@ if $ARGS[0] = 'long_shower':
 				'You are shocked but before you can yell at him or maybe flirt he keeps talking. "Why don''t you suck my dick." He says as he starts walking towards you still stroking his hard cock. You can''t help but stare his dick it is as long as your forearm and nearly as thick.'
 				gs 'arousal', 'voyeur', 2
 				gs 'stat'
-				act 'Suck his dick': gt 'gschool_sex', 'lazar_lockeroom'
+				act 'Suck his dick': gt 'gschool_sex', 'lazar_lockerroom'
 				gs 'willpower', 'sex', 'resist', 'medium'
 				if will_cost <= pcs_willpwr:
 					act 'Tell him to get out (<<will_cost>> Willpower)':
@@ -1293,7 +1294,7 @@ if $ARGS[0] = 'long_shower':
 						'He stops stroking his dick when you yell and he puts up his hands with his dick still hanging out. "Ok ok, no need to yell. I''ll go." He puts his dick away slowly and then very slowly walks out of the shower, watching your naked body the whole time. Once he is gone you wait a couple of minutes until you hear the locker door close and then you rush to your locker and quickly dry off and get dressed, before he comes back.'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+						act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 					end
 				else
 					act 'Tell him to get out (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1314,7 +1315,7 @@ if $ARGS[0] = 'long_shower':
 				'As you are showering enjoying your self you turn and see Vitek and Dan standing there watching you shower with huge smiles on their face. Both of them are only wearing towels, as if they had walked over here after getting out of the boys shower. Then they both let their towels drop almost at once showing off their dangling dicks. "Get on your knees so you can suck our dicks." Dan says.'
 				gs 'arousal', 'voyeur', 2
 				gs 'stat'
-				act 'Get on your knees': gt 'gschool_sex', 'vd_lockeroom'
+				act 'Get on your knees': gt 'gschool_sex', 'vd_lockerroom'
 				if grupTipe = 5:
 					gs 'willpower', 'sex', 'resist', 'hard'
 				elseif grupTipe = 4:
@@ -1339,7 +1340,7 @@ if $ARGS[0] = 'long_shower':
 							'The both laugh at that. "So what? What are you going to do about it?"'
 							'You feel yourself start to panic. "I''ll scream! The coach is still in his office." He is most days anyways and you hope he is today.'
 							'Vitek gives you a hard look and takes a step towards you, you inhale like you are about to scream and he stops dead. "You''re going to regret this bitch." Then Vitek walks out, Dan lingers just a moment longer checking you out before he leaves as well. You wait until you hear the locker room door close, then you rush to your locker, to quickly dry off and get dressed, before he comes back.'
-							act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+							act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 						end
 					end
 				else
@@ -1361,20 +1362,20 @@ if $ARGS[0] = 'long_shower':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petkaleave.jpg"></center>'
 					'You ignore the sounds and just chalk it up to your imagination. You go back to getting dressed, while you get dressed you don''t hear anymore noise, it must have really been just your imagination.'
-					act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+					act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 				end
 				act 'Investigate the noise':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petka2.jpg"></center>'
 					'You walk over to one the lockers where you think you heard the noise from. You get closer and look through the vents in the lockers and listen closely. As you get to one it sounds like ... like someone is breathing... but how can that be. Could someone be inside one of the lockers? "Is anyone there?" You ask and hear no response and the breathing sound if it every existed has stopped.'
-					act 'Open the locker': gt 'gschool_sex', 'petka_lockeroom'
+					act 'Open the locker': gt 'gschool_sex', 'petka_lockerroom'
 					act 'Ignore it':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petkaleave.jpg"></center>'
 						'You shake your head, your imagination must be going crazy. You go back to getting dressed, while you get dressed you don''t hear anymore noise, it must have really been just your imagination.'
-						act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+						act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 					end
 				end
 			end
@@ -1387,7 +1388,7 @@ if $ARGS[0] = 'long_shower':
 				*clr & cla
 				gs 'stat'
 				if hotcat => 6 and npc_rel['A23'] > 60 and checkoutalbina = 1:
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/lockerflirt.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 					'As you walk into the locker room you can tell it is Albina on the phone. She seems to be talking about her dance troupe and a new show they will be doing. Once you start drying your hair you can''t hear what she says anymore. As you finished drying your hair but before you get dressed she comes around to your side of the lockers wearing a towel while you are naked. Then she drops her towel, reveling her naked body as well. Then she turns towards you, giving you a even better view of her naked body. "So do you like what you see?" She asks.'
 					gs 'arousal', 'voyeur', 2
 					gs 'stat'
@@ -1395,12 +1396,12 @@ if $ARGS[0] = 'long_shower':
 						*clr & cla
 						npc_rel['A23'] += 1
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/spank.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/spank.jpg"></center>'
 						'You decided to honest. "Yes very much, I love looking at you. You''re very beautiful and I find you very attractive."'
 						'She walks up to you and then turns you till you are facing the lockers and gives your butt a slap and then a squeeze. "What a dirty girl you are, what ever am I going to do with you?" You can tell it is a rhetorical question as you feel her hand sliding down between your legs.'
 						gs 'arousal', 'foreplay', 2
 						gs 'stat'
-						act 'Give in': gt 'gschool_sex', 'ablina_lockeroom'
+						act 'Give in': gt 'gschool_sex', 'ablina_lockerroom'
 						gs 'willpower', 'sex', 'resist', 'medium'
 						if will_cost <= pcs_willpwr:
 							act 'Pull away (<<will_cost>> Willpower)':
@@ -1408,13 +1409,13 @@ if $ARGS[0] = 'long_shower':
 								gs 'willpower', 'pay', 'resist'
 								npc_rel['A23'] -= 5
 								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/lockerflirt.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 								'You pull away from her and step away. "What are you doing?"'
 								'She looks confused. "I thought... never mind." She says shaking her head and starts to get dressed while ignoring you now. You start getting dressed as well, as soon as she is done she walks out leaving you alone in the locker room.'
 								gs 'arousal', 'voyeur', 2
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+								act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 							end
 						else
 							act 'Pull away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1423,7 +1424,7 @@ if $ARGS[0] = 'long_shower':
 					act 'No':
 						*clr & cla
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/lockerflirt.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 						'You shake your head. "You''re pretty but no."'
 						'She arches a shapely brow. "No? Then why have I caught you checking me out before when I was naked?"'
 						'You blush slightly, you didn''t think anyone noticed you checking out the other girls, apparently you was wrong.'
@@ -1434,24 +1435,24 @@ if $ARGS[0] = 'long_shower':
 							*clr & cla
 							npc_rel['A23'] -= 1
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/lockerflirt.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 							'Shaking your head. "Sorry I was just admiring what great shape you are in, I didn''t mean anything by it."'
 							'She shrugs a bit at that. "Whatever." Then she starts getting dressed and you do the same. Shortly you are both dressed and she walks out, leaving you alone in the locker room.'
 							gs 'arousal', 'voyeur', 2
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+							act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 						end
 						act 'Confess your attraction to her':
 							*clr & cla
 							npc_rel['A23'] += 1
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/spank.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/spank.jpg"></center>'
 							'You decided to just confess your feelings. "Yeah I have, you''re very beautiful and I find you very attractive."'
 							'She walks up to you and then turns you till you are facing the lockers and gives your butt a slap and then a squeeze. "What a dirty girl you are, what ever am I going to do with you?" You can tell it is a rhetorical question as you feel her hand sliding down between your legs.'
 							gs 'arousal', 'foreplay', 2
 							gs 'stat'
-							act 'Give in': gt 'gschool_sex', 'ablina_lockeroom'
+							act 'Give in': gt 'gschool_sex', 'ablina_lockerroom'
 							gs 'willpower', 'sex', 'resist', 'medium'
 							if will_cost <= pcs_willpwr:
 								act 'Pull away (<<will_cost>> Willpower)':
@@ -1459,13 +1460,13 @@ if $ARGS[0] = 'long_shower':
 									gs 'willpower', 'pay', 'resist'
 									npc_rel['A23'] -= 5
 									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/lockerflirt.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 									'You pull away from her and step away. "What are you doing?"'
 									'She looks confused. "I thought... never mind." She says shaking her head and starts to get dressed while ignoring you now. You start getting dressed as well, as soon as she is done she walks out leaving you alone in the locker room.'
 									gs 'arousal', 'voyeur', 2
 									gs 'arousal', 'end'
 									gs 'stat'
-									act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+									act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 								end
 							else
 								act 'Pull away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1473,10 +1474,10 @@ if $ARGS[0] = 'long_shower':
 						end
 					end
 				else
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/getdressed.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/getdressed.jpg"></center>'
 					'You take your clothes out of your locker and start putting them on. While you get dressed you can still hear someone talking in the other row of lockers most likely on the phone, at this point you can tell it is Albina. She sounds frustrated and like she is arguing with someone about a show, but your not sure. Just as you finish dressing she stops talking and comes back around to where you are still only wearing a towel. She gives you a brief look for a moment, perhaps wondering what you heard before she starts getting dressed.'
 					'You can choose another outfit while you''re here.'
-					act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+					act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 				end
 			end
 		elseif longshower = 5 and hotcat => 5 and pav_slut >= 75:
@@ -1490,7 +1491,7 @@ if $ARGS[0] = 'long_shower':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker1.jpg"></center>'
 				'You go to your locker and you don''t see or hear anyone now. You dry your hair and then get dressed just as you finish getting dressed you turn and see the Coach Pavlovich standing there, he looks surprised but you are not sure if he is really surprised or faking it. "Oh I didn''t know anyone was left, I thought the locker room was empty. I was just making sure all the lockers where closed."'
 				'You can''t help but notice the hardon causing his shorts to bulge. His eyes follow your eyes and he smiles when he notices you looking at his bulge in his shorts. "A girl with your reputation, just can''t help herself but to look can you? Go ahead and touch it." He says.'
-				act 'Feel his cock': gt 'gschool_sex', 'victor_lockeroom'
+				act 'Feel his cock': gt 'gschool_sex', 'victor_lockerroom'
 				gs 'willpower', 'sex', 'resist', 'medium'
 				if will_cost <= pcs_willpwr:
 					act 'Ask him to leave (<<will_cost>> Willpower)':
@@ -1500,7 +1501,7 @@ if $ARGS[0] = 'long_shower':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker1.jpg"></center>'
 						'"Do you mind? This is the girls locker room, you''re not suppose to be in here. Please leave." You tell him.'
 						'He pauses a moment and then throws his hands up. "Fine!" Then he turns and leaves.'
-						act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+						act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 					end
 				else
 					act 'Ask 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>'
@@ -1511,32 +1512,32 @@ if $ARGS[0] = 'long_shower':
 			pcs_mood += 10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
 			'The sensation of the hot water hitting your body and running down it, with the steam filling the room, giving it a almost sauna feel, completely relaxes you. Before long you no longer hear any noise at all other than the shower, all the other girls must have already left. After a few minutes more you notice your fingers starting to prune up and decided it is time to get out of the shower. You go to your locker, drying off and getting dressed. By the time you get to the locker room it is empty all the other girls have left.'
-			act 'Finish dressing': gt 'gschool_lessons2', 'post_dress'
+			act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 		end
 	end
-	act 'Go to the locker room': gt 'gschool_lessons2', 'long_shower_locker'
+	act 'Go to the locker room': gt 'gschool_lessons4', 'long_shower_locker'
 end
 
 if $ARGS[0] = 'long_shower_locker':
 	*clr & cla
-	$menu_loc = 'gschool_lessons2'
+	$menu_loc = 'gschool_lessons4'
 	$menu_arg = 'long_shower_locker'
 	menu_off = 0
 	minut +15
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/change.jpg"></center>'
 	'You walk from the showers back into the locker room, over to your locker, grabbing your towel and diligently dry off your body. With your hair still wet,  you''re ready to put the blow dryer to use. Once you finish blow drying your hair you look around and see several other girls have left the showers and are getting dried off or dressed as well. By the time you start to get dressed, all the other girls have already left.'
-	act 'Get Dressed': gt 'gschool_lessons2', 'post_dress'
+	act 'Get Dressed': gt 'gschool_lessons4', 'post_dress'
 end
 
 if $ARGS[0] = 'post_shower':
 	*clr & cla
-	$menu_loc = 'gschool_lessons2'
+	$menu_loc = 'gschool_lessons4'
 	$menu_arg = 'post_shower'
 	menu_off = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic2.jpg"></center>'
 	'You walk from the showers back into the locker room, over to your locker, grabbing your towel and diligently dry off your body. With your hair still wet,  you''re ready to put the blow dryer to use. Once you finish blow drying your hair you look around and see several other girls have left the showers and are getting dried off or dressed as well.'
-	act 'Get Dressed': gt 'gschool_lessons2', 'dress'
+	act 'Get Dressed': gt 'gschool_lessons4', 'dress'
 	act 'Check out the other girls':
 		*clr & cla
 		pcs_mood += 10
@@ -1546,7 +1547,7 @@ if $ARGS[0] = 'post_shower':
 		'Casually you glance around at the other girls who are still getting dressed, some are mostly dressed, a few in the underwear and a few still naked. Several of them are really good looking and you can feel yourself getting aroused as you watch them. You don''t think anyone noticed you checking them out.'
 		gs 'arousal', 'voyeur', 2
 		gs 'stat'
-		act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons2', 'dress'
+		act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 		act 'Check out Anushka':
 			*clr & cla
 			pcs_horny += 5
@@ -1555,7 +1556,7 @@ if $ARGS[0] = 'post_shower':
 			'You notice Anushka drying herself off with a towel. She is very pretty, some would even call her beautiful, you know most of the boys follow her around with the tongues hanging out, even those not into alternative looks and tattoo''s, find her pretty, making her one of the pretties girls in school. She has a petite build, not to skinny, just about right. She has averaged sized perky breasts, while pussy is clean shaven. You can''t help but watch her though, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
 			gs 'arousal', 'voyeur', 3
 			gs 'stat'
-			act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons2', 'dress'
+			act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 		end
 		act 'Check out Aylona':
 			*clr & cla
@@ -1565,7 +1566,7 @@ if $ARGS[0] = 'post_shower':
 			'You notice Aylona drying herself off with a towel. She is kinda cute, no one would call her beautiful, you know most of the boys think she is cute, especially the gopniks who are more into alternative looks and tattoo''s. She is pretty skinny, really to skinny giving her a almost starved look, she would likely look better if she put on a little weight. She has small perky breasts, while her bush is fairly neatly trimmed in a triangle. You can''t help but watch her though, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
 			gs 'arousal', 'voyeur', 3
 			gs 'stat'
-			act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons2', 'dress'
+			act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 		end
 		act 'Check out Albina':
 			*clr & cla
@@ -1576,7 +1577,7 @@ if $ARGS[0] = 'post_shower':
 			'You notice Albina going through her locker getting out her clothes. She is very pretty, some would even call her beautiful, you know most of the boys think she is one of the best looking girls in school and you can understand why, she has a near perfect body, to go along with a beautiful face. She has toned dancers build, thin, with defined muscles and small perk breasts, you doubt she has much body fat. She has small perky breasts and clean shaven pussy. You can''t help but watch her though, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
 			gs 'arousal', 'voyeur', 3
 			gs 'stat'
-			act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons2', 'dress'
+			act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 		end
 		act 'Check out Christina':
 			*clr & cla
@@ -1586,7 +1587,7 @@ if $ARGS[0] = 'post_shower':
 			'You notice Christina walking around naked after getting dried off. She is pretty, no one would call her beautiful, you know most of the boys think she is pretty and you have to agree. She has a very athletic build, somewhat stocky for a girl, with well defined muscles, almost what you would call ripped build. Yet despite that build she has larger than average breasts, while her bush is a neat little landstrip. You can''t help but watch her though, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
 			gs 'arousal', 'voyeur', 3
 			gs 'stat'
-			act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons2', 'dress'
+			act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 		end
 		act 'Check out Lariska':
 			*clr & cla
@@ -1596,7 +1597,7 @@ if $ARGS[0] = 'post_shower':
 			'You notice Lariska wrapping a towel around her head. She is kinda cute, no one would call her beautiful, you know most of the boys think she is cute, she has a runners build. Thin and taller than average, with a athletic build and slightly defined muscles. She has larger than average breasts and a neatly trimmed landing strip for a bush. You can''t help but watch her though, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
 			gs 'arousal', 'voyeur', 3
 			gs 'stat'
-			act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons2', 'dress'
+			act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 		end
 		act 'Check out Lina':
 			*clr & cla
@@ -1606,14 +1607,14 @@ if $ARGS[0] = 'post_shower':
 			'You notice Lina starting to get dressed. She is pretty, no one would call her beautiful, you know most of the boys think she is pretty and you agree, she is slightly more athletic looking than most girls but not by much. She has average breasts a neatly trimmed triangle for a bush. You can''t help but watch her though, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
 			gs 'arousal', 'voyeur', 3
 			gs 'stat'
-			act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons2', 'dress'
+			act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 		end
 	end
 end
 
 if $ARGS[0] = 'post_shower2':
 	*clr & cla
-	$menu_loc = 'gschool_lessons2'
+	$menu_loc = 'gschool_lessons4'
 	$menu_arg = 'post_shower2'
 	menu_off = 0
 	pcs_horny += 5
@@ -1624,7 +1625,7 @@ if $ARGS[0] = 'post_shower2':
 	'You grab your towel and diligently dry off your body. With your hair still wet, you wrap the towel around you, ready to return to the locker room and put that blow dryer to use.'
 	gs 'arousal', 'voyeur', 2
 	gs 'stat'
-	act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons2', 'dress'
+	act 'Get Dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 	act 'Check out Anushka':
 		*clr & cla
 		pcs_horny += 5
@@ -1633,7 +1634,7 @@ if $ARGS[0] = 'post_shower2':
 		'You notice Anushka drying herself off with a towel. She is very pretty, some would even call her beautiful, but you know most of the boys follow her around with the tongues hanging out, especially if you are into alternative looks and tattoo''s. She has a petite build, not to skinny, just about right. She has averaged sized perky breasts, while pussy is clean shaven. You can''t help but watch her though, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
 		gs 'arousal', 'voyeur', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons2', 'dress'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 	end
 	act 'Check out Aylona':
 		*clr & cla
@@ -1643,7 +1644,7 @@ if $ARGS[0] = 'post_shower2':
 		'You notice Aylona soaping up her wet naked body, her hands rubbing all over her curves. She is kinda cute, no one would call her beautiful, but you know most of the boys think she is cute, especially if you are into alternative looks and tattoo''s. She is pretty skinny, really to skinny giving her a almost starved look. She has small perky breasts, while her bush is fairly neatly trimmed in a triangle. You can''t help but watch her though, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
 		gs 'arousal', 'voyeur', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons2', 'dress'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 	end
 	act 'Check out Albina':
 		*clr & cla
@@ -1654,7 +1655,7 @@ if $ARGS[0] = 'post_shower2':
 		'You notice Albina soaping up her wet naked body, her hands rubbing all over her curves. She is very pretty, some would even call her beautiful, but you know most of the boys follow her around with the tongues hanging out and you can understand why. She has toned dancers build, thin, with defined muscles and small perk breasts, you doubt she has much body fat. She has small perky breasts and clean shaven pussy. You can''t help but watch her though, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
 		gs 'arousal', 'voyeur', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons2', 'dress'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 	end
 	act 'Check out Christina':
 		*clr & cla
@@ -1664,7 +1665,7 @@ if $ARGS[0] = 'post_shower2':
 		'You notice Christina soaping up her wet naked body, her hands rubbing all over her curves. She is pretty, no one would call her beautiful, but you know most of the boys think she is pretty and you have to agree. She has a very athletic build, somewhat stocky for a girl, with well defined muscles, almost what you would call ripped build. Yet despite that build she has larger than average breasts, while her bush is a neat little landstrip. You can''t help but watch her though, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
 		gs 'arousal', 'voyeur', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons2', 'dress'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 	end
 	act 'Check out Lariska':
 		*clr & cla
@@ -1674,7 +1675,7 @@ if $ARGS[0] = 'post_shower2':
 		'You notice Lariska soaping up her wet naked body, her hands rubbing all over her curves. She is kinda cute, no one would call her beautiful, but you know most of the boys think she is cute, she has a runners build. Thin and taller than average, with a athletic build and slightly defined muscles. She has larger than average breasts and a neatly trimmed landing strip for a bush. You can''t help but watch her though, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
 		gs 'arousal', 'voyeur', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons2', 'dress'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 	end
 	act 'Check out Lina':
 		*clr & cla
@@ -1684,7 +1685,7 @@ if $ARGS[0] = 'post_shower2':
 		'You notice Lina soaping up her wet naked body, her hands rubbing all over her curves. She is pretty, no one would call her beautiful, but you know most of the boys think she is pretty and you agree, she is slightly more athletic looking than most girls but not by much. She has average breasts a neatly trimmed triangle for a bush. You can''t help but watch her though, there is just something attractive about her to you. You tear your gaze away from her before someone notices you watching her and go back to the lockers.'
 		gs 'arousal', 'voyeur', 3
 		gs 'stat'
-		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons2', 'dress'
+		act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
 	end
 end
 
@@ -1692,7 +1693,7 @@ if $ARGS[0] = 'dress':
 	*clr & cla
 	menu_off = 1
 	$metka = 'dress'
-	$loc = 'gschool_lessons2'
+	$loc = 'gschool_lessons4'
 	minut +10
 	gs 'stat'
 	gymdress = rand(1,20)
@@ -1705,7 +1706,7 @@ if $ARGS[0] = 'dress':
 		*nl
 		'You take your clothes out of your locker and start putting them on. This takes longer than expected, however, since you get distracted several times while getting dressed - sometimes by other girls engaging you in a brief conversation, sometimes by something or someone catching your eye. By the time you are finished, most of the other girls have already left the locker room.'
 		'You can choose another outfit while you''re here.'
-		act 'Continue': gt 'gschool_lessons2', 'post_dress'
+		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 2:
 		*clr & cla
 		pcs_mood += 10
@@ -1715,20 +1716,20 @@ if $ARGS[0] = 'dress':
 		*nl
 		'You take your clothes out of your locker and start putting them on. This takes longer than expected, however, since you get distracted several times while getting dressed - sometimes by other girls engaging you in a brief conversation, sometimes by something or someone catching your eye. By the time you are finished, most of the other girls have already left the locker room.'
 		'You can choose another outfit while you''re here.'
-		act 'Continue': gt 'gschool_lessons2', 'post_dress'
+		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 3:
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/lockerroom.jpg"></center>'
 		'You are running extra late today. By the time you finally finish dressing, nobody seems to be left in the room or shower. You take a few steps towards the door, convinced that you are the last person here, when you hear a soft moan. At first you think you misheard but... there it is again.'
-		act 'Ignore it': gt 'gschool_lessons2', 'post_dress'
+		act 'Ignore it': gt 'gschool_lessons4', 'post_dress'
 		act 'Take a peek':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/les<<rand(1,3)>>.jpg"></center>'
 			'Curious, you sneak toward the source of the soft, feminine sounds. As you get closer, you are sure you are about to come across a couple of girls making out... and, sure enough, when you peek around the next corner, you spy two girls you don''t know making out and feeling each other up. Their display of passion is so infectious that you are tempted to join them, but they seem so into each other that you would feel guilty intruding on their tender moment. That doesn''t make it any less arousing to watch, though.'
 			gs 'arousal', 'voyeur', 3
 			gs 'stat'
-			act 'Leave them in peace':gs 'arousal', 'end' & gt 'gschool_lessons2', 'post_dress'
+			act 'Leave them in peace':gs 'arousal', 'end' & gt 'gschool_lessons4', 'post_dress'
 			act 'Masturbate':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/sex/mast<<rand(1,2)>>.mp4"></video></center>'
@@ -1742,16 +1743,15 @@ if $ARGS[0] = 'dress':
 				$orgasm_txt = ''
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Return': gt 'gschool_lessons2', 'post_dress'
+				act 'Return': gt 'gschool_lessons4', 'post_dress'
 			end
 		end
-		exit
 	elseif gymdress = 4:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic<<rand(1,2)>>.jpg"></center>'
 		'While you are still naked, you hear a couple of girls giggling. You turn to look at them, but they are not looking at you. Confused, you follow their collective gaze and see Christina standing there with her phone out. Glancing back at them, you see them looking at you and giggling again - obviously, something happened that you missed; something that they thought was funny. You wonder what it was.'
 		'You can choose another outfit while you''re here.'
-		act 'Continue': gt 'gschool_lessons2', 'post_dress'
+		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 5:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/boysraid.jpg"></center>'
@@ -1761,7 +1761,7 @@ if $ARGS[0] = 'dress':
 		'Vitek just laughs. "Don''t get your panties in a twist, we just wanted to know if any of your girls wanted to take part in a private work out." He says lewdly.'
 		'"Get out!" Albina says much louder and pushes on the door. Vitek resist only a moment and then steps back, as does Dan and Albina closes the door. "Fucking assholes." With that taken care of the girls go back to getting dressed but you notice most of them do it quicker than normal apparently afraid of a repeat visit.'
 		'You can choose another outfit while you''re here.'
-		act 'Continue': gt 'gschool_lessons2', 'post_dress'
+		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 6:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/christinaselfie<<rand(1,3)>>.jpg"></center>'
@@ -1770,13 +1770,13 @@ if $ARGS[0] = 'dress':
 		'Next Christina grabs up her phone and says to the two of them. "Lets take a selfie."'
 		'The three of them pose several times as Christina takes several selfies of the three of them naked. Lariska even takes a couple herself, which Christina doesn''t seem to mind. They go on for several minutes about how great they look, though mostly it is Lina and Lariska stroking Christina''s ego.'
 		'You can choose another outfit while you''re here.'
-		act 'Continue': gt 'gschool_lessons2', 'post_dress'
+		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 7:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/alynushwedgie.jpg"></center>'
 		'As you finish getting dressed you turn around to see Aylona sneak up behind Anushka and grab ahold of her panties with both hands and then yank them up, giving Anushka a major wedgie. Several other girls laugh as Anushka tries to get away and push Aylona''s hands back down so her panties arn''t all the way up her ass crack. After a little bit of struggling and Anushka calling Aylona all kinds of names, Aylona finally lets go and collapses on one of the benches laughing, while Anushka half heartedly cusses her out as she picks her panties out of her butt crack.'
 		'You can choose another outfit while you''re here.'
-		act 'Continue': gt 'gschool_lessons2', 'post_dress'
+		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 8:
 		*clr & cla
 		pcs_mood += 10
@@ -1787,7 +1787,7 @@ if $ARGS[0] = 'dress':
 		'Christina gives her a final look and then puts her belt on. "Ok fine, but don''t do it again."'
 		'Lina gets up and takes the apple out of her mouth while taking a bite. "I won''t Christina." Then the three of them walk out together, with Lina and Lariska sharing the apple.'
 		'You can choose another outfit while you''re here.'
-		act 'Continue': gt 'gschool_lessons2', 'post_dress'
+		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 9:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/chrislarwedgie.jpg"></center>'
@@ -1796,19 +1796,19 @@ if $ARGS[0] = 'dress':
 		'Christina laughs. "Is that what you tell Ivan when you let him fuck your ass?" Lariska goes bright red at that comment and Christina gives another hard yank and Lariska wincing even more.'
 		'"What ever butt slut, lets go." Christina says and waves to Lina as well and the three of them walk out, as Lariska tries to dig her panties out of her butt.'
 		'You can choose another outfit while you''re here.'
-		act 'Continue': gt 'gschool_lessons2', 'post_dress'
+		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 10:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/panties.jpg"></center>'
 		'As two of the underclass girls get dressed another girl comments they have the exact same panties on. Which gets them to stop and stank next to each other to show off their panties side by side. They both get a laugh out of the fact they are wearing the same style and color panties.'
 		'You can choose another outfit while you''re here.'
-		act 'Continue': gt 'gschool_lessons2', 'post_dress'
+		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress = 11:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/younggirls.jpg"></center>'
 		'A couple of girls are horsing around, another girl starts to take pictures of them with her phone. One of them grabs her friend, reaching around to grab her by the ass, as she puts her hair into a ponytail, another one moons the girl taking the picture. They gets most of the girls laughing, but it quickly breaks up as everyone finishes dressing and starts to leave.'
 		'You can choose another outfit while you''re here.'
-		act 'Continue': gt 'gschool_lessons2', 'post_dress'
+		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	elseif gymdress <= 15:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nerdoutcast.jpg"></center>'
@@ -1818,24 +1818,24 @@ if $ARGS[0] = 'dress':
 		else
 			'Just as you finish dressing you turn around just in time to see Christina stand up on one of the benches, she reaches down and grabs this girl from your brothers grades panties from behind. She yanks up on them hard, making the girl yelp and stand up, This doesn''t stop Christina though, she keeps lifting until she manages to lift the girl off her feet. She squirms and cries out, dangling from her panties. Some of the girls laugh, a few nervously laugh, obviously afraid to make Christina made, a few look away in disgust. The girl starts to beg Christina to let her go, which seems to only encourage Christina. Who now starts bouncing the girl by her panties until there is a loud rip and the girls panties band end up under her arms. The girl looks to be on the verge of tears now and runs out once Christina lets go. Christina laughs some more then heads out with Lariska and Lina in tow.'
 			'You can choose another outfit while you''re here.'
-			act 'Continue': gt 'gschool_lessons2', 'post_dress'
 		end
+		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	else
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
 		'You take your clothes out of your locker and start putting them on. This takes longer than expected, however, since you get distracted several times while getting dressed - sometimes by other girls engaging you in a brief conversation, sometimes by something or someone catching your eye. By the time you are finished, most of the other girls have already left the locker room.'
 		'You can choose another outfit while you''re here.'
+		act 'Continue': gt 'gschool_lessons4', 'post_dress'
 	end
-	act 'Continue': gt 'gschool_lessons2', 'post_dress'
 end
 
 if $ARGS[0] = 'post_dress':
 	*clr & cla
 	$metka = 'post_dress'
 	$metkaM = 'post_dress'
-	$loc = 'gschool_lessons2'
-	$locM = 'gschool_lessons2'
-	$menu_loc = 'gschool_lessons2'
+	$loc = 'gschool_lessons4'
+	$locM = 'gschool_lessons4'
+	$menu_loc = 'gschool_lessons4'
 	$menu_arg = 'post_dress'
 	menu_off = 0
 	gs 'stat'
@@ -1843,7 +1843,7 @@ if $ARGS[0] = 'post_dress':
 	act 'Leave school':
 		if $clothingworntype = 'nude':
 			msg'<b><font color = red>You need to get dressed before you leave the changing rooms.</font></b>'
-			gt 'gschool_lessons2', 'post_dress'
+			gt 'gschool_lessons4', 'post_dress'
 		else
 			gt 'gschool_lessons', 'short_break'
 		end
@@ -1857,7 +1857,7 @@ if $ARGS[0] = 'post_dress':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/smokecig.jpg"></center>'
 			'You feel the need to have a smoke before you leave school, so you take out your pack of smokes. You pull a cigarette out, placing it between your lips before lighting it up and taking a long drag off it. You spend the next few minutes smoking your cigarette feeling it relax you. Once finished you crush it out and throw the butt into one of the toilets.'
-			gt 'gschool_lessons2', 'post_dress'
+			gt 'gschool_lessons4', 'post_dress'
 		end
 	end
 	if joint >= 1:
@@ -1868,7 +1868,7 @@ if $ARGS[0] = 'post_dress':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/smokejoint.jpg"></center>'
 			'You feel the need to get high before you leave school. So you take a seat on one of the benches and take out a joint from your purse, placing it between your lips before lighting it up and taking a long drag off it. You can feel the effects quickly as you feel yourself relax and smile a bit. You spend the next several minutes smoking the joint until you are nice and high. Once down your throw the roach in one of the toilets.'
-			gt 'gschool_lessons2', 'post_dress'
+			gt 'gschool_lessons4', 'post_dress'
 		end
 	end
 	act 'Use the mirror': gt 'mirror', 'start'

+ 4 - 4
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>'

+ 36 - 36
locations/gschool_sex.qsrc

@@ -831,12 +831,12 @@ 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
 
-if $ARGS[0] = 'lazar_lockeroom':
+if $ARGS[0] = 'lazar_lockerroom':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/shower/lazar3.jpg"></center>'
@@ -855,7 +855,7 @@ if $ARGS[0] = 'lazar_lockeroom':
 			'You don''t reply to his request and keep sucking his dick, you think he gets the hint as he doesn''t ask again to fuck you. Maybe he is afraid if he pushes things you will just stop altogether. Regardless you keep sucking his dick and he moans a bit louder and starts to move. At one point he nearly slips and falls on his ass on the slick wet floor. Instead you ease him down onto his back as you keep sucking his dick that way.'
 			gs 'arousal', 'bj', 5
 			gs 'stat'
-			act 'Cum fountain': gt 'gschool_sex', 'lazar_lockeroom_cum'
+			act 'Cum fountain': gt 'gschool_sex', 'lazar_lockerroom_cum'
 		end
 		act 'Mount him':
 			*clr & cla
@@ -871,13 +871,13 @@ if $ARGS[0] = 'lazar_lockeroom':
 				'After a few minutes you turns around so you are now facing him in cowgirl position, as you start riding him more you slowly lower yourself down more and more until you take his full length inside of you. It feels amazing, you feel so full and in complete control, you control the deepth and the rhythm, no wonder guys like controlling the action. It is very empowering, he starts moaning loudly as you now have his full length inside of you and you can tell he is about to cum.'
 				gs 'arousal', 'vaginal', 5, 'dom'
 				gs 'stat'
-				act 'Cum fountain': gt 'gschool_sex', 'lazar_lockeroom_cum'
+				act 'Cum fountain': gt 'gschool_sex', 'lazar_lockerroom_cum'
 			end
 		end
 	end
 end
 
-if $ARGS[0] = 'lazar_lockeroom_cum':
+if $ARGS[0] = 'lazar_lockerroom_cum':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/shower/lazar7.jpg"></center>'
 	'You climb off him once you are sure he is close and get on your knees and start to sucking his cock again, tasting your own juices and stroking it with your hand. When you feel his dick start to twitch you stop sucking his dick and barely pull your mouth off his dick when his cum spurts out hitting the side of your face. You stroke him several more times milking every last drop of cum out of him. He moans loudly as he says. "Fuck I needed that, that was amazing <<$pcs_nickname>>." Then he stands up and pulls his pants back up.'
@@ -898,15 +898,16 @@ if $ARGS[0] = 'lazar_lockeroom_cum':
 		'"I think you got a little something there." He says indicating the right side of your face.'
 		'You roll your eyes at that, knowing full well his cum is still all over your right cheek. "Ha ha, very funny."'
 		'He laughs. "See ya later <<$pcs_nickname>>." Then he walks out of the girls shower. After he leaves you go into the girls locker room to get dressed.'
+	end
 	gs 'arousal', 'hj', 1
 	gs 'arousal', 'bj', 1
 	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':
+if $ARGS[0] = 'vd_lockerroom':
 	*clr & cla
 	if grupTipe = 4: 
 		gs 'fame', 'pav', 'sex', 3
@@ -958,14 +959,14 @@ 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
 	end
 end
 	
-if $ARGS[0] = 'petka_lockeroom':
+if $ARGS[0] = 'petka_lockerroom':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petka3.jpg"></center>'
@@ -1006,7 +1007,6 @@ if $ARGS[0] = 'petka_lockeroom':
 	else
 		act 'Take his clothes (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end	
-	end
 	act 'Suck his dick':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petka5.jpg"></center>'
@@ -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,13 +1391,13 @@ 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':
+if $ARGS[0] = 'albina_lockerroom':
 	*clr & cla
 	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/fingered.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/fingered.jpg"></center>'
 	'Her hand slides between your legs, you part them slightly to allow her hand to fight between your thighs. She rubs your clit with her fingers for a bit, before you feel one of her fingers slide inside or your wet twat. She finger bangs you while she caresses your body with one hand and occasionally nuzzling your neck and ear with her mouth. She pulls her finger our of you and walks over to a bench, pulling your along. She sits down on the bench and spreads her legs wide. "Eat me <<$pcs_nickname>>." She commands, you can tell by her tone of voice she isn''t asking.'
 	gs 'arousal', 'foreplay', 5, 'sub'
 	gs 'arousal', 'vaginal_finger', 5, 'sub'
@@ -1405,25 +1405,25 @@ if $ARGS[0] = 'albina_lockeroom':
 	gs 'stat'
 	act 'Taco Tuesday':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/lockerles1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerles1.jpg"></center>'
 		'You get down on your hands and knees and places your head between her legs and start licking her pussy, it is already wet. You can taste her juices as your tongue licks at her slit and clit. She reaches over and places a hand on the back of your head and pulls your face harder into her crouch as she starts to grind her pussy against your face. Her moans of pleasure echo in the empty locker room, while your face gets smeared in her wetness. Finally she pulls your head away from her crotch as she stands up. "Lay down, I want to taste you pussy."'
 		gs 'arousal', 'cuni_give', 5, 'sub'
 		gs 'stat'
 		act 'Lay down':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/lockerles2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerles2.jpg"></center>'
 			'You lay down and spread your legs, while she gets down on all fours. She starts licking your slit and clit, getting your twat nice and wet before she starts plunging her tongue as deep as it will go into your pussy.'
 			gs 'arousal', 'cuni', 5
 			gs 'stat'
 			act 'More pleasure':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/lockerles3.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerles3.jpg"></center>'
 				'You spread your legs further apart giving her even better access as you feel your arousal mounting, she stays on all fours as she tongue fucks your twat. She stiffens her tongue sticking it out as far as it will go and she pulls it all the way out only to plunge it back inside of your pussy as far as it will go, tongue fucking you for all she is worth. She pulls away and stands up, "My turn again."'
 				gs 'arousal', 'cuni', 5
 				gs 'stat'
 				act 'Return the favor':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/lockerles4.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerles4.jpg"></center>'
 					'She straddles the bench and bends all the way over till her shoulders are resting against the bench presenting her pussy to you. You sit on the bench behind her and lean forward and start licking her pussy again, which is now soaking wet so much, her juices are flowing down her inner thighs. She moans out. "Eat my ass." As she reaches back and tries to pull your head up enough to lick her asshole.'
 					gs 'arousal', 'cuni_give', 5
 					gs 'stat'
@@ -1431,11 +1431,11 @@ if $ARGS[0] = 'albina_lockeroom':
 						*clr & cla
 						npc_rel['A23'] += 2
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/lockerles5.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerles5.jpg"></center>'
 						'You start licking her asshole, getting it nice and wet, you can hear her moaning. She seems to really be enjoying this, her hand smashes your face between her butt cheeks. "Stick your tongue in my ass." She tells you. You stick your tongue in her ass and fuck it with your tongue, she rocks back against your face trying to take more of your tongue in her ass. A few minutes later she pulls away and turns to you. "Lay on your back, I want to sit on your face."'
 						gs 'arousal', 'rimming', 5
 						gs 'stat'
-						act 'Lay back': gt 'gschool_sex', 'albina_lockeroom69'
+						act 'Lay back': gt 'gschool_sex', 'albina_lockerroom69'
 					end
 					gs 'willpower', 'sex', 'resist', 'hard'
 					if will_cost <= pcs_willpwr:
@@ -1444,11 +1444,11 @@ if $ARGS[0] = 'albina_lockeroom':
 							npc_rel['A23'] -= 5
 							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/lockerles4.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerles4.jpg"></center>'
 							'You reach up and pull her hand loose from your hair and go back to just licking her pussy, she doesn''t say anything more but you don''t think she is happy about your refusal to eat her ass, but come on it''s her ass, so gross. A few minutes later she pulls away and turns to you. "Lay on your back, I want to sit on your face."'
 							gs 'arousal', 'cuni_give', 5
 							gs 'stat'
-							act 'Lay back': gt 'gschool_sex', 'albina_lockeroom69'
+							act 'Lay back': gt 'gschool_sex', 'albina_lockerroom69'
 						end
 					else
 						act 'Just lick her pussy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1459,9 +1459,9 @@ if $ARGS[0] = 'albina_lockeroom':
 	end
 end
 
-if $ARGS[0] = 'albina_lockeroom69':
+if $ARGS[0] = 'albina_lockerroom69':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/lockerles6.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerles6.jpg"></center>'
 	'You lay back down on your back on the bench and she straddles your face and lowers herself down until her pussy is grinding against your mouth. You start licking and sucking at her clit, she leans forward and start returning the favor and licking your pussy. Several minutes of heaven passes as you both eat her pussy and get yours eaten by her when her body is rocked my a orgasm. Which completely coats your mouth and chin in her wetness, she almost collapses on top of you, barely holding herself up, before finally climbing off you on shaking legs. As you stand up as well she gives you a full blown long passionate french kiss and slaps your ass with one of her hands. Then she breaks the kiss and starts to get dressed.'
 	gs 'arousal', 'cuni_give', 5
 	gs 'arousal', 'cuni', 5
@@ -1470,7 +1470,7 @@ if $ARGS[0] = 'albina_lockeroom69':
 	gs 'stat'
 	act 'Get dressed':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockeroom/getdressed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/getdressed.jpg"></center>'
 		'As you both start getting dressed she comments. "It''s nice being with another girl, men can be such assholes sometimes."'
 		'You nod slightly in agreement with her. "Yeah."'
 		'She giggles a little. "Don''t get me wrong sometimes it is nice to just get fucked hard and put away wet. But sometimes it is nice feeling another girls touch, it is so much softer and gentler than a guys."'
@@ -1480,11 +1480,11 @@ 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
 
-if $ARGS[0] = 'victor_lockeroom':
+if $ARGS[0] = 'victor_lockerroom':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker2.jpg"></center>'
@@ -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>'
@@ -1548,7 +1548,7 @@ if $ARGS[0] = 'victor_lockeroom':
 					'He lets you alternate between using your hand to stroke him at the same time with your mouth and deep throating you. Several more minutes pass of this before he says. "I''m about to cum, take off your shirt."'
 					gs 'arousal', 'bj', 5, 'deepthroat'
 					gs 'stat'
-					act 'Creamy titties': gt 'gschool_sex', 'victor_lockeroom_cum'
+					act 'Creamy titties': gt 'gschool_sex', 'victor_lockerroom_cum'
 				end
 			else
 				act 'I just want to suck you off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1584,7 +1584,7 @@ if $ARGS[0] = 'victor_lockeroom':
 							'He looks a bit more then says. "Oh sorry, well I''m almost done." But true to his word a few seconds later he starts moaning loudly and pulls out of your ass. "I''m about to cum, get on your knee''s and take off your top." You turn around and drop to your knees.'
 							gs 'arousal', 'anal', 5
 							gs 'stat'
-							act 'Creamy titties': gt 'gschool_sex', 'victor_lockeroom_cum'
+							act 'Creamy titties': gt 'gschool_sex', 'victor_lockerroom_cum'
 						end
 						act 'Say nothing':
 							*clr & cla
@@ -1592,7 +1592,7 @@ if $ARGS[0] = 'victor_lockeroom':
 							'You moan and groan loudly as your grip the bench tightly in your hands, as he pounds your little ass hard and fast. Part of you is really enjoying this, you are still unsure if he did it on purpose until he moans out. "Fuck you have a tight little ass." Well that solves that, he obviously knows so likely did it on purpose. He pounds away at your ass for a couple of more minutes before he starts moaning loudly and pulls out of your ass. "I''m about to cum, get on your knee''s and take off your top." You turn around and drop to your knees.'
 							gs 'arousal', 'anal', 5
 							gs 'stat'
-							act 'Creamy titties': gt 'gschool_sex', 'victor_lockeroom_cum'
+							act 'Creamy titties': gt 'gschool_sex', 'victor_lockerroom_cum'
 						end
 					end
 				end
@@ -1601,7 +1601,7 @@ if $ARGS[0] = 'victor_lockeroom':
 	end
 end
 				
-if $ARGS[0] = 'victor_lockeroom_cum':
+if $ARGS[0] = 'victor_lockerroom_cum':
 	*clr & cla
 !!to do note: to raise PE grade when we redo school grades.
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker9.jpg"></center>'
@@ -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 ---------------------------------

+ 540 - 98
locations/gschool_socialchg1.qsrc

@@ -1,6 +1,5 @@
 # gschool_socialchg1
 
-!Lazar
 if $ARGS[0] = 'tLazar':
 	cla & *clr
 	menu_off = 1
@@ -8,8 +7,6 @@ if $ARGS[0] = 'tLazar':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
 	'You decide on to walk over to see what the fuss is about. As usual Lazar is showing off his skills as he has some of the younger kids challenge him 1-on-1 or even 1-on-2 and he''s still managing to beat them quite easily.'
 	'As you step on the field he waves to you to come over before he kicks the ball further away so that the younger kids go chasing after it.'
-
-	!+ to relationship
 	act 'Walk over':
 		cla & *clr
 		minut += 10
@@ -17,7 +14,6 @@ if $ARGS[0] = 'tLazar':
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
 		'"Hey, Lazar!" you yell out as you wave and smile.'
 		'He waves back and begins talking about how he''s showing the kids some new skills he''s picked up. The two of you talk a while with each other about sport related stuff before you suddenly feel a football hit you in the back.'
-		
 		act 'Turn around':
 			cla & *clr
 			npc_rel['A149'] += 1
@@ -26,29 +22,219 @@ if $ARGS[0] = 'tLazar':
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
 			'Turning around, you hear laughter from Kolka and his friends. Your face turns red and just as you''re about to yell at him, Lazar steps in, "Hey! Why did you do that?!"'
 			'You sigh, "It''s okay... It''s my stupid little brother. He''s probably jealous that I''m talking to you."'
-			'Lazar understandingly nods and walks over to them and whispers something. A few moments later Kolka and his friends walk up to you and say they''re sorry that they hit you in the back with the football. You smile and turn to Lazar giving him a little nod as thanks.'
-			
-			act 'Walk off the pitch': gt 'gschool_grounds', 'sports'
+			'Lazar understandingly nods and walks over to them and whispers something. A few moments later Kolka and his friends walk up to you and say they''re sorry that they hit you in the back with the football. You smile and turn to Lazar giving him a little nod as thanks. A group of Kolka''s classmates start organizing some teams for a pickup game of football, they ask Lazar to watch and give them some pointers. He laughs a bit at their requests but then constants to watch and give points. You decide it is time you should leave since it looks like Lazar is going to be busy. Just as you start to leave Lazar says. "Hey why don''t you hang around and watch?"'
+			act 'Maybe some other time':
+				cla & *clr
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
+				'You shake your head. "That''s ok, I got some stuff I need to do, maybe some other time." You tell him.'
+				'He nods as he says. "Ok suit yourself." Then he turns back to watch Kolka and his classmates play.'
+				act 'Walk off the pitch': gt 'gschool_grounds', 'sports'
+			end
+			act 'Sure why not':
+				cla & *clr
+				npc_rel['A149'] += 1
+				minut += 10
+				gs 'stat'
+				if month > 2 and month < 9:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football1.jpg"></center>'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football4.jpg"></center>'
+				end
+				'At first they are constantly yelling at for Lazar to check this or that out, or watch this or that move by one of them, he gives support or advice for that they are doing. After awhile they get into the game and seem like they kinda forget he is there, you are pretty sure they have always forgot you was there as well. You should really get going and there isn''t much going on here. So you say to Lazar. "Hey I am going to take off, talk to you later ok."'
+				if npc_rel['A149'] >= 50 and hotcat > 5 and pav_slut > 75:
+					'He reaches over and grabs you by the hand to stop you. "Hey stick around, we could go over there behind those trees and have a little fun."'
+					'You think you now what kind of fun he has in mind. "Yeah what kind of fun?" You ask him.'
+					'"You know... fun." He body language and tone of voice leaves no doubt in your mind but you want him to say it anyways.'
+					'"Yeah and exactly what is fun to you?" You ask him.'
+					'He grins a bit. "Well blowjobs are fun."'
+					'You rolls your eyes a bit, typical guy. "They might see." You indicate your brother and his friends, the trees are not that far away or thick.'
+					'He shakes his head confidently. "Nah they won''t, we will be to far away and they won''t even be looking anyways."'
+					gs 'willpower', 'bj', 'resist', 'medium'
+					if will_cost <= pcs_willpwr:
+						act 'No (<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
+							'You roll your eyes, boys are so predictable, even if you might be interested you are not taking the chance on being seen, by your brother and his friends giving Lazar a blowjob. "No I don''t think so." You tell him as you pull your hand free from his.'
+							'He shrugs and laughs a little. "You can''t blame a guy for trying."'
+							'You just shake your head and walk off. "See you later Lazar."'
+							'"Bye <<$pcs_nickname>>." He calls after you.'
+							act 'Walk off the pitch': gt 'gschool_grounds', 'sports'
+						end
+					else
+						act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end	
+					act 'Lets go':
+						cla & *clr
+						npc_rel['A149'] += 1
+						minut += 2
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/stay.jpg"></center>'
+						'The trees are a little ways away, your brother and his friends seem fully engrossed in the game and havn''t even looked your way in minutes, plus Lazar is cute. "Sure why not, lets go."'
+						'He grins and then walks with you over to the tree''s near the edge of the field holding your hand. Once you are behind the tree''s he lets go of your hand and unbuttons his pants. He pulls the front of his underwear down enough until his stiffening cock pops free. You take ahold of it and give it a few strokes, feeling it harden in your hand.'
+						gs 'arousal', 'hj', 2, 'exhibitionism'
+						gs 'stat'
+						act 'Get on your knees':
+							cla & *clr
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/bj1.jpg"></center>'
+							'You get down on your knees and take Lazars hard cock into your mouth. You use one hand to stroke his shaft while you suck on his dick at the same time. Your other hand plays with his balls as you do, his moans of pleasure let you know you are doing a good job. After a couple of minutes he starts trying to thrust into your mouth. "<<$pcs_nickname>> I want to fuck you."'
+							gs 'arousal', 'bj', 5, 'exhibitionism'
+							gs 'stat'
+							gs 'willpower', 'sex', 'resist', 'medium'
+							if will_cost <= pcs_willpwr:
+								act 'Only a blowjob (<<will_cost>> Willpower)':
+									*clr & cla
+									gs 'willpower', 'pay', 'resist'
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/bjtalk.jpg"></center>'
+									'You pull your head back until his dick comes out of your mouth so you can respond to him. While still stroking his dick with one hand you say. "I said I would give you a blow job, nothing else."'
+									'"Aw come on <<$pcs_nickname>>, you know you want it just as bad as me. Just let me fuck you, I promise not to even cum in you." He tells you, trying to convince you.'
+									gs 'arousal', 'hj', 1, 'exhibitionism'
+									gs 'stat'
+									act 'Give in': gt 'gschool_socialchg1', 'lazar_vaginal'
+									act 'Fine but only anal': gt 'gschool_socialchg1', 'lazar_anal'
+									gs 'willpower', 'sex', 'resist', 'easy'
+									if will_cost <= pcs_willpwr:
+										act 'No (<<will_cost>> Willpower)':
+											*clr & cla
+											gs 'willpower', 'pay', 'resist'
+											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/bj2.jpg"></center>'
+											'You are getting a little annoyed he keeps pushing things. "I said no, if you want we can just stop."'
+											'"No, no, a blowjob is fine, I just thought you wanted to get off to." His excuse rings hollow in your ears but at least he has given up on trying to fuck you, this time at least. With that settled you takes his dick back in your mouth and start sucking him off again.'
+											gs 'arousal', 'bj', 5, 'exhibitionism'
+											gs 'stat'
+											act 'Continue':
+												*clr & cla
+												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/bj3.jpg"></center>'
+												'He even stops trying to thrust in your mouth fucking your face, seems he is worried you are going to stop and leave him hanging so to speak. You work his cock with your mouth, sometimes stroking his shaft with your hand as well, and playing with his balls. He moans softly in pleasure seeming to really enjoy the blowjob you''re giving him.'
+												gs 'arousal', 'bj', 5, 'exhibitionism'
+												gs 'stat'
+												act 'No warning':
+													*clr & cla
+													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/bj3.jpg"></center>'
+													'As you are sucking his dick and trying to keep one eye on the sports field to make sure no one is coming over to see what you guys are doing. You suddenly feel the squirt of his cum in your mouth, with out a word or any warning at all he fills your mouth up with his hot salty cum. When he finishes cumming he pulls his dick out of your mouth and slips it back in his pants, pulling up his underwear and buttoning his pants back up, as you swallow his cum. "Thanks <<$pcs_nickname>>, I needed that. But I should really get back to watching the kids, so I can give them some pointers. Catch you later." With that he turns and heads back to the sports field. Typical guy, got what he wanted and now he is done with you, at least until he wants to blow another load.'
+													gs 'arousal', 'bj', 5, 'exhibitionism'
+													gs 'cum_call', 'mouth', 'A149'
+													gs 'arousal', 'end'
+													gs 'stat'
+													act 'Walk off': gt 'gschool_grounds', 'sports'
+												end
+											end
+										end	
+									else
+										act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+									end	
+								end
+							else
+								act 'Only a blowjob (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+							end	
+							act 'Let him': gt 'gschool_socialchg1', 'lazar_vaginal'
+							act 'You can fuck my butt':  gt 'gschool_socialchg1', 'lazar_anal'
+						end
+					end
+				else
+					'He turns and nods to you. "Yeah sure see you around <<$pcs_nickname>>." Then you walk away.'
+					act 'Walk off the pitch': gt 'gschool_grounds', 'sports'
+				end
+			end
 		end
 	end
-
-	!- to relationship
 	act 'Run away':
 		cla & *clr
 		minut += 10
 		npc_rel['A149'] -= 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
-		'You stop in your tracks as you see your brother being one of the kids chasing the ball that Lazar kicked away and you know he would do everything to embarrass you in front of him.'
+		'You stop in your tracks as you see your brother being one of the kids chasing the ball that Lazar kicked away and you know he would do anything to embarrass you in front of him.'
 		'While blushing you quickly make a signal to Lazar that you have to run and quickly turn your back before Kolka notices you being there.'
 		'Lazar is standing there a bit dumbfounded, wondering why you suddenly had a change of heart but shrugs it off and quickly yells to the kids who''s next to challenge him.'
-	
 		act 'Run back to the school grounds': gt 'gschool_grounds', 'main'
 	end
 end
 
-!Ivan & Fedor
-!if player picks Ivan
+if $ARGS[0] = 'lazar_vaginal':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/getfucked.jpg"></center>'
+	'"Fine you can fuck me." You tell him.'
+	'He grins and says. "Awesome. Now just turn around and bend over."'
+	'You turn around till your back is facing him and your facing the tree, then you pulls your clothes out of the way to expose your naked backside to him. Then you bend over, next you feel the tip of his dick rubbing against your wet slit. Once he has the tip of his dick nice and lubed up from your pussy juices he slides his massive dick into your pussy. You feel it stretching to accommodate him, his dick is about the size of your forearm and once he slides himself balls deep inside you, you feel completely full.'
+	gs 'arousal', 'vaginal', 3, 'exhibitionism'
+	gs 'stat'
+	act 'This thing is huge':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/vaginal1.jpg"></center>'
+		'After a bit it starts to feel amazing, despite it''s size or maybe because of it. Either way all you know is that it his huge dick inside of you feels amazing, you feel yourself getting wetter and wetter as he fucks your twat. You start moaning in pleasure, trying not to be to loud, incase someone overhears you.'
+		gs 'arousal', 'vaginal', 5, 'exhibitionism'
+		gs 'stat'
+		act 'It''s not to bad':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/vaginal2.jpg"></center>'
+			'As your moans and grunts of pleasure get louder and louder he starts fucking your harder and harder. Eventually he starts pulling nearly all the way out of you and then thrusting balls deep back in your. After a bit he even starts to occasionally pull out of you only to thrust it hard back into your twat. You are just about overcome with pleasure when he pulls all the way out of you, but this time when he thrust back in he misses. Instead of sliding back in your pussy, his massive dick slides balls deep in your ass with a single stroke.'
+			gs 'arousal', 'anal', 5, 'exhibitionism'
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Wrong hole':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/anal2.jpg"></center>'
+				'Have such a massive dick thrust balls deep in your ass with out warning makes you jump and squeal. You try to pull away but he has a firm grip now with both of his hands one on each of your hips. So when you try to pull away, he just easily yanks you back as he pounds your ass with out mercy. Place your hand back to slow him down as you say. "Fuck Lazar that''s my ass!"'
+				'He keeps pounding away grunting with exertion as he does. "What?"'
+				*nl
+				'"I said that''s my asshole, your fucking my ass!" As you try in vain to get him to slow down or pull away.'
+				'He looks at you a moment then looks down, as he does he slows down but doesn''t stop fucking you, just moves slower and takes shallower strokes. Then he grins a bit. "Oh sorry about that, I didn''t notice." When he see''s the look on your face he adds. "Seriously it was a accident, sorry, but I am almost done." He does at least slow down and be a lot gentler now that he knows he is fucking your butthole. It even starts to feel good after a few minutes, when he suddenly pulls his dick out of your ass.'
+				gs 'arousal', 'anal', 5, 'exhibitionism'
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Butt glaze':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/buttcum.jpg"></center>'
+					'You feel a splatter of hot sperm hit your butt cheeks, followed by several more. A few spurts even get on the the small of your back. When he finishes cumming he slips his dick back in his pants, pulling up his underwear and buttoning his pants back up. "Thanks <<$pcs_nickname>>, I needed that. But I should really get back to watching the kids, so I can give them some pointers, after their game. Catch you later." With that he turns and heads back to the sports field. Typical guy, got what he wanted and now he is done with you, at least until he wants to blow another load. And here you are, bent over half naked, with a gapping asshole, and cum running down the crack of your ass.'
+					gs 'cum_call', 'mouth', 'A149'
+					gs 'stat'
+					act 'Walk off': gt 'gschool_grounds', 'sports'
+				end
+			end
+		end
+	end
+end
+	
+if $ARGS[0] = 'lazar_anal':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/getfucked.jpg"></center>'
+	'"Fine but you can only fuck my butt!" You tell him.'
+	'His grin tells you he doesn''t mind at all that you are only going to let him fuck your ass. "Works for me. Now just turn around and bend over." He says'
+	if lubri = 0:
+		'You turn around till your back is facing him and your facing the tree, then you pulls your clothes out of the way to expose your naked backside to him. Then you bend over, he spits on the crack of your ass a couple of times and works the spit into your asshole to give you some lubricate. Next you feel the tip of his dick pressed up against your wet asshole, the pressure builds into finally the head of his dick pops into your asshole causing your to grasp out in pain. He pauses a moment to let you adjust, you hear him spit again you guess on his dick to add some more lube. Then he starts to slowly fuck your butt.'
+	else
+		lubri -= 1
+		'You dig in your purse and pull out your small bottle of lube and hand it to him. Then you turn around till your back is facing him and your facing the tree, then you pulls your clothes out of the way to expose your naked backside to him. Then you bend over, he squirts a little lube between your butt cheeks and works the lube into your asshole to give you some lubricate. Next you feel the tip of his dick pressed up against your wet asshole, the pressure builds into finally the head of his dick pops into your asshole causing your to grasp out in pain. He pauses a moment to let you adjust, then he starts to slowly fuck your butt.'
+	end
+	gs 'arousal', 'anal', 3, 'exhibitionism'
+	gs 'stat'
+	act 'This thing is huge':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/anal1.jpg"></center>'
+		'He tries to be gentle but his massively thick dick, feels like it is splitting your ass in two, he keeps working his cock deeper and deeper up your butt and he still isn''t balls deep yet and it feels like his dick is about to come up your throat. It must be as long as your forearm or longer by how it feels. You take several deep breaths trying to relax you muscles to make it more pleasant, after a bit it does start to feel good, despite it''s size or maybe because of it. Either way the pain gives way to pleasure and you start to moan, as he holds you by the hips as he butt fucks you.'
+		gs 'arousal', 'anal', 5, 'exhibitionism'
+		gs 'stat'
+		act 'It''s not to bad':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/anal2.jpg"></center>'
+			'Every time you just get used to it he goes a little deeper, finally you feel his balls slapping against you twat with each thrust in your asshole. You butt feels to incredible full, the pleasure keeps building more and more as he fucks your ass. Once he is sure you are into it, he tightens his grip on your hips and starts to really hammer butt, with each thrust his balls slap against your wet slit. He starts to grunt and moan loudly as well, you can tell he is getting close. Just then you feel him pull out of your asshole.'
+			gs 'arousal', 'anal', 5, 'exhibitionism'
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Butt glaze':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/buttcum.jpg"></center>'
+				'You feel a splatter of hot sperm hit your butt cheeks, followed by several more. A few spurts even get on the the small of your back. When he finishes cumming he slips his dick back in his pants, pulling up his underwear and buttoning his pants back up. "Thanks <<$pcs_nickname>>, I needed that. But I should really get back to watching the kids, so I can give them some pointers, after their game. Catch you later." With that he turns and heads back to the sports field. Typical guy, got what he wanted and now he is done with you, at least until he wants to blow another load. And here you are, bent over half naked, with a gapping asshole, and cum running down the crack of your ass.'
+				gs 'cum_call', 'mouth', 'A149'
+				gs 'stat'
+				act 'Walk off': gt 'gschool_grounds', 'sports'
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'tIvan':
 	cla & *clr
 	menu_off = 1
@@ -57,7 +243,6 @@ if $ARGS[0] = 'tIvan':
 	'Ivan is looking victorious as he greets you between the breaths, "What are you doing out here this early?" he asks.'
 	'"Nothing much, just out on a stroll," you answer, "I wasn''t expecting to run into the two of you."'
 	'Ivan smiles, "We usually do this to gain an edge against our opponents."'
-	
 	act 'I see':
 		cla & *clr
 		minut += 5
@@ -68,13 +253,11 @@ if $ARGS[0] = 'tIvan':
 		'Fedor makes a funny face while you smile back, "I''ll think about it."'
 		'"Great!" Ivan replies, "Well, that''s enough resting, Fedor. Time for another lap."'
 		'The two of them say their goodbye''s and it doesn''t take long before you''re only able to see their backs on the horizon.'
-		
 		act 'Return to the secluded beach': gt 'gLakeNude'
 		
 	end
 end
 
-!if player picks Fedor
 if $ARGS[0] = 'tFedor':
 	cla & *clr
 	menu_off = 1
@@ -82,7 +265,6 @@ if $ARGS[0] = 'tFedor':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"> <img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	'A flustered Fedor is huffing and puffing, "You really need to take it easy. I can barely keep up with you, Ivan..."'
 	'"Come on, Fedor. Don''t sell yourself short. You''ve got potential and remember the dirtbag you wanted to get revenge on..." Ivan tries to motivate a dejected Fedor.'
-	
 	act 'Ask about the dirtbag':
 		cla & *clr
 		minut += 5
@@ -97,12 +279,134 @@ if $ARGS[0] = 'tFedor':
 		'You give Fedor an encouraging smile, "I''m sure you''ll do great. He''s got nothing on you."'
 		'Fedor acknowledges your attempt to motivate him by giving you a slight nod as he takes one last deep breath, "No time to rest. Let''s go!" He says before taking off and running again.'
 		'Ivan gives you a thumb up as he starts running after Fedor. "Hey champ, wait up! You''re running too fast!"'
-		
 		act 'Return to the secluded beach':gt 'gLakeNude'
 	end
 end
 
-!Svyatoslav
+if $ARGS[0] = 'ivan_fedor_naked':
+	cla & *clr
+	menu_off = 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked1.jpg"></center>'
+	'You put on your best smile, despite feeling a bit... well exposed. You really should have considered that you might run into someone you knew while walking around the beach naked. "Hey guys." You say to them.'
+	if fedorKozlovQW >= 5:
+		'Ivan has a huge grin, Fedor looks shocked and then tries to cover you up with his hands. "What are you doing <<$pcs_nickname>>?"'
+		'You shrug a little. "You know just out to enjoy the cool breeze, warm sun on my skin, while I take a walk. How about you guys?" You say trying to act as casual as you can, considering.'
+		'Fedor glances around. "What if someone else sees you? What will they think? What will they say?" He sounds very worried about this.'
+		*nl
+		'You frown a little. "I understand you are worried about what people will think and say about your girlfriend Fedor, but this is my body and this makes me happy and I don''t care what anyone else says. Unless you are ashamed of me?"'
+		'He shakes his head while Ivan walks off a bit obviously not wanting to get involved. "No no, it''s not that. It''s just... I worry... never mind." He sighs. "Your right it is your body and if you want to do this, then I won''t stop you."'
+		'You smile to him and give him a quick kiss. Which is interupted by Ivan. "You ready, we got a couple more miles to go."'
+		'Fedor nods to Ivan and then says to you. "Ok got to go, talk to you later ok?" Then he turns and runs after Ivan who already started running again. Soon you are once again alone on the beach.'
+		act 'Leave them to their training':gt 'gLakeNude'
+	else
+		'Ivan has a huge grin, Fedor just seems to be shocked. "So what are you up to <<$pcs_nickname>>?"'
+		'You shrug a little. "You know just out to enjoy the cool breeze, warm sun on my skin, while I take a walk. How about you guys?" You say trying to act as casual as you can, considering.'
+		'Ivan chuckles a little. "We was out training, so this a normal thing for you walking around naked like this?"'
+		act 'I made a mistake':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
+			'You blush at his words and suddenly feel very self conscious and cover yourself up with your hands as best you can. "I... I made a mistake. I don''t know what I was thinking. Please don''t tell anyone." You beg.'
+			'Fedor shakes his head. "Don''t worry we won''t tell anyone." He says as he glances to Ivan.'
+			'Ivan nods. "Not a problem we won''t tell anyone, but if you don''t want anyone to see you. Maybe you should go put on some clothes?" He says with a bemused smile.'
+			'You nod and turn and head back towards your clothes. "Thanks guys, see you around." With that they wave bye and then go back to their run, with only a few glances back at you.'
+			act 'Go to your clothes':gt 'gLakeNude'
+		end
+		act 'I''m not ashamed':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked1.jpg"></center>'
+			if hotcat => 5:
+				'You don''t cover up, you know you have nothing to be ashamed of. "I have nothing to be ashamed of. This is how I was made and I look amazing, plus I like showing it off." You tell them.'
+				'Both their eyes roam all over your naked body, you feel more than a bit of a thrill from it. "Yeah, yeah you do and no you have nothing to be ashamed of." Ivan says. "You have every reason to be proud." Fedor adds, then they exchange looks and both grin as if they know they are both thinking the same thing.'
+				'You arch a brow at them. "What?"'
+				'They exchange looks again and then Ivan says. "Would you want to go somewhere more private where we could... um appreciate your body... even more?"'
+				'You know they mean sex, that is all boys ever think about.'
+				if pcs_vag > 0:
+					act 'Sure lets go': gt 'gschool_socialchg1', 'ivanfedor_threesome'
+				end
+				act 'No thanks':
+					cla & *clr
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked1.jpg"></center>'
+					'You shake your head no with a bemused smile, boys are so simple minded, one track minds most of the time. "Thanks but just because I like to walk around naked doesn''t mean I want to have sex."'
+					'They both shake their head like that wasn''t what they meant and stammer trying to explain talking over each other.'
+					'You interrupt them. "It''s ok, I don''t mind you asking but no."'
+					'Ivan nods. "Yeah cool, well ok, guess we will get back to training, have fun on your walk." With that they wave bye and then go back to their run, with only a few glances back at you.'
+					act 'Leave them to their training':gt 'gLakeNude'
+				end
+			else
+				'You don''t cover up, you know you have nothing to be ashamed of. "I have nothing to be ashamed of. This is how I was made and I look amazing, plus I like showing it off." You tell them.'
+				'After a moment they are both looking at anything but your naked body, and Ivan scratches his head while looking up at the clouds. "Yeah, I guess. But ah... we should really get back to training." Ivan says. "Yeah we should get back to training, have fun." Fedor adds, then they exchange looks, just before they start running again with out a glance back at you.'
+				act 'Leave them to their training':gt 'gLakeNude'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'ivanfedor_threesome':
+	cla & *clr
+	menu_off = 1
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some1.jpg"></center>'
+	'The three of you walk further down the beach past the sauna where almost no one ever goes. Just around a bend in the shore to block the view from the rest of the beach, and the park forest further down. Once the three of you are sure no one else is around the boys start stripping off their clothes, while you drop down to your knees between them. You take both their cocks in your hands and start stroke them until you get them both rock hard.'
+	gs 'arousal', 'hj', 5, 'group', 'exhibitionism'
+	gs 'arousal', 'hj', 5, 'group', 'exhibitionism'
+	minut -= 5
+	gs 'stat'
+	act 'Suck them':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some2.jpg"></center>'
+		'Once they are both hard, you take Ivan''s cock into your mouth and start sucking it while you keep stroking it with your hand. You use your other hand to keep stroking Fedor''s dick. After a couple of minutes you switch cocks and start sucking on Fedor''s dick instead. The boys give each other a high five above your head.'
+		gs 'arousal', 'hj', 5, 'group', 'exhibitionism'
+		gs 'arousal', 'bj', 5, 'group', 'exhibitionism'
+		minut -= 5
+		gs 'stat'
+		act 'Switch cocks':
+			cla & *clr
+			gs 'boyStat', 'A5'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some3.jpg"></center>'
+			'Once switch back to sucking on Ivan''s cock, Fedor steps away from you a moment. Then he bends over and takes hold of your hips and pulls you up. You keep sucking on Ivan''s cock, which forces you to bend over as Fedor pulls you up into a standing position. Which you are sure that is exactly what he wanted and he steps behind you at once. He rubs your clit a few times to get your a little wet, before he rubs the tip of his dick against your slit. Once he is sure you are wet enough he pushes his <<dick>>cm <<$dick_girth>> dick inside your pussy, stretching and filling it out. He slowly fucks you, steadily going a little deeper with each stroke, while you suck on Ivan''s cock.'
+			gs 'arousal', 'vaginal', 5, 'group', 'exhibitionism'
+			gs 'arousal', 'bj', 5, 'group', 'exhibitionism'
+			minut -= 5
+			gs 'stat'
+			act 'DP time':
+				cla & *clr
+				gs 'boyStat', 'A3'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some4.jpg"></center>'
+				'You moan around Ivan''s cock as you suck it, while Fedor fucks you. Ivan interupts things by saying. "Fedor lay down on your back and then <<$pcs_nickname>> you get on top of him, so I can get at that ass."'
+				'Fedor pulls out of you and lays down on his back and the boys guide you down onto Fedor, Ivan fingers you a little bit until he gets his fingers nice and wet and then he smears your wetness on his dick. You are lowered down onto Fedor and you feel his cock easily sliding back inside of your pussy. Ivan kneels down behind you and spits on your ass and rubs his spit against your asshole, he repeats it a couple of times until your asshole is nice and wet with his spit. You feel the tip of his dick pressing against your butthole, building up into the head of his dick pops in your ass. Ivan starts slowly fucking your ass being as gentle as he can while you get use to his <<dick>>cm <<$dick_girth>> dick filling your butt.'
+				gs 'arousal', 'vaginal', 5, 'group', 'exhibitionism'
+				gs 'arousal', 'anal', 5, 'group', 'exhibitionism'
+				minut -= 5
+				gs 'stat'
+				act 'Double the fun':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some5.jpg"></center>'
+					'Ivan grabs your hips and holds them in place while Fedor thrusts into your twat from beneath you, while Ivan pounds your little asshole. It hurt a little at first but now the pleasure of both your holes filling this full over takes any pain you felt and replaces it with pleasure. You find yourself moaning louder and louder as the boys fuck both your holes.'
+					gs 'arousal', 'vaginal', 5, 'group', 'exhibitionism'
+					gs 'arousal', 'anal', 5, 'group', 'exhibitionism'
+					minut -= 5
+					gs 'stat'
+					act 'Cum on my titties':
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some5.jpg"></center>'
+						'As both boys start grunting you can tell they are both getting close to cumming, just as you think that in fact Fedor says. "I''m about to cum." They both quickly pull out of you and stand up, as you get on your knees they finish by jerking off, there cum starts spraying all over your boobs, covering them in hot sticky streams of sperm. You can feel it running your down your chest and tits, until they finally both finish.'
+						*nl
+						'With that they start getting dressed, as they finish Fedor says. "That was great <<$pcs_nickname>>, you''re amazing."'
+						'Ivan nods in agreement with that. "Well we should get back to working out, hope we see you around again <<$pcs_nickname>>, catch you later." Ivan says with a wink. As you wave bye to the boys they start off running again, chatting as they go, you are sure about you. Now you are on the beach not only naked but with a cum covered tits.'
+						gs 'arousal', 'foreplay', 5, 'group', 'exhibitionism'
+						gs 'cum_call', 'breasts', 'A3'
+						gs 'cum_call', 'breasts', 'A5'
+						gs 'arousal', 'end'
+						gs 'stat'
+						act 'Leave them to their training':gt 'gLakeNude'
+					end
+				end
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'tSvyatoslav':
 	cla & *clr
 	menu_off = 1
@@ -110,7 +414,6 @@ if $ARGS[0] = 'tSvyatoslav':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big8.jpg"></center>'
 	'You wait patiently until Svyatoslav ends one of his runs. "You''re improving greatly," You complement him.'
 	'Panting with sweat dripping down his face, Svyatoslav replies, "Thanks! I''ve been trying my hardest to one up Ivan for this year."'
-	
 	act 'Keep up the good work':
 		cla & *clr
 		minut += 5
@@ -120,10 +423,8 @@ if $ARGS[0] = 'tSvyatoslav':
 		'You tilt your head as you give him some encouraging words, "If you continue working out as hard as you''re currently doing I''m sure you''ll finally be able to beat Ivan."'
 		'Still panting, Svyatoslav smiles and nods while picking up the water bottle and taking a sip.'
 		'You stand and chat with him a little further until he tells you that his break is up and once again gets ready to do some sprints.'
-	
 		act 'Walk away': gt 'gschool_grounds', 'sports'
 	end
-	
 	act 'Laugh at him':
 		cla & *clr
 		minut += 5
@@ -134,7 +435,6 @@ if $ARGS[0] = 'tSvyatoslav':
 		'You can clearly see that Svyatoslav is agitated by your words, "You know what, I''ll show you and the rest of the school that I''m going to be the best. I''ll beat Ivan and you''ll feel like idiots for laughing at me."'
 		'"Okay, okay, champ, take it easy now." You patronize him.'
 		'With a big huff Svyatoslav turns around and starts sprinting up and down the makeshift track while completely ignoring you.'
-		
 		act 'Leave': gt 'gschool_grounds', 'sports'
 	end
 end
@@ -147,7 +447,6 @@ if $ARGS[0] = 'tVanya':
 	'Seeing you he stops in his tracks, "Hey, <<$pcs_nickname>>, you''re out early today!" he gives you a subtle smile.'
 	'"The same can be said about you," You answer playfully.'
 	'"Well to be honest, I was looking for something..." he starts talking more to himself now.'
-	
 	act 'Ask what he''s up to':
 		cla & *clr
 		minut += 5
@@ -160,7 +459,6 @@ if $ARGS[0] = 'tVanya':
 		'"Well, you know, there''s barely anyone in the park right now, seems like the perfect time to be on the look out..." he touches the back of his head and nervously laughs.'
 		'"If it was anyone else I would say you were being really weird but I get that. I hope you find a decent spot and tell Vicky I said hi!" you give him a smile and a wink.'
 		'"Sure, sure!" he replies as he slowly starts scampering from you.'
-		
 		act 'Go back to what you were doing': gt 'gskver', 'start'
 	end
 end
@@ -172,7 +470,6 @@ if $ARGS[0] = 'tErast':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big150.jpg"></center>'
 	'You walk up to him not really wanting to bother him but you feel the need to ask him how it works, "Sorry Erast, I don''t want to bother you..." you start as he puts down the weights.'
 	'"Oh, hi, <<$pcs_nickname>>. You need some help?" Erast politely replies.'
-	
 	act 'Nod your head':
 		cla & *clr
 		minut += 20
@@ -186,10 +483,8 @@ if $ARGS[0] = 'tErast':
 		'Erast lets out a subtle smile and nods, "Yeah, what about it?"'
 		'You squirm a little as you continue on, "Well, I would like to try it out but I don''t know how to use it..."'
 		'"Don''t worry, <<$pcs_nickname>> I''ll show you on how to use it." He leads you back to the machine and shows you on how to use it. He makes sure that you''ve got the hang of it before leaving.'
-		
 		act 'Thank him':gt 'gdk'
 	end
-	
 	act 'Shake your head':
 		cla & *clr
 		minut += 5
@@ -199,7 +494,6 @@ if $ARGS[0] = 'tErast':
 		'"Are you sure you don''t need any help?" he asks once more.'
 		'"N-No, I''m sorry to have bothered you..." you shyly reply and quickly move away.'
 		'Erast is still scratching his head as you quickly dash towards the exit.'
-		
 		act 'Leave':gt 'gdk'
 	end
 end
@@ -208,73 +502,235 @@ if $ARGS[0] = 'tChristina':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
-	'"What are the two of you up to?" you ask Christina ignoring Lina as you walk up to them.'
-	'"I''m trying to get this lazy ass to perform better..." Christina sourly answers. "Thanks to her we lost the last relay race. And now I''ve got to whip her into shape before the next one."'
-	
-	act 'You''re right':
+	if $clothingworntype ! 'nude':
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
+		'"What are the two of you up to?" you ask Christina ignoring Lina as you walk up to them.'
+		'"I''m trying to get this lazy ass to perform better..." Christina sourly answers. "Thanks to her we lost the last relay race. And now I''ve got to whip her into shape before the next one."'
+		act 'You''re right':
+			cla & *clr
+			minut += 10
+			npc_rel['A18'] += 2
+			npc_rel['A19'] -= 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"> <img <<$set_imgh>> src="images/pc/npc_headshots/big19.jpg"></center>'
+			'"But... But..." Lina tries to explain but gets interrupted by you, "No Lina, Christina is right. If you messed it up then you need to train harder and perform better next time. There''s no slacking off."'
+			'"Of course I''m correct." Christina fills in, "I''m the most prominent athlete at the school and also the captain of the track and field team. My word is law."'
+			'Dejected, Lina stares at the ground and you can hear her quietly whimper since she thought that you would have helped her out.'
+			'"No time to rest, time for you to take another run around the lake. I''ll time you this time and if you fail, you''ll be in a world of trouble." Christina commands.'
+			'As Lina can''t find a way out she nods and gets ready. You hear Christina shout "GO!" and watch Lina speed off...'
+			act 'Leave them alone': gt 'gLake'
+		end
+		act 'You''re being too harsh':
+			cla & *clr
+			minut += 10
+			npc_rel['A18'] -= 2
+			npc_rel['A19'] += 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
+			'"Give her a break, Christina. Everyone can have a bad race once in a while..." you begin defending Lina.'
+			'"What do you know, <<$pcs_nickname>>? Were you there?! You have no idea how humiliated I felt." Christina replies.'
+			'"Put your ego aside. Just look at Lina, she''s totally exhausted and needs a break. What will you do if she gets injured?" you continue on.'
+			'Christina glares at you menacingly, "Like I care... Because of this you''ll do double the sprints, Lina."'
+			'The only thing you can do is sigh and look apologetically to Lina while she nods understandingly.'
+			act 'Leave them alone': gt 'gLake'
+		end
+	else
+		gs 'exhibitionism', 3
+		gs 'fame', 'pav', 'sex', 3
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
+		'"What are the two of you up to?" you ask Christina ignoring Lina as you walk up to them.'
+		'"I''m trying to get this lazy ass to perform better..." Then Christina stops talking as she turns to face you and sees you are completely naked. She bursts out laughing. "Oh my god, what a fucking slut you are." Lina joins in laughing at you as well, as they both point and laugh at you being naked. Christina pulls out her phone and starts taking pictures of you with her phone. You start to blush as you realize what this means, while Christina keeps taking your picture as she talks. "I am going to send these to everyone, they are going to love seeing these."'
+		act 'Run off': christinaphotos = daystart & gt 'gLake'
+		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
+	end
+end
+
+if $ARGS[0] = 'tLina':
+	cla & *clr
+	menu_off = 1
+	gs 'stat'
+	if $clothingworntype ! 'nude':
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
+		'"What are you two up to?" you ask Lina ignoring Christina as you walk up to them.'
+		'Lina is just about to answer but gets interrupted by Christina, "Who told you that you could speak?! You don''t deserve that after your poor performance after the last race."'
+		act 'Was I talking to you?':
+			cla & *clr
+			minut += 10
+			npc_rel['A18'] -= 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big19.jpg"></center>'
+			'You turn around to Christina, "Did I ask you anything?" Christina is clearly fuming but you once again turn to Lina and ask "What are you doing?"'
+			'Lina carefully picks her words as Christina listens on, "I-I messed up in the last race. And..." she stops in her tracks and thinks for a short moment, "And I asked Christina for some pointers since she''s a great athlete."'
+			'Lina quickly casts a look towards Christina that has calmed down hearing Lina''s explanation...'
+			act 'Keep on fighting':
+				cla & *clr
+				npc_rel['A19'] += 2
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big19.jpg"></center>'
+				'You''re grinning hearing that, "Well good for you wanting to improve your performance. I''m sure Christina will have no issues getting you into shape. Just don''t let her take advantage of you. She can be quite excessive when it comes to these things."'
+				'Lina nods, "No, don''t worry I need the help."'
+				'"Well, if Christina gives you a hard time be sure to tell me and we''ll have a talk." you stick out your tongue teasingly and give her a wink.'
+				'Lina smiles while Christina clears her throat, "Okay that''s enough, time to head back to work... Get ready this will be painful..."'
+				act 'Leave them alone':gt 'gLake'
+			end
+		end
+	else
+		gs 'exhibitionism', 3
+		gs 'fame', 'pav', 'sex', 3
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
+		'"What are you two up to?" you ask Lina ignoring Christina as you walk up to them.'
+		'Lina is just about to answer but gets interrupted by Christina, "Who told you that you could speak?!..." Then Christina stops talking as she turns to face you and sees you are completely naked. She bursts out laughing. "Oh my god, what a fucking slut you are." Lina joins in laughing at you as well, as they both point and laugh at you being naked. Christina pulls out her phone and starts taking pictures of you with her phone. You start to blush as you realize what this means, while Christina keeps taking your picture as she talks. "I am going to send these to everyone, they are going to love seeing these."'
+		gs 'willpower', 'crime', 'self', 'medium'
+!!I picked crime because it is assault unless there is a better one
+		if will_cost <= pcs_willpwr:
+			act 'Kick her ass (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				gt 'gschool_socialchg1', 'christina_fight'
+			end
+		else
+			act 'Kick her ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
+		act 'Run off': christinaphotos = daystart & gt 'gLake'
+		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
+	end
+end
+
+if $ARGS[0] = 'chrislina_naked':
+	cla & *clr
+	menu_off = 1
+	gs 'exhibitionism', 3
+	gs 'fame', 'pav', 'sex', 3
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
+	'Christina is standing by the beach looking out over the lake, with Lina standing next to her, breathing heavily. You feel yourself panic a bit, if they turn around and see you while you are naked. You start to turn and head off when Christina suddenly turns and looks right at you.'
+	'She suddenly bursts out laughing, pointing at you, and walks towards you. Lina is confused a moment and then she realizes what Christina is laughing at and joins in as she follows Christina over. "Don''t you have any shame, you fucking slut?"'
+	'"Yeah." Lina adds kinda half heartedly, you think she is just doing it to make Christina happy.'
+	'Christina looks you over head to toe with a look of disgust on her face. "Maybe this is the only way you can get guys to even look at you, hag."'
+	act 'I made a mistake':
 		cla & *clr
-		minut += 10
-		npc_rel['A18'] += 2
-		npc_rel['A19'] -= 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"> <img <<$set_imgh>> src="images/pc/npc_headshots/big19.jpg"></center>'
-		'"But... But..." Lina tries to explain but gets interrupted by you, "No Lina, Christina is right. If you messed it up then you need to train harder and perform better next time. There''s no slacking off."'
-		'"Of course I''m correct." Christina fills in, "I''m the most prominent athlete at the school and also the captain of the track and field team. My word is law."'
-		'Dejected, Lina stares at the ground and you can hear her quietly whimper since she thought that you would have helped her out.'
-		'"No time to rest, time for you to take another run around the lake. I''ll time you this time and if you fail, you''ll be in a world of troubles." Christina commands.'
-		'As Lina can''t find a way out she nods and gets ready. You hear Christina shout "GO!" and watch Lina speed off...'
-		
-		act 'Leave them alone': gt 'gLake'
-	
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
+		'Hearing the girls laugh and Christina''s stinging words you blush and cover yourself up as best you can. "I... I made a mistake. I don''t know what I was thinking. Please don''t tell anyone." You beg.'
+		'Christina pulls out her phone and starts taking pictures of you with her phone as she talks. "Yeah you make a mistake you stupid cunt and now your going to pay for it. I am going to send these to everyone, they are going to love seeing these." You start to panic as you realize what this means, this might ruin your reputation, while Christina keeps taking your picture.'
+		gs 'willpower', 'crime', 'self', 'medium'
+!!I picked crime because it is assault unless there is a better one
+		if will_cost <= pcs_willpwr:
+			act 'Kick her ass (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				gt 'gschool_socialchg1', 'christina_fight'
+			end
+		else
+			act 'Kick her ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
+		act 'Run off': christinaphotos = daystart & gt 'gLake'
+		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
 	end
-	
-	act 'You''re being too harsh':
+	act 'I''m not ashamed':
 		cla & *clr
-		minut += 10
-		npc_rel['A18'] -= 2
-		npc_rel['A19'] += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
-		'"Give her a break, Christina. Everyone can have a bad race once in a while..." you begin defending Lina.'
-		'"What do you know, <<$pcs_nickname>>? Were you there?! You have no idea how humiliated I felt." Christina replies.'
-		'"Put your ego aside. Just look at Lina, she''s totally exhausted and needs a break. What will you do if she gets injured?" you continue on.'
-		'Christina glares at you menacingly, "Like I care... Because of this you''ll do double the sprints, Lina."'
-		'The only thing you can do is sigh and look apologetically to Lina while she nods understandingly.'
-		
-		act 'Leave them alone': gt 'gLake'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
+		'Hearing the girls laugh and Christina''s words you shake your head and don''t cover up, you know you have nothing to be ashamed of. "I have nothing to be ashamed of. This is how I was made and I look amazing, just because you are ashamed of your body Christina, doesn''t mean I am." You tell her with a sneer.'
+		'Christina''s jaw tightens and her eyes narrow in obvious anger as she pulls out her phone and starts taking pictures of you with her phone as she talks. "No? Well then you won''t mind if I take your picture and send to everyone then right? They are going to love seeing these." Your confidence wavers a little, despite not being ashamed you do realize what this means, this might ruin your reputation.'
+		gs 'willpower', 'crime', 'self', 'medium'
+!!I picked crime because it is assault unless there is a better one
+		if will_cost <= pcs_willpwr:
+			act 'Kick her ass (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				gt 'gschool_socialchg1', 'christina_fight'
+			end
+		else
+			act 'Kick her ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end	
+		act 'Run off': christinaphotos = daystart & gt 'gLake'
+		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
 	end
 end
-
-if $ARGS[0] = 'tLina':
+	
+if $ARGS[0] = 'beg_christina':
 	cla & *clr
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>'
-	'"What are you two up to?" you ask Lina ignoring Christina as you walk up to them.'
-	'Lina is just about to answer but gets interrupted by Christina, "Who told you that you could speak?! You don''t deserve that after your poor performance after the last race."'
-	
-	act 'Was I talking to you?':
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
+	'Panic sets in as you try and cover yourself up as best you can. Maybe you can convince her not to send the pictures to everyone. "Please Christina, don''t send those pictures, please?" You beg her.'
+	'Christina laughs at that and looks to Lina. "Can you believe this whinny little bitch? She gets herself in trouble and is now begging for help." Lina joins in with Christina laughing at that, before Christina looks back to you. "I might be persuaded not to share these. But if I agree, then I own you, you understand?"'
+	'You are a bit confused, own you? "Own me?" You ask.'
+	'Christina snarls at you. "Yeah that''s right bitch I will own you, I tell you to do my homework you will, if I tell you to lick my shoes clean you will, if I tell you to stick a bottle up your ass you will, got it?"'
+	'You feel the blood drain from your face as you realize she means it and will likely torment you for the rest of the school year, but it will save your reputation.'
+!!I went with misc on this one cause nothing else seemed to fit
+	gs 'willpower', 'misc', 'resist', 'medium'
+	if will_cost <= pcs_willpwr:
+		act 'Refuse (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'resist'
+			christinaphotos = daystart
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
+			'You shake your head no. "No I''m not going to do that, you will humiliate me worse than those photos every would."'
+			'Christina snorts then shrugs. "Yeah you''re probably right, but now everyone will see you naked and know you run around the beach naked like a whore." She says as she does something on her phone. "There all sent, now everyone will get a link to all these images." You feel yourself on the verge of tears but what can you do? You glance at Lina and she seems to have some sympathy for you but doesn''t say a word. Likely afraid to incur Chrsitina''s wraith herself if she speaks up. Not knowing what else to do you turn and walk away.'
+			act 'Walk off': gt 'gLake'
+		end
+	else
+		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end	
+	act 'Agree':
 		cla & *clr
-		minut += 10
-		npc_rel['A18'] -= 1
+		mood -= 10
+!! check with nutluck about post PE scenes
+		christinaphotos = 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big19.jpg"></center>'
-		'You turn around to Christina, "Did I ask you anything?" Christina is clearly fuming but you once again turn to Lina and ask "What are you doing?"'
-		'Lina carefully picks her words as Christina listens on, "I-I messed up in the last race. And..." she stops in her tracks and thinks for a short moment, "And I asked Christina for some pointers since she''s a great athlete."'
-		'Lina quickly casts a look towards Christina that has calmed down hearing Lina''s explanation...'
-		
-		act 'Keep on fighting':
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/christina/beach/onall4s.jpg"></center>'
+		'You reluctantly nod your head and meekly agree. "Ok." You tell her.'
+		'"That''s right bitch, I own your ass now, Now roll over and get on your hands and knees." You reluctantly do as she says and get down on your hands and knees.'
+		'She walks behind you. "Now spread those legs so we can get a nice shot of that disgusting pussy and dirty ass of yours." You blush with shame but do as she says, she takes several more pictures laughing the whole time. "You are going to do anything I want any time I say it from now on or everyone in school will see these pictures." You meekly nod on the verge of tears.'
+		*nl
+		'Then you feel a swift kick from behind, between your open legs, as Christina kicks you in the twat hard. You cry out and tears running down your cheeks as you grab your crotch and roll over onto your side with your legs squeezed closed. "Then say it! Say you are a little cunt and will do anything I say anytime I say it." Christina demands as she towers over you.'
+		*nl
+		'You croak out. "I am a little cunt that will do anything you say, anytime you say it." With that Christina laughs with a fairly evil laugh, she seems to be enjoying bullying you a lot, then she and Lina walk off leaving you laying on the beach naked and in pain. Once the walk off you dry your tears as best you can and get up.'
+		gs 'pain', 1, 'labia', 'kick'
+		act 'Walk off': gt 'gLake'
+	end
+end
+	
+if $ARGS[0] = 'christina_fight':
+	cla & *clr
+	menu_off = 1
+	gs 'stat'
+	'You step closer to Christina and say. "Give me the fucking phone before I kick you ass."'
+	'She smirks to you and puts her phone in her pocket and gets in fighting stance obviously more than willing to fight you. "Take if you think you can cunt!" Lina moves out of the way to watch, just as you take your first swing. Which Christina was waiting for and easily side steps your first blow, but now the fight is on.'
+!! Fightcheck
+	act 'fight':
+		gs 'fight','initFight'
+		gs 'fight_npcdata', 'christina'
+		gt 'fight', 'start'
+	end
+	if win:
+		mood += 10
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/christina/beach/losefight.jpg"></center>'
+		'Christina is a hell of a fighter, she is fast, hits harder than most boys and knows what she is doing. Yet despite all that she just isn''t a match for you. You finally land a few hard blows and she goes down gasping for breath, holding up her hand in a signal of no more, you smirk as she lays beaten at your feet. You reach down and pull her phone out of her pocket and then heave it as far as you can out into the lake where it plops into the water. Lina seems to be stunned that you beat Christina and she looks a little afraid of you. "Now neither you you seen me here naked right? And since I wasn''t here, that means I didn''t beat you ass, but from now on we both know who''s the bitch don''t we?" You say to both of them. Lina nods quickly Christina a little slower but she nods as well. With that you walk away from the two of them as Lina helps Christina back to her feet.'
+		act 'Walk off': gt 'gLake'
+	else
+		mood -= 20
+		'<center><img <<$set_imgh>> src="images/shared/fight/nakedlose.jpg"></center>'
+		'You do your best, you really thought you could beat Christina, but she is just so fast. She hits harder than most guys and worse, someone has trained her how to fight. In the end you find you are no match for her, a blow finally knocks you down and you land on your back. You know you can''t win at this point so you just lay there. Christina smirks at you as you lay there and she pulls her phone back out and takes more pictures of you. "That''s right bitch, I own your ass now, Now roll over and get on your hands and knees." You reluctantly do as she says.'
+		act 'Do as she says':
 			cla & *clr
-			npc_rel['A19'] += 2
+			mood -= 10
+			christinaphotos = 3
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big19.jpg"></center>'
-			'You''re grinning hearing that, "Well good for you wanting to improve your performance. I''m sure Christina will have no issues getting you into shape. Just don''t let her take advantage of you. She can be quite excessive when it comes to these things."'
-			'Lina nods, "No, don''t worry I need the help."'
-			'"Well, if Christina gives you a hard time be sure to tell me and we''ll have a talk." you stick out your tongue teasingly and give her a wink.'
-			'Lina smiles while Christina clears her throat, "Okay that''s enough, time to head back to work... Get ready this will be painful..."'
-			
-			act 'Leave them alone':gt 'gLake'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/christina/beach/onall4s.jpg"></center>'
+			'Now spread those legs so we can get a nice shot of that disgusting pussy and dirty ass of yours." You blush with shame but do as she says, she takes several more pictures laughing the whole time. "You are going to do anything I want any time I say it from now on or everyone in school will see these and I will kick your ass again, right?" You meekly nod on the verge of tears.'
+			*nl
+			'Then you feel a swift kick from behind, between your open legs, as Christina kicks you in the twat hard. You cry out and tears running down your cheeks as you grab your crotch and roll over onto your side with your legs squeezed closed. "Then say it! Say you are a little cunt and will do anything I say anytime I say it." Christina demands as she towers over you.'
+			*nl
+			'You croak out. "I am a little cunt that will do anything you say, anytime you say it." With that Christina laughs with a fairly evil laugh, she seems to be enjoying bullying you a lot, then she and Lina walk off leaving you laying on the beach naked and in pain. Once the walk off you dry your tears as best you can and get up.'
+			gs 'pain', 1, 'labia', 'kick'
+			act 'Walk off': gt 'gLake'
 		end
 	end
 end
@@ -287,7 +743,6 @@ if $ARGS[0] = 'tBella':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big22.jpg"></center>'
 	'You approach her and tap her on her shoulder, "Hi, Bella! You''re heading into the city?" you ask.'
 	'Sighing, Bella replies, "Yeah, I''m meeting some of my older friends in town. There''s a new gym opening so we though we might check it out."'
-	
 	act 'Sounds amazing':
 		cla & *clr
 		npc_rel['A22'] += 2
@@ -297,10 +752,8 @@ if $ARGS[0] = 'tBella':
 		'"Hanging around older people does have its perks," she winks. "One of my friends can get me in, no questions asked."'
 		'You nod your head, "Must be great hanging around older people..."'
 		'"Oh, the stories I''ve got to tell..." Bella replies but before she can continue on there''s an announcement and she excuses herself saying that''s the train she needs to catch.'
-	
 		act 'Return to the train station': gt 'pavtrainhall'
 	end
-
 	act 'What''s wrong with the gym in Pavlovsk?':
 		cla & *clr
 		npc_rel['A22'] -= 2
@@ -311,7 +764,6 @@ if $ARGS[0] = 'tBella':
 		'"Like what?" you continue on pressing.'
 		'Bella gives you a smirk, "Well first of all, there will be fully grown men there not only little wimpy boys that think they''re the shit. Real men that know how to treat women... And let''s not talk about all the sexy women that work out."'
 		'As she''s about to continue on you hear an announcement about a train, "That''s my train I need to catch, too bad <<$pcs_nickname>> I though of inviting you but you disappointed me. I had higher hopes about you..." she says as she''s walking away from you.'
-		
 		act 'Return to the train station': gt 'pavtrainhall'
 	end
 end
@@ -323,7 +775,6 @@ if $ARGS[0] = 'tVeronika':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
 	'Noticing it''s Veronika, you start waving towards her trying to catch her attention. She barely bats an eye towards you as you try your hardest to get her attention.'
 	'After a while she stops practicing and starts skating towards you...'
-	
 	act 'Greet':
 		cla & *clr
 		minut += 20
@@ -331,7 +782,6 @@ if $ARGS[0] = 'tVeronika':
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
 		'"Hi, Veronika!" you shout out, "Looking great out there!"'
 		'Ice cold with a blank expression, she stops in front of you, "What do you want? Can''t you see that I''m practicing?"'
-		
 		act 'Encourage':
 			cla & *clr
 			npc_rel['A141'] += 2
@@ -341,11 +791,8 @@ if $ARGS[0] = 'tVeronika':
 			'Veronika, still stone faced and rigid, replies a bit reluctantly. "Thanks, I guess. I do train a lot to succeed so I can leave this god forsaken hole..."'
 			'You awkwardly smile, "I know what you mean. It really is a dump isn''t it?"'
 			'"If there wasn''t anything more I need to get back to my training..." she replies. Before you''re able to answer back, Veronika is already skating away from you...'
-			
 			act 'Walk away': gt 'gLake'
-			
 		end
-		
 		act 'Discourage':
 			cla & *clr
 			npc_rel['A141'] -= 2
@@ -356,9 +803,7 @@ if $ARGS[0] = 'tVeronika':
 			'Veronika rolls her eyes and lets out a sigh, "Do I really need to explain it to you...?"'
 			'"What an ungrateful bitch you are!!!" you yell out, "I just wanted to encourage you on, but since you''re behaving like this I hope you break a leg or something..."'
 			'Stone cold Veronika only shrugs her shoulders, turning around and skates away like the two of you never had a conversation...'
-			
 			act 'Walk away': gt 'gLake'
-			
 		end
 	end
 end
@@ -370,7 +815,6 @@ if $ARGS[0] = 'tLariska':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big13.jpg"></center>'
 	'You carefully walk up to her, trying your best not the make your presence known. As you stand and observe her for a moment, you''re flabbergasted as Lariska is smashing the ball and have it effortlessly return to her hands over and over again...'
 	'You really get into seeing her keeping it up that you let out a loud-voiced gasp as the ball bounces differently. Letting yourself be known, it'' as you''ve managed the brake the spell Lariska was under as she turns towards you, "Impressed?"'
-	
 	act 'Yes!':
 		cla & *clr
 		minut += 20
@@ -381,10 +825,8 @@ if $ARGS[0] = 'tLariska':
 		'Lariska, breaks out in a huge smile and you even notice her cheeks blush a little, "Thanks, <<$pcs_nickname>>. I really got into the zone this time. Usually I''m not doing that good..." she humbly replies.'
 		'"No need to be humble, it was really amazing, trust me... You''re one of the best volleyball players I''ve ever seen." you genuinely respond, "I''ll let you go back to it, I didn''t want to bother." you smile.'
 		'Smiling back Lariska turns back towards the wall and smashes it as usual, but instead of catching the ball it ends up hitting her in the head and you can see her whole face turn red as you quickly walk away from there.'
-		
 		act 'Continue on': gt 'pavComplex', 'start'
 	end
-	
 	act 'Play it off':
 		cla & *clr
 		minut += 20
@@ -396,9 +838,9 @@ if $ARGS[0] = 'tLariska':
 		'You begin to laugh, "Why would I need to prove myself over such a silly little thing."'
 		'By now you can clearly notice that you''ve gotten under Lariska''s skin, "Go away, <<$pcs_nickname>>... Or else I''ll make you regret it..."'
 		'Knowing she''s close to Christina you take the hint and nod your head. As you''re walking away you can hear the bouncing sounds clearly louder...'
-		
 		act 'Walk away': gt 'pavComplex', 'start'
 	end
 end
 
---- gschool_socialchg1 ---------------------------------
+--- gschool_socialchg1 ---------------------------------
+

+ 6 - 6
locations/hunter_interactions.qsrc

@@ -329,7 +329,7 @@ if $ARGS[0] = 'chat_with_hunters':
 			if hunter_sexual_comfort < 35 and hunter_collective_opinion > 40:
 				'"Stop embarrassing the little lady" says Sergey. "She is our guest, we have to be polite"'
 				act 'Continue': gt 'swamp_yard', 'campfire'
-			elseif hunter_sexual_comfort > 50:
+			else
 				'"Wow so you really are a full on tease." says Igor'
 				'"Since you are such an innocent young lady why don''t you give us a little show without clothes blocking your innocence'
 				!TODO: Implement event
@@ -345,7 +345,7 @@ if $ARGS[0] = 'chat_with_hunters':
 			if hunter_sexual_comfort < 35 or hunter_collective_opinion > 40:
 				'"Well uhhh... it is normal at your age. You are not a little kid anymore" says Sergey'
 				act 'Continue': gt 'swamp_yard', 'campfire'
-			elseif hunter_sexual_comfort > 50:
+			else
 				'"That means you know how to have fun. Say, how about we play together a bit?" says Andrei before the hunters get up and start approaching you'
 				!TODO: Implement event
 				!if hunter_collective_opinion > 30 or alko < 4:
@@ -1185,7 +1185,7 @@ if $ARGS[0] = 'shooting_bet':
 		'Andrei is nowhere to be seen. That bastard ran away!'
 
 		hunter_collective_opinion += 15
-		act 'Further': gt 'swamp_woods'
+		act 'Further': gt 'swamp_woods', 'start'
 	end
 
 	if $ARGS[1] = 'lose':
@@ -1209,7 +1209,7 @@ if $ARGS[0] = 'shooting_bet':
 
 					'"No fucking way! You really are getting ahead of yourself now." you angrily respond.'
 					'"Damn you are such a cocktease. You are all fine walking around displaying yourself like that but the moment someone wants some fun you turn into an absolute prude." he says, somewhat annoyed.'
-					act 'Walk away': gt 'swamp_woods'
+					act 'Walk away': gt 'swamp_woods', 'start'
 				end
 
 				act 'Let him lead you to the trees': gt 'hunter_favors', 'yard_bondage', 'lost_bet'
@@ -1231,7 +1231,7 @@ if $ARGS[0] = 'shooting_bet':
 					gs 'arousal', 'end'
 
 					gs 'stat'
-					gt 'swamp_woods'
+					gt 'swamp_woods', 'start'
 				end
 
 				act 'Refuse':
@@ -1244,7 +1244,7 @@ if $ARGS[0] = 'shooting_bet':
 					'"Three men you barely know? <<$pcs_nickname>>, I thought we were your friends. It is nothing more than just having some silly fun together" he responds.'
 					'"Besides, it is not fair to just back down from a bet like that." he adds.'
 					'"Sorry, but I will not just prance around naked for your viewing pleasure." you firmly respond.'
-					act 'Walk away': gt 'swamp_woods'
+					act 'Walk away': gt 'swamp_woods', 'start'
 				end
 			end
 

+ 1 - 1
locations/korrPar.qsrc

@@ -90,7 +90,7 @@ if nodimkaK >= rand(7,10) and DimkaWarnedToday = 0:
 	if hour >= 9 and hour < 24 and week >=6 and DimkaWarnedToday = 0: gt 'dimaEv', 'Dimka_warning'
 end
 
-if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and PCloStyle2 = 4:
+if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or Enable_sforma = 1):
 	*nl
 	'Go pick up <a href="exec:gt ''natbelEv'', ''carrybooks''">Natasha</a> before school.'
 end

+ 2 - 0
locations/lover_meet.qsrc

@@ -410,6 +410,8 @@ if $ARGS[0] = 'start':
 
 				act 'Continue': xgt 'lover_meet', 'likes'
 			end
+		else
+			act 'Continue': xgt 'lover_meet', 'likes'
 		end
 	else
 		act 'Continue': xgt 'lover_meet', 'likes'

+ 5 - 0
locations/medical_din.qsrc

@@ -58,10 +58,15 @@ if $ARGS[0] = 'abortion':
 elseif $ARGS[0] = 'birthControlShot':
 	!! Gives Sveta the effects of a birth control shot. Usage: gs 'medical_din','birthControlShot'
 	!! Note: You have to make sure that she is not pregnant beforehead.
+	!!length of shot
 	tabletkishot = rand(84,91)
+	!!How long before you can get next shot
 	shotdays = 84
+	!!Flag for protection type - shot
 	tabletkicheck = 2
+	!!Sets the actual drug in your system
 	pillcon = 40000
+	!!How much of the drug Sveta things is in her system
 	pillcon2 = 40000
 elseif $ARGS[0] = 'healthTreatment':
 	!! Gives Sveta an health treatment (like the doctors in the clinic do). Usage: gs 'medical_din','healthTreatment'

+ 0 - 2
locations/npcgeneratec.qsrc

@@ -200,7 +200,6 @@ npc_glasses[$npclastgenerated] = rand(0,1)
 npc_grades[$npclastgenerated] = rand(40,100)
 npc_run[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_vball[$npclastgenerated] = rand(0,(npctempc2 + 10))
-npc_nerd[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_shoot[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_sewing[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_serving[$npclastgenerated] = rand(0,(npctempc2 + 10))
@@ -233,7 +232,6 @@ npc_herpes[$npclastgenerated] = 0
 npc_syth[$npclastgenerated] = 0
 npc_gon[$npclastgenerated] = 0
 npc_chlam[$npclastgenerated] = 0
-npc_Hiv[$npclastgenerated] = 0
 npc_genwart[$npclastgenerated] = 0
 npc_Thrush[$npclastgenerated] = 0
 npc_Malen[$npclastgenerated] = 0

+ 6 - 1
locations/npcgenext.qsrc

@@ -58,7 +58,7 @@ if $args[0] = 'dick':
 				tempfindgirth += 1
 			end
 		end
-	elseif tempfinddick < 4:
+	elseif tempfinddick > 4:
 		tempfindgirth += 1
 		if tempfinddick = 6:
 			tempfinddick = rand(1,3)
@@ -85,6 +85,11 @@ if $args[0] = 'dick':
 	else
 		$npctempgn[4] = 'monstrous'
 	end
+
+	! {cleanup}
+	killvar 'tempfindadd'
+	killvar 'tempfinddick'
+	killvar 'tempfindgirth'
 end
 
 ! {Personality Generator. Outputs $npctempgn[6]}

+ 1 - 1
locations/pavSharedApt.qsrc

@@ -278,7 +278,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	
-	if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0:
+	if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or Enable_sforma = 1):
 		act 'Go pick up Natasha before school': gt 'natbelEv', 'carrybooks'
 	end
 	

+ 40 - 40
locations/pirsingsalon.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = 'tongue_pir':
 				'You don''t have enough money in your bank for this piercing.'
 			end
 		end
-	elseif money >= 5000 or karta + bankDebtLimit >= 5000:
+	elseif (money >= 5000) or (karta + bankDebtLimit >= 5000):
 		if money >= 5000:
 			act 'Get your tongue pierced with this piercing for 5000 <b>₽</b> (cash)':
 				cls
@@ -208,7 +208,7 @@ if $ARGS[0] = 'lip_pir':
 					cla
 					money -= 4000
 					dynamic 'pirsB<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+					act 'Return':gt 'pirsingsalon', 'pirsgub'
 				end
 			else
 				'You don''t have enough cash for this piercing.'
@@ -218,13 +218,13 @@ if $ARGS[0] = 'lip_pir':
 					'You buy the piercing.'
 					karta -= 4000
 					dynamic 'pirsB<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+					act 'Return':gt 'pirsingsalon', 'pirsgub'
 				end
 			else
 				'You don''t have enough money in your bank for this piercing.'
 			end
 		end
-	elseif money >= 6000 or karta + bankDebtLimit >= 6000:
+	elseif (money >= 6000) or (karta + bankDebtLimit >= 6000):
 		if money >= 6000:
 			act 'Get your lip pierced with this piercing for 6000 <b>₽</b> (cash)':
 				cls
@@ -294,7 +294,7 @@ if $ARGS[0] = 'ears_pir':
 					cla
 					money -= 1000
 					dynamic 'pirsC<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+					act 'Return':gt 'pirsingsalon', 'pirsysh'
 				end
 			else
 				'You don''t have enough cash for these earrings.'
@@ -304,13 +304,13 @@ if $ARGS[0] = 'ears_pir':
 					'You buy the earrings.'
 					karta -= 1000
 					dynamic 'pirsC<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+					act 'Return':gt 'pirsingsalon', 'pirsysh'
 				end
 			else
 				'You don''t have enough money in your bank for these earrings.'
 			end
 		end
-	elseif money >= 3000 or karta + bankDebtLimit >= 3000:
+	elseif (money >= 3000) or (karta + bankDebtLimit >= 3000):
 		if money >= 3000:
 			act 'Get your ears pierced with these earrings for 3000 <b>₽</b> (cash)':
 				cls
@@ -380,7 +380,7 @@ if $ARGS[0] = 'nose_pir':
 					cla
 					money -= 2000
 					dynamic 'pirsD<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+					act 'Return':gt 'pirsingsalon', 'pirsnos'
 				end
 			else
 				'You don''t have enough cash for this piercing.'
@@ -390,13 +390,13 @@ if $ARGS[0] = 'nose_pir':
 					'You buy the piercing.'
 					karta -= 2000
 					dynamic 'pirsD<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+					act 'Return':gt 'pirsingsalon', 'pirsnos'
 				end
 			else
 				'You don''t have enough money in your bank for this piercing.'
 			end
 		end
-	elseif money >= 5000 or karta + bankDebtLimit >= 5000:
+	elseif (money >= 5000) or (karta + bankDebtLimit >= 5000):
 		if money >= 5000:
 			act 'Get your nose pierced with this piercing for 5000 <b>₽</b> (cash)':
 				cls
@@ -466,7 +466,7 @@ if $ARGS[0] = 'brow_pir':
 					cla
 					money -= 2000
 					dynamic 'PirsE<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+					act 'Return':gt 'pirsingsalon', 'pirsbro'
 				end
 			else
 				'You don''t have enough cash for this piercing.'
@@ -476,13 +476,13 @@ if $ARGS[0] = 'brow_pir':
 					'You buy the piercing.'
 					karta -= 2000
 					dynamic 'PirsE<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+					act 'Return':gt 'pirsingsalon', 'pirsbro'
 				end
 			else
 				'You don''t have enough money in your bank for this piercing.'
 			end
 		end
-	elseif money >= 5000 or karta + bankDebtLimit >= 5000:
+	elseif (money >= 5000) or (karta + bankDebtLimit >= 5000):
 		if money >= 5000:
 			act 'Get your brow pierced with this piercing for 5000 <b>₽</b> (cash)':
 				cls
@@ -552,7 +552,7 @@ if $ARGS[0] = 'nip_pir':
 					cla
 					money -= 6000
 					dynamic 'pirsF<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+					act 'Return':gt 'pirsingsalon', 'pirssos'
 				end
 			else
 				'You don''t have enough cash for these piercings.'
@@ -562,13 +562,13 @@ if $ARGS[0] = 'nip_pir':
 					'You buy the piercings.'
 					karta -= 6000
 					dynamic 'pirsF<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+					act 'Return':gt 'pirsingsalon', 'pirssos'
 				end
 			else
 				'You don''t have enough money in your bank for this piercing.'
 			end
 		end
-	elseif money >= 10000 or karta + bankDebtLimit >= 10000:
+	elseif (money >= 10000) or (karta + bankDebtLimit >= 10000):
 		if money >= 10000:
 			act 'Get your nipples pierced with these piercings for 10,000 <b>₽</b> (cash)':
 				cls
@@ -638,7 +638,7 @@ if $ARGS[0] = 'belly_pir':
 					cla
 					money -= 7000
 					dynamic 'PirsN<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+					act 'Return':gt 'pirsingsalon', 'pirspyp'
 				end
 			else
 				'You don''t have enough cash for this piercing.'
@@ -648,13 +648,13 @@ if $ARGS[0] = 'belly_pir':
 					'You buy the piercing.'
 					karta -= 7000
 					dynamic 'PirsN<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+					act 'Return':gt 'pirsingsalon', 'pirspyp'
 				end
 			else
 				'You don''t have enough money in your bank for this piercing.'
 			end
 		end
-	elseif money >= 10000 or karta + bankDebtLimit >= 10000:
+	elseif (money >= 10000) or (karta + bankDebtLimit >= 10000):
 		if money >= 10000:
 			act 'Get your belly button pierced with this piercing for 10,000 <b>₽</b> (cash)':
 				cls
@@ -724,7 +724,7 @@ if $ARGS[0] = 'pubic_pir':
 					cla
 					money -= 10000
 					dynamic 'pirsG<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+					act 'Return':gt 'pirsingsalon', 'pirsvla'
 				end
 			else
 				'You don''t have enough cash for this piercing.'
@@ -734,13 +734,13 @@ if $ARGS[0] = 'pubic_pir':
 					'You buy the piercing.'
 					karta -= 10000
 					dynamic 'pirsG<<i>>_owned = 1'
-					act 'Return':gt 'pirsingsalon', 'pirsyaz'
+					act 'Return':gt 'pirsingsalon', 'pirsvla'
 				end
 			else
 				'You don''t have enough money in your bank for this piercing.'
 			end
 		end
-	elseif money >= 25000 or karta + bankDebtLimit >= 25000:
+	elseif (money >= 25000) or (karta + bankDebtLimit >= 25000):
 		if money >= 25000:
 			act 'Get your pussy pierced with this piercing for 25,000 <b>₽</b> (cash)':
 				cls
@@ -805,7 +805,7 @@ if $ARGS[0] = 'arm_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/arms/tatarm<<n>>.jpg"></center>'
 
-	if money < 8000 or karta + bankDebtLimit < 8000:
+	if (money < 8000) and (karta + bankDebtLimit < 8000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 8000:
@@ -860,7 +860,7 @@ if $ARGS[0] = 'ass_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/ass/tatass<<n>>.jpg"></center>'
 
-	if money < 10000 or karta + bankDebtLimit < 10000:
+	if (money < 10000) and (karta + bankDebtLimit < 10000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 10000:
@@ -915,7 +915,7 @@ if $ARGS[0] = 'back_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/back/tatback<<n>>.jpg"></center>'
 
-	if money < 10000 or karta + bankDebtLimit < 10000:
+	if (money < 10000) and (karta + bankDebtLimit < 10000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 10000:
@@ -970,7 +970,7 @@ if $ARGS[0] = 'belly_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/belly/tatblly<<n>>.jpg"></center>'
 
-	if money < 10000 or karta + bankDebtLimit < 10000:
+	if (money < 10000) and (karta + bankDebtLimit < 10000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 10000:
@@ -1025,7 +1025,7 @@ if $ARGS[0] = 'breast_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/breasts/tatbrst<<n>>.jpg"></center>'
 
-	if money < 15000 or karta + bankDebtLimit < 15000:
+	if (money < 15000) and (karta + bankDebtLimit < 15000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 15000:
@@ -1080,7 +1080,7 @@ if $ARGS[0] = 'chest_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/chest/tatchst<<n>>.jpg"></center>'
 
-	if money < 12000 or karta + bankDebtLimit < 12000:
+	if (money < 12000) and (karta + bankDebtLimit < 12000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 12000:
@@ -1135,7 +1135,7 @@ if $ARGS[0] = 'face_get':
 	cla
 '<center><img src="images/pc/body/tattoos/face/tatfce<<n>>.jpg"></center>'
 
-	if money < 10000 or karta + bankDebtLimit < 10000:
+	if (money < 10000) and (karta + bankDebtLimit < 10000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 10000:
@@ -1190,7 +1190,7 @@ if $ARGS[0] = 'foot_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/foot/tatankle<<n>>.jpg"></center>'
 
-	if money < 8000 or karta + bankDebtLimit < 8000:
+	if (money < 8000) and (karta + bankDebtLimit < 8000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 8000:
@@ -1245,7 +1245,7 @@ if $ARGS[0] = 'leg_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/legs/tatleg<<n>>.jpg"></center>'
 
-	if money < 10000 or karta + bankDebtLimit < 10000:
+	if (money < 10000) and (karta + bankDebtLimit < 10000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 10000:
@@ -1300,7 +1300,7 @@ if $ARGS[0] = 'lip_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/lip/tatlip<<n>>.jpg"></center>'
 
-	if money < 5000 or karta + bankDebtLimit < 5000:
+	if (money < 5000) and (karta + bankDebtLimit < 5000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 5000:
@@ -1355,7 +1355,7 @@ if $ARGS[0] = 'neck_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/neck/tatnck<<n>>.jpg"></center>'
 
-	if money < 8000 or karta + bankDebtLimit < 8000:
+	if (money < 8000) and (karta + bankDebtLimit < 8000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 8000:
@@ -1410,7 +1410,7 @@ if $ARGS[0] = 'vag_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/pubic/tatvag<<n>>.jpg"></center>'
 
-	if money < 20000 or karta + bankDebtLimit < 20000:
+	if (money < 20000) and (karta + bankDebtLimit < 20000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 20000:
@@ -1465,7 +1465,7 @@ if $ARGS[0] = 'shoulder_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/shoulder/tatshldr<<n>>.jpg"></center>'
 
-	if money < 8000 or karta + bankDebtLimit < 8000:
+	if (money < 8000) and (karta + bankDebtLimit < 8000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 8000:
@@ -1520,7 +1520,7 @@ if $ARGS[0] = 'side_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/side/tatside<<n>>.jpg"></center>'
 
-	if money < 12000 or karta + bankDebtLimit < 12000:
+	if (money < 12000) and (karta + bankDebtLimit < 12000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 12000:
@@ -1575,7 +1575,7 @@ if $ARGS[0] = 'tramp_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/trampstamp/tatlowbck<<n>>.jpg"></center>'
 
-	if money < 12000 or karta + bankDebtLimit < 12000:
+	if (money < 12000) and (karta + bankDebtLimit < 12000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 12000:
@@ -1630,7 +1630,7 @@ if $ARGS[0] = 'under_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/underbreast/tatundbreast<<n>>.jpg"></center>'
 
-	if money < 12000 or karta + bankDebtLimit < 12000:
+	if (money < 12000) and (karta + bankDebtLimit < 12000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 12000:
@@ -1685,7 +1685,7 @@ if $ARGS[0] = 'wrist_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/wrists/tatwrst<<n>>.jpg"></center>'
 
-	if money < 7000 or karta + bankDebtLimit < 7000:
+	if (money < 7000) and (karta + bankDebtLimit < 7000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 7000:
@@ -1740,7 +1740,7 @@ if $ARGS[0] = 'hand_get':
 	cla
 	'<center><img src="images/pc/body/tattoos/hand/tathnd<<n>>.jpg"></center>'
 
-	if money < 7000 or karta + bankDebtLimit < 7000:
+	if (money < 7000) and (karta + bankDebtLimit < 7000):
 		'You cannot afford this tattoo.'
 	else
 		if money >= 7000:

+ 1 - 1
locations/pornfilm.qsrc

@@ -1314,7 +1314,7 @@ if $ARGS[0] = '13a':
 	act 'Fake orgasm':
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/citycenter/studio/sex/porgasm.mp4" width="400"></video></center>'
-		'The first drops of sperm leak from your pussy as <<$paktor[3]>> and <<$paktor[4]>> switch places with <<$paktor[1]>> and <<$paktor[2]>>. You give them both a quick blowjob before <<$paktor[3] lies on the floor and pulls you on top of him, sliding his cock into your ass. <<$paktor[4]>> moves in behind and inserts his dick into your already stretched ass. Despite the increased tightness, the guys quickly find a rhythm and you soon feel their warm sperm deep in your ass.'
+		'The first drops of sperm leak from your pussy as <<$paktor[3]>> and <<$paktor[4]>> switch places with <<$paktor[1]>> and <<$paktor[2]>>. You give them both a quick blowjob before <<$paktor[3]>> lies on the floor and pulls you on top of him, sliding his cock into your ass. <<$paktor[4]>> moves in behind and inserts his dick into your already stretched ass. Despite the increased tightness, the guys quickly find a rhythm and you soon feel their warm sperm deep in your ass.'
 		'You fake an orgasm for the camera while you wait for them to finish.'
 		gs 'arousal', 'anal', 5, 'exhibitionism', 'group'
 		gs 'arousal', 'end'

+ 30 - 30
locations/spell.qsrc

@@ -515,7 +515,7 @@ end
 
 if $ARGS[0] = 'scaldingtouch':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 250 * SuccessValue
+		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>Flames spring from your hands.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -524,7 +524,7 @@ end
 
 if $ARGS[0] = 'burninghands':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 2500 * SuccessValue
+		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 250 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>A torrent of flames jets from your hands.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -533,7 +533,7 @@ end
 
 if $ARGS[0] = 'firebarrier':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 750
+		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 200
 		'<b><font color = <<$SplTxtColGood>>>A flaming barrier has sprung up between you and your opponents.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -542,11 +542,11 @@ end
 
 if $ARGS[0] = 'firestorm':
 	if SuccessValue > 0:
-		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, 4250 + (2000 * SuccessValue)
+		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, (200 * SuccessValue)
 		'<b><font color = <<$SplTxtColGood>>>Uncountable glowing embers steak down upon the foes of <<dyneval($spellFunc["GetCombatantName"], $CasterType, CasterNumber)>>.</font></b>'
 	elseif SuccessValue < 0:
-		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, 2000
-		dynamic $spellFunc['ApplyDamageToAll'], $CasterType, 200
+		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, 200
+		dynamic $spellFunc['ApplyDamageToAll'], $CasterType, 100
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Uncountable glowing embers steak down upon the battlefield burning everyone.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -555,7 +555,7 @@ end
 
 if $ARGS[0] = 'flameshield':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 2500
+		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 250
 		'<b><font color = <<$SplTxtColGood>>>A Shield made of Flames interposes itself between <<dyneval($spellFunc["GetCombatantName"], $CasterType, CasterNumber)>> and the enemy.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -564,7 +564,7 @@ end
 
 if $ARGS[0] = 'shock':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 150 * SuccessValue
+		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>You build a static electric charge in your hand and zap your opponent.</font></b>'
 	elseif SuccessValue < 0:
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 50
@@ -576,10 +576,10 @@ end
 
 if $ARGS[0] = 'lightning':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 1500 * SuccessValue
+		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 200 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>You shoot a lightning bolt from your hand zapping your opponent.</font></b>'
 	elseif SuccessValue < 0:
-		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 300
+		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 100
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! You manage to zap yourself with lightning.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -588,7 +588,7 @@ end
 
 if $ARGS[0] = 'electricbarrier':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 1500
+		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 250
 		'<b><font color = <<$SplTxtColGood>>>A wall of dancing lightning springs up around yourself.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -597,12 +597,12 @@ end
 
 if $ARGS[0] = '1000birds':
 	if SuccessValue > 0:
-		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, 2750 + (1000 * SuccessValue)
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 2750 + (1000 * SuccessValue)
+		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, (100 * SuccessValue)
+		gs 'fight', 'applyDamage', $TargetType, TargetNumber, (100 * SuccessValue)
 		'<b><font color = <<$SplTxtColGood>>>You shoot hundreds of small lightning bolts toward your enemy.</font></b>'
 	elseif SuccessValue < 0:
-		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, 2000
-		dynamic $spellFunc['ApplyDamageToAll'], $CasterType, 200
+		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, 100
+		dynamic $spellFunc['ApplyDamageToAll'], $CasterType, 100
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Hundreds of small lightning bolts curl toward the battlefield shocking everyone.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -611,7 +611,7 @@ end
 
 if $ARGS[0] = 'dancingsphere':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 5000
+		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 500
 		'<b><font color = <<$SplTxtColGood>>>A large field of lightning dances around you blocking attacks.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -633,7 +633,7 @@ end
 
 if $ARGS[0] = 'earthshield':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 1000 + 1500
+		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 100 + 250
 		'<b><font color = <<$SplTxtColGood>>>Tendrils of Earth rise to defend you.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -642,10 +642,10 @@ end
 
 if $ARGS[0] = 'abyss':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 1500 * SuccessValue
+		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 250 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>The Earth opens up beneath your opponents feet, slamming shut damaging him and depriving him of the ability to move.</font></b>'
 	elseif SuccessValue < 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 1500
+		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 250
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 200
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! The Earth opens up beneath your opponents feet, slamming shut damaging him and depriving him of the ability to move.  You are also caught.</font></b>'
 	else
@@ -655,7 +655,7 @@ end
 
 if $ARGS[0] = 'earthguardian':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 2000 +5200
+		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 500
 		'<b><font color = <<$SplTxtColGood>>>The Earth itself comes alive defending you from attacks.  It draws from the power of the land to regenerate itself every round. You now have <<defence>> protection units.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -664,10 +664,10 @@ end
 
 if $ARGS[0] = 'sando':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 3000 + (2000 * SuccessValue)
+		gs 'fight', 'applyDamage', $TargetType, TargetNumber, (250 * SuccessValue)
 		'<b><font color = <<$SplTxtColGood>>>Two huge plates of earth colapse together crushing the enemy and depriving him of the ability to move.</font></b>'
 	elseif SuccessValue < 0:
-		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 200
+		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 50
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Two huge plates of earth colapse together with crushing force, but the enemy is missed and you are instead caught.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -693,7 +693,7 @@ end
 
 if $ARGS[0] = 'pressure':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 1000 * SuccessValue
+		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 200 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>You dramatically raised the air pressure.</font></b>'
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
@@ -710,7 +710,7 @@ end
 
 if $ARGS[0] = 'vacuum':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 1500
+		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 250
 		'<b><font color = <<$SplTxtColGood>>>A turbulent sphere of vacuum surrounds you blocking incoming attacks. You now have <<defence>> protection units.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -719,7 +719,7 @@ end
 
 if $ARGS[0] = 'vacuumshells':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 2500 * SuccessValue
+		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 250 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>Turbulent spheres of vacuum bombard your enemy. The air is full of whistling sounds as the spheres fly by at high speeds over the battlefield.</font></b>'
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
@@ -747,7 +747,7 @@ if $ARGS[0] = 'leechmana':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100
 		damTipM = 1000
-		dynamic $spellFunc['UpdateAttrib'], 'mana', $CasterType, CasterNumber, '+', 1000
+		dynamic $spellFunc['UpdateAttrib'], 'mana', $CasterType, CasterNumber, '+', 100
 		'<b><font color = <<$SplTxtColGood>>>You leech mana from your enemy.</font></b>'
 	elseif SuccessValue < 0:
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 50
@@ -759,7 +759,7 @@ end
 
 if $ARGS[0] = 'flood':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 1000 * SuccessValue
+		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 200 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>A surge of water rises towards your enemy.</font></b>'
 	elseif SuccessValue < 0:
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 100
@@ -771,7 +771,7 @@ end
 
 if $ARGS[0] = 'blister':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', 1500
+		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', 500
 		'<b><font color = <<$SplTxtColGood>>>A protective sphere of water surrounds you.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -780,7 +780,7 @@ end
 
 if $ARGS[0] = 'sharkrockets':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 1500 * SuccessValue
+		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 150 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>Blobs of Water shaped like sharks fly towards your enemy stiking them.</font></b>'
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
@@ -793,7 +793,7 @@ end
 
 if $ARGS[0] = 'greatflood':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', 5000
+		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', 1000
 		'<b><font color = <<$SplTxtColGood>>>You have filled the whole neighborhood with water protecting you and devouring enemy mana.</font></b>'
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0

+ 58 - 37
locations/telefon.qsrc

@@ -1280,58 +1280,72 @@ end &! --- Phone_notebook ---
 
 !!For setting the total numbers of selfies
 if $ARGS[0] = 'Phone_selfie_totals':
-	bathroom_clotot = 20
-	bathroom_undtot = 20
-	bathroom_nudtot = 20
-	bathroom_titflash = 10
-	bathroom_assflash = 10
-	bathroom_pussyflash = 10
+	bathroom_clotot = 24
+	bathroom_undtot = 21
+	bathroom_nudtot = 27
+	bathroom_titflash = 20
+	bathroom_assflash = 3
+	bathroom_pussyflash = 22
 	bathroom_bathtot = 24
 	bathroom_showertot = 25
 	bedroom_clotot = 27
 	bedroom_undtot = 20
 	bedroom_nudtot = 25
 	bedroom_titflash = 30
-	bedroom_assflash = 5
-	bedroom_pussyflash = 17
-	kitchen_clotot = 16
-	kitchen_undtot = 11
-	kitchen_nudtot = 19
-	kitchen_titflash = 20
+	bedroom_assflash = 14
+	bedroom_pussyflash = 23
+	kitchen_clotot = 27
+	kitchen_undtot = 23
+	kitchen_nudtot = 23
+	kitchen_titflash = 21
 	kitchen_assflash = 1
-	kitchen_pussyflash = 5
-	livingroom_clotot = 17
-	livingroom_undtot = 21
-	livingroom_nudtot = 16
-	livingroom_titflash = 7
-	livingroom_assflash = 2
-	livingroom_pussyflash = 2
-	changingroom_clotot = 19
+	kitchen_pussyflash = 9
+	livingroom_clotot = 27
+	livingroom_undtot = 23
+	livingroom_nudtot = 20
+	livingroom_titflash = 9
+	livingroom_assflash = 5
+	livingroom_pussyflash = 18
+	changingroom_clotot = 22
 	changingroom_undtot = 25
 	changingroom_nudtot = 25
 	changingroom_titflash = 28
-	changingroom_assflash = 16
+	changingroom_assflash = 19
 	changingroom_pussyflash = 27
 	park_clotot = 28
-	park_undtot = 0
-	park_nudtot = 10
-	park_titflash = 13
-	park_assflash = 1
-	park_pussyflash = 4
-	lockeroom_clotot = 21
-	lockeroom_undtot = 16
-	lockeroom_nudtot = 6
-	lockeroom_titflash = 9
+	park_undtot = 2
+	park_nudtot = 12
+	park_titflash = 18
+	park_assflash = 2
+	park_pussyflash = 5
+	lockeroom_clotot = 26
+	lockeroom_undtot = 21
+	lockeroom_nudtot = 12
+	lockeroom_titflash = 12
 	lockeroom_assflash = 1
-	lockeroom_pussyflash = 10
+	lockeroom_pussyflash = 1
 	beach_swim = 21
-	beach_nudtot = 15
-	beach_titflash = 11
+	beach_nudtot = 20
+	beach_titflash = 14
 	beach_assflash = 1
-	beach_pussyflash = 2
-	classroom_clotot = 10
+	beach_pussyflash = 4
+	classroom_clotot = 11
 	classroom_titflash = 1
 	classroom_pussyflash = 1
+	!!classroom_assflash = 0
+!!I am adding a few more lines for selfies that I have, I am commenting them out for now until we add in the option to take the image. I named the first folder school_bathroom and the second folder restroom
+	!!school_bathroom_clotot = 24
+	!!school_bathroom_undtot = 2
+	!!school_bathroom_nudtot = 0
+	!!school_bathroom_assflash = 0
+	!!school_bathroom_titflash = 3
+	!!school_bathroom_pussyflash = 3
+	!!restroom_clotot = 34
+	!!restroom_undtot = 25
+	!!restroom_nudtot = 2
+	!!restroom_assflash = 8
+	!!restroom_titflash = 34
+	!!restroom_pussyflash = 18
 end
 
 
@@ -1368,9 +1382,16 @@ if $ARGS[0] = 'Phone_camera_selfie':
 	elseif $locclass = 'beach':
 		$phone_loc = 'beach'
 		gs 'telefon', 'Phone_selfie_image'
-	elseif $locclass = 'classroom':
-		$phone_loc = 'classroom'
+	elseif $locclass = 'school_classroom':
+		$phone_loc = 'school_classroom'
+		gs 'telefon', 'Phone_selfie_image'
+!{for the above image sets school bathroom and restroom aka public bathrooms, not sure what all should be added below so leaving it for you crowke
+	elseif $locclass = 'school_bathroom':
+		$phone_loc = 'school_bathroom'
 		gs 'telefon', 'Phone_selfie_image'
+	elseif $locclass = 'restroom':
+		$phone_loc = 'restroom'
+		gs 'telefon', 'Phone_selfie_image'}
 	else
 		phone_rand = RAND(1,2)
 		phone_selfie[phone_rand] = 1