Browse Source

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

CroWke 4 years ago
parent
commit
2b2519b1d0

+ 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"/>

+ 1 - 0
locations/Cheatmenu_din.qsrc

@@ -1126,6 +1126,7 @@ $cheatmenu['stats'] = {
 	*p 'Serving (<<servng_lvl>>) - Total (<<pcs_servng>>): ' & dynamic $cheatmenu['printStatLinks'], 'servng', 'Serving'
 	*p 'Modeling (<<mdlng_lvl>>) - Total (<<pcs_mdlng>>): ' & dynamic $cheatmenu['printStatLinks'], 'mdlng', 'Modeling'
 	*p 'Medicine (<<medcn_lvl>>) - Total (<<pcs_medcn>>): ' & dynamic $cheatmenu['printStatLinks'], 'medcn', 'Medicine'
+	*p 'Cleaning (<<cleaning_lvl>>) - Total (<<pcs_cleaning>>): ' & dynamic $cheatmenu['printStatLinks'], 'cleaning', 'Cleaning'
 	'</tr></table></b></center>'
 }
 

+ 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

+ 9 - 8
locations/boyStat.qsrc

@@ -89,18 +89,19 @@ elseif $ARGS[1] = 'd':
 	$dick_girth4 = $bstemp[3]
 	silavag4 = bstemp[4]
 else
-	i = ARGS[1]
-	if mid($ARGS[1],1,1) < 10: i = $ARGS[1]
-	$boy[i] = $npclastcalled
-	$boydesc[i] = $bstemp[1]
-	dick[i] = bstemp[2]
-	$dick_girth[i] = $bstemp[3]
-	silavag[i] = bstemp[4]
+	boyStat_i = ARGS[1]
+	if mid($ARGS[1],1,1) < 10: boyStat_i = $ARGS[1]
+	$boy[boyStat_i] = $npclastcalled
+	$boydesc[boyStat_i] = $bstemp[1]
+	dick[boyStat_i] = bstemp[2]
+	$dick_girth[boyStat_i] = $bstemp[3]
+	silavag[boyStat_i] = bstemp[4]
 end
 
 killvar 'bstemp'
 killvar '$bstemp'
-killvar 'i'
+killvar 'boyStat_i'
+
 
 
 --- boyStat ---------------------------------

+ 1 - 0
locations/clothing_attributes.qsrc

@@ -82,6 +82,7 @@ CloSkirtShortness = 0
 CloPanties = 0
 CloOnePiece = 0
 CloStyle = 0
+CloStyle2 = 0
 CloBimbo = 0
 CloInhibit = 0
 

+ 1 - 1
locations/din_bad.qsrc

@@ -607,7 +607,7 @@ $d_cycreport_actor = {
 			'List of potential fathers:'
 			:potfather_loop
 			if $wombpotfath[potfather_temp] ! 'unknown':
-				$potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''"><<$npc_usedname[$wombpotfath[potfather_temp]]>> (<<$wombpotfath[potfather_temp]>>)</a>'
+				$potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''"><<$npc_usedname[$wombpotfath[potfather_counter]]>> (<<$wombpotfath[potfather_counter]>>)</a>'
 			else
 				$potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''">Unknown (-)</a>'
 			end

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

+ 130 - 55
locations/fight.qsrc

@@ -1,6 +1,25 @@
 # fight
+!{  To Use Fight:
+	1) Initialize fight to make sure previous fighter are cleared out.
+	2) Add Opponents and Allies
+	3) Set Fight Ending
+	4) Start Fight
 
-!! Variables to be set before fight - in brackets so you can copy/paste
+	Example:
+	Let''s make a fight where Tatiana helps us beat Kisame and a bandit
+
+		gs 'fight','initFight'
+
+		gs 'fight_npcdata', 'tatiana', 'pcs'
+		gs 'fight_npcdata', 'kisame', 'opp'
+		gs 'fight_npcdata', 'bandit', 'opp'
+
+		fightEnding = 2
+
+		gt 'fight', 'start'
+}
+
+!! Variables to be set for each participant before fight - in brackets so you can copy/paste
 !!{
 $opp_name[0] = <<name of opponent>>
 $opp_image[0] = opponent image ie. '<img <<$set_imgh>> src="images/characters/city/tobi/tobi.jpg">'
@@ -9,7 +28,7 @@ opp_run[0] = Opponent running skill used for player escape
 opp_wrstlng[0] = Wrestling skill
 opp_kick[0] = Kicking
 opp_punch[0] = Power punch
-opp_jab[0] = Ligth punch
+opp_jab[0] = Light punch
 opp_stren[0] = Strengh
 opp_agil[0] = Agility
 opp_vital[0] = vitality
@@ -150,19 +169,23 @@ 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:
 				<<$fightAppDam['TargetType']>>_shield[<<fightAppDam['TargetNumber']>>] = 0
 				""<<$fightAppDam['TargetName']>> losses <<fightAppDam['Shield']>> defense.""
 			end
-			<<$fightAppDam['TargetType']>>_health -= <<fightAppDam['OverShieldDamage']>>
-			""<<$fightAppDam['TargetName']>> losses <<fightAppDam['OverShieldDamage']>> health.""
+			if <<$fightAppDam['TargetType']>>_health[<<fightAppDam['TargetNumber']>>] > <<fightAppDam['OverShieldDamage']>>:
+				<<$fightAppDam['TargetType']>>_health[<<fightAppDam['TargetNumber']>>] -= <<fightAppDam['OverShieldDamage']>>
+			else
+				<<$fightAppDam['TargetType']>>_health[<<fightAppDam['TargetNumber']>>] = 0
+			end
+			""<<$fightAppDam['TargetName']>> loses <<fightAppDam['OverShieldDamage']>> health.""
 		end
 	"
 	killvar '$fightAppDam'
@@ -181,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'
@@ -224,7 +247,7 @@ if $ARGS[0] = 'start':
 		jump 'OppTimerInit'
 	end
 
-	act 'Engage': gt 'fight', 'main'
+	act 'Fight!': gt 'fight', 'main'
 
 	killvar '$HTMLText'
 	killvar 'tableSize'
@@ -250,7 +273,8 @@ if $ARGS[0] = 'findActiveTimer':
 		!Skip round if char is stunned
 		if pcs_stun[i] > 0:
 			pcs_stun[i] -= 1
-		else
+		!Skip anyone with no Health
+		elseif pcs_health[i] > 0:
 			if pcs_timer[i] < fightTimLow:
 				fightTimLow = pcs_timer[i]
 				fightTimNum = i
@@ -267,7 +291,8 @@ if $ARGS[0] = 'findActiveTimer':
 		!Skip round if char is stunned
 		if opp_stun[i] > 0:
 			opp_stun[i] -= 1
-		else
+		!Skip anyone with no Health
+		elseif opp_health[i] > 0:
 			if opp_timer[i] < fightTimLow:
 				fightTimLow = opp_timer[i]
 				fightTimNum = i
@@ -277,7 +302,6 @@ if $ARGS[0] = 'findActiveTimer':
 		i += 1
 		jump 'LowTimerLoop2'
 	end
-
 	killvar 'i'
 end
 
@@ -305,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]
@@ -314,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 = red>Protection <<fightPStats["Shield"]>> units</font></b>'
-	if fightPStats['Clone'] > 0:'<b><font color = red>Clones active <<fightPStats["Clone"]>> </font></b>'
-	if fightPStats['Fog'] > 0:'<b><font color = red>Obscuring Fog <<fightPStats["Fog"]>> units</font></b>'
-	if fightPStats['Stun'] > 0:'<b><font color = red>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'
@@ -329,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':
@@ -409,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]
@@ -417,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]
@@ -427,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]
 
@@ -445,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:
@@ -464,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
+			'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
-			'Its a glancing blow, but still hurts.'
-		end	
+			'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
@@ -561,12 +633,15 @@ if $ARGS[0] = 'fightAlgorithm':
 		!Physical attack if nothing else can be done.
 		if ActionMade = 0:
 			if rand(0,dyneval('result=<<$AttackerType>>_kick[<<AttackerNumber>>]')) > 40:
-				gs 'fight', 'Attack', 'Kick', $TargetType, AttackerNumber, TargetNumber
+				gs 'fight', 'Attack', 'Kick', $TargetType, TargetNumber, AttackerNumber
 			elseif rand(0,dyneval('result=<<$AttackerType>>_punch[<<AttackerNumber>>]')) > 40:
-				gs 'fight', 'Attack', 'Hard Punch', $TargetType, AttackerNumber, TargetNumber
+				gs 'fight', 'Attack', 'Hard Punch', $TargetType, TargetNumber, AttackerNumber
 			else
-				gs 'fight', 'Attack', 'Jab', $TargetType, AttackerNumber, TargetNumber
+				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
@@ -582,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':
@@ -600,15 +675,15 @@ if $ARGS[0] = 'player':
 				$op_name_000000 = $opp_name[fightAvailTarg[i]]
 				dynamic "
 					act 'Kick <<$op_name_000000>>':
-						gs 'fight', 'Attack', 'Kick', 'opp', 0, <<fightAvailTarg[i]>>
+						gs 'fight', 'Attack', 'Kick', 'opp', <<fightAvailTarg[i]>>, 0
 					end
 
 					act 'Punch <<$op_name_000000>> hard':
-						gs 'fight', 'Attack', 'Hard Punch', 'opp', 0, <<fightAvailTarg[i]>>
+						gs 'fight', 'Attack', 'Hard Punch', 'opp', <<fightAvailTarg[i]>>, 0
 					end
 
 					act 'Jab <<$op_name_000000>>':
-						gs 'fight', 'Attack', 'Jab', 'opp', 0, <<fightAvailTarg[i]>>
+						gs 'fight', 'Attack', 'Jab', 'opp', <<fightAvailTarg[i]>>, 0
 					end
 				"
 				killvar '$op_name_000000'
@@ -698,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 ---------------------------------
 

+ 18 - 18
locations/gKristinaZv.qsrc

@@ -76,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
 	
@@ -95,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
 
@@ -114,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
 
@@ -134,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
 
@@ -154,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
 
@@ -174,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
 
@@ -237,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
@@ -266,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
@@ -302,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
 	
@@ -338,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
 	
@@ -374,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
 	
@@ -410,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
 	
@@ -445,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
 	
@@ -481,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
 	
@@ -521,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
 	
@@ -554,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
 	
@@ -577,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
 
@@ -585,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 ---------------------------------

+ 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."'

+ 1 - 1
locations/gschool_events.qsrc

@@ -537,7 +537,7 @@ if $ARGS[0] = 'break_events':
 			grupvalue[2] -= 2
 			grupvalue[3] += 3
 			grupvalue[4] -= 5
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big36.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big152.jpg"></center>'
 			'You look away from Feofan and then keep walking, ignoring what just happened.'
 			gs 'gschool_events', 'leave_break_events'
 		end

+ 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 or (christinaphotos > 0 and christinaphotos <= 4) 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 ---------------------------------

+ 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

+ 1 - 0
locations/lab.qsrc

@@ -68,6 +68,7 @@ if $ARGS[0] = 'start':
 			gt 'fight', 'start'
 		end
 	end
+
 	
 	!!!Has to be adjusted to match TatianaMissionQW value for latest mission (see 'tatiana_missions')
 	TatianaMissionTotal = 2

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

+ 1 - 1
locations/mirror.qsrc

@@ -539,7 +539,7 @@ if $ARGS[0] = 'd_bag_mirror':
 	*clr & cla
 	gs 'stat'
 	'<center><h1>Compact Mirror</h1></center>'
-	'<center><img <<$set_imgh>> src="/images/pc/items/compact_mirror.jpg"></center>'
+	'<center><img <<$set_imgh>> src="/images/pc/items/mirrorcompact.jpg"></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	'You have '+iif(kosmetitka > 0, '<b><<kosmetitka>></b>', 'no')+' cosmetic applications and '+iif(salfetka > 0, '<b><<salfetka>></b>', 'no')+' tissues left in your purse.'

+ 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

@@ -48,7 +48,7 @@ if $args[0] = 'dick':
 				tempfindgirth += 1
 			end
 		end
-	elseif tempfinddick < 4:
+	elseif tempfinddick > 4:
 		tempfindgirth += 1
 		if tempfinddick = 6:
 			tempfinddick = rand(1,3)
@@ -75,6 +75,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'

+ 100 - 96
locations/spell.qsrc

@@ -15,6 +15,8 @@
 !	 ARGS[4] = Caster party member number
 
 SuccessValue = $ARGS[1]
+$SplTxtColGood = 'green'
+$SplTxtColBad = 'red'
 
 ! ARGS for Combat Spells if Applicable
 $TargetType = $ARGS[2]
@@ -32,6 +34,8 @@ else
 	! Others are assumed to be enemy targets
 	if $TargetType = 'pcs':
 		$CasterType = 'opp'
+		$SplTxtColGood = 'red'
+		$SplTxtColBad = 'green'
 	elseif $TargetType = 'opp':
 		$CasterType = 'pcs'
 	else
@@ -177,7 +181,7 @@ if $ARGS[0] = 'regenerate':
 			gs 'spellTimer', 'add', 'regenerate', 120, 'pcs_health += (5 * <<regenVal>>)', 'pcs_health += <<regenVal>>'
 		end
 
-		'<b><font color = green>Your body surges with life. You feel better already.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Your body surges with life. You feel better already.</font></b>'
 		killvar 'regenVal'
 		killvar 'regenArrIdx'
 	else
@@ -188,7 +192,7 @@ end
 if $ARGS[0] = 'painblock':
 	if SuccessValue > 0:
 		pain['killer'] = 1
-		'<b><font color = green>Your pain recedes into a dull throb.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Your pain recedes into a dull throb.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -211,7 +215,7 @@ if $ARGS[0] = 'curedisease':
 		pain['vaginal'] += 10
 		! You do not feel good
 		pcs_mood -= 30
-		'<b><font color = green>You burst into a high fever.  You feel terrible, but you know you are now healthy.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You burst into a high fever.  You feel terrible, but you know you are now healthy.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -222,7 +226,7 @@ if $ARGS[0] = 'curewounds':
 		! Remove some pain
 		gs 'medical_din','healthTreatment'
 		gs 'medical_din','healthTreatment'
-		'<b><font color = green>You feel yourself coursing with life.  You feel better already.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You feel yourself coursing with life.  You feel better already.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -233,7 +237,7 @@ if $ARGS[0] = 'curewounds2':
 		! Remove all pain
 		killvar 'pain'
 		pcs_health = pcs_vital * 10 + pcs_stren * 5 + 1000
-		'<b><font color = green>You feel yourself coursing with life.  All pain is gone.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You feel yourself coursing with life.  All pain is gone.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -281,7 +285,7 @@ if $ARGS[0] = 'berserk':
 			}
 			gs 'spellTimer', 'add', 'berserk', 120, $berserkCode, ''
 		end
-		'<b><font color = green>You feel a huge adrenalin surge. You begin looking for someone to battle.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You feel a huge adrenalin surge. You begin looking for someone to battle.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -299,7 +303,7 @@ if $ARGS[0] = 'shower':
 		pcs_sweat = 10
 		! Brush Teeth
 		pcs_breath = 1
-		'<b><font color = green>You feel clean and refreshed.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You feel clean and refreshed.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -332,7 +336,7 @@ if $ARGS[0] = 'makeup':
 
 		killvar 'MakeupArg'
 		killvar '$MakeupArg'
-		'<b><font color = green>makeup is applied to your face.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>makeup is applied to your face.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -379,7 +383,7 @@ if $ARGS[0] = 'cosmetica':
 			end
 		end
 
-		'<b><font color = green>You feel beautiful.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You feel beautiful.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -393,7 +397,7 @@ end
 if $ARGS[0] = 'fog':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '+', 10 * SuccessValue
-		'<b><font color = green>A Fog materializes around, obscuring <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from enemies.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A Fog materializes around, obscuring <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from enemies.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -402,10 +406,10 @@ end
 if $ARGS[0] = 'clone':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '+', SuccessValue
-		'<b><font color = green><<SuccessValue>> clone<<iif(SuccessValue>1,"s","")>> springs from <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> confusing enemies.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>><<SuccessValue>> clone<<iif(SuccessValue>1,"s","")>> springs from <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> confusing enemies.</font></b>'
 	elseif SuccessValue < 0 and dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '-', 1
-		'<b><font color = red>The spell backfires! A <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> clone disappears.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! A <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> clone disappears.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -415,7 +419,7 @@ if $ARGS[0] = 'stun':
 	if SuccessValue > 0:
 		stunner = 1
 		dynamic $spellFunc['UpdateAttrib'], 'stun', $TargetType, TargetNumber, '+', rand(2,5)+ SuccessValue
-		'<b><font color = green><<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> is stunned.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>><<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> is stunned.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -424,10 +428,10 @@ end
 if $ARGS[0] = 'weapon':
 	!{if SuccessValue > 0:
 		magweapbonus = weapbonus * 4 * SuccessValue
-		'<b><font color = green>Your Weapon now feels more powerful.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Your Weapon now feels more powerful.</font></b>'
 	elseif SuccessValue < 0:
 		magweapbonus = weapbonus * -1
-		'<b><font color = red>The spell backfires! Your weapon seems weaker.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Your weapon seems weaker.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -438,14 +442,14 @@ end
 if $ARGS[0] = 'wind':
 	if SuccessValue = 2:
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
-		'<b><font color = green>A wind blows through the area eliminating the fog around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from the battlefield.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A wind blows through the area eliminating the fog around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from the battlefield.</font></b>'
 	elseif SuccessValue = 1:
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $CasterType, CasterNumber, '=', 0
-		'<b><font color = green>A wind blows through the area eliminating all fog on the battlefield.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A wind blows through the area eliminating all fog on the battlefield.</font></b>'
 	elseif SuccessValue = -1:
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $CasterType, CasterNumber, '=', 0
-		'<b><font color = red>A wind blows through the area eliminating the fog around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from the battlefield.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>A wind blows through the area eliminating the fog around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from the battlefield.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -454,14 +458,14 @@ end
 if $ARGS[0] = 'multiclone':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '+', SuccessValue * 3
-		'<b><font color = green><<SuccessValue * 3>> clone<<iif(SuccessValue>1,"s","")>> of <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> springs forth confusing the enemy.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>><<SuccessValue * 3>> clone<<iif(SuccessValue>1,"s","")>> of <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> springs forth confusing the enemy.</font></b>'
 	elseif SuccessValue < 0 and klon > 0:
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') < 3:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
 		else
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '-', 3
 		end
-		'<b><font color = red>The spell backfires! Some clones of <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> disappear.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Some clones of <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> disappear.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -470,7 +474,7 @@ end
 if $ARGS[0] = 'energo':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 100
-		'<b><font color = green>An energy shield materializes around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>>, granting protection from enemies.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>An energy shield materializes around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>>, granting protection from enemies.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -479,7 +483,7 @@ end
 if $ARGS[0] = 'haste':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'init', $TargetType, TargetNumber, '+', SuccessValue * 120
-		'<b><font color = green><<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> feels mind and body race though a sluggish world.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>><<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> feels mind and body race though a sluggish world.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -488,7 +492,7 @@ end
 if $ARGS[0] = 'heal':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'health', $TargetType, TargetNumber, '+', SuccessValue * 400
-		'<b><font color = green><<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> surges with life, feeling much stronger.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>><<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> surges with life, feeling much stronger.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -500,7 +504,7 @@ if $ARGS[0] = 'hand':
 		TargetStrenDelta = TargetStren*20*SuccessValue/100
 		TargetStrenBase  = TargetStren*10
 		dynamic $spellFunc['UpdateAttrib'], 'stren', $TargetType, TargetNumber, '=', RAND(TargetStrenBase - TargetStrenDelta,TargetStrenBase + TargetStrenDelta)
-		'<b><font color = green>Power flows from the hands of <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>>.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Power flows from the hands of <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>>.</font></b>'
 		killvar 'TargetStren'
 		killvar 'TargetStrenDelta'
 		killvar 'TargetStrenBase'
@@ -511,8 +515,8 @@ end
 
 if $ARGS[0] = 'scaldingtouch':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 250 * SuccessValue
-		'<b><font color = green>Flames spring from your hands.</font></b>'
+		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>'
 	end
@@ -520,8 +524,8 @@ end
 
 if $ARGS[0] = 'burninghands':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 2500 * SuccessValue
-		'<b><font color = green>A torrent of flames jets from your hands.</font></b>'
+		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>'
 	end
@@ -529,8 +533,8 @@ end
 
 if $ARGS[0] = 'firebarrier':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 750
-		'<b><font color = green>A flaming barrier has sprung up between you and your opponents.</font></b>'
+		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>'
 	end
@@ -538,12 +542,12 @@ end
 
 if $ARGS[0] = 'firestorm':
 	if SuccessValue > 0:
-		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, 4250 + (2000 * SuccessValue)
-		'<b><font color = green>Uncountable glowing embers steak down upon the foes of <<dyneval($spellFunc["GetCombatantName"], $CasterType, CasterNumber)>>.</font></b>'
+		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
-		'<b><font color = red>The spell backfires! Uncountable glowing embers steak down upon the battlefield burning everyone.</font></b>'
+		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>'
 	end
@@ -551,8 +555,8 @@ end
 
 if $ARGS[0] = 'flameshield':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 2500
-		'<b><font color = green>A Shield made of Flames interposes itself between <<dyneval($spellFunc["GetCombatantName"], $CasterType, CasterNumber)>> and the enemy.</font></b>'
+		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>'
 	end
@@ -560,11 +564,11 @@ end
 
 if $ARGS[0] = 'shock':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 150 * SuccessValue
-		'<b><font color = green>You build a static electric charge in your hand and zap your opponent.</font></b>'
+		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
-		'<b><font color = red>The spell backfires! You manage to zap yourself with a static charge.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! You manage to zap yourself with a static charge.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -572,11 +576,11 @@ end
 
 if $ARGS[0] = 'lightning':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 1500 * SuccessValue
-		'<b><font color = green>You shoot a lightning bolt from your hand zapping your opponent.</font></b>'
+		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
-		'<b><font color = red>The spell backfires! You manage to zap yourself with lightning.</font></b>'
+		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>'
 	end
@@ -584,8 +588,8 @@ end
 
 if $ARGS[0] = 'electricbarrier':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 1500
-		'<b><font color = green>A wall of dancing lightning springs up around yourself.</font></b>'
+		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>'
 	end
@@ -593,13 +597,13 @@ end
 
 if $ARGS[0] = '1000birds':
 	if SuccessValue > 0:
-		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, 2750 + (1000 * SuccessValue)
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 2750 + (1000 * SuccessValue)
-		'<b><font color = green>You shoot hundreds of small lightning bolts toward your enemy.</font></b>'
+		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
-		'<b><font color = red>The spell backfires! Hundreds of small lightning bolts curl toward the battlefield shocking everyone.</font></b>'
+		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>'
 	end
@@ -607,8 +611,8 @@ end
 
 if $ARGS[0] = 'dancingsphere':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 5000
-		'<b><font color = green>A large field of lightning dances around you blocking attacks.</font></b>'
+		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>'
 	end
@@ -617,11 +621,11 @@ end
 if $ARGS[0] = 'quicksand':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100 * SuccessValue
-		'<b><font color = green>You have trapped your opponent in quicksand.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You have trapped your opponent in quicksand.</font></b>'
 	elseif SuccessValue < 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 50
-		'<b><font color = red>The spell backfires! You are both trapped in quicksand.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! You are both trapped in quicksand.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -629,8 +633,8 @@ end
 
 if $ARGS[0] = 'earthshield':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 1000 + 1500
-		'<b><font color = green>Tendrils of Earth rise to defend you.</font></b>'
+		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>'
 	end
@@ -638,12 +642,12 @@ end
 
 if $ARGS[0] = 'abyss':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 1500 * SuccessValue
-		'<b><font color = green>The Earth opens up beneath your opponents feet, slamming shut damaging him and depriving him of the ability to move.</font></b>'
+		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 = red>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>'
+		'<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
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -651,8 +655,8 @@ end
 
 if $ARGS[0] = 'earthguardian':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 2000 +5200
-		'<b><font color = green>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>'
+		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>'
 	end
@@ -660,11 +664,11 @@ end
 
 if $ARGS[0] = 'sando':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 3000 + (2000 * SuccessValue)
-		'<b><font color = green>Two huge plates of earth colapse together crushing the enemy and depriving him of the ability to move.</font></b>'
+		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
-		'<b><font color = red>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>'
+		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>'
 	end
@@ -673,14 +677,14 @@ end
 if $ARGS[0] = 'windgust':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100 * SuccessValue
-		'<b><font color = green>You have created a gust of wind.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You have created a gust of wind.</font></b>'
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
-			'<b><font color = green>Enemy clones are vaporized.</font></b>'
+			'<b><font color = <<$SplTxtColGood>>>Enemy clones are vaporized.</font></b>'
 		end
 		if dyneval('result=<<$TargetType>>_fog[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
-			'<b><font color = green>Enemy Fog is torn to shreds by the wind.</font></b>'
+			'<b><font color = <<$SplTxtColGood>>>Enemy Fog is torn to shreds by the wind.</font></b>'
 		end
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -689,15 +693,15 @@ end
 
 if $ARGS[0] = 'pressure':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 1000 * SuccessValue
-		'<b><font color = green>You dramatically raised the air pressure.</font></b>'
+		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
-			'<b><font color = green>Enemy clones are vaporized.</font></b>'
+			'<b><font color = <<$SplTxtColGood>>>Enemy clones are vaporized.</font></b>'
 		end
 		if dyneval('result=<<$TargetType>>_fog[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
-			'<b><font color = green>Enemy Fog is torn to shreds by the wind.</font></b>'
+			'<b><font color = <<$SplTxtColGood>>>Enemy Fog is torn to shreds by the wind.</font></b>'
 		end
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -706,8 +710,8 @@ end
 
 if $ARGS[0] = 'vacuum':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 1500
-		'<b><font color = green>A turbulent sphere of vacuum surrounds you blocking incoming attacks. You now have <<defence>> protection units.</font></b>'
+		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>'
 	end
@@ -715,15 +719,15 @@ end
 
 if $ARGS[0] = 'vacuumshells':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 2500 * SuccessValue
-		'<b><font color = green>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>'
+		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
-			'<b><font color = green>Enemy clones are vaporized.</font></b>'
+			'<b><font color = <<$SplTxtColGood>>>Enemy clones are vaporized.</font></b>'
 		end
 		if dyneval('result=<<$TargetType>>_fog[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
-			'<b><font color = green>Enemy Fog is torn to shreds by the wind.</font></b>'
+			'<b><font color = <<$SplTxtColGood>>>Enemy Fog is torn to shreds by the wind.</font></b>'
 		end
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -733,7 +737,7 @@ end
 if $ARGS[0] = 'devouringvacuum':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '=', 0
-		'<b><font color = green>A devouring vacuum sucks away your enemys defenses.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A devouring vacuum sucks away your enemys defenses.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -743,11 +747,11 @@ if $ARGS[0] = 'leechmana':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100
 		damTipM = 1000
-		dynamic $spellFunc['UpdateAttrib'], 'mana', $CasterType, CasterNumber, '+', 1000
-		'<b><font color = green>You leech mana from your enemy.</font></b>'
+		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
-		'<b><font color = red>The spell backfires! Ouch!</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Ouch!</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -755,11 +759,11 @@ end
 
 if $ARGS[0] = 'flood':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 1000 * SuccessValue
-		'<b><font color = green>A surge of water rises towards your enemy.</font></b>'
+		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
-		'<b><font color = red>The spell backfires! A surge of water rises towards your enemy, but missed and hits you.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! A surge of water rises towards your enemy, but missed and hits you.</font></b>'
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
 	end
@@ -767,8 +771,8 @@ end
 
 if $ARGS[0] = 'blister':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', 1500
-		'<b><font color = green>A protective sphere of water surrounds you.</font></b>'
+		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>'
 	end
@@ -776,11 +780,11 @@ end
 
 if $ARGS[0] = 'sharkrockets':
 	if SuccessValue > 0:
-		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 1500 * SuccessValue
-		'<b><font color = green>Blobs of Water shaped like sharks fly towards your enemy stiking them.</font></b>'
+		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
-			'<b><font color = green>Enemy clones are vaporized.</font></b>'
+			'<b><font color = <<$SplTxtColGood>>>Enemy clones are vaporized.</font></b>'
 		end
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'
@@ -789,11 +793,11 @@ end
 
 if $ARGS[0] = 'greatflood':
 	if SuccessValue > 0:
-		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', 5000
-		'<b><font color = green>You have filled the whole neighborhood with water protecting you and devouring enemy mana.</font></b>'
+		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
-			'<b><font color = green>Enemy clones are vaporized.</font></b>'
+			'<b><font color = <<$SplTxtColGood>>>Enemy clones are vaporized.</font></b>'
 		end
 	else
 		'<b>The spell fizzles.  Nothing seems to happen.</b>'