locations/_attributes_cats_dress.qsrc

@@ -1404,10 +1404,9 @@ elseif ARGS[1] = 207:
 	CloDress = 1
 
 elseif ARGS[1] = 208:
-!! Duplicate of Coco 210
 	CloQuality = 4
 	CloThinness = 4
-	CloTopCut = 4
+	CloTopCut = 2
 	CloSkirtShortness = 4
 
 elseif ARGS[1] = 209:

locations/_attributes_cats_outfits.qsrc

@@ -688,10 +688,9 @@ elseif ARGS[1] = 111:
 	
 elseif ARGS[1] = 112:
 	CloQuality = 3
-	CloThinness = 5
+	CloThinness = 3
 	CloTopCut = 2
-	CloPantsShortness = 5
-	CloStyle = 4
+	CloPantsShortness = 4
 	
 elseif ARGS[1] = 113:
 	CloQuality = 3

locations/_attributes_gm_dress.qsrc

@@ -1557,9 +1557,9 @@ elseif ARGS[1] = 217:
 	
 elseif ARGS[1] = 218:
 	CloQuality = 2
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloThinness = 3
+	CloTopCut = 3
+	CloSkirtShortness = 3
 	
 elseif ARGS[1] = 219:
 	CloQuality = 2

locations/_attributes_moncheri_bodysuit.qsrc

@@ -365,14 +365,13 @@ elseif ARGS[1] = 32:
 
 elseif ARGS[1] = 33:
 	BraType = 7
-	BraMaterial = 3
+	BraMaterial = 6
 	BraFun = 1
 	BraQuality = 6
-	BraThinness = 4
+	BraThinness = 3
 	BraCover = 3
 	PanThinness = 4
-	PanCoverFront = 3
-	PanCoverBack = 3
+	PanCoverBack = 2
 
 elseif ARGS[1] = 34:
 	BraType = 7

locations/_attributes_moncheri_dress.qsrc

@@ -689,7 +689,7 @@ elseif ARGS[1] = 89:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 3
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 	CloDress = 1
 	CloStyle = 3
 

locations/_attributes_scandalicious_dress.qsrc

@@ -10,7 +10,7 @@ if ARGS[1] = 1:
 	CloDress = 1
 	
 elseif ARGS[1] = 2:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3

locations/_attributes_scandalicious_outfits.qsrc

@@ -145,9 +145,9 @@ elseif ARGS[1] = 19:
 	CloStyle = 4
 	
 elseif ARGS[1] = 20:
-	CloQuality = 5
+	CloQuality = 3
 	CloThinness = 5
-	CloTopCut = 4
+	CloBra = 1
 	CloPantsShortness = 5
 	CloBimbo = 1
 	CloStyle = 4

locations/alexandriaEv.qsrc

@@ -1607,5 +1607,7 @@ if $ARGS[0] = 'anamotel':
 	end
 end
 
+killvar 'dummy'
+
 --- alexandriaEv ---------------------------------
 

locations/anushkaev1.qsrc

@@ -942,7 +942,7 @@ if $ARGS[0] = 'domnush_doggy':
 			gs 'stat'
 			act 'Afterglow':
 				*clr & cla
-				minut +10
+				minut += 10
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/naked_sleep.jpg"></center>'
 				'You roll off her, pulling the strap-on out of her pussy as you do, and take a second to slip the harness off before laying next to her as she turns over on her back and you hear her give a blissful sigh of contentment. She glances at you with a huge grin and you lay back with a smile, happy that you could bring so much joy to your friend.'
 				'The two of you lay side by side naked for some time, nearly falling asleep in the silence before you both begin to stir and get dressed and cleaned up.'
@@ -986,7 +986,7 @@ if $ARGS[0] = 'domnush_doggy_magic':
 			gs 'stat'
 			act 'Afterglow':
 				*clr & cla
-				minut +10
+				minut += 10
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/naked_sleep.jpg"></center>'
 				'You roll off her, pulling your cock out of her pussy as you do, and take a second to slip the harness off, breaking the magic, before laying next to her as she turns over on her back and you hear her give a blissful sigh of contentment. She glances at you with a huge grin and you lay back with a smile, happy that you could bring so much joy to your friend.'
 				'The two of you lay side by side naked for some time, nearly falling asleep in the silence before you both begin to stir and get dressed and cleaned up.'
@@ -1100,7 +1100,7 @@ if $ARGS[0] = 'domnush_fuckass_magic1':
 				gs 'stat'
 				act 'Afterglow':
 					*clr & cla
-					minut +10
+					minut += 10
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/naked_sleep.jpg"></center>'
 					'You lean over and give her a kiss on the lips. "That''s a natural state for you isn''t it." You say teasing her.'
 					'She flips you the bird. "Bitch!" she says playfully'
@@ -1246,7 +1246,7 @@ if $ARGS[0] = 'domnush_fuckass_lubed_magic':
 				gs 'stat'
 				act 'Afterglow':
 					*clr & cla
-					minut +10
+					minut += 10
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/naked_sleep.jpg"></center>'
 					'You lean over and give her a kiss on the lips. "That''s a natural state for you isn''t it." You say teasing her.'
 					'She flips you the bird. "Bitch!" she says playfully'
@@ -1390,7 +1390,7 @@ if $ARGS[0] = 'domnush_fuckass_nolube_magic':
 						gs 'stat'
 						act 'Afterglow':
 							*clr & cla
-							minut +10
+							minut += 10
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/naked_sleep.jpg"></center>'
 							'You lean over and give her a kiss on the lips, which seems to have mollified her a little. "I''m sorry I got carried away, but you know how I love pounding your cute little ass. Don''t forget you''re my little bitch and your ass belongs to me. We both know I can fuck it when, where, and how I want anytime."'
 							'She flips you the bird. "At least use more fucking lube next time! Fuck, my ass hurts."'
@@ -1442,7 +1442,7 @@ if $ARGS[0] = 'domnush_fuckass_nolube_magic':
 					gs 'stat'
 					act 'Afterglow':
 						*clr & cla
-						minut +10
+						minut += 10
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/naked_sleep.jpg"></center>'
 						'You lean over and give her a kiss on the lips, which seems to have mollified her a little. "I''m sorry I got carried away, but you know how I love pounding your cute little ass. Don''t forget you''re my little bitch and your ass belongs to me. We both know I can fuck it when, where, and how I want anytime."'
 						'She flips you the bird. "At least use more fucking lube next time! Fuck, my ass hurts."'

locations/boyStat.qsrc

@@ -8,7 +8,7 @@
 !! A second argument calls for multiple partners. They are output as stats1, stats2, stats3, and stats4, for a total of 5 stats.
 !! If ARGS[1] is not set it defaults to zero, so you can use the variables it sets with or without [0] e.g. dick or dick[0] are equivalent 
 
-if ($ARGS[0] = '' and ARGS[0] > 0) or mid($ARGS[0],1,1) < 10:
+if ($ARGS[0] = '' and ARGS[0] > 0) or (isnum(mid($ARGS[0],1,1)) and val(mid($ARGS[0],1,1)) < 10):
 	if ARGS[0] > 0:
 		npclastcalledn = ARGS[0]
 	else
@@ -18,7 +18,7 @@ if ($ARGS[0] = '' and ARGS[0] > 0) or mid($ARGS[0],1,1) < 10:
 else
 	$npcboytemp = $ARGS[0]
 	!! {This error is for where something outside the range of possibility is specified. The calling code is broken. The exact thing specified will be announced.}
-	if mid($npcboytemp,2,1) > 10:
+	if isnum(mid($npcboytemp,2,1)) and val(mid($npcboytemp,2,1)) > 10:
 		MSG 'There has been an error in the $boy passing code. Please contact a developer with what you were doing prior to receiving this message so the error may be fixed. Error type: Improper value for boyStat. Calling <<$ARGS[0]>>'
 		$npcboytemp = 'D0'
 	end

locations/courtletter.qsrc

@@ -160,7 +160,7 @@ if $ARGS[0] = 'letter':
 
 		$policeQW_courthearing_subjects[] = mid($policeQW_courtletter_subjects[0], 14)
 
-		if $policeQW['courtletter_hearing_counter'] < 10:
+		if policeQW['courtletter_hearing_counter'] < 10:
 			policeQW['courtletter_hearing_counter'] += 1
 			pcs_mood -= 100
 			gs 'stat'
@@ -197,7 +197,7 @@ if $ARGS[0] = 'letter':
 
 		$policeQW_courthearing_subjects[] = $policeQW_courtletter_subjects[0]
 
-		if $policeQW['courtletter_hearing_counter'] < 10:
+		if policeQW['courtletter_hearing_counter'] < 10:
 			policeQW['courtletter_hearing_counter'] += 1
 			pcs_mood -= 100
 			gs 'stat'

locations/cum_call.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] ! 'precum':
 	if $boy ! $ARGS[1] and $ARGS[1] ! '': $boy = $ARGS[1]
 
 	!!This check if the name passed is not in the new MGX format
-	if $ARGS[1] = '' or mid($ARGS[1],2,1) > 10:
+	if $ARGS[1] = '' or (isnum(mid($ARGS[1],2,1)) and val(mid($ARGS[1],2,1) > 10)):
 		if ARGS[2] = 0 or ARGS[2] = 2:
 			gs 'npcgeneratec', 0, $ARGS[1], rand(18,60)
 			gs 'boyStat', $npclastgenerated

locations/djibrilev1.qsrc

@@ -647,7 +647,7 @@ end
 if $ARGS[0] = 'djibril_nush':
 	menu_off = 1
 	*clr & cla
-	minut +60
+	minut += 60
 	gs 'exp_gain', 'gaming', rand(1, 2)
 	gs 'drugs', 'alcohol', 'wine', 1
 	gs 'stat'

locations/ender.qsrc

@@ -203,7 +203,7 @@ if $ARGS[0] = 'loss':
 		gs 'pain', 5, 'thighs', 'kick'
 		gs 'pain', 5, 'hair', 'stretch'
 		dynamic '<<$clothingworntype>>_h[<<clothingwornnumber>>] = 0'
-		'<<$streetev_title>>'
+		$streetev_title
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/lostfight.jpg"></center>'
 		'You do your best, but there are just too many of them. Eventually they get you down on the ground and beat you, ripping out handfuls of your hair and tearing your clothes.'
 		'After what feels like an eternity, they finally stop hitting you. "That''s what you get, you stupid bitch." Then the girl spits on you, with the rest of the gang following suit and spitting on you as well. Finally they get bored of tormenting you further and leave, laughing about how they beat the ugly girls ass.'
@@ -283,10 +283,11 @@ if $ARGS[0] = 'loss':
 			act 'Run!(<<will_cost>> Willpower)':			
 				gs 'willpower', 'pay', 'self'
 				AlexandriaMissionQW += 1
+				dummy = rand(1,100)
 				gs 'stat'
-                if rand(1,100) <= pcs_run: 
+                if dummy <= pcs_run:
                     gt 'alexandriaEv', 'anachase3'
-	            elseif rand(1,100) > (pcs_run and 89): 
+	            elseif dummy >= pcs_run and dummy >= 90:
                     gt 'alexandriaEv', 'anacrash1'
 	            else 
                     gt 'alexandriaEv', 'anachase4'
@@ -535,7 +536,7 @@ if $ARGS[0] = 'win':
 	elseif fightEnding = 14:
 		fightEnding = 0
 		Win += 1
-		'<<$streetev_title>>'
+		$streetev_title
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'
 		'Even though it was four against one, you beat their asses triumphantly. They got in some hits of their own, but in the end you are the only one standing while the four of them lay around your feet curled up, bloody and crying. You straighten your clothes the best you can and proudly continue on your way to the claps of several onlookers that watched the fight.'
 
@@ -598,10 +599,11 @@ if $ARGS[0] = 'win':
 			act 'Run!(<<will_cost>> Willpower)':			
 				gs 'willpower', 'pay', 'self'
 				AlexandriaMissionQW += 1
+				dummy = rand(1,100)
 				gs 'stat'
-                if rand(1,100) <= pcs_run: 
+                if dummy <= pcs_run:
                     gt 'alexandriaEv', 'anachase3'
-	            elseif rand(1,100) > (pcs_run and 89): 
+	            elseif dummy >= pcs_run and dummy >= 90:
                     gt 'alexandriaEv', 'anacrash1'
 	            else 
                     gt 'alexandriaEv', 'anachase4'
@@ -907,7 +909,7 @@ if $ARGS[0] = 'surrender':
 		fightEnding = 0
 		Loss += 1
 		gs 'pain', 5, 'hair', 'stretch'
-		'<<$streetev_title>>'
+		$streetev_title
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/lostfight.jpg"></center>'
 		if fightPStats['Health'] = pcs_health:
 			'Just the mere thought of a fight, your knees go weak and you feel yourself being out of breath. Before even the first punch is thrown you raise up your hands and squeak out in fear. "Don''t hurt me, I give up."'
@@ -997,10 +999,11 @@ if $ARGS[0] = 'surrender':
 			act 'Run!(<<will_cost>> Willpower)':			
 				gs 'willpower', 'pay', 'self'
 				AlexandriaMissionQW += 1
+				dummy = rand(1,100)
 				gs 'stat'
-                if rand(1,100) <= pcs_run: 
+                if dummy <= pcs_run:
                     gt 'alexandriaEv', 'anachase3'
-	            elseif rand(1,100) > (pcs_run and 89): 
+	            elseif dummy >= pcs_run and dummy >= 90:
                     gt 'alexandriaEv', 'anacrash1'
 	            else 
                     gt 'alexandriaEv', 'anachase4'

locations/gschool_lessons4.qsrc

@@ -1400,7 +1400,8 @@ if $ARGS[0] = 'pube_bully':
 end
 
 if $ARGS[0] = 'pube_compliment':
-
+	!!temp link as no content in this event
+	gs 'gschool_lessons4','shower_options'
 end
 
 if $ARGS[0] = 'whore_bully':

locations/gschool_lessonsev1.qsrc

@@ -10,29 +10,7 @@ if $ARGS[0] = 'fiz_rand':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand2.jpg"></center>'
 		'During the warm-up for gym class, Coach Pavlovich comes over to assist you with your warm-up, his groin grinding against your ass as he does. If looks could kill, Christina''s jealous gaze would have had you dead on the ground by now.'
 	elseif fizperand = 2:
-		*clr & cla
-		pcs_mood += 20
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand3.jpg"></center>'
-		'You and some of the other girls get down on your knees together, enjoying the attention of the watching boys as you all show off your asses to them. Deciding to tease them further, the girls all pull their pants down at the same time.'
-		gs 'willpower', 'misc', 'self', 'medium'
-		if will_cost <= pcs_willpwr:
-			act 'Pull your pants down':
-				cla
-				gs 'willpower', 'misc', 'self', 'hard'
-				gs 'willpower', 'pay', 'self'
-				gs 'arousal', 'foreplay', 10, 'exhibitionism'
-				pcs_mood += 20
-				gs 'stat'
-				'You join in and enjoy the small boost of confidence as the boys drool over the panty-clad asses all swaying in front of them. Coach Pavlovich is keeping his distance, unsure what to think or do.'
-			end
-		else
-			act 'Pull your pants down (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
-		act 'Don''t pull your pants down':
-			cla
-			'You refrain from following their example and just sway your ass for the boys, but they seem to be more interested in the other girls.'
-		end
+		gt 'gschool_lessonsev1', 'fiz2'
 	elseif fizperand = 3:
 		*clr & cla
 		pcs_mood += 20
@@ -69,45 +47,7 @@ if $ARGS[0] = 'fiz_rand':
 		'During a break in gym class, you and several other girls are talking when Igor wanders over and tries to chat you all up. You find his efforts amusing at best and you can tell they aren''t working on the other girls either, yet he seems to think he''s oozing cool and keeps chatting up the lot of you before Vitek suddenly rushes up behind him, grabs his shorts and yanks them down to his ankles.'
 		'Unfortunately for Igor, his underwear went with the shorts and now he''s standing half naked in front of a bunch of girls. What''s worse is that now everyone can see how tiny his dick is, making you and the others gasp and giggle, several girls even pointing and laughing loudly. The whole class is soon in stitches as Igor desperately tries to pull up his shorts and fails, all while cursing at Vitek and calling him all kinds of names. You almost feel sorry for him; not only is he a terrible flirt, but the whole class has seen his tiny dick.'
 	elseif fizperand = 8 and $pantyworntype ! 'none':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/wedgie.jpg"></center>'
-		'During a break in gym class, you''re chatting with several other girls when you feel someone''s hands reach down the back of your shorts, grab hold of your panties and sharply yank them 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_lessons4', 'postphys'
-		gs 'willpower', 'misc', 'self', 'medium'
-		if will_cost <= pcs_willpwr:
-			act 'Kick him (<<will_cost>> Willpower)':
-				!!Screen not cleared as no event image, change that if you find an image for it
-				cla & *nl
-				gs 'willpower', 'misc', 'self', 'medium'
-				gs 'willpower', 'pay', 'self'
-				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 causes the others to laugh harder at him. A few of the other girls give the guys dirty looks and walk over to give you moral support and use their bodies to shield you from the rest of the class so you can peel your panties out of your ass and put everything back in its proper place.'
-				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>'
-		end
-		if grupTipe = 2 or grupTipe = 4:
-			gs 'willpower', 'misc', 'self', 'hard'
-			if will_cost <= pcs_willpwr:
-				act 'Beat his ass (<<will_cost>> Willpower)':
-					*clr & cla
-					gs 'willpower', 'misc', 'self', 'hard'
-					gs 'willpower', 'pay', 'self'
-					gs 'stat'
-					grupvalue[4] +=1
-					demerit += 20
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/beathisass.jpg"></center>'
-					'Your first kick catches him on the shin, causing him to hop around on one leg. Not expecting any more, his attention wanders and he doesn''t see you charging him. You bash into him, knocking him to the floor, and quickly climb on top of him before you start furiously punching him.'
-					'He tries to block your incoming blows to no avail. Luckily for him, the coach arrives, grabs you by the back of the neck and effortlessly pulls you off of him, causing you to stumble backwards and almost fall on your back. He then steps between the two of you, stopping you from going at it again, and turns to you. "Go to the principal''s office, <b>NOW</b>!"' 
-					'You try to protest, but he doesn''t want to hear it and points sternly at the door, so you begrudingly walk out as the coach helps Dan to his feet. Everyone is stunned or amused by your actions - some of the gopniks even look a little impressed.'
-					act 'Go to the principal''s office': gt 'gschool_office', 'principal'
-				end
-			else
-				act 'Beat his ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
-		end
+		gt 'gschool_lessonsev1', 'fiz8'
 	elseif fizperand = 9:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/hanging.jpg"></center>'
 		'During class, Albina gives you a tap on the shoulder, giggling and pointing at Vitek. You look over and see the tip of his dick hanging out the leg of his shorts. You giggle as well, but you are also quite impressed and maybe just a little turned on at the sight; he''s certainly very well endowed.' 
@@ -115,50 +55,7 @@ if $ARGS[0] = 'fiz_rand':
 		gs 'arousal', 'erotic_nudity', 2
 		gs 'arousal', 'end'
 	elseif fizperand = 10 and hotcat >= 5 and fame['pav_slut'] >= 150:
-		cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/supply.jpg"></center>'
-		'The coach asks you to help him get some equipment out of the storage room. You go along and he starts pointing out several things you need for the class, but he gets uncomfortably close and touches you way more than is necessary.' 
-		'At one point, you''re reaching for something high on a shelf and he stands so close behind you, you can feel his dick against your ass as his hands grip your waist. "Careful! We wouldn''t want you to fall now. Let me steady you."'
-		gs 'arousal', 'foreplay', 5, 'sub'
-		act 'Do nothing':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage1.jpg"></center>'
-			'When you don''t object, his hands slide under your shirt and squeeze your breasts. He then pulls your shirt over your head before you can even protest.'
-			gs 'arousal', 'foreplay', 2, 'sub'
-			act 'Say nothing': gt 'gschool_sex', 'storagesex'
-			act 'Pull away':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storageno.jpg"></center>'
-				'You jerk away from him and snatch your shirt out of his hand. "Mr. Pavlovich, I''m not that kind of girl!"'
-				'He laughs. "That''s not what I hear..."'
-				'You give him a dirty look and put your shirt back on before storming out.'
-				gs 'arousal', 'end'
-				act 'End of lesson': gt 'gschool_lessons4', 'postphys'
-			end
-		end
-		act 'Leave the creep':
-			*clr & cla
-			gs 'arousal', 'end'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/supply.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_lessons4', 'postphys'
-		end
-		gs 'willpower', 'exhib', 'self'
-		if will_cost <= pcs_willpwr:
-			act 'Tease him (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'pay', 'self'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand6.jpg"></center>'
-				'You decide to have a little fun of your own. You ''accidentally'' drop something while he''s keeping you steady and bend over to pick it up, pushing your ass up against his crotch. You then grind yourself against him and can feel him getting hard before you pick up the dropped item and quickly stand up before heading out of the room.'
-				'You glance back and flash him a sweet smile, noticing he''s trying to hide the erection in his shorts. You add a bit of extra sway to your hips as you walk away.'
-				gs 'arousal', 'foreplay', 5, 'sub'
-				gs 'arousal', 'end'
-				gs 'stat'
-				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>'
-		end
+		gt 'gschool_lessonsev1', 'fiz10'
 	elseif fizperand = 11:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/bendoverff.jpg"></center>'
 		'During class, Lina notices Ivan watching Lariska and moves up behind her before pushing her forward at the shoulders, making her bend over. She proceeds to pretend to hump Lariska, obviously trying to mimic Ivan''s voice and speech. "Oh Lariska, I want to fuck your ass!" This causes several of the other students to laugh, even Ivan, but it''s quickly broken up by Mr. Nikolaevich.'
@@ -184,6 +81,125 @@ if $ARGS[0] = 'fiz_rand':
 	end
 end
 
+if $ARGS[0] = 'fiz2':
+	*clr & cla
+	pcs_mood += 20
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand3.jpg"></center>'
+	'You and some of the other girls get down on your knees together, enjoying the attention of the watching boys as you all show off your asses to them. Deciding to tease them further, the girls all pull their pants down at the same time.'
+	gs 'willpower', 'misc', 'self', 'medium'
+	if will_cost <= pcs_willpwr:
+		act 'Pull your pants down':
+			cla
+			gs 'willpower', 'misc', 'self', 'hard'
+			gs 'willpower', 'pay', 'self'
+			gs 'arousal', 'foreplay', 10, 'exhibitionism'
+			pcs_mood += 20
+			gs 'stat'
+			'You join in and enjoy the small boost of confidence as the boys drool over the panty-clad asses all swaying in front of them. Coach Pavlovich is keeping his distance, unsure what to think or do.'
+			act 'End of lesson': gt 'gschool_lessons4', 'postphys'
+		end
+	else
+		act 'Pull your pants down (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	act 'Don''t pull your pants down':
+		cla
+		'You refrain from following their example and just sway your ass for the boys, but they seem to be more interested in the other girls.'
+		act 'End of lesson': gt 'gschool_lessons4', 'postphys'
+	end
+end
+
+if $ARGS[0] = 'fiz8':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/wedgie.jpg"></center>'
+	'During a break in gym class, you''re chatting with several other girls when you feel someone''s hands reach down the back of your shorts, grab hold of your panties and sharply yank them 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_lessons4', 'postphys'
+	gs 'willpower', 'misc', 'self', 'medium'
+	if will_cost <= pcs_willpwr:
+		act 'Kick him (<<will_cost>> Willpower)':
+			!!Screen not cleared as no event image, change that if you find an image for it
+			cla & *nl
+			gs 'willpower', 'misc', 'self', 'medium'
+			gs 'willpower', 'pay', 'self'
+			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 causes the others to laugh harder at him. A few of the other girls give the guys dirty looks and walk over to give you moral support and use their bodies to shield you from the rest of the class so you can peel your panties out of your ass and put everything back in its proper place.'
+			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>'
+	end
+	if grupTipe = 2 or grupTipe = 4:
+		gs 'willpower', 'misc', 'self', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Beat his ass (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'misc', 'self', 'hard'
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				grupvalue[4] +=1
+				demerit += 20
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/beathisass.jpg"></center>'
+				'Your first kick catches him on the shin, causing him to hop around on one leg. Not expecting any more, his attention wanders and he doesn''t see you charging him. You bash into him, knocking him to the floor, and quickly climb on top of him before you start furiously punching him.'
+				'He tries to block your incoming blows to no avail. Luckily for him, the coach arrives, grabs you by the back of the neck and effortlessly pulls you off of him, causing you to stumble backwards and almost fall on your back. He then steps between the two of you, stopping you from going at it again, and turns to you. "Go to the principal''s office, <b>NOW</b>!"' 
+				'You try to protest, but he doesn''t want to hear it and points sternly at the door, so you begrudingly walk out as the coach helps Dan to his feet. Everyone is stunned or amused by your actions - some of the gopniks even look a little impressed.'
+				act 'Go to the principal''s office': gt 'gschool_office', 'principal'
+			end
+		else
+			act 'Beat his ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+	end
+end
+
+if $ARGS[0] = 'fiz10':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/supply.jpg"></center>'
+	'The coach asks you to help him get some equipment out of the storage room. You go along and he starts pointing out several things you need for the class, but he gets uncomfortably close and touches you way more than is necessary.' 
+	'At one point, you''re reaching for something high on a shelf and he stands so close behind you, you can feel his dick against your ass as his hands grip your waist. "Careful! We wouldn''t want you to fall now. Let me steady you."'
+	gs 'arousal', 'foreplay', 5, 'sub'
+	act 'Do nothing':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage1.jpg"></center>'
+		'When you don''t object, his hands slide under your shirt and squeeze your breasts. He then pulls your shirt over your head before you can even protest.'
+		gs 'arousal', 'foreplay', 2, 'sub'
+		act 'Say nothing': gt 'gschool_sex', 'storagesex'
+		act 'Pull away':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storageno.jpg"></center>'
+			'You jerk away from him and snatch your shirt out of his hand. "Mr. Pavlovich, I''m not that kind of girl!"'
+			'He laughs. "That''s not what I hear..."'
+			'You give him a dirty look and put your shirt back on before storming out.'
+			gs 'arousal', 'end'
+			act 'End of lesson': gt 'gschool_lessons4', 'postphys'
+		end
+	end
+	act 'Leave the creep':
+		*clr & cla
+		gs 'arousal', 'end'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/supply.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_lessons4', 'postphys'
+	end
+	gs 'willpower', 'exhib', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'Tease him (<<will_cost>> Willpower)':
+			*clr & cla
+			gs 'willpower', 'pay', 'self'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand6.jpg"></center>'
+			'You decide to have a little fun of your own. You ''accidentally'' drop something while he''s keeping you steady and bend over to pick it up, pushing your ass up against his crotch. You then grind yourself against him and can feel him getting hard before you pick up the dropped item and quickly stand up before heading out of the room.'
+			'You glance back and flash him a sweet smile, noticing he''s trying to hide the erection in his shorts. You add a bit of extra sway to your hips as you walk away.'
+			gs 'arousal', 'foreplay', 5, 'sub'
+			gs 'arousal', 'end'
+			gs 'stat'
+			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>'
+	end
+end
+
+
+
 if $ARGS[0] = 'biology':
 	*clr & cla
 	menu_off = 1

locations/katja_chat.qsrc

@@ -340,9 +340,6 @@ if $ARGS[0] = 'brunch':
 		'After a while, a heavily tattooed waitress with short blond hair shaved on one side comes over to your table. "Welcome to the Coffee Hole, what can I get you?" she asks in a bored and monotone voice.'
 	end
 	act 'Order from the menu (0:05)': katjaQW['brunch_bought'] = 1 & gs 'food_menu'
-	if pcs_traits['commando_lvl'] > 0 and $pantyworntype = 'none' and npc_sex['A14'] > 0 and katjaQW['no_panties_day'] ! daystart:
-		act 'Show Katja that you''re not wearing panties': gt 'katja_pantyquest', 'coffee_hole'
-	end
 	act 'Say you don''t need anything': gt 'katja_chat', 'coffee_hole_event'
 end
 
@@ -769,6 +766,9 @@ if $ARGS[0] = 'coffee_hole_hangout':
 		end
 	else
 		act 'Order from the menu (0:05)': katjaQW['brunch_bought'] = 1 & gs 'food_menu'
+		if pcs_traits['commando_lvl'] > 0 and $pantyworntype = 'none' and npc_sex['A14'] > 0 and katjaQW['no_panties_day'] ! daystart:
+			act 'Show Katja that you''re not wearing panties': gt 'katja_pantyquest', 'coffee_hole'
+		end
 		act 'Continue talking': gt 'katja_chat', 'coffee_hole_event'
 		act 'Try to convince her to do something else': gt 'katja_chat', 'coffee_hole_have_fun'
 	end

locations/mey_vika_events.qsrc

@@ -478,7 +478,7 @@ if $ARGS[0] = 'beach_stalk':
 		mey_vika['mey_vika_qw'] = 1
 		act 'Go to the Park': minut += 10 & gt 'pav_park', 'start'
 	else
-		'"I don''t really know what the two of them are doing." Katja answers shortly, lays back down and puts her eye protection back on, in dissmisal.'
+		'"I don''t really know what the two of them are doing." Katja answers shortly, lays back down and puts her eye protection back on, in dismissal.'
 		
 		mey_vika['mey_vika_qw'] = 2
 		act 'Stalk them': minut += 15 & gt 'pav_park', 'start'

locations/npc_3501_init.qsrc

@@ -58,7 +58,7 @@ end
 if $ARGS[0] = 'graveyard_memorial':
 	*clr & cla
 	$setloc['StageTitle'] = 'Pushkin Graveyard'
-	$setloc['StageImage'] = '<<$default_img_path>>ballet_events/graveyard'
+	$setloc['StageImage'] = '<<$default_img_path>>ballet_events/graveyard.jpg'
 	minut += 45
 	gs 'stat'
 	gs 'core_library', 'stage_title'
@@ -195,13 +195,13 @@ if $ARGS[0] = 'summer_school':
 		*clr & cla
 		if mayaqw['grave'] = 4:
 			mood += 10
-			'<center><img <<$set_imgh>> src="images/characters/ballet/3501_1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pushkin/maya/3501-1.jpg"></center>'
 			'<<$npc_firstname[''A3501'']>> is bubbling with enthuasism when she finds you running behind schedule, "Come on <<$pcs_nickname>> you''re going to be late!"'
 			'Her mood is infectious and soon you quickly grab your dance bag and head to school with <<$npc_firstname[''A3501'']>>.'
 
 			act 'Go to School': gt 'pushkin_ballet_class', 'start'
 		else
-			'<center><img <<$set_imgh>> src="images/characters/ballet/warden.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_npc/3513.jpg"></center>'
 			'Bronya finds you running late in your morning preperations, "Come on <<$pcs_nickname>>, you''re going to be late!"'
 
 			act 'Go to School': gt 'pushkin_ballet_class', 'start'

locations/npcgenext.qsrc

@@ -119,7 +119,7 @@ end
 ! {Venerial Disease Generator. requires an index.}
 if $args[0] = 'rstd':
 	if $ARGS[1] = '': ARGS[1] = 0
-	if mid($ARGS[1],1,1) < 10: 
+	if isnum(mid($ARGS[1],1,1)) and val(mid($ARGS[1],1,1)) < 10: 
 		$tempvan1 = 'A' + $ARGS[1]
 	else
 		$tempvan1 = $ARGS[1]

locations/olutaxi.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = 'station':
 		end
 		act 'Talk to them':
 			*clr & cla
-			minut +30
+			minut += 30
 			npc_rel['A55'] +=1
 			npc_rel['A82'] +=1
 			gs 'stat'
@@ -79,7 +79,7 @@ if $ARGS[0] = 'station':
 				act 'Accept': gt 'olutaxi', 'djibril_taxi_sex'
 				act 'Decline':
 					*clr & cla
-					minut +15
+					minut += 15
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
 					'You shake your head no. "Maybe some other time."'
@@ -139,7 +139,7 @@ if $ARGS[0] = 'station':
 		act 'Mind if we talk?':
 			*clr & cla
 			npc_rel['A55'] +=1
-			minut +30
+			minut += 30
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
 			if OluQW['sex'] = 1:
@@ -149,7 +149,7 @@ if $ARGS[0] = 'station':
 				act 'Accept': gt 'olutaxi', 'olu_taxi_sex'
 				act 'Decline':
 					*clr & cla
-					minut +15
+					minut += 15
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
 					'You shake your head no. "Maybe some other time."'

locations/pav_beach_chat.qsrc

@@ -448,7 +448,20 @@ if $ARGS[0] = 'ivan':
 	gs 'exp_gain', 'chrsm', rand(1,2)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/beach_chat.jpg"></center>'
-	if npc_rel['A3'] >= 50:
+!!added this top bit so the community center shower stuff can be done during the summer. make sure I copied it correctly
+	if fame['pav_slut'] < 225 and IvanShowerQW = 1:
+		IvanShowerQW = 11
+		'Ivan thinks for a second before he speaks. "<<$pcs_nickname>>, I would like to talk to you about what happened in the shower. You''re a great girl, and I had a great time, but I''m not ready for a relationship. I need to put all my energy into my athletics. I think I have a good shot at getting to the Russian National Championships this year. I really can''t afford to be distracted by girls, even girls as attractive as you. So how about we just stick to fooling around a little?"'
+		act 'Discuss':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"></center>'
+			'You nod at what he says. "Sure Ivan, I understand. I''m okay with just being friends, really close friends who sometimes fool around in the shower..." you say in your best sexy voice with a wink.'
+			'He gives you a one armed hug. "<<$pcs_nickname>>, you''re the best! Not only are you smoking hot, but you''re a super cool chick too! If you want to hang out some time, you can stop by my place." He pauses and looks around before leaning in close. "Or if you get a little bored during lunch break, you can let me know too..." he says with a suggestive tone and waggled eyebrows.'
+			'You laugh at his silly antics. It''s nice to have found a fun guy to hang out with. Perhaps you will stop by his place, or maybe even take him up on his offer to make lunch break less boring. "Sure Ivan, I''ll think about it."'
+			func('npc_reactions', 'general', 'A3')
+			act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
+		end
+	elseif npc_rel['A3'] >= 50:
 		'"Hey <<$pcs_nickname>>," Ivan greets you as he sees you approaching.'
 		'"Hey Ivan. How was your last training match?" you ask curiously.'
 		'He tells you about it and after that the two of you talk about a variety of topics for a while until he gets up and says he''s going for a swim. He runs out into the lake and dives forward once the water is deep enough.'

locations/pet_dog.qsrc

@@ -96,7 +96,7 @@ if $ARGS[0] = 'feed':
 	if $home['current'] ! 'parents_home': objects['dog_food'] -= 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/rex/feeding_'+rand(0,1)+'.jpg"></center>'
-	'"Come '+iif(rand(0,1) = 0, 'boy', '<<$rex[''name'']>>')+' let''s get you something to eat," you say and go into the kitchen. He '+iif(rand(0,1) = 0, 'follows and watches you fill his bowl with big thankful eyes', 'runs into the kitchen the second he hears you filling his bowl')+' before he eagerly digs in.'
+	'"Come '+iif(rand(0,1) = 0, 'boy', $rex['name'])+' let''s get you something to eat," you say and go into the kitchen. He '+iif(rand(0,1) = 0, 'follows and watches you fill his bowl with big thankful eyes', 'runs into the kitchen the second he hears you filling his bowl')+' before he eagerly digs in.'
 	*nl
 	if $home['current'] ! 'parents_home': 'You have enough dog food for <<objects[''dog_food'']>> meals.'
 
@@ -158,7 +158,7 @@ if $ARGS[0] = 'exercise':
 		gs 'sweat', 'add', 20
 		gs 'exercise', 'tier1', 60, 'run'
 		fat -= rand(1,3)
-		'<center><img <<$set_imgh>> src="images/characters/shared/rex/run_'+iif(daystage = 1 or daystage = 3 or daystage = 4 or daystage = 6, 'sunset', rand(0,1))+'.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/shared/rex/run_'+iif(daystage = 1 or daystage = 3 or daystage = 4 or daystage = 6, 'sunset', str(rand(0,1)))+'.jpg"></center>'
 		'<<$rex[''name'']>> excitedly runs around you as you put on your running shoes. He loves going on runs with you. "Yes," you say with a smile. "We''re going for a run. Are you ready?" He wags his tail. "Alright, let''s go boy!"'
 		'You head out and start your run. <<$rex[''name'']>> follows obediently, sometimes stopping to sniff or mark his territory, but he always returns to your side before you get too far away.'
 		'You return home an hour later, exhausted and sweaty.'

locations/pushkin_ballet_center.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	gs 'shortgs', 'setloc', 'ballet_pushkin_center', $ARGS[0]
 	$region = 'puskin'
 	$setloc['StageTitle'] = 'Pushkin Residential School'
-	$setloc['StageImage'] =  'pushkin/residence/residence.jpg'
+	$setloc['StageImage'] =  'pushkin/ballet_residence/residence.jpg'
 	menu_off = 0
 	if sound = 0:PLAY 'sound/street.mp3',30
 	gs'stat'

locations/pushkin_ballet_class.qsrc

@@ -304,7 +304,7 @@ if $ARGS[0] = 'shower':
 	gs 'stat'
 	*nl
 	$setloc['StageTitle'] = 'School Showers'
-	$setloc['StageImage'] =  'locations/pushkin/ballet_school/daily/shower_1'
+	$setloc['StageImage'] =  'locations/pushkin/ballet_school/daily/shower_1.jpg'
 	if nclass > 1:	  
 		$location_type = 'public'
 		gs 'themes', 'indoors'
@@ -320,7 +320,7 @@ if $ARGS[0] = 'shower':
 		*nl
 	else 
 		$setloc['StageTitle'] = 'Residential Bathroom'
-		$setloc['StageImage'] =  'locations/pushkin/ballet_residence/residential_bathroom'
+		$setloc['StageImage'] =  'locations/pushkin/ballet_residence/residential_bathroom.jpg'
 		$location_type = 'private' 
 		gs 'themes', 'indoors'
 		gs 'stat'	

locations/pushkin_ballet_res.qsrc

@@ -70,10 +70,7 @@ if $ARGS[0] = 'bedroom':
 		if $apparel['status'] ! 'nude':
 			act 'Go to the hallway': minut += 5 & gt 'pushkin_ballet_res', 'hallway'
 		else
-			act 'Go to the hallway':
-				msg '<b><font color = red>Whilst as a dancer you have less worries about showing yourself Bronya would likely have a few choice words about your behaviour.</font></b>'
-				gt $loc, $loc_arg
-			end
+			act 'Go to the hallway': msg '<b><font color = red>Whilst as a dancer you have less worries about showing yourself Bronya would likely have a few choice words about your behaviour.</font></b>'
 		end
 
 		!! Default actions
@@ -130,9 +127,8 @@ if $ARGS[0] = 'hallway':
 		else
 			act 'Leave Residence': minut += 5 & ballet_awol = 1 & gt 'pushkin_ballet_center', 'start'
 		end
-	else	   
+	else
 		msg '<b><font color = red>Whilst as a dancer you have less inhibition than most, Bronya would likely have a few choice words about your clothing choices or lack thereof.</font></b>'
-		gt $loc, $loc_arg	
 	end
 
 	act 'Go to your room':  minut += 5 & gt 'pushkin_ballet_res', 'bedroom'
@@ -402,13 +398,13 @@ if $ARGS[0] = 'make_up':
 		mod_homework[week] += 1 
 		mod_daily_score[week] += 1
 		gs 'exp_gain', 'makupskl', rand(1,3)
-		if pcs_makupskl < 30:
+		if pcs_makupskl <= 30:
 			mc_inventory['cosmetics'] -= 9
 			pcs_makeup = 0
-		elseif pcs_makupskl >=31 <= 74:
+		elseif pcs_makupskl <= 69:
 			mc_inventory['cosmetics'] -= 5
 			pcs_makeup = 3
-		elseif pcs_makupskl >= 75:
+		else
 			mc_inventory['cosmetics'] -= 3
 			pcs_makeup = 5
 		end
@@ -419,12 +415,10 @@ if $ARGS[0] = 'make_up':
 
 		if pcs_makupskl <= 30:
 			'You struggle to master the basics of applying your look, wasting a lot of your expensive make-up. You begin to wonder if you need to get help with practicing.'
-		elseif pcs_makupskl >= 31 or pcs_makupskl <= 69:
+		elseif pcs_makupskl <= 69:
 			'You try to replicate the deft strokes that you was taught in school as you apply the basic foundations and contouring. You struggle briefly with the eyelashes before they settle in place. It takes you a few attempts to finalise the blending of your final look but at the end of your practice you are happy with the results even though it won''t win any awards.'
-		elseif pcs_makupskl >= 70:
-			'You artfully apply the make-up look with a quick, practiced ease that would leave most girls jealous with envy. The final look is almost flawless and you criticaly review the final result trying to find any imperfections.'
 		else
-			$ballet['error'] += 'Makeup skill failed check'
+			'You artfully apply the make-up look with a quick, practiced ease that would leave most girls jealous with envy. The final look is almost flawless and you criticaly review the final result trying to find any imperfections.'
 		end
 		act 'Finish practicing': gt 'pushkin_ballet_res', 'bedroom'
 end

locations/saveg.qsrc

@@ -15,7 +15,7 @@
 
 version_major = 0
 version_minor = 9
-version_revision = 2
-version_patch = 4
+version_revision = 3
+version_patch = 0
 --- saveg ---------------------------------
 

locations/saveupdater.qsrc

@@ -1059,10 +1059,10 @@ if temp_current_save_version  < 00080307:
 
 	!!Moved Igor''s quest to use daystart.
 	if igor_DimaNos = 2 or igor_DimaNos = 3:
-		if $igor_DimaNos_day > 5:
+		if max(val($igor_DimaNos_day), igor_DimaNos_day) > 5:
 			igor_DimaNos_day = daystart
 		else
-			igor_DimaNos_day = daystart + 6 - $igor_DimaNos_day
+			igor_DimaNos_day = daystart + 6 - max(val($igor_DimaNos_day), igor_DimaNos_day)
 		end
 	end
 end
@@ -3151,9 +3151,9 @@ if temp_current_save_version < 00090204:
 end
 
 
-!!------------------------------------!!Version 0.9.2.5!!-----------------------------------------------!!
+!!------------------------------------!!Version 0.9.3!!-----------------------------------------------!!
 
-if temp_current_save_version < 00090205:
+if temp_current_save_version < 00090300:
 	$home_name['gad_swamphouse'] = 'hunters_lodge'
 	$home_name['gad_swamp_yard'] = 'hunters_lodge'
 
@@ -3197,6 +3197,11 @@ if temp_current_save_version < 00090205:
 	end
 end
 
+!!------------------------------------!!Version 0.9.3.1!!-----------------------------------------------!!
+
+if temp_current_save_version < 00090301:
+!! use this for updates in 0.9.3
+end
 
 killvar 'temp_current_save_version'
 gs 'saveg'

locations/transport_functions.qsrc

@@ -71,7 +71,7 @@ if $ARGS[0] = 'set_train_ticket':
 	temp_price = func('transport_functions', 'get_train_price', $ARGS[1], $ARGS[2])
 	$temp_time = func('transport_functions', 'display_train_timecost', $ARGS[1], $ARGS[2])
 
-	if mid($temp_time, 1, 1) < 2:
+	if isnum(mid($temp_time, 1, 1)) and val(mid($temp_time, 1, 1)) < 2:
 		if money < ARGS[1]:
 			dynamic 'act ''Buy a ticket to <<$ARGS[3]>> (<font color="red"><<$temp_time>> - <<temp_price>> <b>₽</b></font>)'': ''<br><font color="red">You don''t have enough money for a ticket to <<$ARGS[3]>>'' '
 		else
@@ -334,7 +334,7 @@ if $ARGS[0] = 'display_train_schedule':
 	end
 	$train_schedule += '</table></center>'
 
-	'<<$train_schedule>>'
+	$train_schedule
 
 	killvar 'train_schedule'
 	killvar 'th'
@@ -838,7 +838,7 @@ if $ARGS[0] = 'display_bus_schedule':
 	end
 	$bus_schedule += '</table></center>'
 
-	'<<$bus_schedule>>'
+	$bus_schedule
 
 	killvar 'bus_schedule'
 	killvar 'th'

locations/uni_dorm.qsrc

@@ -924,13 +924,12 @@ if $ARGS[0] = 'dorm_shower_men':
 	gs 'stat'
 	*clr & cla
 	'<center><b><font color="maroon">Dormitory - Men''s Communal Showers</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/showers/empty.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/showers/entry.jpg"></center>'
 	'You open the door and walk down to the end of the L shaped hall to peek around the corner. In the nearest corner is a small alcove with lockers, a few benches, two rows of sinks and some <a href="exec:gt ''mirror'', ''start''">mirrors</a>. On the other side of the room is a walkway that leads off to the communal <a href="exec:gt ''uni_dorm'', ''mens_shower''">showers</a>.'
 	act 'Leave': minut += 1 & gt 'uni_dorm', $uni_dorm['floor']
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-!!if this has a shower function tied to it, can that be removed now that we have actual showers
 end
 
 if $ARGS[0] = 'dorm_shower_women':
@@ -945,7 +944,7 @@ if $ARGS[0] = 'dorm_shower_women':
 	gs 'stat'
 	*clr & cla
 	'<center><b><font color="maroon">Dormitory - Women''s Communal Showers</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/showers/empty.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/showers/entry.jpg"></center>'
 	'You open the door and walk down to the end of the L shaped hall, which takes you to the main area of the communal shower room. In the nearest corner is a small alcove with lockers, a few benches, two rows of sinks and some <a href="exec:gt ''mirror'', ''start''">mirrors</a>. On the other side of the room is a walkway that leads off to the communal <a href="exec:gt ''uni_dorm'', ''womens_shower''">showers</a>.'
 	act 'Leave': minut += 1 & gt 'uni_dorm', $uni_dorm['floor']
 	dynamic $tampon

locations/version.qsrc

@@ -2,6 +2,59 @@
 
 act 'Return': gt 'start'
 
+'0.9.3'
+'- Learnt how to spell Anjuna by Kevin Smarts'
+'- Cum clean up of more intimate areas now requires a private location thanks to Lusticon'
+'- A little more  Anna content from Kevin'
+'- New butt size and body calc tweaks from anjuna'
+'- Ivan shower chat at the beach from nutluck with code by Violet Kitten'
+'- Exp calculation adjusted to slow gains significantly from bgkjdgbizgblzdgbr'
+'- Variable migration for the amateur and professional runner questline by anjuna'
+'- Additional Nat as friend/lover content from BBZ01 with code from anjuna'
+'- Flashing code rewritten and should not repeat so much thanks to anjuna'
+'- Arousal will no longer remain extremely high even post orgasm thanks to Kevin'
+'- Updated parser from Chimrod'
+'- Artem and Anushka added to uni library from nutluck with code from Insomniac'
+'- Changes to events in Pav park from nutluck coded by Insomniac'
+'- Porn added to PC by Vengeance11'
+'- Pain system reworked by Lusticon'
+'- "All I did was add height, build, to all the school kids and hair color for the boys" - Nutluck'
+'- New spell to make Sveta using a strapon feel like its her penis during sex scenes for nutluck. Spell from Key Master, arousal update from Kevin'
+'- Can donate milk bottles at the clinic thanks to anjuna'
+'- Introduction of the blackmail storyline from anjuna'
+'- New uni dorm content from nutluck, coded by bgkjdgbizgblzdgbr'
+'- New Katja nighclub sex scene from bgkjdgbizgblzdgbr'
+'- New menu option "glossary" with player characteristics explanations (also linked during start to help new players) from bgkjdgbizgblzdgbr'
+'- New Ksenya event written by Hidden Flame with code from Awesome'
+'- Intro to therapist quest from anjuna'
+'- Lots of SMS stuff from anjuna inc. Hookup SMS update written by HornGuy6'
+'- New Artem uni and Pav content by Nutluck, code by bgkjdgbizgblzdgbr'
+'- New Petka event from Nutluck with minor code edits by Awesome'
+'- Natasha school and disco chats. Written by BBZ01, code by anjuna'
+'- New bimbo start from BBZ01, code by Kevin Smarts'
+'- Health recovery slowed down and better when sleeping thanks to anjuna'
+'- School uniform attributes updated by nutluck and nerd preference uniforms have to be more conservative so more uniforms are generally liked'
+'- Katja panty quest scene in the Coffee Hole added by bgkjdgbizgblzdgbr'
+'- Mira put on a schedule by anjuna'
+'- Relationship gains with npcs now affected by people skill thanks to bgkjdgbizgblzdgbr'
+'- Breast size increases to cleavage reduced so larger ladies will have more clothing option thanks to bgkjdgbizgblzdgbr'
+'- Newspaper added by anjuna'
+'- Two more starting dates: August 1st and July 1st. Suggested by Selen99'
+'- Pregnancy weight and bust growth plus additional butt sizes from anjuna'
+'- Sleep reflections - artem and anushka added by Nutluck framework by anjuna'
+'- band chat hangout expanded, new events added from nutluck'
+'- Niko added to band hangout thanks to Violet Kitten'
+'- Radomirs'' home and family added and Maksim blackmail events expanded by nutluck'
+'- City/Uni DnD night updated by nutluck'
+'- Small addition to the Maksim when playing against him and small changes to Vladimir (Park sugar daddy) from anjuna'
+'- Duplicate outfits replaced with images from Earnest and selen99'
+'- New character view option using AI image variations for consistency from BOBcat, with code by anjuna'
+'- Various alterations, fixes, text edits and additions to fuckbuddies and hookups from hornguy6'
+'- Text edits from Anjuna, Rin, nutluck, Awesome, Rirene and Vengeance11'
+'- Code refactoring by Anjuna and Lusticon'
+'- Bug fixes from Anya, Rin, Sword, Mona Lisa, Myles Croft, Anjuna, aesthete, Anya, Awesome, Derryth Love, Rachels, Lusticon, Insomniac, Violet Kitten, hornguy6, bgkjdgbizgblzdgbr and Kevin Smarts'
+'- Image pack from Anya'
+
 '0.9.2.2'
 '- Simplified the BDSM mansion navigation quite a bit and removed a few rooms that are not needed by Kevin Smarts'
 '- Bug fixes from Anjuna, Lusticon, Violet Kitten, bgkjdgbizgblzdgbr and Kevin Smarts'