Bladeren bron

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

iron_jack 8 maanden geleden
bovenliggende
commit
7f5fb35ba6

+ 4 - 2
locations/Cheatmenu_din.qsrc

@@ -1063,7 +1063,7 @@ $cheatmenu['parameters'] = {
 	'magtarcup = <<magtarcup>>'
 	'normbuffpick = <<normbuffpick>>'
 	'nrmbfpckct = <<nrmbfpckct>>'
-	'btwarn = <<btwarn>>'
+	'bodyVars[''weight_warning''] = <<bodyVars[''weight_warning'']>>'
 	'salolast = <<salolast>>'
 }
 
@@ -1190,6 +1190,8 @@ $cheatmenu['setAttrs'] = {
 	loop_index = 0
 	!! skip stren_plus and butt_tr
 	loop_index_max = arrsize('$att_name') - 2
+	!! skip magik in nonmagic starts
+	if $start_type[1] = 'nomagic': loop_index_max -= 1
 	:set_attrs_loop
 		gs 'shortgs', 'setStat', $att_name[loop_index], ARGS[0]
 		loop_index += 1
@@ -1298,7 +1300,7 @@ $cheatmenu['stats'] = {
 		*pl 'History grade: <<class[''school_his_grade'']>> '    + iif(class['school_his_grade']  < 100, ' <a href="exec:gs ''grades'', ''grade_award'',''school'', ''his'',  10 & dynamic $cheatmenu[''stats'']">+10</a>', '') + iif(class['school_his_grade']  > 0, ' <a href="exec:gs ''grades'', ''grade_award'',''school'', ''his'',  -10 & dynamic $cheatmenu[''stats'']">-10</a>', '')
 		*pl 'Shop grade: <<class[''school_shop_grade'']>> '      + iif(class['school_shop_grade'] < 100, ' <a href="exec:gs ''grades'', ''grade_award'',''school'', ''shop'', 10 & dynamic $cheatmenu[''stats'']">+10</a>', '') + iif(class['school_shop_grade'] > 0, ' <a href="exec:gs ''grades'', ''grade_award'',''school'', ''shop'', -10 & dynamic $cheatmenu[''stats'']">-10</a>', '')
 		*pl 'Computer grade: <<class[''school_comp_grade'']>> '  + iif(class['school_comp_grade'] < 100, ' <a href="exec:gs ''grades'', ''grade_award'',''school'', ''comp'', 10 & dynamic $cheatmenu[''stats'']">+10</a>', '') + iif(class['school_comp_grade'] > 0, ' <a href="exec:gs ''grades'', ''grade_award'',''school'', ''comp'', -10 & dynamic $cheatmenu[''stats'']">-10</a>', '')
-		*pl 'History grade: <<class[''school_mus_grade'']>> '    + iif(class['school_mus_grade']  < 100, ' <a href="exec:gs ''grades'', ''grade_award'',''school'', ''mus'',  10 & dynamic $cheatmenu[''stats'']">+10</a>', '') + iif(class['school_mus_grade']  > 0, ' <a href="exec:gs ''grades'', ''grade_award'',''school'', ''mus'',  -10 & dynamic $cheatmenu[''stats'']">-10</a>', '')
+		*pl 'Music grade: <<class[''school_mus_grade'']>> '      + iif(class['school_mus_grade']  < 100, ' <a href="exec:gs ''grades'', ''grade_award'',''school'', ''mus'',  10 & dynamic $cheatmenu[''stats'']">+10</a>', '') + iif(class['school_mus_grade']  > 0, ' <a href="exec:gs ''grades'', ''grade_award'',''school'', ''mus'',  -10 & dynamic $cheatmenu[''stats'']">-10</a>', '')
 		*pl 'P.E. grade: <<class[''school_pe_grade'']>> '        + iif(class['school_pe_grade']   < 100, ' <a href="exec:gs ''grades'', ''grade_award'',''school'', ''pe'',   10 & dynamic $cheatmenu[''stats'']">+10</a>', '') + iif(class['school_pe_grade']   > 0, ' <a href="exec:gs ''grades'', ''grade_award'',''school'', ''pe'',   -10 & dynamic $cheatmenu[''stats'']">-10</a>', '')
 
 		if schoolprogul >= 0: *pl '<a href="exec: schoolprogul = 0 & dynamic $cheatmenu[''stats'']">Zero Absenteeism (School): <<schoolprogul>></a>'

+ 3 - 0
locations/MagEncounterFairy.qsrc

@@ -6,6 +6,7 @@ menu_off = 1
 
 if $ARGS[0] = '':
 	if knowsfairy = 1:
+		'You find yourself in the area where you know the fairy to hang around.'
 		if fairyshoo = 0:
 			act 'Look for the fairy to chat': gt 'MagEncounterFairy', 'fairy_chat'
 			act 'Just be on your way': gt $loc, $loc_arg
@@ -15,11 +16,13 @@ if $ARGS[0] = '':
 			act 'Shoo the pesky fairy away': gt 'MagEncounterFairy', 'fairy_shoo'
 		end
 	elseif pcs_magik + rand (1,10) >= 8:
+		'There appears to be a firefly here and its getting closer.'
 		act 'Investigate the strange glow': gt 'MagEncounterFairy', 'fairy_chat_no1'
 		act 'Shoo the pesky firefly away': gt 'MagEncounterFairy', 'fairy_shoo'
 		act 'Ignore the firefly': fairyskip = 1 & gt $loc, $loc_arg
 	else
 		gs 'stat'
+		'This part of the park has a weird feel to it causing the hairs on the back of your neck to stand on end.'
 		'You have the strange feeling of being watched, but looking around you don''t see anybody.'
 		act 'Shake off the feeling and move on': fairyskip = 1 & gt $loc, $loc_arg
 	end

+ 1 - 0
locations/ballet_secrets.qsrc

@@ -32,6 +32,7 @@ if $ARGS[0] = 'init':
     end
   else
     'You look at the shop window and realise it''s closed, there is a security door to the left of you that allows you access the studio areas if you are a member.'
+    act 'Return to Okhlopkov Square' : gt 'pushkin_sq' 
     if balletqw['membership'] >= daystart:
       act 'Swipe membership card': gt 'ballet_secrets', 'reception'
     end

+ 19 - 7
locations/body.qsrc

@@ -20,7 +20,7 @@
 !!magf2bdo = flag for magic bust increase; 0, ready; 1, do it; 2, ask; 3, no
 !!mgf2bnocnt = used to count the number of times a bust increase was turned down and stop asking after 3
 !!magtarcup = set in the dream code as the target cup size 
-!!btwarn = used to flag if to display the gaining/losing weight message when bathing
+!!bodyVars['weight_warning'] = used to flag if to display the gaining/losing weight message when bathing
 !!salolast = used when doing a soft rest to control the cycling of the main code
 !!bodyresetflag = used to prevent a code chunk from firing on a soft or hard reset
 !!Image set variables
@@ -374,12 +374,23 @@ if $ARGS[0] = 'Update_Body':
 	salocatnow = func('body', 'Calc_salocat')
 
 	!!This will trigger the warning notices in the bathing code (the +/- 12 should always be +/- 11 + the max change to pcs_mass['body'] w/ fat)
-	if salolast > pcs_mass['body'] and pcs_mass['body'] <= (20 * (salocatnow - 1)) + 12:
-		btwarn = 1
-	elseif salolast < pcs_mass['body'] and pcs_mass['body'] >= (20 * (salocatnow + 1)) - 12:
-		btwarn = 2
+
+!	if salolast > pcs_mass['body'] and pcs_mass['body'] <= (20 * (salocatnow - 1)) + 12:
+!		bodyVars['weight_warning'] = 1
+!	elseif salolast < pcs_mass['body'] and pcs_mass['body'] >= (20 * (salocatnow + 1)) - 12:
+!		bodyVars['weight_warning'] = 2
+!	end
+
+	if pcs_mass['body'] < pcs_mass['body_message'] - 5:
+		bodyVars['weight_warning'] = 1
+		pcs_mass['body_message'] = pcs_mass['body']
+	elseif pcs_mass['body'] > pcs_mass['body_message'] + 5:
+		bodyVars['weight_warning'] = 2
+		pcs_mass['body_message'] = pcs_mass['body']
 	end
 
+
+
 	!!This will trigger the dream for the option to use magic to increase bust
 	!!Three nos at the dream will lock it out (1 yes resets the count)
 	if pcs_magik >= 5 and MagikDostup = 0 and magf2bdo = 0:
@@ -858,7 +869,7 @@ if $ARGS[0] = 'softreset':
 
 	!!Clears the warning and reset status flags if they were set
 	bodyresetflag = 0
-	btwarn = 0
+	bodyVars['weight_warning'] = 0
 end
 
 if $ARGS[0] = 'hardreset':
@@ -910,12 +921,13 @@ if $ARGS[0] = 'hardreset':
 			end
 		end
 
+		pcs_mass['body_message'] = pcs_mass['body']
 		pcs_mass['bust_message'] = pcs_mass['bust']
 		pcs_mass['butt_message'] = pcs_mass['butt']
 
 		bodyresetflag = 0
 		normbuffpick = 0
-		btwarn = 0
+		bodyVars['weight_warning'] = 0
 		magf2bdo = 0
 
 		killvar 'dounsplkil'

+ 4 - 6
locations/city_library.qsrc

@@ -193,14 +193,12 @@ if $ARGS[0] = 'loan':
 			if lib_debt <= 0: lib_debt = 0
 			gt 'city_library'
 		end
-
-		act 'Go back': gt 'city_library'
 	end
 
 	if lib_debt > 0:
-		'You''ve owe an outstanding debt of <<lib_debt>> <b>₽</b> to the library.'
+		'You owe an outstanding debt of <<lib_debt>> <b>₽</b> to the library.'
 		if money < lib_debt and karta < lib_debt:
-			act '<font color="red">Pay your debt</font>': '<br><font color="red">You don''t have enough money to pay your debt.</font>'
+			'You don''t have enough money to pay your debt!'
 		else
 			if money >= lib_debt:
 				act 'Pay your debt (cash)':
@@ -280,9 +278,9 @@ if $ARGS[0] = 'loan':
 			'"You need to return it within 2 weeks. Every day that you''re late incurs a 50 <b>₽</b> fine."'
 			act 'Continue': gt 'city_library'
 		end}
-	
-		act 'Go back': gt 'city_library'
 	end
+
+	act 'Go back': gt 'city_library'
 end
 
 --- city_library ---------------------------------

+ 8 - 8
locations/din_van.qsrc

@@ -102,11 +102,11 @@ $shower = {
 
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & 'Your deodorant gets washed away in the shower.'
 
-		if btwarn > 0:
-			if btwarn = 1: $weightwarn = 'losing'
-			if btwarn = 2: $weightwarn = 'gaining'
+		if bodyVars['weight_warning'] > 0:
+			if bodyVars['weight_warning'] = 1: $weightwarn = 'losing'
+			if bodyVars['weight_warning'] = 2: $weightwarn = 'gaining'
 			'<font color="red"><b>You seem to be <<$weightwarn>> weight.</b></font>'
-			killvar '$weightwarn' & btwarn = 0
+			killvar '$weightwarn' & bodyVars['weight_warning'] = 0
 		end
 		if normbuffpick = 1:
 			*nl
@@ -243,11 +243,11 @@ $bath = {
 
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & 'Your deodorant gets washed away in the bath.'
 
-		if btwarn > 0:
-			if btwarn = 1: $weightwarn = 'losing'
-			if btwarn = 2: $weightwarn = 'gaining'
+		if bodyVars['weight_warning'] > 0:
+			if bodyVars['weight_warning'] = 1: $weightwarn = 'losing'
+			if bodyVars['weight_warning'] = 2: $weightwarn = 'gaining'
 			'<font color="red"><b>You seem to be <<$weightwarn>> weight.</b></font>'
-			killvar '$weightwarn' & btwarn = 0
+			killvar '$weightwarn' & bodyVars['weight_warning'] = 0
 		end
 		if normbuffpick = 1:
 			''

+ 4 - 4
locations/exhibitionistshop.qsrc

@@ -121,19 +121,19 @@ end
 if $ARGS[0] = 'ksenya_shop':
     *clr & cla
 	KsenyaQW = 3
-    '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/shop1.jpg"></center>'
+    '<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/shop1.jpg"></center>'
     'You are taken to Ksenya''s office and it is open a crack and you look inside. You see her sitting on a chair looking back at you.'
     '"Hey <<$pcs_nickname>>, Come in, Come in. What do I owe the pleasure?" she asks and closes the door to her office behind you after which she hugs you gently.' 
     act 'continue':
         *clr & cla
-        '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/shop2.jpg"></center>'
+        '<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/shop2.jpg"></center>'
         '"I wanna ask about what happened at the lake. Was that... for me?" you ask blushing.'
         '"Which part?" she asks sitting on the edge of that same chair. She doesn''t seem that bothered by being seen in her underwear.'
         '"The... flashing part when you saw me" you say without making eye contact.'
         '"Maybe" she teases.'
         act 'continue':
             *clr & cla
-            '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/shop3.jpg"></center>'
+            '<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/shop3.jpg"></center>'
             '"Did you like what you saw?" she asks.'
             'You look at her as she teases removing her bra. "I did, I think you are very beautiful." you tell her.'
             '"Would you like to be my girlfriend?" she asks bluntly.'
@@ -148,7 +148,7 @@ if $ARGS[0] = 'ksenya_shop':
             end
             act 'No thanks':
                 *clr & cla
-                '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/shop4.jpg"></center>'
+                '<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/shop4.jpg"></center>'
                 '"I''m sorry Ksenya, this is moving too fast. I don''t think I''m ready for that right now" you tell her.'
                 'She looks upset at your answer as she leans on the chair. "That''s ok, I''ll be here when you are ready." she says and goes to her desk like nothing ever happened.'
                 'You walk out of her office feeling you are no longer welcome there today.'

+ 1 - 1
locations/igorhome.qsrc

@@ -113,7 +113,7 @@ if $ARGS[0] = 'igorroom':
 	'You see Igor sitting on the edge of his bed.'
 	act 'Excuse yourself': gt 'igorhome','hallway'
 	if lernHome > 0:
-		act 'Do your homework togheter': gt 'igorhome','study'
+		act 'Do your homework together': gt 'igorhome','study'
 	end
 	act 'Chat': gt 'igorhome','chat'
 	if hour = 23:

+ 3 - 3
locations/intro_city.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'start':
 	'The big day has finally arrived! Your family piled into your stepfather''s Gazelle pickup and you all traveled from your hometown, Pavlovsk, to St. Petersburg. Today is the day you move into your own apartment and start this new phase of your life.'
 	'You think back to your school days and what kind of student you were...'
 
-	if $start_type[1] = 'tg':
+	if $start_type['magic'] = 'tg':
 		act 'Continue': gt 'intro_city', '2'
 	else
 		act 'Continue': gt 'intro_city_select', 'start'
@@ -153,9 +153,9 @@ if $ARGS[0] = 'family_goodbye':
 	*nl
 	'They all wave and head out, leaving you alone for the first time. You spend some time unpacking your stuff before you stop and stretch, deciding you can finish later.'
 
-	if $start_type[1] = 'nomagic':
+	if $start_type['magic'] = 'nomagic':
 		act 'Continue': gt 'intro_city', 'welcome_intro'
-	elseif $start_type[1] = 'tg':
+	elseif $start_type['magic'] = 'tg':
 		act 'Continue': gt 'intro_city_tg', 'welcome_intro'
 	else
 		act 'Continue': gt 'intro_city_m', 'welcome_intro'

+ 0 - 4
locations/intro_sg_m.qsrc

@@ -1,10 +1,6 @@
 # intro_sg_m
 
 gs 'themes', 'indoors'
-killvar '$start_type'
-$start_type['loc'] = 'sg'
-$start_type['magic'] = 'magic'
-
 if $ARGS[0] = 'four':
 	*clr & cla
 	menu_off = 1

+ 1 - 7
locations/intro_sg_select_custom.qsrc

@@ -24,14 +24,8 @@ if $ARGS[0] = 'start':
 			gs 'obj_din', 'old'
 		end
 
-		killvar 'class_list_institution'
-		killvar 'class_list_name'
 
-		!!Setting the shcoll classes such that grades can be assigned
-		gs 'intro_functions', 'create_sgclasses'
-
-		!!Set the greades to be average.
-		gs 'intro_functions', 'set_base_sgrades'
+		gs 'intro_functions', 'reset_sgclasses'
 
 		gt $loc, $loc_arg
 	end

+ 3 - 3
locations/intro_uni.qsrc

@@ -209,7 +209,7 @@ if $ARGS[0] = 'mom_intro':
 	'"Yeah, <<$npc_nickname[''A29'']>>! There''s so much to do and see here."'
 	'"Well don''t forget to stay focused on your studies, and stay away from boys for now. There will be plenty of time after you''ve finished studying to think about that stuff."'
 	
-	if $start_type[1] ! 'tg':
+	if $start_type['magic'] ! 'tg':
 		act 'Tell her what she wants to hear':
 			gs 'npc_relationship', 'set', 'A29', 50
 			*clr & cla
@@ -284,9 +284,9 @@ if $ARGS[0] = 'family_goodbye':
 	*nl
 	'They all wave at you before leaving. You spend some time putting the rest of your stuff away or stashing it under your bed before deciding to explore the grounds.'
 
-	if $start_type[1] = 'tg':
+	if $start_type['magic'] = 'tg':
 		act 'Head outside': gt 'intro_uni_tg', 'welcome_intro'
-	elseif $start_type[1] = 'nomagic':
+	elseif $start_type['magic'] = 'nomagic':
 		act 'Head outside': gt 'intro_uni', 'welcome_intro'
 	else
 		act 'Head outside': gt 'intro_uni_m', 'welcome_intro'

+ 1 - 1
locations/lover.qsrc

@@ -204,7 +204,7 @@ if $ARGS[0] = 'clear_all':
 	! CLEAR FUCKBUDDIES
 	:clear_fb_loop
 	if arrsize('$fuckbuddy') > 0:
-		gs 'lover', 'remove fuckbudy', $fuckbuddy[0]
+		gs 'lover', 'remove_fuckbuddy', $fuckbuddy[0]
 		jump 'clear_fb_loop'
 	end
 	

+ 1 - 1
locations/mainQW.qsrc

@@ -53,7 +53,7 @@ act 'Investigate':
 				'"That''s not so easy, the site is closed and guarded, but we managed to get in there and the scrolls have not aged well. The papyrus has dried out so much that it crumbles if you try and open it and the ink has faded away."'
 				'"We met Reinhold there, he represents the council of the highest order. They are the old ones and hold council on the highest matters of magic we must be careful not to upset them or attract the attention of demons."'
 				'"Woah! Demons?'
-				'"Demons, you know, creatures from other plains of existence. It''s possible that Rikudo was a demon, but demons unlike him are beings with terrible force, blunt and aggressive. Something like beasts woven from pure magic. Much like the fae, they have different types and they possess different magics and skills, but these are not cute or friendly."'
+				'"Demons, you know, creatures from other planes of existence. It''s possible that Rikudo was a demon, but demons unlike him are beings with terrible force, blunt and aggressive. Something like beasts woven from pure magic. Much like the fae, they have different types and they possess different magics and skills, but these are not cute or friendly."'
 				if $start_type[1] = 'tg':
 					'"Got it. Hey, you can turn me back into a man?"'
 					'"I can''t. I drew the energy you were emitting from the amulet, I don''t hold anything like the energy required and you have only access to the smallest hint of the potential of the amulet. It might be possible if your magical energies are much higher and you somehow pass me all your energy that I can reverse the spell, but this is unlikely and could put you back in the position you were in when we met. I''m sorry."'

+ 14 - 15
locations/npc_3501_init.qsrc

@@ -4,7 +4,7 @@
 !! locations:
 	!! Generic - 1 bedroom, 2 living room, 3 kitchen, 4 bathroom, 5 hall, 6 changing room, 7 dressing room, 8 class
 	!! Locations: 1 home, 2 dance school, 3 theatre, 4 Pushkin Sq, 5 City, 6 Canals, 7 shops (random), 8 uni, 9 public eaterie
-	!! Locations are built locat[maya]  to point to a major location and then locat[maya_room] to determine sub-location
+	!! Locations are built locat[maya] to point to a major location and then locat[maya_room] to determine sub-location
 !! scheduler
 if $ARGS[0] = 'scheduler':
 	!! School week - Summer school
@@ -23,7 +23,7 @@ if $ARGS[0] = 'scheduler':
 		elseif hour= 17 and hour < 18:
 			locat['maya'] = 1
 			locat['maya'] = 3
-		elseif hour =  18 and hour < 22:
+		elseif hour = 18 and hour < 22:
 			locat['maya'] = rand(0,1)
 			if locat['maya'] = 1:
 				locat['maya'] = 1
@@ -49,19 +49,19 @@ if $ARGS[0] = 'grave':
 	'"I need to go somewhere, but I don''t want to go alone," <<$npc_firstname[''A3501'']>> says, avoiding the question, her eyes looking at the floor.'
 	'"Are you okay?" you ask, concerned about her. You briefly think you saw the pain in her eyes before she looked away, but you remain unsure.'
 	'"I just need to go to the graveyard tonight. It''s something I need to do. I understand if you don''t want to come." Something in her voice leaves you puzzled, but you''re not sure what it is.'
-    
+	
 	act 'Go to the graveyard' : mayaqw['grave'] = 2 & gt 'npc_3501_init', 'graveyard_memorial' 
 	act 'Say sorry, you''re studying' : mayaqw['grave'] = 1 & npc_trust['A3501'] -= 5 & gt 'pushkin_ballet_res', 'bedroom' 
-    
+	
 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'
 	minut += 45
 	gs 'stat'
-    gs 'core_library', 'stage_title'
+	gs 'core_library', 'stage_title'
 	'You agree to <<$npc_firstname[''A3501'']>>''s strange request. You grab your coat before the two of you head out of your bedroom. You take the short walk from your residence to the graveyard, a quiet location. <<$npc_firstname[''A3501'']>> has been quiet during your walk, totally unlike her usual boisterous self. However, you''re unsure how to break the silence when she touches your arm.'
 	'You pause and look towards her. "Thank you, <<$pcs_nickname>>, for coming with me. You''re probably wondering why we''re here." Grief fills her eyes, showing the pain that she''s been holding back. <<$npc_firstname[''A3501'']>> starts to walk again until you come to a grave.'
 	*nl
@@ -91,7 +91,7 @@ if $ARGS[0] = 'graveyard_memorial':
 				*nl
 				'"There, that''s better. I don''t have all my makeup with me, but at least you''re presentable now," you give a small laugh and smile to show you''re joking, and she laughs with you. The first genuine sign all evening that she''s coming out of whatever bothers her is, "Thank you, <<$pcs_nickname>>. I don''t know if I could have done this without you.'
 				'"Don''t worry about it," you reply. "Come on, we need to get back, or we''ll get into trouble with Bronya!" <<$npc_firstname[''A3501'']>> gives you a quick hug in gratitude, and somehow her hand finds yours as you make your way back to your residence.'
-                
+				
 				act 'Head back' : gt 'npc_3501_init', 'post_grave' 
 			end
 		end
@@ -120,7 +120,6 @@ end
 !! Init second event - triggered from pushkin_ballet_res, bedroom decides if Maya helps at quest point.
 
 if $ARGS[0] = 'post_grave':
-   
 	if mayaqw['grave'] = 1:
 		*clr & cla
 		minut += 15
@@ -133,14 +132,14 @@ if $ARGS[0] = 'post_grave':
 
 		act 'Continue talking': mayaqw['grave'] = 3 & gt 'npc_3501_init', 'post_grave'
 	end
-	if mayaqw['grave'] = 2:       
+	if mayaqw['grave'] = 2:
 		gs 'npc_relationship', 'modify', 'A3501', 'like'
 		minut += 20
 		gs 'stat'
 		'<center><h2>Residental Bedroom</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_residence/bedroom.jpg"></center>'
 		'You enter your room together and see that <<$npc_firstname[''A3501'']>> is still subdued. "You want some tea <<$npc_firstname[''A3501'']>>?" she looks up and nods before she starts dabbing her eyes with the handkerchief. '
-		act 'Go to the kitchen':  
+		act 'Go to the kitchen':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_events/gasha_raid.jpg"></center>'
 			'You quickly leave the room and bump into Gasha doing a snack raid. She jumps as she sees you, almost dropping her loot. She has a guilty expression. You''re about to say something, but she''s off before you can get a word out, leaving you to shake your head in amusement.' 
@@ -153,7 +152,7 @@ if $ARGS[0] = 'post_grave':
 				'She opens her eyes and gives you a small smile, "Yes, <<$pcs_nickname>>. You brought the tea, thank you. You''ve been too good to me tonight."'
 				'<<$npc_firstname[''A3501'']>> settles down and starts to talk. "<<$pcs_nickname>>, how much do you know about me?"'
 				'"Nothing, we only just meet this week!" you reply, giving a small laugh.'
-                
+				
 				act 'Continue talking': mayaqw['grave'] = 4 & gt 'npc_3501_init', 'post_grave'
 			end
 		end
@@ -162,10 +161,10 @@ if $ARGS[0] = 'post_grave':
 		minut += 20
 		gs 'stat'
 		if mayaqw['grave'] = 3:
-			*clr & cla   
+			*clr & cla
 			'<center><h2>Residental Bedroom</h2></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_residence/bedroom.jpg"></center>'
-		else  
+		else
 			*clr & cla
 			'<center><h2>Residental Bedroom</h2></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_events/tea_bed.jpg"></center>'
@@ -196,13 +195,13 @@ if $ARGS[0] = 'summer_school':
 		*clr & cla
 		if mayaqw['grave'] = 4:
 			mood += 10
-			'<center><img <<$set_imgh>> src="images/character/ballet/3501_1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/ballet/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/character/ballet/warden.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/ballet/warden.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'

+ 25 - 25
locations/pav_lake.qsrc

@@ -702,32 +702,32 @@ if $ARGS[0] = 'beach_hangout':
 end
 
 if $ARGS[0] = 'klake':
-    *clr & cla
+	*clr & cla
 	KsenyaQW = 2
-    '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/lake2.jpg"></center>'
-    'As you head to the lake you see a figure walking around the water. It''s Ksenya. She is in a black negligee and nothing else. You walk up to her and see her mother taking pictures of her. You stand back for a bit watching her work.'
-    act 'Continue':
-        *clr & cla
-        '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/lake1.jpg"></center>'
-        'You watch her for some time and you see her lift the back side of her outfit and her panties drop to the sand. You hear her mother say something and she turns around.'
-        act 'Continue':
-            *clr & cla
-            '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/lake3.jpg"></center>'
-            'When she turns around, she sees you and is shocked but keeps doing what she is told by her mother, trying to look like nothing is wrong.'
-            act 'Continue':
-                *clr & cla
-                '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/lake4.jpg"></center>'
-                'She makes a tease with her panties around her ankles. She lifts her leg and makes it look like she is going to grab them but doesn''t.'
-                act 'Continue':
-                    *clr & cla
-                    '<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/lake5.jpg"></center>'
-                    'She pulls her dress up and shows you her bare pussy. You hear her mother sigh and keep taking a few pictures.'
-                    '"Is she doing this for me?" you ask yourself as you watch. "I''ll have to ask her the next time I see her. Best get away before her mother sees me" and with that, you leave the lake area.'
-                    act 'Go back': gt 'pav_lake'
-                end
-            end
-        end
-    end
+	'<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/lake2.jpg"></center>'
+	'As you head to the lake you see a figure walking around the water. It''s Ksenya. She is in a black negligee and nothing else. You walk up to her and see her mother taking pictures of her. You stand back for a bit watching her work.'
+	act 'Continue':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/lake1.jpg"></center>'
+		'You watch her for some time and you see her lift the back side of her outfit and her panties drop to the sand. You hear her mother say something and she turns around.'
+		act 'Continue':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/lake3.jpg"></center>'
+			'When she turns around, she sees you and is shocked but keeps doing what she is told by her mother, trying to look like nothing is wrong.'
+			act 'Continue':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/lake4.jpg"></center>'
+				'She makes a tease with her panties around her ankles. She lifts her leg and makes it look like she is going to grab them but doesn''t.'
+				act 'Continue':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/lake5.jpg"></center>'
+					'She pulls her dress up and shows you her bare pussy. You hear her mother sigh and keep taking a few pictures.'
+					'"Is she doing this for me?" you ask yourself as you watch. "I''ll have to ask her the next time I see her. Best get away before her mother sees me" and with that, you leave the lake area.'
+					act 'Go back': gt 'pav_lake'
+				end
+			end
+		end
+	end
 end
 
 --- pav_lake ---------------------------------

+ 5 - 7
locations/pav_library.qsrc

@@ -30,7 +30,7 @@ if mid($start_type,1,2) = 'sg' and kanikuli = 0 and week > 5 and hour >= 12 and
 		if rand(0,3) = 0: nataliaQW['library_day'] = daystart
 	end
 	if nataliaQW['library_day'] = daystart:
-		'You see your classmate <a href="exec: gt ''natalia_pavlova'',''library''">Natalia Pavlova</a> .'
+		'You see your classmate <a href="exec: gt ''natalia_pavlova'',''library''">Natalia Pavlova</a> sitting alone at one of the tables.'
 	end
 end
 
@@ -215,14 +215,12 @@ if $ARGS[0] = 'loan':
 			lib_book_read = 0
 			gt 'pav_library'
 		end
-
-		act 'Go back': gt 'pav_library'
 	end
 
 	if lib_debt > 0:
-		'You''ve owe an outstanding debt of <<lib_debt>> <b>₽</b> to the library.'
+		'You owe an outstanding debt of <<lib_debt>> <b>₽</b> to the library.'
 		if money < lib_debt and karta < lib_debt:
-			act '<font color="red">Pay your debt</font>': '<br><font color="red">You don''t have enough money to pay your debt.</font>'
+			'You don''t have enough money to pay your debt!'
 		else
 			if money >= lib_debt:
 				act 'Pay your debt (cash)':
@@ -302,9 +300,9 @@ if $ARGS[0] = 'loan':
 			'"You need to return it within 2 weeks. Every day that you''re late incurs a 50 <b>₽</b> fine."'
 			act 'Continue': gt 'pav_library'
 		end}
-		
-		act 'Go back': gt 'pav_library'
 	end
+
+	act 'Go back': gt 'pav_library'
 end
 
 --- pav_library ---------------------------------

+ 1 - 7
locations/prostitution_functions.qsrc

@@ -408,13 +408,7 @@ if $ARGS[0] = 'work_clothes':
 end
 
 if $ARGS[0] = 'is_default':
-	RESULT = prostitute['clothingwornnumber'] = clothingwornnumber _ 
-			 and prostitute['shoewornnumber']     = shoewornnumber _ 
-			 and prostitute['currentpursenumber'] = currentpursenumber _ 
-			 and prostitute['coatwornnumber']     = coatwornnumber _ 
-			and (prostitute['bodysuitwornnumber'] = bodysuitwornnumber _ 
-			 or (prostitute['pantywornnumber']    = pantywornnumber _ 
-			 and prostitute['brawornnumber']      = brawornnumber))
+	RESULT = prostitute['clothingwornnumber'] = clothingwornnumber and prostitute['shoewornnumber'] = shoewornnumber and prostitute['currentpursenumber'] = currentpursenumber and prostitute['coatwornnumber'] = coatwornnumber and (prostitute['bodysuitwornnumber'] = bodysuitwornnumber or (prostitute['pantywornnumber'] = pantywornnumber and prostitute['brawornnumber'] = brawornnumber))
 end
 
 

+ 312 - 313
locations/pushkin_ballet_evt.qsrc

@@ -8,322 +8,321 @@
 
 if $ARGS[0] = 'letter':
 
-    if mod_ballet['letter'] ! 1:
-        mod_ballet['letter'] = 1
-        *clr & cla
-        minut += 15
-        gs 'stat'
-        '<center><b><font color="maroon">Your Mother, Natasha Lebedev</font></b></center>
-        <center><img src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-        
-        '"<<$pcs_nickname>>," your mother calls your name, getting your attention. You''ve received a letter from the school, and she hands it over to you.'
-        'You take the letter from your <<$npc_nickname[''A29'']>>, and your hands start shaking when you see the sender''s stamp. You look up.'
-        '"Open it, <<$pcs_nickname>>," she encourages you excitedly.'
-        
-        act 'Open Letter':
-            *clr & cla
-            '<center><img <<$set_imgh>> src="images/shared/misc/letter.jpg"></center>'
-            'You quickly grab a knife from the counter to open the letter and start to read the contents.'
-            'You skim through the letter to find the information you were hoping for and let out a scream as you find the paragraph that has awarded you a grant and a spot at the Pushkin Ballet summer school.'
-            '"Did you get the place, <<$pcs_nickname>>?" your <<$npc_nickname[''A29'']>> asks.'
-            '"Yes, I''ve been accepted into the summer ballet school and I have awarded a full grant to cover all the accomodation costs," you proudly announce.'
-            'Your <<$npc_nickname[''A29'']>> pulls you into her arms. "I knew you could do it, <<$pcs_nickname>>. Well done!"'
-            'Hearing the commotion, your stepdad and brother step into the kitchen and ask, "What''s all the commotion?" You excitedly tell your family the news. "Well done, sis," your brother tells you. Your stepfather gives you a proud smile.'
-            '"When do you go?" your <<$npc_nickname[''A29'']>> asks.'
-            '"The first week of July. I''ve got to catch the school bus from the community center on Sunday, 3rd July between 1600 and 1700." You look through the other information, providing details on what you need to pack and other relevant course information.'
-        
-            act 'Accept the opportunity': gt 'kuhrPar'
-            act 'Think on the opportunity': gt 'kuhrpar'
-            act 'Reject the opportunity': gs 'pushkin_ballet_init', 'cleanup_var' & gt 'kuhrpar'
-        end
-    end
-    
-
-    if balletqw['school'] = 1:
-        *clr & cla
-        minut += 15
-        gs 'stat'
-
-        '<center><img <<$set_imgh>> src="images/shared/misc/letter.jpg"></center>'
-
-        'You look at the envelope with a sense of déjà vu when you see the school''s branding on the envelope. Then, you sit down at the kitchen table and open it.'
-        'You read and reread the contents, trying to make sense of them. You can''t believe the news. You jubilantly punch the air and let out a cry of joy.'
-        'Your <<$npc_nickname[''A29'']>> picks up the letter you dropped and reads it. "You''ve done it, <<$pcs_nickname>>. You''re in. I''m proud of you, daughter." It''s a rare moment between you and your mother.'
-        '"You''ve got to be at the School at 0900 next Sunday for induction. There will be a bus waiting at the community center, or you can find the way to the school on your own," your <<$npc_nickname[''A29'']>> says, still reading the contents.'
-        'You take the letter, and the envelope inside is more documents and forms for you to apply for your Ballet scholarship and funding. It also lists accredited suppliers to provide the necessary clothing and equipment.'
-        'You get back up, still trying to let the news sink in, and your <<$npc_nickname[''A29'']>> gives you a big hug and a kiss on the cheek."'
-        '"You''ve made it, <<$pcs_nickname>>. All that hard work has paid off." your <<$npc_nickname[''A29'']>> says proudly.'
-        '"No, <<$npc_nickname[''A29'']>>, it''s only the first step but it''s an important one" you muse to yourself.'
-        
-        
-        ! Rejection letter into the Corp.
-
-        act 'Continue your day.' :  act 'Continue': gt 'kuhrPar'
-    end
+	if mod_ballet['letter'] ! 1:
+		mod_ballet['letter'] = 1
+		*clr & cla
+		minut += 15
+		gs 'stat'
+		'<center><b><font color="maroon">Your Mother, Natasha Lebedev</font></b></center>
+		<center><img src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+		
+		'"<<$pcs_nickname>>," your mother calls your name, getting your attention. You''ve received a letter from the school, and she hands it over to you.'
+		'You take the letter from your <<$npc_nickname[''A29'']>>, and your hands start shaking when you see the sender''s stamp. You look up.'
+		'"Open it, <<$pcs_nickname>>," she encourages you excitedly.'
+		
+		act 'Open Letter':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/shared/misc/letter.jpg"></center>'
+			'You quickly grab a knife from the counter to open the letter and start to read the contents.'
+			'You skim through the letter to find the information you were hoping for and let out a scream as you find the paragraph that has awarded you a grant and a spot at the Pushkin Ballet summer school.'
+			'"Did you get the place, <<$pcs_nickname>>?" your <<$npc_nickname[''A29'']>> asks.'
+			'"Yes, I''ve been accepted into the summer ballet school and I have awarded a full grant to cover all the accomodation costs," you proudly announce.'
+			'Your <<$npc_nickname[''A29'']>> pulls you into her arms. "I knew you could do it, <<$pcs_nickname>>. Well done!"'
+			'Hearing the commotion, your stepdad and brother step into the kitchen and ask, "What''s all the commotion?" You excitedly tell your family the news. "Well done, sis," your brother tells you. Your stepfather gives you a proud smile.'
+			'"When do you go?" your <<$npc_nickname[''A29'']>> asks.'
+			'"The first week of July. I''ve got to catch the school bus from the community center on Sunday, 3rd July between 1600 and 1700." You look through the other information, providing details on what you need to pack and other relevant course information.'
+		
+			act 'Accept the opportunity': gt 'kuhrPar'
+			act 'Think on the opportunity': gt 'kuhrpar'
+			act 'Reject the opportunity': gs 'pushkin_ballet_init', 'cleanup_var' & gt 'kuhrpar'
+		end
+	end
+	
+
+	if balletqw['school'] = 1:
+		*clr & cla
+		minut += 15
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/shared/misc/letter.jpg"></center>'
+
+		'You look at the envelope with a sense of déjà vu when you see the school''s branding on the envelope. Then, you sit down at the kitchen table and open it.'
+		'You read and reread the contents, trying to make sense of them. You can''t believe the news. You jubilantly punch the air and let out a cry of joy.'
+		'Your <<$npc_nickname[''A29'']>> picks up the letter you dropped and reads it. "You''ve done it, <<$pcs_nickname>>. You''re in. I''m proud of you, daughter." It''s a rare moment between you and your mother.'
+		'"You''ve got to be at the School at 0900 next Sunday for induction. There will be a bus waiting at the community center, or you can find the way to the school on your own," your <<$npc_nickname[''A29'']>> says, still reading the contents.'
+		'You take the letter, and the envelope inside is more documents and forms for you to apply for your Ballet scholarship and funding. It also lists accredited suppliers to provide the necessary clothing and equipment.'
+		'You get back up, still trying to let the news sink in, and your <<$npc_nickname[''A29'']>> gives you a big hug and a kiss on the cheek."'
+		'"You''ve made it, <<$pcs_nickname>>. All that hard work has paid off." your <<$npc_nickname[''A29'']>> says proudly.'
+		'"No, <<$npc_nickname[''A29'']>>, it''s only the first step but it''s an important one" you muse to yourself.'
+		
+		
+		! Rejection letter into the Corp.
+
+		act 'Continue your day.' :  act 'Continue': gt 'kuhrPar'
+	end
 end
 
 if $ARGS[0] = 'starlets':
 
-    if mod_ballet['letter'] = 1:
-        *clr & cla
-        minut += 15
-        gs 'stat'
-
-        '<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
-        '<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
-        '"Albina, I need to have a talk with you." She turns towards you with a frown, "What''s wrong, <<$pcs_nickname>>." You wince at her frosty tone; you know she''s a hard taskmaster with an even sharper tongue.'
-        '"I want to thank yo...", Albina cuts in, "What is it, you''re not been knocked up or you want to quit?", she demands impatiently.'
-        '"No, no", you hastily reply holding up your hands, "nothing like that it''s just that I''ve been accepted into the Pushkin Ballet School for assessment."' 
-        'Albina looks at you for a long moment then gives one of her rare smiles, "That''s great and all that, but what does that mean for Starlets?"'
-        '"I need to attend their residential school for a week, so I will not be able attend your training for Starlets and I''m not sure what is going to happen after the week is over."'
-        'Albina stands staring at you with a frown, "Fine. I know you''ve worked hard for this, ", she pauses, "but don''t expect to get back into the Starlets when you''re finished. I need 100% commitment from my dancers. When do you leave?"'
-        '"I''ll be leaving in the first weekend in July. Thank you for you being understanding," you say with a sigh of relief, realizing you had been holding your breath. You''re relieved that Albina hasn''t started one of her famous tirades against you.'
-        'As you are about to leave Albina calls out, "Good luck!" before turning back to her dancers.'        
-        !Same value to quit Starlets.
-        AlbinaQW['StarletsJoined'] = -1
-
-        act 'Leave': gt 'gdksport', 'start'
-    end
+	if mod_ballet['letter'] = 1:
+		*clr & cla
+		minut += 15
+		gs 'stat'
+
+		'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
+		'"Albina, I need to have a talk with you." She turns towards you with a frown, "What''s wrong, <<$pcs_nickname>>." You wince at her frosty tone; you know she''s a hard taskmaster with an even sharper tongue.'
+		'"I want to thank yo...", Albina cuts in, "What is it, you''re not been knocked up or you want to quit?", she demands impatiently.'
+		'"No, no", you hastily reply holding up your hands, "nothing like that it''s just that I''ve been accepted into the Pushkin Ballet School for assessment."' 
+		'Albina looks at you for a long moment then gives one of her rare smiles, "That''s great and all that, but what does that mean for Starlets?"'
+		'"I need to attend their residential school for a week, so I will not be able attend your training for Starlets and I''m not sure what is going to happen after the week is over."'
+		'Albina stands staring at you with a frown, "Fine. I know you''ve worked hard for this, ", she pauses, "but don''t expect to get back into the Starlets when you''re finished. I need 100% commitment from my dancers. When do you leave?"'
+		'"I''ll be leaving in the first weekend in July. Thank you for you being understanding," you say with a sigh of relief, realizing you had been holding your breath. You''re relieved that Albina hasn''t started one of her famous tirades against you.'
+		'As you are about to leave Albina calls out, "Good luck!" before turning back to her dancers.'		
+		!Same value to quit Starlets.
+		AlbinaQW['StarletsJoined'] = -1
+
+		act 'Leave': gt 'gdksport', 'start'
+	end
 end
 
 if $ARGS[0] = 'pregnant':
-    ! Do pregnancy checks and have Sveta kicked out
+	! Do pregnancy checks and have Sveta kicked out
 
-    ! Have Maya''s reactions here depending on relationship
+	! Have Maya''s reactions here depending on relationship
 end
 
 if $ARGS[0] = 'dancebreak':
 
-    ! mid-class
+	! mid-class
 
-    ! Talk with girls
-    ! Drink water 
-    ! Tanis bullying scenes - dancing hippos, snidey commentary or 'bumping' into girls when en pointé making them fall over.
-    !
+	! Talk with girls
+	! Drink water 
+	! Tanis bullying scenes - dancing hippos, snidey commentary or 'bumping' into girls when en pointé making them fall over.
+	!
 
-    ! Lunch
-    ! Grave > 4 Eat meal with maya
-    ! Random meal events
-    ! Tanis bullying scenes, knock dinner out of hand, pour water over heads etc, comments about 'weight' to Gasha
-    !
+	! Lunch
+	! Grave > 4 Eat meal with maya
+	! Random meal events
+	! Tanis bullying scenes, knock dinner out of hand, pour water over heads etc, comments about 'weight' to Gasha
+	!
 end
 
 if $ARGS[0] = 'res_events':
-    !! Communal fixed events
-
-    if $ARGS[1] = 'introductions':
-        !! Sunday night meet some of your classmates.
-
-        'You enter the communal area and are greeted by a gaggle of excited girls who immediately call out and surround you. You spot a small group sitting down and taking a selfie with a tablet and you look around and see Ms <<$npc_lastname[''A3513'']>> watching over the proceedings.'
-
-        killvar '$mod_student_table'
-        killvar 'mod_table_count'
-        i_student = 1
-
-        :student_meet_loop
-            if mod_table_count = 6:
-                $mod_student_table += '<tr>'
-                mod_table_count += 1
-                $mod_student_table += '' + '<td><table bgcolor=<<$theme[''table_bg_alt'']>>><tr><td align="center"><img  height="100" src="images/character/ballet/A350<<$npc_idx>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<$npc_idx>>'']>></td></tr></table>'
-            end
-            if mod_table_count < 6:
-                $mod_student_table += '</td>'
-            elseif mod_table_count = 6:
-                $mod_student_table +='</td></tr><tr>' & mod_table_count = 0
-            end
-            i_student += 1
-        if i_student <= 9: jump 'student_meet_loop'
-
-        '<center><table cellspacing="3">'
-        '<<$mod_student_table>>'
-        '</table></center>'
-        killvar 'i_student'
-    end
-
-    if $ARGS[1] = 'birthday':
-        ! Birthday night for Gasha, develops homesickness, Bronya/Nikita baked her a cake.
-
-        if $ARGS[2] = '1':
-            'You enter the halls after classes, and Nikita sees you, grabbing your arm and looking around. "Sveta, do you have a moment?"'
-            '"Sure?" you reply.'
-            '"It''s Gasha''s birthday today, and I''ve got her a card. Can you sign it, please, to cheer her up?"'
-            '"No problem, Nikita. What''s wrong with her?"'
-            '"She''s not used to city life and adapting to this school is challenging. She''s missing home and not being there for her birthday. My mother is baking a cake for her, and I''m about to prepare some buffet food in the kitchen for a little party later."'
-            '"Where is she? She can''t miss all this bustle?"'
-            '"Don''t worry about it; Galina is taking her out to Pushkin under the pretense of showing her the local sights."'
-            'You raise your eyebrow; Galina would have been the last person you''d have thought would help, being so introverted and rarely saying anything. "Yes, she surprised me as well when I asked her. She''s also looking forward to the surprise party planned."'
-            'Nikita hands you the card and a pen to sign, and you quickly scribble your wishes and name into it. You briefly consider putting some cash in it as a present.'
-
-            if money >= 500:
-                act 'Gift 500 <b>₽</b>':
-                    money -= 500
-                    gs 'npc_relationship', 'modify', 'A3507', 'like'
-                    gs 'stat'
-                    'You dig out your purse and put 500 <b>₽</b> inside the card, and hand it back to Nikita. She notices you''ve put something inside and opens the card to find the money.'
-                    '"Why <<$pcs_nickname>>? I''m aware your parents are poor, and I didn''t expect you to give her a gift," she says with a surprised voice.'
-                    '"It''s fine, Nikita. Tell her to buy a treat to cheer herself up. Just don''t mention it''s from me, please. How do you know I''m from a poor family?" you ask, frowning.'
-                    '"She''ll love the gift, and I know because my mother is given a list of students to help out if they don''t have the necessary items, whether it''s tampons, makeup, or other essentials. She''s here to support them."'
-                    '"The school thinks of everything, doesn''t it?"'
-                    '"It tries. It helped me adapt to life here when my mother got the job. The first year was tough at the local school with the kids bullying me for being a villager. The ballet school became my refuge."'
-                    '"This is why you''re organizing the party?"'
-                    '"Yes, I want to cheer her up, and your present is going to go a long way toward showing how welcome she is here. I need to get on with preparing the food, but let me say thank you so much for this." With that, she gives you a quick hug and a warm smile, then hurries away to the kitchen. As she leaves, she shouts out, "Remember the communal room at 18:30. Don''t miss it!"'
-                    act 'Return to the hallway': gt 'pushkin_ballet_res', 'hallway'
-                end
-            end
-
-            act 'Hand card back':
-                'You hand the card back to Nikita, and she looks at you. "Thank you, <<$pcs_nickname>>, this is meant to make her feel welcome here. She''s been struggling to cope with being away from home for the first time."'
-                '"Think nothing of it, Nikita. If it makes her feel better, that''s great," you say.'
-                '"Yeah, look, I need to start baking the food for tonight. Will you come to the communal room after 18:30?" You nod your head in a non-committal way as she leaves.'
-                act 'Return to the hallway': gt 'pushkin_ballet_res', 'hallway'
-            end
-        elseif $ARGS[2] = '2':
-            !! Communal Party
-            'WIP - tbc'
-        end
-    end
-
-    if $ARGS[1] = 'homesick':
-
-        'You enter the communal area and see Gasha holding a study book with a sad expression. "Hello Gasha, everything okay?" you ask.'
-        'She looks up to you from the book, "I''m okay, <<$pcs_nickname>>, I''m just not used to being away from home or being in the city."'
-        '"You''re a friend of Nikita?" you ask her, trying to distract her.'
-        '"Yeah, we grew up in the same village and attended the same school until a few years ago when her mother got a job here. We''ve kept in touch, but it''s been difficult as I''ve been stuck in the village."'
-        '"I know what village life is like," you pause to remember your time in Gadukino, "I spent my summers in Gadukino with my grandparents."'
-        'Gasha looks at you with more interest, and you start to gossip and trade stories about your lives in rural Russia. After a while, she''s laughing at your own escapades and local mishaps.'
-        '"Thank you, <<$pcs_nickname>>, for telling me your stories and cheering me up. I''m glad I''m not the only one!" Gasha says with a broad smile on her face.'
-        '"Anytime, Gasha, if you''re feeling down, let me know."'
-    
-        act 'Leave room': gt 'pushkin_ballet_res', 'communal_area'
-    end
-    
-
-    if $ARGS[1] = 'tanis_bully':
-        ! Tanis tries to bully Sveta
-        'WIP - tbc'
-    end
-
-    if $ARGS[1] = 'tanis_gasha':
-        !  Sveta catches Tanis bullying Gasha
-        'WIP - tbc'
-    end
-
-    if $ARGS[1] = 'tanis_showdown':
-        ! Sveta showdown with Tanis
-        'WIP - tbc'
-    end
-
-    if $ARGS[1] = 'kima_gossip':
-        ! Kima blackmails Tanis into stop bullying.
-        'WIP - tbc'
-    end
-    
-    !! Communal random events
-
-    if $ARGS[1] = '1':
-         ! Chess game between Calina and Ruza
-         'WIP - tbc'
-    end
-    if $ARGS[1] = '2':
-        ! TV with Gasha and munchies
-        'WIP - tbc'
-    end
-    if $ARGS[1] = '3':
-        ! Random girls doing barre training.
-        'WIP - tbc'
-    end
-    if $ARGS[1] = '4':
-        ! Random girls doing yoga.
-        'WIP - tbc'
-    end
-    if $ARGS[1] = '5':
-
-        'You enter the communal room and see Gasha at her favorite place watching TV. She looks at you nervously as you enter, you ask if you could join her.'
-        '"Are you going to bully me too?", she asks, her voice trembling..'
-        '"No why?", you ask. Gasha looks nervously at the door, "She was here, calling me a fat hippo that can''t dance.", Gasha looks as if she''s about to break down in tears.'
-        '"Let me guess, Tanis?", Gasha nods fearful to name her in case she summons her back. "Why don''t you go to Bronya? She''ll help."'
-        'Gasha''s eyes open even wider, "Are you crazy? She''ll just make my life a living hell. I just want to pass this course and get out of here."'
-        '"You can''t let her get away with this, She''ll just get worse and bully someone else", you say, "Please <<$pcs_nickname>>, don''t make this worse for me."'
-
-        act 'Support Gasha':
-            gs 'npc_relationship', 'modify', 'A3507', 'like'
-            npc_trust['A3507'] += 2
-            gs 'stat'
-            '"Okay, but I''m not willing to let this rest.", you say your voice tinged with anger.'
-            'You grab a blanket to cover yourself and settle down to watch TV. After a moment Gasha shivers a bit and you pull the blanket over her. This seems to help relax her and you sit in companionable silence enjoying the show.'
-            'When the show finishes, you get up to leave. Gasha stirs from her position and looks at you but doesn''t say anything, but you can tell she appreciates your company.'
-            act 'Leave room': gt 'pushkin_ballet_res', 'communal_area'
-        end
-        act 'Let Gasha handle it':
-            gs 'npc_relationship', 'modify', 'A3507', 'dislike'
-            gs 'stat'
-            '"If you''re sure, but promise me that''ll you talk to Bronya if it gets out of hand?", Gasha nods too fearful to say anything else.'
-            'You leave the room still uncertain if you should leave the matter to Gasha or if you should see Bronya.'
-            act 'Leave room': gt 'pushkin_ballet_res', 'communal_area'
-        end
-    end
-    if $ARGS[1] = '6':
-        'WIP - tbc'
-    end
-    if $ARGS[1] = '7':
-        'WIP - tbc'
-    end
-    if $ARGS[1] = '8':
-        'WIP - tbc'
-    end
-    if $ARGS[1] = '9':
-        'WIP - tbc'
-    end
-    if $ARGS[1] = '10':
-        'WIP - tbc'
-    end
-
-    !! Day 4, meet with the girls - discuss the classes and grand reverence.
-
-    !! kitchen
-
-    if $ARGS[1] = 'kitchen_birthday':
-        birthday_party = 1
-        'You step into the kitchen, looking for something to eat, and see Nikita organizing the food for the party. A delightful aroma wafts from the oven.
-
-        "Do you need any help, Nikita?" you ask.
-        
-        "No, Sveta, all''s fine. I''m just finishing off the last of the food to be baked."
-        
-        "Gasha is going to be overwhelmed with all this! Have you asked everyone to come?" you inquire.
-        
-        "Yeah, well, everyone except Tanis. I''ve asked my mom to keep an eye on her tonight. It''d be like her to do something spiteful."
-        
-        "Why doesn''t she get kicked out? We were told to be on our best behavior when we arrived here."
-        
-        "Contacts and money, sadly. She comes from one of the unmentionable families."
-        
-        "Oh," you reply, realizing that this is a touchy topic. You start to collect plates and glasses to take through to the communal area.'
-        
-        act 'Help out': gt 'pushkin_ballet_res', 'communal_area'
-
-    end
-
-    !! Cook meal with Maya if grave = 4
-    !! Nikita cooking for Gasha''s birthdays
-    !! Random cooking events
-
-
-    !! bedroom
+	!! Communal fixed events
+	if $ARGS[1] = 'introductions':
+		!! Sunday night meet some of your classmates.
+
+		'You enter the communal area and are greeted by a gaggle of excited girls who immediately call out and surround you. You spot a small group sitting down and taking a selfie with a tablet and you look around and see Ms <<$npc_lastname[''A3513'']>> watching over the proceedings.'
+
+		killvar '$mod_student_table'
+		killvar 'mod_table_count'
+		i_student = 1
+
+		:student_meet_loop
+			if mod_table_count = 6:
+				$mod_student_table += '<tr>'
+				mod_table_count += 1
+				$mod_student_table += '' + '<td><table bgcolor=<<$theme[''table_bg_alt'']>>><tr><td align="center"><img  height="100" src="images/characters/ballet/A350<<$npc_idx>>.jpg"></a></td></tr><tr><td align="center"><<$npc_usedname[''A<<$npc_idx>>'']>></td></tr></table>'
+			end
+			if mod_table_count < 6:
+				$mod_student_table += '</td>'
+			elseif mod_table_count = 6:
+				$mod_student_table +='</td></tr><tr>' & mod_table_count = 0
+			end
+			i_student += 1
+		if i_student <= 9: jump 'student_meet_loop'
+
+		'<center><table cellspacing="3">'
+		'<<$mod_student_table>>'
+		'</table></center>'
+		killvar 'i_student'
+	end
+
+	if $ARGS[1] = 'birthday':
+		! Birthday night for Gasha, develops homesickness, Bronya/Nikita baked her a cake.
+
+		if $ARGS[2] = '1':
+			'You enter the halls after classes, and Nikita sees you, grabbing your arm and looking around. "Sveta, do you have a moment?"'
+			'"Sure?" you reply.'
+			'"It''s Gasha''s birthday today, and I''ve got her a card. Can you sign it, please, to cheer her up?"'
+			'"No problem, Nikita. What''s wrong with her?"'
+			'"She''s not used to city life and adapting to this school is challenging. She''s missing home and not being there for her birthday. My mother is baking a cake for her, and I''m about to prepare some buffet food in the kitchen for a little party later."'
+			'"Where is she? She can''t miss all this bustle?"'
+			'"Don''t worry about it; Galina is taking her out to Pushkin under the pretense of showing her the local sights."'
+			'You raise your eyebrow; Galina would have been the last person you''d have thought would help, being so introverted and rarely saying anything. "Yes, she surprised me as well when I asked her. She''s also looking forward to the surprise party planned."'
+			'Nikita hands you the card and a pen to sign, and you quickly scribble your wishes and name into it. You briefly consider putting some cash in it as a present.'
+
+			if money >= 500:
+				act 'Gift 500 <b>₽</b>':
+					money -= 500
+					gs 'npc_relationship', 'modify', 'A3507', 'like'
+					gs 'stat'
+					'You dig out your purse and put 500 <b>₽</b> inside the card, and hand it back to Nikita. She notices you''ve put something inside and opens the card to find the money.'
+					'"Why <<$pcs_nickname>>? I''m aware your parents are poor, and I didn''t expect you to give her a gift," she says with a surprised voice.'
+					'"It''s fine, Nikita. Tell her to buy a treat to cheer herself up. Just don''t mention it''s from me, please. How do you know I''m from a poor family?" you ask, frowning.'
+					'"She''ll love the gift, and I know because my mother is given a list of students to help out if they don''t have the necessary items, whether it''s tampons, makeup, or other essentials. She''s here to support them."'
+					'"The school thinks of everything, doesn''t it?"'
+					'"It tries. It helped me adapt to life here when my mother got the job. The first year was tough at the local school with the kids bullying me for being a villager. The ballet school became my refuge."'
+					'"This is why you''re organizing the party?"'
+					'"Yes, I want to cheer her up, and your present is going to go a long way toward showing how welcome she is here. I need to get on with preparing the food, but let me say thank you so much for this." With that, she gives you a quick hug and a warm smile, then hurries away to the kitchen. As she leaves, she shouts out, "Remember the communal room at 18:30. Don''t miss it!"'
+					act 'Return to the hallway': gt 'pushkin_ballet_res', 'hallway'
+				end
+			end
+
+			act 'Hand card back':
+				'You hand the card back to Nikita, and she looks at you. "Thank you, <<$pcs_nickname>>, this is meant to make her feel welcome here. She''s been struggling to cope with being away from home for the first time."'
+				'"Think nothing of it, Nikita. If it makes her feel better, that''s great," you say.'
+				'"Yeah, look, I need to start baking the food for tonight. Will you come to the communal room after 18:30?" You nod your head in a non-committal way as she leaves.'
+				act 'Return to the hallway': gt 'pushkin_ballet_res', 'hallway'
+			end
+		elseif $ARGS[2] = '2':
+			!! Communal Party
+			'WIP - tbc'
+		end
+	end
+
+	if $ARGS[1] = 'homesick':
+
+		'You enter the communal area and see Gasha holding a study book with a sad expression. "Hello Gasha, everything okay?" you ask.'
+		'She looks up to you from the book, "I''m okay, <<$pcs_nickname>>, I''m just not used to being away from home or being in the city."'
+		'"You''re a friend of Nikita?" you ask her, trying to distract her.'
+		'"Yeah, we grew up in the same village and attended the same school until a few years ago when her mother got a job here. We''ve kept in touch, but it''s been difficult as I''ve been stuck in the village."'
+		'"I know what village life is like," you pause to remember your time in Gadukino, "I spent my summers in Gadukino with my grandparents."'
+		'Gasha looks at you with more interest, and you start to gossip and trade stories about your lives in rural Russia. After a while, she''s laughing at your own escapades and local mishaps.'
+		'"Thank you, <<$pcs_nickname>>, for telling me your stories and cheering me up. I''m glad I''m not the only one!" Gasha says with a broad smile on her face.'
+		'"Anytime, Gasha, if you''re feeling down, let me know."'
+	
+		act 'Leave room': gt 'pushkin_ballet_res', 'communal_area'
+	end
+	
+
+	if $ARGS[1] = 'tanis_bully':
+		! Tanis tries to bully Sveta
+		'WIP - tbc'
+	end
+
+	if $ARGS[1] = 'tanis_gasha':
+		!  Sveta catches Tanis bullying Gasha
+		'WIP - tbc'
+	end
+
+	if $ARGS[1] = 'tanis_showdown':
+		! Sveta showdown with Tanis
+		'WIP - tbc'
+	end
+
+	if $ARGS[1] = 'kima_gossip':
+		! Kima blackmails Tanis into stop bullying.
+		'WIP - tbc'
+	end
+	
+	!! Communal random events
+
+	if $ARGS[1] = '1':
+		 ! Chess game between Calina and Ruza
+		 'WIP - tbc'
+	end
+	if $ARGS[1] = '2':
+		! TV with Gasha and munchies
+		'WIP - tbc'
+	end
+	if $ARGS[1] = '3':
+		! Random girls doing barre training.
+		'WIP - tbc'
+	end
+	if $ARGS[1] = '4':
+		! Random girls doing yoga.
+		'WIP - tbc'
+	end
+	if $ARGS[1] = '5':
+
+		'You enter the communal room and see Gasha at her favorite place watching TV. She looks at you nervously as you enter, you ask if you could join her.'
+		'"Are you going to bully me too?", she asks, her voice trembling..'
+		'"No why?", you ask. Gasha looks nervously at the door, "She was here, calling me a fat hippo that can''t dance.", Gasha looks as if she''s about to break down in tears.'
+		'"Let me guess, Tanis?", Gasha nods fearful to name her in case she summons her back. "Why don''t you go to Bronya? She''ll help."'
+		'Gasha''s eyes open even wider, "Are you crazy? She''ll just make my life a living hell. I just want to pass this course and get out of here."'
+		'"You can''t let her get away with this, She''ll just get worse and bully someone else", you say, "Please <<$pcs_nickname>>, don''t make this worse for me."'
+
+		act 'Support Gasha':
+			gs 'npc_relationship', 'modify', 'A3507', 'like'
+			npc_trust['A3507'] += 2
+			gs 'stat'
+			'"Okay, but I''m not willing to let this rest.", you say your voice tinged with anger.'
+			'You grab a blanket to cover yourself and settle down to watch TV. After a moment Gasha shivers a bit and you pull the blanket over her. This seems to help relax her and you sit in companionable silence enjoying the show.'
+			'When the show finishes, you get up to leave. Gasha stirs from her position and looks at you but doesn''t say anything, but you can tell she appreciates your company.'
+			act 'Leave room': gt 'pushkin_ballet_res', 'communal_area'
+		end
+		act 'Let Gasha handle it':
+			gs 'npc_relationship', 'modify', 'A3507', 'dislike'
+			gs 'stat'
+			'"If you''re sure, but promise me that''ll you talk to Bronya if it gets out of hand?", Gasha nods too fearful to say anything else.'
+			'You leave the room still uncertain if you should leave the matter to Gasha or if you should see Bronya.'
+			act 'Leave room': gt 'pushkin_ballet_res', 'communal_area'
+		end
+	end
+	if $ARGS[1] = '6':
+		'WIP - tbc'
+	end
+	if $ARGS[1] = '7':
+		'WIP - tbc'
+	end
+	if $ARGS[1] = '8':
+		'WIP - tbc'
+	end
+	if $ARGS[1] = '9':
+		'WIP - tbc'
+	end
+	if $ARGS[1] = '10':
+		'WIP - tbc'
+	end
+
+	!! Day 4, meet with the girls - discuss the classes and grand reverence.
+
+	!! kitchen
+
+	if $ARGS[1] = 'kitchen_birthday':
+		birthday_party = 1
+		'You step into the kitchen, looking for something to eat, and see Nikita organizing the food for the party. A delightful aroma wafts from the oven.
+
+		"Do you need any help, Nikita?" you ask.
+		
+		"No, Sveta, all''s fine. I''m just finishing off the last of the food to be baked."
+		
+		"Gasha is going to be overwhelmed with all this! Have you asked everyone to come?" you inquire.
+		
+		"Yeah, well, everyone except Tanis. I''ve asked my mom to keep an eye on her tonight. It''d be like her to do something spiteful."
+		
+		"Why doesn''t she get kicked out? We were told to be on our best behavior when we arrived here."
+		
+		"Contacts and money, sadly. She comes from one of the unmentionable families."
+		
+		"Oh," you reply, realizing that this is a touchy topic. You start to collect plates and glasses to take through to the communal area.'
+		
+		act 'Help out': gt 'pushkin_ballet_res', 'communal_area'
+
+	end
+
+	!! Cook meal with Maya if grave = 4
+	!! Nikita cooking for Gasha''s birthdays
+	!! Random cooking events
+
+
+	!! bedroom
 end
 
 if $ARGS[0] = 'barre_exercise':
-    *clr & cla
-    mod_homework[week] += 1
-    mod_daily_score[week] += 1
-    minut += 60
-    gs 'exercise', 'tier1', 60, 'agil_exp', 'stren_exp'
-    gs 'sweat', 'add', 20
-    gs 'stat'
-    '<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_residence/residence_barre_single.jpg"></center>'
-    'You leave your room and head to the exercise area. You see some barres set up and spend an hour performing stretching exercises and practicing your forms.'
-    !! Add scenes with other girls - TBC
-    act 'Return': gt $loc, $loc_arg
+	*clr & cla
+	mod_homework[week] += 1
+	mod_daily_score[week] += 1
+	minut += 60
+	gs 'exercise', 'tier1', 60, 'agil_exp', 'stren_exp'
+	gs 'sweat', 'add', 20
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pushkin/ballet_residence/residence_barre_single.jpg"></center>'
+	'You leave your room and head to the exercise area. You see some barres set up and spend an hour performing stretching exercises and practicing your forms.'
+	!! Add scenes with other girls - TBC
+	act 'Return': gt $loc, $loc_arg
 end
 
 
@@ -331,18 +330,18 @@ end
 
 if $ARGS[0] = 'firstperformance':
 
-    !! invite school friends or family. 
+	!! invite school friends or family. 
 end
 
 if $ARGS[0] = 'performances':
-    !! Theatre productions
-    !! St P. White Nights Festival.
-    !! Marlilnsky Theatre night
+	!! Theatre productions
+	!! St P. White Nights Festival.
+	!! Marlilnsky Theatre night
 end
 
 if $ARGS[0] = 'socialnight':
-    !! Social visit with invited partner or friends after the show.
-    !! Attend Ballet or theatre events with friends.
+	!! Social visit with invited partner or friends after the show.
+	!! Attend Ballet or theatre events with friends.
 end
 
 !! Post School Character events - break out into individual sections when req.
@@ -350,17 +349,17 @@ end
 !! Rudolph blackmail and corruption events post-School
 
 if $ARGS[0] = 'rudolphqw':
-    ! Rudolph''s first attempt at blackmail
-    ! write a story to imply sexual favors to get on the course. Leaves <<$pcs_nickname>> to think on it.
-    ! <<$pcs_nickname>> meets to discuss what favors, and he denies it and threatens to throw her out. He says he will think about it.
-    ! Allows <<$pcs_nickname>> to take remedial lessons, but owes him. 
-    ! Series of random events to unsettle <<$pcs_nickname>>, undermines her confidence by lying about her dance ability, scenes of him watching her but all she hears is his walking cane and denies when confronted. 
-    ! Series of demeaning jobs around the school, fetching coffee, cleaning the floors etc and it''s never good enough. 
-    ! Major ballet show event, and <<$pcs_nickname>> is desperate to be a part of it and he agrees but when she turns up she''s not part of the show and he denies it telling her she imagined it.
-    ! Each sequence is the first stage of corruption, each giving a rnd number from 1-5 until it hits 50 then that stage is complete. 
-    ! 
-    ! Stage 2 is when Randolph starts to meet <<$pcs_nickname>> outside of school increasing his control over her and creating friction between <<$pcs_nickname>> and her friends.
-    ! Stage 3 is full corruption where <<$pcs_nickname>> is totally dependent on him for her career leading to abuse, intention is to have this after the second year. 
+	! Rudolph''s first attempt at blackmail
+	! write a story to imply sexual favors to get on the course. Leaves <<$pcs_nickname>> to think on it.
+	! <<$pcs_nickname>> meets to discuss what favors, and he denies it and threatens to throw her out. He says he will think about it.
+	! Allows <<$pcs_nickname>> to take remedial lessons, but owes him. 
+	! Series of random events to unsettle <<$pcs_nickname>>, undermines her confidence by lying about her dance ability, scenes of him watching her but all she hears is his walking cane and denies when confronted. 
+	! Series of demeaning jobs around the school, fetching coffee, cleaning the floors etc and it''s never good enough. 
+	! Major ballet show event, and <<$pcs_nickname>> is desperate to be a part of it and he agrees but when she turns up she''s not part of the show and he denies it telling her she imagined it.
+	! Each sequence is the first stage of corruption, each giving a rnd number from 1-5 until it hits 50 then that stage is complete. 
+	! 
+	! Stage 2 is when Randolph starts to meet <<$pcs_nickname>> outside of school increasing his control over her and creating friction between <<$pcs_nickname>> and her friends.
+	! Stage 3 is full corruption where <<$pcs_nickname>> is totally dependent on him for her career leading to abuse, intention is to have this after the second year. 
 end
 
 

+ 12 - 12
locations/rolanbath.qsrc

@@ -59,11 +59,11 @@ if $ARGS[0] = 'start':
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 		*nl
 		if hypnoAddict > 0:'You have no reason to, but you carefully avoid cleaning out your pussy and ass.'
-		if btwarn > 0:
-			if btwarn = 1: $weightwarn = 'losing'
-			if btwarn = 2: $weightwarn = 'gaining'
+		if bodyVars['weight_warning'] > 0:
+			if bodyVars['weight_warning'] = 1: $weightwarn = 'losing'
+			if bodyVars['weight_warning'] = 2: $weightwarn = 'gaining'
 			'<font color="red"><b>You seem to be <<$weightwarn>> weight.</b></font>'
-			killvar '$weightwarn' & btwarn = 0
+			killvar '$weightwarn' & bodyVars['weight_warning'] = 0
 		end
 		if normbuffpick = 1:
 			*nl
@@ -254,11 +254,11 @@ if $ARGS[0] = 'start':
 			pcs_horny += rand(2,6)
 			'You lean back and relax for a while. Then you begin to lather your body, gently gliding your soft hands over your smooth curves, and wash yourself thoroughly.'
 		end
-		if btwarn > 0:
-			if btwarn = 1: $weightwarn = 'losing'
-			if btwarn = 2: $weightwarn = 'gaining'
+		if bodyVars['weight_warning'] > 0:
+			if bodyVars['weight_warning'] = 1: $weightwarn = 'losing'
+			if bodyVars['weight_warning'] = 2: $weightwarn = 'gaining'
 			'<font color="red"><b>You seem to be <<$weightwarn>> weight.</b></font>'
-			killvar '$weightwarn' & btwarn = 0
+			killvar '$weightwarn' & bodyVars['weight_warning'] = 0
 		end
 		if normbuffpick = 1:
 			*nl
@@ -536,11 +536,11 @@ if $ARGS[0] = 'pervshower':
 		'You try to forget that Rolan''s is here.'
 		'The idea of him opening the curtain occupies your mind while you are showering. It would be really embarrassing if Rolan opened the curtain now.'
 		if hypnoAddict > 0:'You have no reason to, but you carefully avoid cleaning out your pussy and ass.'
-		if btwarn > 0:
-			if btwarn = 1: $weightwarn = 'losing'
-			if btwarn = 2: $weightwarn = 'gaining'
+		if bodyVars['weight_warning'] > 0:
+			if bodyVars['weight_warning'] = 1: $weightwarn = 'losing'
+			if bodyVars['weight_warning'] = 2: $weightwarn = 'gaining'
 			'<font color="red"><b>You seem to be <<$weightwarn>> weight.</b></font>'
-			killvar '$weightwarn' & btwarn = 0
+			killvar '$weightwarn' & bodyVars['weight_warning'] = 0
 		end
 		if normbuffpick = 1:
 			*nl

+ 2 - 2
locations/saveg.qsrc

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

+ 15 - 0
locations/saveupdater.qsrc

@@ -2550,6 +2550,21 @@ if temp_current_save_version < 00090200:
 end
 
 
+!!------------------------------------!!Version 0.9.2.1!!-----------------------------------------------!!
+
+if temp_current_save_version < 00090201:
+	if btwarn > 0:		bodyVars['weight_warning']	= btwarn	& killvar 'btwarn'
+	if pcs_mass['body_message'] = 0:	pcs_mass['body_message']	= pcs_masss['body']
+
+end
+
+
+!!------------------------------------!!Version 0.9.3.0!!-----------------------------------------------!!
+
+
+
+
+
 
 killvar 'temp_current_save_version'
 gs 'saveg'

+ 7 - 7
locations/shoplifting.qsrc

@@ -126,7 +126,7 @@ if $ARGS[0] = 'securityroom':
 
 		act 'Masturbate for him': gt 'shoplifting', 'show'
 		act 'Offer him relief': gt 'shoplifting', 'bj'
-		if pcs_money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe'
+		if money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe'
 		act 'Keep quiet': gt 'shoplifting', 'quiet'
 	end
 	gs 'willpower', 'misc', 'self', 'medium'
@@ -148,7 +148,7 @@ if $ARGS[0] = 'securityroom':
 
 			act 'Masturbate for him': gt 'shoplifting', 'show'
 			act 'Offer him relief': gt 'shoplifting', 'bj'
-			if pcs_money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe'
+			if money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe'
 			act 'Keep quiet': gt 'shoplifting', 'quiet'
 		end
 	end
@@ -451,7 +451,7 @@ if $ARGS[0] = 'bribe':
 		act 'Pay up':
 			*clr & cla
 			minut += 5
-			pcs_money -= 5000
+			money -= 5000
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/shoplift/offermoney.jpg"></center>'
@@ -741,7 +741,7 @@ if $ARGS[0] = 'securityroom_pav':
 			'Looking at you, the security guard starts pondering, and after a short moment, he speaks up, "So what would you be able to offer me?"'
 
 			act 'Offer him a blowjob': gt 'shoplifting', 'bj_pav'
-			if pcs_money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe_pav'
+			if money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe_pav'
 			act 'Keep quiet': gt 'shoplifting', 'quiet_pav'
 		end
 
@@ -763,7 +763,7 @@ if $ARGS[0] = 'securityroom_pav':
 				'The security guard crosses his hands, "Why not?"'
 
 				act 'Offer him blowjob': gt 'shoplifting', 'bj_pav'
-				if pcs_money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe_pav'
+				if money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe_pav'
 
 				act 'Keep quiet': gt 'shoplifting', 'quiet_pav'
 			end
@@ -930,7 +930,7 @@ if $ARGS[0] = 'bribe_pav':
 		act 'Pay up':
 			*clr & cla
 			minut += 5
-			pcs_money -= 5000
+			money -= 5000
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/shoplift/offermoney.jpg"></center>'
@@ -976,7 +976,7 @@ if $ARGS[0] = 'quiet_pav':
 	'"Well? Why did you go all quiet all of a sudden?" he demands. Then he walks out of the room.'
 
 	act 'Offer him blowjob': gt 'shoplifting', 'bj_pav'
-	if pcs_money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe_pav'
+	if money >= 5000: act 'Offer a bribe (5000 <b>₽</b>)': gt 'shoplifting', 'bribe_pav'
 
 	act 'Wait':
 		*clr & cla

+ 1 - 1
locations/start.qsrc

@@ -10,7 +10,7 @@ showinput 0
 
 if $QSPVER ! '5.7.0':
 	showacts 0
-	'<center><font size="+3" color="red"><b>RUNTIME VERSION MISMATCh</b></font><br>'
+	'<center><font size="+3" color="red"><b>RUNTIME VERSION MISMATCH</b></font><br>'
 	'The player you are using is incompatible with <b>Girl Life</b><br>'
 	'Please use one of the recommended players: <a href="https://tfgames.site/index.php?module=viewgame&id=597"><b>link</b</a></center>'
 	exit

+ 2 - 2
locations/therapist_hotel.qsrc

@@ -619,8 +619,8 @@ if $ARGS[0] = 'event5_submit':
 		gs 'stat'
 		
 		'You come to and see that you are naked. "WHAT THE HELL?" you yell and slap the therapist. You quickly get up and grab your clothes and rush out of the hotel room to the front desk to ask them to call the police. After explaining everything, they send a single officer to the hotel room to find it empty. You are slapped with a 500 ₽ fine for public indecency, told not to waste their time, and sent on your way.'
-		pcs_money -= 500
-		if pcs_money < 0: pcs_money = 0
+		money -= 500
+		if money < 0: money = 0
 		'<center><font color="red"> ***Therapist is no longer an option for now*** </font></center>'
 
 		act 'Get dressed and leave':

+ 7 - 5
locations/torgcentr.qsrc

@@ -84,34 +84,36 @@ end
 
 if hour > 12 and hour < 18 and sunWeather = 1 and exhibitionQW >= 5 and KsenyaQW = 0 and Kignore ! daystart:
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/mall1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/mall1.jpg"></center>'
 	'As you approach the mall, you see a beautiful, hot pink Lamborghini before you. It''s top is down and it''s doors are wide open. Inside you see a familiar face. "Hello Ksenya" You say walking up to her.'
 	'She looks up at you with a smile and steps out of the car. You can see she isn''t wearing her normal exhibition clothes today but with slight movement, you can get a look at her panties as her dress is rather tight and short.'
 	
 	act 'Talk to Ksenya':
 		*clr & cla
 		KsenyaQW = 1
-		'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/mall5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/mall5.jpg"></center>'
 		'"Hello <<$pcs_nickname>>, What brings you to the city?" she asks leaning on the windshield.'
 		'"Oh you know, shopping" you reply. "What about you?"'
 		'"My mother is getting her hair down and I''m waiting for her to finish," she admits. "Stick around long enough and you can meet her if you want" she offers.'
 
 		act 'head into the Mall':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/mall4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/mall4.jpg"></center>'
 			'You see Ksenya lean over her car looking bored. "If I had time I would, but I have to get my shopping done. Hope to see you around" You tell her and she gives you a slight smile and lets you head off with a gentle wave.'
 
 			act 'stick around':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/mall3.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/mall3.jpg"></center>'
 				'You and Ksenya wait around talking about your shared passion when a woman in a white dress walks up to the car. For a moment you could swear this was her sister but when Ksenya walked up to her and hugged her, you understood that this was her mother. "You look good, mom" She says to the other woman.' 
 				'"Who''s your friend?" she asks leaning on the hood of the car.'
 				'"Mom, This is <<$pcs_firstname>>. She is a friend that I share an interest with and she is also a customer of mine" Ksenya says. "<<$pcs_nickname>>, This is my mother, Makoto." she says and her mother hugs you. "Any friend of my daughters is a friend of mine."' 
 
 				act 'continue':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/character/pushkin/ksenya/mall2.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/mall2.jpg"></center>'
 					'Makoto gets into the driver seat and starts up the car. "Come on Ksenya, we need to make a stop at the bank before we head back" she says and looks at you as Ksenya goes to the other side of the car. "Nice to have met you, <name>. I hope to see you around" she says and they drive off, leaving you alone in the parking lot.'
+
+					act 'Enter the mall': gt 'torgcentr'
 				end
 			end
 		end

+ 61 - 58
locations/uni_lessons_electives1.qsrc

@@ -235,8 +235,8 @@ if $ARGS[0] = 'art_101_model':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(1,5)
-		if temprand = 1:
+		temprand = rand(0, 4)
+		if temprand = 0:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
 			'Today''s lesson concerns the history of art and its impact on society throughout the ages. Mr. Ilyushin focuses on one time period when ''art made a real difference in the world,'' as he puts it. The lecture goes by fairly quickly.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
@@ -247,25 +247,26 @@ if $ARGS[0] = 'art_101_model':
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		end
 	else
-		temprand = rand(1,9)
-		if temprand <= 3:
+		temprand = rand(0, 5)
+		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
 			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
-		elseif temprand <= 5:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
-			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before walking to the back of the class and telling everyone to start.' 
-			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. The class goes by fairly quickly.'
-		elseif temprand <= 7:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male1.jpg"></center>'
+		elseif temprand = 2:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides a raised platform against one of the walls as a young, good-looking man comes in and sits on it. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too. The class goes by fairly quickly.'
-		elseif temprand <= 9:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female1.jpg"></center>'
+		elseif temprand = 3:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides a raised platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on it. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
-		else
+		elseif temprand = 4:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka1.jpg"></center>'
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
+			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before walking to the back of the class and telling everyone to start.' 
+			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. The class goes by fairly quickly.'
+		elseif temprand = 5:
+				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin sets up a raised platform as a familiar face walks into the classroom. It''s Albina. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya."'
 			'Albina stands on the platform and assumes a position where she pulls her leg up to the back of her head. Her muscular legs and toned ass are highlighted by her yoga pants, something that somewhat flusters Mr. Ilyushin before he nods in approval and walks to the back of the class, where he tells everyone to start.'
@@ -273,7 +274,6 @@ if $ARGS[0] = 'art_101_model':
 		end
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	end
-
 end
 
 if $ARGS[0] = 'art_101_model_igor':
@@ -281,8 +281,8 @@ if $ARGS[0] = 'art_101_model_igor':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(1,5)
-		if temprand = 1:
+		temprand = rand(0, 4)
+		if temprand = 0:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
 			'Today''s lesson concerns the history of art and its impact on society throughout the ages. Mr. Ilyushin focuses on one time period when ''art made a real difference in the world,'' as he puts it. The lecture goes by fairly quickly and Igor seems engrossed by it.'
 		else
@@ -291,29 +291,30 @@ if $ARGS[0] = 'art_101_model_igor':
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do well and ends up asking more questions than most. The class goes by fairly quickly.'
 		end
 	else
-		temprand = rand(1,9)
-		if temprand <= 3:
+		temprand = rand(0, 5)
+		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
 			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do well and ends up asking more questions than most.' 
 			'The class goes by fairly quickly.'
-		elseif temprand <= 5:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
-			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before walking to the back of the class and telling everyone to start.' 
-			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how her clothes fit her feminine form.' 
-			'The class goes by fairly quickly.'
-		elseif temprand <= 7:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male1.jpg"></center>'
+		elseif temprand = 2:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides a raised platform against one of the walls as a young, good-looking man comes in and sits on it. "Today, we have one of your fellow students as a model."' 
 			'He then walks to the back of the class and tells everyone to start, then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how his clothes fit his masculine form.' 
 			'The class goes by fairly quickly.'
-		elseif temprand <= 9:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female1.jpg"></center>'
+		elseif temprand = 3:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides a raised platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on it. "Today, we have one of your fellow students as a model."' 
 			'He walks to the back of the classroom and tells everyone to start, then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how her clothes fit her feminine form.' 
 			'The class goes by fairly quickly.'
-		else
+		elseif temprand = 4:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka1.jpg"></center>'
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
+			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before walking to the back of the class and telling everyone to start.' 
+			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how her clothes fit her feminine form.' 
+			'The class goes by fairly quickly.'
+		elseif temprand = 5:
+				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin sets up a raised platform as a familiar face walks into the classroom. It''s Albina. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya."'
 			'Albina stands on the platform and assumes a position where she pulls her leg up to the back of her head. Her muscular legs and toned ass are highlighted by her yoga pants, something that somewhat flusters Mr. Ilyushin before he nods in approval and walks to the back of the class, where he tells everyone to start.'
@@ -328,8 +329,8 @@ if $ARGS[0] = 'art_101_model_feofan':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(1,5)
-		if temprand = 1:
+		temprand = rand(0, 4)
+		if temprand = 0:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
 			'Today''s lesson concerns the history of art and its impact on society throughout the ages. Mr. Ilyushin focuses on one time period when ''art made a real difference in the world,'' as he puts it. Feofan seems semi bored with the class and keeps doodling instead of listening, but the lecture goes by fairly quickly.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
@@ -339,25 +340,26 @@ if $ARGS[0] = 'art_101_model_feofan':
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		end
 	else
-		temprand = rand(1,9)
-		if temprand <= 3:
+		temprand = rand(0, 5)
+		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
 			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to start drawing the object. Feofan mutters something about he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
 			'The class goes by fairly quickly.'
-		elseif temprand <= 5:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Holy shit..." you hear Feofan mutter before he seems to blush and look away, worried someone might have overheard him.' 
-			'"Today, we have one of your fellow students as a model," Mr. Ilyushin continues. "Please take your seat, Miss Konstantinov."' 
-			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before he walks to the back of the classroom. "Alright class, begin." He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. Meanwhile, Feofan seems to spend a lot of time trying to draw her breasts just right. The class goes by fairly quickly.'
-		elseif temprand <= 7:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male1.jpg"></center>'
+		elseif temprand = 2:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides a raised platform against one of the walls as a young, good-looking man comes in and sits on it. "Aww, man!" you hear Feofan mutter in disappointment.' 
 			'"Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too. Meanwhile, Feofan seems to be focusing on trying to draw the guys shoes. The class goes by fairly quickly.'
-		elseif temprand <= 9:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female1.jpg"></center>'
+		elseif temprand = 3:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides a raised platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on it. "Sweet..." you hear Feofan mutter as the girl comes in.'
 			'"Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Meanwhile Feofan seems to spend a lot of time trying to draw her breasts just right. The class goes by fairly quickly.'
-		else
+		elseif temprand = 4:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka1.jpg"></center>'
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Holy shit..." you hear Feofan mutter before he seems to blush and look away, worried someone might have overheard him.' 
+			'"Today, we have one of your fellow students as a model," Mr. Ilyushin continues. "Please take your seat, Miss Konstantinov."' 
+			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before he walks to the back of the classroom. "Alright class, begin." He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. Meanwhile, Feofan seems to spend a lot of time trying to draw her breasts just right. The class goes by fairly quickly.'
+		elseif temprand = 5:
+				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin sets up a raised platform as a familiar face walks into the classroom. It''s Albina. "Holy shit..." you hear Feofan mutter before he seems to blush and look away, worried someone might have overheard him.' 
 			'"Today, we have one of your fellow students as a model," Mr. Ilyushin continues. "Please take your position, Miss Barlovskaya."'
@@ -373,8 +375,8 @@ if $ARGS[0] = 'art_101_model_natasha':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(1,5)
-		if temprand = 1:
+		temprand = rand(0, 4)
+		if temprand = 0:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
 			'Today''s lesson concerns the history of art and its impact on society throughout the ages. Mr. Ilyushin focuses on one time period when ''art made a real difference in the world,'' as he puts it. The lecture goes by fairly quickly.'
 			'You notice that Natasha appears to like this lecture as she appears very comfortable with theory.'
@@ -386,26 +388,27 @@ if $ARGS[0] = 'art_101_model_natasha':
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		end
 	else
-		temprand = rand(1,9)
-		if temprand <= 3:
+		temprand = rand(0, 5)
+		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
 			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.'
 			'You notice that Natasha seems happy drawing the object and gets on with it, rarely needing guidance from the professor, but the class goes by fairly quickly.'
-		elseif temprand <= 5:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
-			'Anushka straddles the wooden bar, you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before he walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too.'
-			'You look over at Natasha and notice that as soon as Anushka straddles the bar, she gets deeply embarrassed and starts blushing. She clearly struggles during the lesson, requiring the professor to spend some time with her, but the class goes by fairly quickly.'
-		elseif temprand <= 7:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male1.jpg"></center>'
+		elseif temprand = 2:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male1.jpg"></center>'
 			'After he finishes his lecture, he slides the platform against one of the walls. A moment later a young, good-looking man comes in and sits on it. "Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
 			'While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too.'
 			'You''re sitting next to Natasha and notice that as soon as the model takes his place, she gets very embarrassed and starts blushing. She clearly struggles to concentrate and keeps making mistakes as you see her rubbing out parts of her drawing and starting over until the professor comes over and talks to her. The class goes by fairly quickly.'
-		elseif temprand <= 9:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female1.jpg"></center>'
+		elseif temprand = 3:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides a raised platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on it. "Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.'
 			'You notice that Natasha seems to struggle at first and blushes slightly. After a few pointers from the professor, she gains confidence and seems happy to continue. The class goes by fairly quickly.'
-		else
+		elseif temprand = 4:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka1.jpg"></center>'
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
+			'Anushka straddles the wooden bar, you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before he walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too.'
+			'You look over at Natasha and notice that as soon as Anushka straddles the bar, she gets deeply embarrassed and starts blushing. She clearly struggles during the lesson, requiring the professor to spend some time with her, but the class goes by fairly quickly.'
+		elseif temprand = 5:
+				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin sets up a raised platform as a familiar face walks into the classroom. It''s Albina. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya."'
 			'Albina stands on the platform and assumes a position where she pulls her leg up to the back of her head. Her muscular legs and toned ass are highlighted by her yoga pants, something that somewhat flusters Mr. Ilyushin before he nods in approval and walks to the back of the class, where he tells everyone to start.'

+ 101 - 93
locations/uni_lessons_electives2.qsrc

@@ -235,24 +235,25 @@ if $ARGS[0] = 'art_102_model':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(1,9)
-		if temprand <= 3:
+		temprand = rand(0, 5)
+		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
-		elseif temprand <= 5:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
-			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. The class goes by fairly quickly.'
-		elseif temprand <= 7:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male2.jpg"></center>'
+		elseif temprand = 2:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in, strips down to his boxer shorts and half sits and half stands against the edge of the platform. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models later in the semester too. The class goes by fairly quickly.'
-		elseif temprand <= 9:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female2.jpg"></center>'
+		elseif temprand = 3:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."' 
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
-		else
+		elseif temprand = 4:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka2.jpg"></center>'
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
+			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. The class goes by fairly quickly.'
+		elseif temprand = 5:
+				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin places a stool in the middle of the room as a familiar face walks into the classroom. It''s Albina, who is wearing a set of black lingerie that gets more than a few people in the room talking. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya."'
 			'Albina takes a seat on the stool and runs her hands through her hair, assuming a pose that causes Mr. Ilyushin to nod in approval before he walks to the back of the class and tells everyone to start.'
@@ -260,24 +261,25 @@ if $ARGS[0] = 'art_102_model':
 		end
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	else
-		temprand = rand(1,9)
-		if temprand <= 3:
+		temprand = rand(0, 5)
+		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
-		elseif temprand <= 5:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.' 
-			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they would like to bang her. The class goes by fairly quickly.'
-		elseif temprand <= 7:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male3.jpg"></center>'
+		elseif temprand = 2:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male3.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."' 
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few your female classmates talking about how he''s not as good looking as the previous male models. Two of the girls can''t stop giggling, much to Mr. Ilyushin''s annoyance, who lectures them about taking it seriously. The class goes by fairly quickly.'
-		elseif temprand <= 9:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female3.jpg"></center>'
+		elseif temprand = 3:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female3.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."' 
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
-		else
+		elseif temprand = 4:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka3.jpg"></center>'
+			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.' 
+			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they would like to bang her. The class goes by fairly quickly.'
+		elseif temprand = 5:
+				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina3.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin sets up a raised platform as a familiar face walks into the classroom. It''s Albina, who is wearing a short robe. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya."'
 			'Albina removes her robe to reveal that she''s completely naked before she sits on the platform and assumes a tastefully artistic pose.'
@@ -292,25 +294,26 @@ if $ARGS[0] = 'art_102_model_igor':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(1,9)
-		if temprand <= 3:
+		temprand = rand(0, 5)
+		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do fairly decent and ends up asking more questions than most. The class goes by fairly quickly.'
-		elseif temprand <= 5:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
-			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
-			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. Igor, meanwhile, seems very intent on trying to capture her feminine form, paying special attention to her clothes and body position. The class goes by fairly quickly.'
-		elseif temprand <= 7:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male2.jpg"></center>'
+		elseif temprand = 2:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in, strips down to his boxer shorts and half sits and half stands against the edge of the platform. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models later in the semester too. Igor, meanwhile, is looking a little flushed as he starts drawing.'
-		elseif temprand <= 9:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female2.jpg"></center>'
+		elseif temprand = 3:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."' 
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor looks her over as she strips down, but he doesn''t seem to be leering like the other boys. The class goes by fairly quickly.'
-		else
+		elseif temprand = 4:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka2.jpg"></center>'
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
+			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
+			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. Igor, meanwhile, seems very intent on trying to capture her feminine form, paying special attention to her clothes and body position. The class goes by fairly quickly.'
+		elseif temprand = 5:
+				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin places a stool in the middle of the room as a familiar face walks into the classroom. It''s Albina, who is wearing a set of black lingerie that gets more than a few people in the room talking. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya."'
 			'Albina takes a seat on the stool and runs her hands through her hair, assuming an erotic pose that causes Mr. Ilyushin to nod in approval before he walks to the back of the class and tells everyone to start.'
@@ -318,24 +321,25 @@ if $ARGS[0] = 'art_102_model_igor':
 		end
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	else
-		temprand = rand(1,9)
-		if temprand <= 3:
+		temprand = rand(0, 5)
+		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do fairly decent and ends up asking more questions than most. The class goes by fairly quickly.'
-		elseif temprand <= 5:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.' 
-			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they would like to bang her. Igor, meanwhile, seems very intent on trying to capture her femine form, paying special attention to her body position. The class goes by fairly quickly.'
-		elseif temprand <= 7:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male3.jpg"></center>'
+		elseif temprand = 2:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male3.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."' 
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few your female classmates walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor, meanwhile, is looking a little flushed as he starts drawing. The class goes by fairly quickly.'
-		elseif temprand <= 9:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female3.jpg"></center>'
+		elseif temprand = 3:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female3.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."' 
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor, meanwhile, seems very intent on trying to capture her femine form, paying special attention to her body position. The class goes by fairly quickly.'
-		else
+		elseif temprand = 4:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka3.jpg"></center>'
+			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.' 
+			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they would like to bang her. Igor, meanwhile, seems very intent on trying to capture her femine form, paying special attention to her body position. The class goes by fairly quickly.'
+		elseif temprand = 5:
+				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina3.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin sets up a raised platform as a familiar face walks into the classroom. It''s Albina, who is wearing a short robe. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya."'
 			'Albina removes her robe to reveal that she''s completely naked before she sits on the platform and assumes a tastefully artistic pose.'
@@ -350,26 +354,27 @@ if $ARGS[0] = 'art_102_model_feofan':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(1,9)
-		if temprand <= 3:
+		temprand = rand(0, 5)
+		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Feofan mutters something about how he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
-		elseif temprand <= 5:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
-			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
-			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. The class goes by fairly quickly, but you do notice how Mr. Ilyushin seems to spend more time than normal with Feofan.'
-		elseif temprand <= 7:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male2.jpg"></center>'
+		elseif temprand = 2:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in, strips down to his boxer shorts and half sits and half stands against the edge of the platform. "Today, we have one of your fellow students as a model."'
 			'Feofan shakes his head. "Man, I could never do that." Mr. Ilyushin walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models later in the semester too. The class goes by fairly quickly.'
-		elseif temprand <= 9:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female2.jpg"></center>'
+		elseif temprand = 3:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in and strips down to her panties.'
 			'"I''m so glad I took art this year," you overhear Feofan mutter to himself as she sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."' 
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Glancing over at Feofan''s work, you notice he seems to being spending a lot of time drawing her breasts.'
-		else
+		elseif temprand = 4:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka2.jpg"></center>'
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
+			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
+			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. The class goes by fairly quickly, but you do notice how Mr. Ilyushin seems to spend more time than normal with Feofan.'
+		elseif temprand = 5:
+				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin places a stool in the middle of the room as a familiar face walks into the classroom. It''s Albina, who is wearing a set of black lingerie that gets more than a few people in the room talking. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya."'
 			'Albina takes a seat on the stool and runs her hands through her hair, assuming an erotic pose that causes Mr. Ilyushin to nod in approval before he walks to the back of the class and tells everyone to start.'
@@ -377,25 +382,26 @@ if $ARGS[0] = 'art_102_model_feofan':
 		end
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	else
-		temprand = rand(1,9)
-		if temprand <= 3:
+		temprand = rand(0,5)
+		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Feofan mutters something about how he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
-		elseif temprand <= 5:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else.' 
-			'As Anushka strips down, you notice Feofan swallow as he tries not to stare. You''re pretty sure you can see a growing bulge in his pants though.'
-			'Anushka gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class. Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
-		elseif temprand <= 7:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male3.jpg"></center>'
+		elseif temprand = 2:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male3.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."' 
 			'You notice Feofan is trying not to look at the naked guy, which only makes you smile at his discomfort. Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few your female classmates talking about how he''s not as good looking as the previous male models. Two of the girls can''t stop giggling, much to Mr. Ilyushin''s annoyance, who lectures them about taking it seriously. The class goes by fairly quickly.'
-		elseif temprand <= 9:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female3.jpg"></center>'
+		elseif temprand = 3:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female3.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Man, I love art class..." Feofan mutters to himself.' 
 			'"Today, we have one of your fellow students as a model," Mr. Ilyushin says before he walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
-		else
+		elseif temprand = 4:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka3.jpg"></center>'
+			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else.' 
+			'As Anushka strips down, you notice Feofan swallow as he tries not to stare. You''re pretty sure you can see a growing bulge in his pants though.'
+			'Anushka gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class. Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
+		elseif temprand = 5:
+				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina3.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin sets up a raised platform as a familiar face walks into the classroom. It''s Albina, who is wearing a short robe. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya." Albina removes her robe to reveal that she''s completely naked before she sits on the platform and assumes a tastefully artistic pose.'
 			'Feofan is sitting directly in front of her and has a view of everything she''s showing off. You see him getting rather flustered and avoiding eye contact as he subtly tries to hide the obvious bulge in his pants, but Albina notices this and grins slightly.'
@@ -410,25 +416,26 @@ if $ARGS[0] = 'art_102_model_natasha':
 	gs 'stat'
 	*clr & cla
 	if university['semester_week'] < 8:
-		temprand = rand(1,9)
-		if temprand <= 3:
+		temprand = rand(0, 5)
+		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. This is a theory lesson which Natasha is clearly comfortable with and she doesn''t require any assistance from the lecturer. The class goes by fairly quickly.'
-		elseif temprand <= 5:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
-			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
-			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. When you glance over at Natasha, you see that she''s clearly a bit uncomfortable with Anushka''s state of undress and despite her best efforts, she can''t stop herself from blushing slightly. You shake your head slightly and smile before getting on with your own work. The class goes by fairly quickly.'
-		elseif temprand <= 7:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male2.jpg"></center>'
+		elseif temprand = 2:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in, strips down to his boxer shorts and half sits and half stands against the edge of the platform. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models later in the semester too. You look over at Natasha and notice that she''s bright red. You aren''t sure if this is due to embarrassment or if she might fancy the model; maybe it''s a bit of both. The class goes by fairly quickly.'
-		elseif temprand <= 9:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female2.jpg"></center>'
+		elseif temprand = 3:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."' 
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. When you look over at Natasha, you see that she''s clearly uncomfortable with the woman''s lack of clothing and is unable to stop herself from blushing. You let out a small, quiet giggle before concentrating on your work for the rest of the lesson. The class goes by fairly quickly.'
-		else
+		elseif temprand = 4:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka2.jpg"></center>'
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
+			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
+			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. When you glance over at Natasha, you see that she''s clearly a bit uncomfortable with Anushka''s state of undress and despite her best efforts, she can''t stop herself from blushing slightly. You shake your head slightly and smile before getting on with your own work. The class goes by fairly quickly.'
+		elseif temprand = 5:
+				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin places a stool in the middle of the room as a familiar face walks into the classroom. It''s Albina, who is wearing a set of black lingerie that gets more than a few people talking. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya."'
 			'Albina takes a seat on the stool and runs her hands through her hair, assuming an erotic pose that causes Mr. Ilyushin to nod in approval before he walks to the back of the class and tells everyone to start.'
@@ -436,26 +443,27 @@ if $ARGS[0] = 'art_102_model_natasha':
 		end
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	else
-		temprand = rand(1,9)
-		if temprand <= 3:
+		temprand = rand(0, 5)
+		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Natasha concentrates hard on the lecture and is clearly comfortable with a theory lesson. The lecturer didn''t need to come over to her and could concentrate on helping some of the other students. The class goes by fairly quickly.'
-		elseif temprand <= 5:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.' 
-			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they would like to bang her.'
-			'You glance over at Natasha and see that she''s clearly uncomfortable with Anushka''s lack of clothing. She blushes occasionally and clearly struggles to concentrate on her work until the lecturer comes over and talks to her, giving her come encouragement and guidance.'
-		elseif temprand <= 7:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male3.jpg"></center>'
+		elseif temprand = 2:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male3.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."' 
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few your female classmates talking about how he''s not as good looking as the previous male models. Two of the girls can''t stop giggling, much to Mr. Ilyushin''s annoyance, who lectures them about taking it seriously.' 
 			'You notice that Natasha is glowing bright red and think back to school, feeling that the reason she''s so embarrassed at the whole situation is because she was rumoured to have gone out on a few dates with Lazar, so this model clearly wouldn''t appeal to her.'
-		elseif temprand <= 9:
-			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female3.jpg"></center>'
+		elseif temprand = 3:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female3.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."' 
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. When you look at Natasha, you see that she''s clearly very uncomfortable with the situation and is simply unable to stop herself from blushing. You quietly giggle, but the lecturer notices and tells you to get on with your work before going to help Natasha. The class goes by fairly quickly.'
-		else
+		elseif temprand = 4:
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka3.jpg"></center>'
+			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.' 
+			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they would like to bang her.'
+			'You glance over at Natasha and see that she''s clearly uncomfortable with Anushka''s lack of clothing. She blushes occasionally and clearly struggles to concentrate on her work until the lecturer comes over and talks to her, giving her come encouragement and guidance.'
+		elseif temprand = 5:
+				!! TO BE CHANGED AFTER IMAGE PACK IS FIXED
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/albina3.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin sets up a raised platform as a familiar face walks into the classroom. It''s Albina, who is wearing a short robe. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya." Albina removes her robe to reveal that she''s completely naked before she sits on the platform and assumes a tastefully artistic pose.'
 			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Albina, you overhear a few of your male classmates talking about how they would love to bang her, with one claiming that he already has.'

+ 18 - 11
locations/uni_library.qsrc

@@ -441,20 +441,27 @@ if $ARGS[0] = 'loan':
 			if lib_debt <= 0: lib_debt = 0
 			gt 'uni_library', 'start'
 		end
-
-		act 'Go back': gt 'uni_library', 'start'
 	end
 
 	if lib_debt > 0:
 		'You owe an outstanding debt of <<lib_debt>> <b>₽</b> to the library.'
-		if pcs_money >= lib_debt:
-			act 'Pay your debt':
-				pcs_money -= lib_debt
-				lib_debt = 0
-				gt 'uni_library', 'Pay_debt'			
-			end
+		if money < lib_debt and karta < lib_debt:
+			'You don''t have enough money to pay your debt!'
 		else
-			act '<font color="red">Pay your debt</font>': '<br><font color="red">You don''t have enough money to pay your debt.</font>'
+			if money >= lib_debt:
+				act 'Pay your debt (cash)':
+					money -= lib_debt
+					lib_debt = 0
+					gt 'uni_library', 'loan'
+				end
+			end
+			if karta >= lib_debt:
+				act 'Pay your debt (card)':
+					karta -= lib_debt
+					lib_debt = 0
+					gt 'uni_library', 'loan'
+				end
+			end
 		end
 	end
 
@@ -519,9 +526,9 @@ if $ARGS[0] = 'loan':
 			'"You need to return it within 2 weeks. Every day that you''re late incurs a 50 <b>₽</b> fine."'
 			act 'Continue': gt 'uni_library'
 		end}
-		
-		act 'Go back': gt 'uni_library', 'start'
 	end
+
+	act 'Go back': gt 'uni_library', 'start'
 end
 
 if $ARGS[0] = 'kendra':

+ 39 - 0
locations/version.qsrc

@@ -2,6 +2,45 @@
 
 act 'Return': gt 'start'
 
+'0.9.2'
+'- New therapist scene from HiddenFlame with code from Anjuna'
+'- More breakup options for hookups and fuckbuddies from hornguy6'
+'- Daydreaming in class now refills sleep meter just a tiny bit thanks to Lusticon'
+'- New bus system with timetable and everything from Anjuna'
+'- Refactoring of transport system code from Anjuna'
+'- New Ksenya events written by Hidden Flame with code from  Awesome'
+'- Sveta finally gets her own room in the barn at grandparent''s place thanks to Myles Croft'
+'- Sweat and hair getting tangled from more vigorous sex acts added by Lusticon'
+'- Cum leakage and new cleaning options in bathrooms to resolve it from Lusticon'
+'- New start option from Anjuna (under cool kids)'
+'- Autosave now by day of week so there''s 7 days you can revert back should things go wrong from Lusticon'
+'- New Katya Uni events from bgkjdgbizgblzdgbr'
+'- Generation of NPCs should be correct gender thanks to Anjuna'
+'- New event to slut it up during and after church from hornguy6'
+'- Rework of SMS system adding more function and ability to send images from Anjuna (also makes it easier for us to add text chats)'
+'- Customizable theme added by Felix'
+'- Centralization of body system calculations now with more accurate BMI from Anjuna'
+'- Assbook (the social media site) from Anjuna'
+'- Complete overhaul of the body system changing the calculations to be more reliable and hopefully more realistic from Anjuna'
+'- Parser tool for checking the code (not included in game) which helps fix coding errors from Chimrod'
+'- Fights now apply pain to specific parts with feedback during the fight from Kevin Smarts'
+'- Experimental trials mod by pchs and julzor integrated and updated by Anjuna'
+'- ''Nush and bandmates have schedule while at school now thanks to bgkjdgbizgblzdgbr'
+'- Nursing degree added to Uni by Vengence11'
+'- Abortion and post rape talk with Mom from BBZ01 with code by Kevin'
+'- Mod support for crime and sleep from Anjuna'
+'- New Nat friend/lover content from BBZ01 with code from Anjuna and Kevin'
+'- Start of performance/gig rework by netuttki'
+'- Code refactoring from Felix'
+'- New alarm clock design from Awesome'
+'- Ballet content from Hooded''s mod coded, edited and reworked by Myles Croft (dancer start required)'
+'- Various alterations, fixes, text edits and additions to fuckbuddies and hookups from hornguy6'
+'- Text edits from Anjuna, and Vengeance11'
+'- Code refactoring by Anjuna, Felix and Creamel'
+'- Bug fixes from Myles Croft, Felix, Anjuna, netuttki, Anya, Awesome, Derryth Love, Rachels, Lusticon, 00, Creamel, hornguy6, bgkjdgbizgblzdgbr and Kevin Smarts'
+'- Image pack from Anya'
+
+
 '0.9.1.1'
 '- Bug fixes from Myles Croft, Felix, Anjuna, netuttki, Awesome, Derryth_Love, hornguy6, bgkjdgbizgblzdgbr and Kevin Smarts'