1
0

11 Komitmen b1c313255c ... 5343f74e03

Pembuat SHA1 Pesan Tanggal
  philormand 5343f74e03 [Changed] Removed school_year as it was changed to be hard coded to 2000 so was redundant 4 tahun lalu
  KevinSmarts 89732683b0 Merge remote-tracking branch 'Philo/master' 4 tahun lalu
  Netuttki c2a0412f2d Merge remote-tracking branch 'upstream/master' 4 tahun lalu
  Netuttki 1ab43c0913 Merge branch 'ml-dev' 4 tahun lalu
  Netuttki 3291190e77 Fixed a few 'dead ends' in the events. 4 tahun lalu
  Kevin_Smarts f894f917e6 Merge branch 'master' of AAAAA/glife into master 4 tahun lalu
  Kevin_Smarts ca57ee8a62 Merge branch 'master' of astatine575/glife-shopfix into master 4 tahun lalu
  KevinSmarts 64481b8289 [added] Missing credit in the change log, sorry 4 tahun lalu
  astatine575 b8381bd4e1 Fixed sorting bug in shops 4 tahun lalu
  AAAAA 769ea4d115 [fixed] add missing boyStat 4 tahun lalu
  AAAAA f0829bc379 [fixed] missing *clr & cla 4 tahun lalu

+ 3 - 4
locations/NewCloShop.qsrc

@@ -149,12 +149,11 @@ if $ARGS[0] = 'dressingclothes':
 		gt 'NewCloShop', 'changingroom'
 	end
 
-	i = Clothingstock +1
-
-	if Clothingstock - 12 > 0:i -= 12
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		i = Clothingstock +1
+
+		if Clothingstock - 12 > 0:i -= 12
 
 		:loopexpensive2
 			if expensive[i] = 0:

+ 34 - 38
locations/budgetclothes.qsrc

@@ -109,19 +109,18 @@ if $ARGS[0] = 'clothes':
 		gt 'budgetclothes', 'start'
 	end
 
-	i = Clothingstock + 1
-
-	if Clothingstock - 18 > 0:
-		i -= 18
-	elseif Clothingstock - 12 > 0:
-		i -= 12
-	elseif Clothingstock - 6 > 0:
-		i -= 6
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
-	
+		i = Clothingstock + 1
+
+		if Clothingstock - 18 > 0:
+			i -= 18
+		elseif Clothingstock - 12 > 0:
+			i -= 12
+		elseif Clothingstock - 6 > 0:
+			i -= 6
+		end
+		
 		:loopcheap
 			if cheap[i] = 0:
 				gs 'clothing_attributes', 'cheap', i
@@ -172,17 +171,16 @@ if $ARGS[0] = 'office':
 		gt 'budgetclothes', 'start'
 	end
 
-	if Clothingstock > 15:
-		i = 3
-	elseif Clothingstock > 7:
-		i = 2
-	else
-		i = 1
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality2
-	
+		if Clothingstock > 15:
+			i = 3
+		elseif Clothingstock > 7:
+			i = 2
+		else
+			i = 1
+		end
+
 		:loopoffice
 			if office[i] = 0:
 				gs 'clothing_attributes', 'office', i
@@ -228,17 +226,16 @@ if $ARGS[0] = 'uniform':
 		gt 'budgetclothes', 'start'
 	end
 
-	if Clothingstock > 15:
-		i = 1
-	elseif Clothingstock > 7:
-		i = 2
-	else
-		i = 3
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality3
-	
+		if Clothingstock > 15:
+			i = 1
+		elseif Clothingstock > 7:
+			i = 2
+		else
+			i = 3
+		end
+
 		:loopuniform
 			if uniform[i] = 0:
 				gs 'clothing_attributes', 'uniform', i
@@ -284,17 +281,16 @@ if $ARGS[0] = 'school':
 		gt 'budgetclothes', 'start'
 	end
 
-	if Clothingstock > 15:
-		i = 1
-	elseif Clothingstock > 7:
-		i = 2
-	else
-		i = 3
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality4
-	
+		if Clothingstock > 15:
+			i = 1
+		elseif Clothingstock > 7:
+			i = 2
+		else
+			i = 3
+		end
+
 		:loopschool
 			if school[i] = 0:
 				gs 'clothing_attributes', 'school', i

+ 2 - 8
locations/cikl.qsrc

@@ -120,13 +120,7 @@ if husbandMark = 1 and husband <= 10:
 	'<b><font color="red">Your husband has filed for a divorce.</font></b>'
 end
 
-if katjaPreg = 0 and month >= 2:
-	if school_year = 2001 and year > 2016:
-		katjaPreg = 1
-	elseif school_year = 2000 and year > 2017:
-		katjaPreg = 1
-	end
-end
+if katjaPreg = 0 and month >= 2 and year > 2017: katjaPreg = 1
 
 !! after having surgery you will be in recuperation for a few days
 
@@ -1374,7 +1368,7 @@ if storyline = 1:
 				end
 			end
 		elseif month = 5:
-			if (school_year = 2000 and year = 2017) or (school_year = 2001 and year = 2018):
+			if year = 2017:
 				if day = 25:
 					kanikuli = 6
 					SchoolAtestat = -1

+ 6 - 2
locations/dimalina.qsrc

@@ -454,12 +454,12 @@ if $ARGS[0] = 'watch3':
 		'"Hmm... I think... That... Hm?" She stands and then stumbles a bit before falling back onto the bed. Dimka sees his chance and gently guides her to lay down. She tries to fight back, but it only results in her being positioned onto her stomach by him. Smiling, he puts his hands under her skirt and slides her panties down to her thighs. Lina lets out a breathy moan as she looks back at him in confusion and arousal.' 
 		'"I know how to make you behave..." Dimka whispers to her before he begins to unzip the front of his jeans. You close your eyes for a moment...'
 		act 'Dream of Lina':
-			gs 'stat'
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/F3.jpg"></center>'
 			'You can hear Lina''s cries of pleasure and a sudden image of her comes to mind. She is on all fours moaning as you massage lube into her tight little ass. She looks at you with concern, but you know what to do, You are going to fill that cute hole with the beads. Your fingers were only the beginning. You lick the beads and spread her cheeks. When you begin to push, she gasps, cries and clenches her teeth as she adjusts to the toy and slowly starts to enjoy the feeling. You smile knowing that by the end of this, she''ll be the perfect anal slut for you.' 
 			'Just as you begin to thrust the beads in and out of her ass a bit, you''re pulled back to reality by the sound of grunting from Dimka'
-			*clr & cla
 			pcs_horny += 10
+			gs 'stat'
 			act 'Lina is defiled...': gt 'dimalina', 'linadefiled'
 		end
 		act 'Dream of Dimka':
@@ -473,6 +473,7 @@ if $ARGS[0] = 'watch3':
 			act 'Lina is defiled...': gt 'dimalina', 'linadefiled'
 		end
 		act 'Continue to watch them':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D12.jpg"></center>'
 			'Pulling out his cock, he grabs Lina''s hair and holds her in place as he slaps his cock against her face. The mask of shyness and awkwardness is gone, and his true face resurfaces. "From now on, you are no longer Lina. You are Litte Slut. Understood?!"'
 			'"No... I..."'
@@ -830,6 +831,7 @@ end
 
 if $ARGS[0] = 'hooksex':
 	*clr & cla
+	gs 'boyStat', 'A1'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D17.jpg"></center>'
 	'You feel the shaft of his <<dick>>cm <<$dick_girth>> cock pushing your vaginal lips slightly apart.'
 	if pcs_vag < 10:
@@ -881,6 +883,7 @@ if $ARGS[0] = 'helplina':
 	gs 'stat'
 	act 'Dimka joins in':
 		*clr & cla
+		gs 'boyStat', 'A1'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D26.jpg"></center>'
 		'While you and Lina were busy with each other, Dimka stripped himself of his clothes and climbs onto the bed to separate the two of you.'
 		'"Playtime is over for you two sluts!"'
@@ -1099,6 +1102,7 @@ if $ARGS[0] = 'succubuslina':
 		'She gives you a timid smile that soon grows as your lesbian show turns hotter. Horny as hell, she practically rips apart those clothes she''s still wearing. Looking at Dimka, you see that he paces nervously from feet to feet. You can'' wait to drain the little shit. So... What next?'
 		act '"Time for the main dish... Master"':
 			*clr & cla
+			gs 'boyStat', 'A1'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D30.jpg"></center>'
 			'Dimka jumps on the bed and crawls towards Lina. He probably thinks that he is in control of her. Hehehe. Poor stupid kid. She lays on her back, observing him with a mix of lust and hate. They are slaves to their desires and you are the one who whispers the lust in their ears.'
 			'"Master... Take your Litte Slut. I have her ready for you."'

+ 7 - 8
locations/dolls.qsrc

@@ -78,16 +78,15 @@ if $ARGS[0] = 'clothing':
 		gt 'dolls', 'start'
 	end
 
-	if Clothingstock > 15:
-		i = 1
-	elseif Clothingstock > 7:
-		i = 3
-	else
-		i = 2
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		if Clothingstock > 15:
+			i = 1
+		elseif Clothingstock > 7:
+			i = 3
+		else
+			i = 2
+		end
 
 		:loopalt
 			if alternative[i] = 0:

+ 9 - 10
locations/exhibitionistshop.qsrc

@@ -59,18 +59,17 @@ if $ARGS[0] = 'clo':
 		gt 'exhibitionistshop', 'start'
 	end
 
-	if Clothingstock >= 18:
-		i = 1
-	elseif Clothingstock >= 12:
-		i = 2
-	elseif Clothingstock >= 6:
-		i = 3
-	else
-		i = 4
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		if Clothingstock >= 18:
+			i = 1
+		elseif Clothingstock >= 12:
+			i = 2
+		elseif Clothingstock >= 6:
+			i = 3
+		else
+			i = 4
+		end
 
 		:loopexhibit
 			if exhibit[i] = 0:

+ 125 - 143
locations/katjaEv.qsrc

@@ -649,7 +649,7 @@ if $ARGS[0] = 'kiss_events':
 		'While you kissed Katja, someone came nearby sighed loudly, probably, appreciating the view.'
 		'"How beautiful," again it was Ivan, he was waiting for you or something. Not being distracted, you continued to kiss Katja.'
 		'"Look, look, lesbians." one guy yelled and pointed at Katja and you.'
-		act 'Glare the moron':gt 'katjaEv', 'moron'
+		act 'Glare at the moron':gt 'katjaEv', 'moron'
 	end
 end
 
@@ -667,7 +667,7 @@ if $ARGS[0] = 'moron':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/frenchkiss.jpg"></center>'
-			'Looking at Ivan, then for this idiot, it seems that Ivan didn''t notice, you sighed and said to the idoit. "Is that really necessary? She is my best friend and we want kiss, you just seem jealous.'
+			'Looking at Ivan, then at this idiot, it seems that Ivan didn''t notice, you sighed and said to the idiot. "Is that really necessary? She is my best friend and we want kiss, you just seem jealous.'
 			'"Lesbians, lesbians." He continued to scream like a freak, so much that people began to gather around to find out, what''s happening. Ivan stepped over next to you and put his hand on your shoulder, giving the idiot a glare as well. Boosted by Ivan''s support you continued. "We like boys, just not assholes like you!" with those words, you stood on tiptoe, clasping and Ivan''s head in his hands and gave him a deep long passionate kiss, with lots of tongue.'
 
 			act 'Kiss again':
@@ -675,14 +675,14 @@ if $ARGS[0] = 'moron':
 				cla
 				if flag_KissEV = 0: flag_KissEV = 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/prohorov_3.jpg"></center>'
-				'"And I can kiss all the boys." you said, under the joyous hubbub of guys gathering near you. You began to kiss all the boys in succession, carefully avoiding the that called you a lesbian.'
+				'"And I can kiss all the boys." you said, under the joyous hubbub of guys gathering near you. You began to kiss all the boys in succession, carefully avoiding the one that called you a lesbian.'
 				'Seeing this he said offended. "The redhead doesn''t like guys, I bet." hoping Katja will kiss him to prove him wrong.'
 				'But Katja recovered and said. "Wrong again loser.", and began to repeat your route, of kissing the boys.'
 				if $loc = 'gdkin':
 					'After kissing the last boy, you turn back and make sure Katja kisses all of them too. You now realise the guys are hoping for more and quickly drag Katja away before you accidentally start an orgy.'
 					act 'Return to dance': gt 'gdkin'
 				else
-					'Just as you, kissed the last boy, you turned around to see how Katja was doing with her kissing, but then the bell rang, and you all rushed to class.'
+					'Just as you kissed the last boy, you turned around to see how Katja was doing with her kissing, but then the bell rang, and you all rushed to class.'
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
 			end
@@ -1102,7 +1102,7 @@ if $ARGS[0] = 'kathan1':
 		gt 'katjaEv','kathan3'
 	elseif dummy >= 3 and konki = 0:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/lake.winter.jpg"></center>'
-		'It''s winter, and most activities on the lake are limited, if you had skates, Katja and you, could use them on the ice covered waters, but at the moment, it''s seems that only can look at the frozen waters, is better to look for something else to do.'
+		'It''s winter, and most activities on the lake are limited, if you had skates, Katja and you, could use them on the ice covered waters, but at the moment, it''s seems that you can only look at the frozen waters, is better to look for something else to do.'
 
 		act 'Continue':gt 'katjaEv','kathan'
 	else
@@ -1195,7 +1195,7 @@ if $ARGS[0] = 'kathan1':
 				'Katja screams as she loses her balance and slips. It''s seems that you aren''t really good at skating, and your intended "synchronized ice dancing" with the redhead has ended, with a tackle and Katja falling to the ground.'
 				'"Oh shit! Sorry Katja!"'
 				'With a silent "thud" and a lot of blow ice, the redhead ends up sitting on the lake''s frozen surface. It looks painful, except for the giggling coming from the girl''s mouth.'
-				'Ouch! Jajaja, my ass! <<$pcs_nickname>>, who had the bright idea to give you skates?'
+				'Ouch! Hahaha, my ass! <<$pcs_nickname>>, who had the bright idea to give you skates?'
 				gs 'stat'
 
 				act '...?':
@@ -1300,7 +1300,7 @@ if $ARGS[0] = 'kathan2':
 		'That is the thing that passes by your head in the aftermath of laying in the frozen soil. The snow, trying to its heart content, to pass the flimsy protection that your winter clothes try to give but you remember one thing.'
 		'"I am a Russian bitch! You can''t stop me Winter!"'
 		'You scream at the heavens, and with an effort of will, your arms and legs begin to move against the snow''s cold resistance, shaping it on your heavenly form''s visage, but winter is not defeated, and a sudden icy wind blows against your face, trying to stop you.'
-		'"<<$pcs_nickname>>! Snort! You are crazy! Just...Jajaja!"'
+		'"<<$pcs_nickname>>! Snort! You are crazy! Just...Hahaha!"'
 		'You look to the smiling redhead, who is trying to stand, but fails and sits on the ground, laughing at your antics until you get up and help her to her feet. There in the ground are your silhouettes. It has been fun, but now you are cold and it is probably best to look for something else to do.'
 
 		act 'Continue':gt 'katjaEv','kathan'
@@ -2357,147 +2357,130 @@ if $ARGS[0] = 'kathan14':
 			'Neither Katja nor Natasha seems to be aware of your mutual presence, or neither care. After all, the two are in totally different social circles and a politically correct aptitude to ignore one another is perfectly understandable.'
 			'"Come on <<$pcs_nickname>>! Look at that rack!"'
 			'Katja grabs your arm and pulls you away from the nerd. Maybe you should go and talk with her?'
+		end
+		act 'Prank Natasha':
+			menu_off = 1
+			*clr & cla
+			random_event = rand (1,100)
+			minut += 5
+			npc_rel['A14'] += 1
+			npc_rel['A16'] -= 1
+			gs 'stat'
+
+			if random_event < pcs_agil:
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWS4.jpg"></center>'
+				'"Ok Katja, get ready for a pic!"'
+				'She raises an eyebrow, gives you a conspiratory smile and prepares her phone as you sneak up behind the unsuspecting nerd. Natasha lets out a surprised scream as her butt is exposed, along with her brightly colored thong.'
+				'"Look Katja! Pink!"'
+				'There is a sonorous "click" and Natasha''s buttocks are preserved for the posterity.'
+
+				if NatbelQW['QWstage'] >= 8:
+					'"Hey! What are... <<$pcs_nickname>>?!"'
+					'Natasha''s angry retort is cut short of blowing out as she realizes who her assailant was. Standing silently while looking between a snickering Katja and you, she quickly covers her butt. It seems like you have her well trained. Smiling, you bend towards her and whisper into Natasha''s ear.'
+					'"What I am doing? Whatever... I... Want... Slut."'
+					'The nerdy girl just looks at you with big puppy eyes and then obediently looks down. Yes, a well-trained bitch.'
+				else
+					'"Hey! What are you doing <<$pcs_nickname>>?!"'
+					'You and Katja snicker at the nerdy girl as she angrily covers her ass. She doesn''t share in the happy moment, looking at you like she could induce spontaneous combustion only with her gaze.'
+					'"What I am doing? It was just a prank, Natasha! It would have been worse if your ass wasn''t that pretty!"'
+					'The nerdy girl doesn''t say anything. She just continues looking at you angrily. However, as a nerd, Natasha doesn''t have the presence to really seem threatening.'
+				end
+				if hour >= 20:
+					act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+				else
+					act 'Continue window shopping':npc_rel['A16'] -= 1 & grupvalue[1] += 5 & grupvalue[3] -= 5 & mood += 10 & gt 'katjaEv','kathan14'
+					act 'Look for something else to do':npc_rel['A16'] -= 1 & grupvalue[1] += 5 & grupvalue[3] -= 5 & mood += 10 & gt 'katjaEv','kathan'
+					act 'Invite Natasha to hang around with you':npc_rel['A16'] -= 1 & grupvalue[1] += 5 & grupvalue[3] -= 5 & mood += 10 & gt 'katjaEv','kathan15'
+				end
+			else
+				'<center><table><td><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></td><td><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></td></table></center>'
+				'You aren''t a ninja, and the most flagrant clue to that is the puzzled expression on Natasha''s face as she turns towards you and slaps your extended hands as you try to expose her butt.'
+				'"<<$pcs_nickname>>? Katja? What are you doing?"'
+				'Katja mouths an embarrassed "Oops!" and realization appears on Natasha''s eyes as she peeks into your dumbfounded face. Maybe she isn''t sure what were you planning, but her steps back show a weariness towards the two of you. Now what? You turn towards Katja as her phone goes "click", followed by Katja giggling.'
+				'"Te-he! Sorry <<$pcs_nickname>>, but you look like Wile E. Coyote!"'
+				'Behind you, Natasha quickly leaves the scene as Katja bursts into laughter.'
+				'"Hahaha! Beep Beep! Hehehe, this is priceless!"'
+				'Rolling your eyes, you grab the giggling redhead''s hand and leave. Time to look for something else to do.'
 
-			act 'Prank Natasha':
+				if hour >= 20:
+					act 'It''s too late, acompany Katja to her home':mood -= 10 & minut += 5 & gt 'pav_residential'
+				else
+					act 'Continue window shopping':mood -= 10 & gt 'katjaEv','kathan14'
+					act 'Look for something else to do':mood -= 10 & gt 'katjaEv','kathan'
+				end
+			end
+		end
+		gs 'willpower', 'humiliation', 'self', 'easy'
+		if will_cost <= pcs_willpwr:
+			act 'Tease Natasha':
 				menu_off = 1
 				*clr & cla
-				random_event = rand (1,100)
+				gs 'willpower', 'pay', 'self'
 				minut += 5
-				npc_rel['A14'] += 1
-				npc_rel['A16'] -= 1
+				KatjaHorny += 20
+				pav_slut += rand(0,5)
 				gs 'stat'
-
-				if random_event < pcs_agil:
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWS4.jpg"></center>'
-					'"Ok Katja, get ready for a pic!"'
-					'She raises an eyebrow, gives you a conspiratory smile and prepares her phone as you sneak up behind the unsuspecting nerd. Natasha lets out a surprised scream as her butt is exposed, along with her brightly colored thong.'
-					'"Look Katja! Pink!"'
-					'There is a sonorous "click" and Natasha''s buttocks are preserved for the posterity.'
-
-					if NatbelQW['QWstage'] >= 8:
-						'"Hey! What are... <<$pcs_nickname>>?!"'
-						'Natasha''s angry retort is cut short of blowing out as she realizes who her assailant was. Standing silently while looking between a snickering Katja and you, she quickly covers her butt. It seems like you have her well trained. Smiling, you bend towards her and whisper into Natasha''s ear.'
-						'"What I am doing? Whatever... I... Want... Slut."'
-						'The nerdy girl just looks at you with big puppy eyes and then obediently looks down. Yes, a well-trained bitch.'
-					else
-						'"Hey! What are you doing <<$pcs_nickname>>?!"'
-						'You and Katja snicker at the nerdy girl as she angrily covers her ass. She doesn''t share in the happy moment, looking at you like she could induce spontaneous combustion only with her gaze.'
-						'"What I am doing? It was just a prank, Natasha! It would have been worse if your ass wasn''t that pretty!"'
-						'The nerdy girl doesn''t say anything. She just continues looking at you angrily. However, as a nerd, Natasha doesn''t have the presence to really seem threatening.'
-
-						if hour >= 20:
-							act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
-						else
-							act 'Continue window shopping':npc_rel['A16'] -= 1 & grupvalue[1] += 5 & grupvalue[3] -= 5 & mood += 10 & gt 'katjaEv','kathan14'
-							act 'Look for something else to do':npc_rel['A16'] -= 1 & grupvalue[1] += 5 & grupvalue[3] -= 5 & mood += 10 & gt 'katjaEv','kathan'
-							act 'Invite Natasha to hang around with you':npc_rel['A16'] -= 1 & grupvalue[1] += 5 & grupvalue[3] -= 5 & mood += 10 & gt 'katjaEv','kathan15'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWS5.jpg"></center>'
+
+				if NatbelQW['QWstage'] >= 8 and NatbelQW['Debt'] >= 500 and Katjaslut >= 20 and Katjahorny >=20 and katjaFirstKiss = 1 and KatjaOTN = 1:
+					'Walking without care to your submissive slut, Natasha becomes aware of your presence, but before the nerd can react, you push her against a stand, cornering the surprised girl.'
+					'"<<$pcs_nickname>>?"'
+					'She looks at you nervously, your action calling the entire shop''s attention, especially when your hands first grab Natasha''s waist, and then slide to her ass, making the nerd jump, but she doesn''t try to push you away.'
+					'"Slut! I want to see something sexy the next time I see you. Got it bitch?!"'
+					'She doesn''t answer, and just bites her lips and looks around nervously before you bend, this time whispering huskily in her ear.'
+					'"I can''t hear you slut."'
+					'"I... Ok <<$pcs_nickname>>."'
+					'She answers meekly, and at that moment, you let her go. Around you, people are whispering. Some smile, most frown and sweet, loving Katja blushes, licks her lips, and paces nervously. She is horny and you have your favorite slave here.'
+
+					gs 'willpower', 'group', 'force', 'hard'
+					if will_cost <= pcs_willpwr:
+						act 'Take Natasha to Katja''s room':
+							*clr & cla
+							gs 'willpower', 'pay', 'force'
+							gs 'stat'
+							gt 'katjaEv','katnatsex1'
 						end
-					end
-				else
-					'<center><table><td><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></td><td><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></td></table></center>'
-					'You aren''t a ninja, and the most flagrant clue to that is the puzzled expression on Natasha''s face as she turns towards you and slaps your extended hands as you try to expose her butt.'
-					'"<<$pcs_nickname>>? Katja? What are you doing?"'
-					'Katja mouths an embarrassed "Oops!" and realization appears on Natasha''s eyes as she peeks into your dumbfounded face. Maybe she isn''t sure what were you planning, but her steps back show a weariness towards the two of you. Now what? You turn towards Katja as her phone goes "click", followed by Katja giggling.'
-					'"Te-he! Sorry <<$pcs_nickname>>, but you look like Wile E. Coyote!"'
-					'Behind you, Natasha quickly leaves the scene as Katja bursts into laughter.'
-					'"Jajaja! Beep Beep! Jejeje, this is priceless!"'
-					'Rolling your eyes, you grab the giggling redhead''s hand and leave. Time to look for something else to do.'
-
-					if hour >= 20:
-						act 'It''s too late, acompany Katja to her home':mood -= 10 & minut += 5 & gt 'pav_residential'
 					else
-						act 'Continue window shopping':mood -= 10 & gt 'katjaEv','kathan14'
-						act 'Look for something else to do':mood -= 10 & gt 'katjaEv','kathan'
+						act 'Take Natasha to Katja''s room (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
+				elseif NatbelQW['QWstage'] >= 8:
+					'Walking without care to your submissive slut, Natasha becomes aware of your presence, but before the nerd can react, you push her against a stand, cornering the surprised girl.'
+					'"<<$pcs_nickname>>?"'
+					'She looks at you nervously, your action calling the entire shop''s attention, especially when your hands first grab Natasha''s waist, and then slide to her ass, making the nerd jump, but she doesn''t try to push you away.'
+					'"Slut! I want to see something sexy the next time I see you. Got it bitch?!"'
+					'She doesn''t answer, and just bites her lips and looks around nervously before you bend, this time whispering huskily in her ear.'
+					'"I can''t hear you slut."'
+					'"I... Ok <<$pcs_nickname>>."'
+					'She answers meekly, and at that moment, you let her go. Around you, people are whispering. Some smile, most frown and after a silent moment, an embarrassed Natasha runs out of the shop. A blushing Katja seems to go to say something, but stops, grabs your hand and follows the nerd girl. OK, it seems that it is time to look for something else to do.'
+				else
+					'Walking without care to the nerd, Natasha becomes aware of your presence, but before the girl can react, you push Natasha against a stand, cornering the surprised girl.'
+					'"<<$pcs_nickname>>?"'
+					'She looks at you nervously, your action calling the entire shop''s attention, especially when your hands first grab Natasha''s waist, and then slide to her ass, making the nerd jump, but she doesn''t try to push you away.'
+					'"Fuck! Natasha! You are getting me hot!"'
+					'She blinks, not knowing how to react and looks around nervously, before lowering her face and whispering.'
+					'"Please <<$pcs_nickname>>, I... don''t like this game..."'
+					'You bend so your mouth is at Natasha''s ear.'
+					'"That is sad... because I... REALLY... WANT... TO... PLAY"'
+					'You then take a step back and release the embarrassed girl. Around you, people are whispering. Some smile, most frown and after a silent moment, an embarrassed Natasha runs out of the shop. A blushing Katja seems to go to say something, but stops, grabs your hand and follows the nerd girl. OK, it seems that it is time to look for something else to do.'
 				end
-			end
-			gs 'willpower', 'humiliation', 'self', 'easy'
-			if will_cost <= pcs_willpwr:
-				act 'Tease Natasha':
-					menu_off = 1
-					*clr & cla
-					gs 'willpower', 'pay', 'self'
-					minut += 5
-					KatjaHorny += 20
-					pav_slut += rand(0,5)
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWS5.jpg"></center>'
-
-					if NatbelQW['QWstage'] >= 8 and NatbelQW['Debt'] >= 500 and Katjaslut >= 20 and Katjahorny >=20 and katjaFirstKiss = 1 and KatjaOTN = 1:
-						'Walking without care to your submissive slut, Natasha becomes aware of your presence, but before the nerd can react, you push her against a stand, cornering the surprised girl.'
-						'"<<$pcs_nickname>>?"'
-						'She looks at you nervously, your action calling the entire shop''s attention, especially when your hands first grab Natasha''s waist, and then slide to her ass, making the nerd jump, but she doesn''t try to push you away.'
-						'"Slut! I want to see something sexy the next time I see you. Got it bitch?!"'
-						'She doesn''t answer, and just bites her lips and looks around nervously before you bend, this time whispering huskily in her ear.'
-						'"I can''t hear you slut."'
-						'"I... Ok <<$pcs_nickname>>."'
-						'She answers meekly, and at that moment, you let her go. Around you, people are whispering. Some smile, most frown and sweet, loving Katja blushes, licks her lips, and paces nervously. She is horny and you have your favorite slave here.'
-
-						gs 'willpower', 'group', 'force', 'hard'
-						if will_cost <= pcs_willpwr:
-							act 'Take Natasha to Katja''s room':
-								*clr & cla
-								gs 'willpower', 'pay', 'force'
-								gs 'stat'
-								gt 'katjaEv','katnatsex1'
-							end
-						else
-							act 'Take Natasha to Katja''s room (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-						end
-
-						if hour >= 20:
-							act 'It''s too late, acompany Katja to her home':mood -= 10 & minut += 5 & gt 'pav_residential'
-						else
-							act 'Continue window shopping':gt 'katjaEv','kathan14'
-							act 'Look for something else to do':gt 'katjaEv','kathan'
-						end
-					elseif NatbelQW['QWstage'] >= 8:
-						'Walking without care to your submissive slut, Natasha becomes aware of your presence, but before the nerd can react, you push her against a stand, cornering the surprised girl.'
-						'"<<$pcs_nickname>>?"'
-						'She looks at you nervously, your action calling the entire shop''s attention, especially when your hands first grab Natasha''s waist, and then slide to her ass, making the nerd jump, but she doesn''t try to push you away.'
-						'"Slut! I want to see something sexy the next time I see you. Got it bitch?!"'
-						'She doesn''t answer, and just bites her lips and looks around nervously before you bend, this time whispering huskily in her ear.'
-						'"I can''t hear you slut."'
-						'"I... Ok <<$pcs_nickname>>."'
-						'She answers meekly, and at that moment, you let her go. Around you, people are whispering. Some smile, most frown and after a silent moment, an embarrassed Natasha runs out of the shop. A blushing Katja seems to go to say something, but stops, grabs your hand and follows the nerd girl. OK, it seems that it is time to look for something else to do.'
-
-						if hour >= 20:
-							act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
-						else
-							act 'Continue window shopping':gt 'katjaEv','kathan14'
-							act 'Look for something else to do':gt 'katjaEv','kathan'
-						end
-					else
-						'Walking without care to the nerd, Natasha becomes aware of your presence, but before the girl can react, you push Natasha against a stand, cornering the surprised girl.'
-						'"<<$pcs_nickname>>?"'
-						'She looks at you nervously, your action calling the entire shop''s attention, especially when your hands first grab Natasha''s waist, and then slide to her ass, making the nerd jump, but she doesn''t try to push you away.'
-						'"Fuck! Natasha! You are getting me hot!"'
-						'She blinks, not knowing how to react and looks around nervously, before lowering her face and whispering.'
-						'"Please <<$pcs_nickname>>, I... don''t like this game..."'
-						'You bend so your mouth is at Natasha''s ear.'
-						'"That is sad... because I... REALLY... WANT... TO... PLAY"'
-						'You then take a step back and release the embarrassed girl. Around you, people are whispering. Some smile, most frown and after a silent moment, an embarrassed Natasha runs out of the shop. A blushing Katja seems to go to say something, but stops, grabs your hand and follows the nerd girl. OK, it seems that it is time to look for something else to do.'
-
-						if hour >= 20:
-							act 'It''s too late, acompany Katja to her home':npc_rel['A16'] -= 5 & minut += 5 & gt 'pav_residential'
-						else
-							act 'Continue window shopping':npc_rel['A16'] -= 5 & gt 'katjaEv','kathan14'
-							act 'Look for something else to do':npc_rel['A16'] -= 5 & gt 'katjaEv','kathan'
-						end
-					end
+				if hour >= 20:
+					act 'It''s too late, acompany Katja to her home':npc_rel['A16'] -= 5 & minut += 5 & gt 'pav_residential'
+				else
+					act 'Continue window shopping':npc_rel['A16'] -= 5 & gt 'katjaEv','kathan14'
+					act 'Look for something else to do':npc_rel['A16'] -= 5 & gt 'katjaEv','kathan'
 				end
-			else
-				act 'Tease Natasha (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
+		else
+			act 'Tease Natasha (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 
-			act 'Invite Natasha to hang around with you':gt 'katjaEv','kathan15'
+		act 'Invite Natasha to hang around with you':gt 'katjaEv','kathan15'
 
-			if hour >= 20:
-				act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
-			else
-				act 'Continue window shopping':gt 'katjaEv','kathan14'
-				act 'Look for something else to do':gt 'katjaEv','kathan'
-			end
+		if hour >= 20:
+			act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+		else
+			act 'Continue window shopping':gt 'katjaEv','kathan14'
+			act 'Look for something else to do':gt 'katjaEv','kathan'
 		end
 	end
 end
@@ -2532,13 +2515,12 @@ if $ARGS[0] = 'kathan15':
 		'"Hey! What the...?! Katja wait for me! I also want to play with Natasha!"'
 		 'You don''t know who is happier. Katja for having a life-size doll to play dress up with, or Natasha for being a life-size doll to play dress up. The spectacle takes the shop like a hurricane as you model all that is in stock.'
 		'Your group even poses for some photos, but in the end and after a great time together, it is time to look for something else to do.'
-
-		if hour >= 20:
-			act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
-		else
-			act 'Continue window shopping':gt 'katjaEv','kathan14'
-			act 'Look for something else to do':gt 'katjaEv','kathan'
-		end
+	end
+	if hour >= 20:
+		act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
+	else
+		act 'Continue window shopping':gt 'katjaEv','kathan14'
+		act 'Look for something else to do':gt 'katjaEv','kathan'
 	end
 end
 
@@ -2712,7 +2694,7 @@ if $ARGS[0] = 'kathan18':
 			'...'
 			wait 1000
 			'...'
-			'Slurp...Life is good! With your hard-won slushie, you and Katja stroll pavlovsk''s streets...Slurp...High on sugar, you two realize how wonderful it is to be so fabulous...Slurp...And show the world all your sugary magnificence with a selfie...Slurp...Time to look for something else to do.'
+			'Slurp...Life is good! With your hard-won slushie, you and Katja stroll Pavlovsk''s streets...Slurp...High on sugar, you two realize how wonderful it is to be so fabulous...Slurp...And show the world all your sugary magnificence with a selfie...Slurp...Time to look for something else to do.'
 
 			if hour >= 20:
 				act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'

+ 5 - 6
locations/moncheri.qsrc

@@ -79,14 +79,13 @@ if $ARGS[0] = 'clothes':
 
 	act 'Return': minut += 1 & gt 'moncheri', 'start'
 
-	if Clothingstock > 11:
-		i = 1
-	else
-		i = 2
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		if Clothingstock > 11:
+			i = 1
+		else
+			i = 2
+		end
 
 		:loopformal
 			if formal[i] = 0:

+ 22 - 110
locations/npcstatic1.qsrc

@@ -7,11 +7,7 @@ $npc_firstname['A<<npctemp>>'] = 'Dmitriy'
 $npc_nickname['A<<npctemp>>'] = 'Dimka'
 $npc_lastname['A<<npctemp>>'] = 'Nosov'
 $npc_usedname['A<<npctemp>>'] = 'Dimka'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19991020
-else
-	npc_dob['A<<npctemp>>'] = 20001020
-end
+npc_dob['A<<npctemp>>'] = 19991020
 $npc_notes['A<<npctemp>>'] = 'Dimka Nosov is a cute guy and all the girls adore him, he is considered the coolest kid in school. The guys tend to either befriend him or loath him. He comes from a fairly wealthy family, and is always dressed in expensive stylish clothes. Despite his pleasant smile and friendly demeanor, there are rumors saying he is a sadist bastard that always gets what he wants.'
 !!set gender before calling npcstaticdefaults, override values you don''t like afterwards
 npc_gender['A<<npctemp>>'] = 0
@@ -112,11 +108,7 @@ $npc_firstname['A<<npctemp>>'] = 'Dmitriy'
 $npc_nickname['A<<npctemp>>'] = 'Dimka'
 $npc_lastname['A<<npctemp>>'] = 'Nosov'
 $npc_usedname['A<<npctemp>>'] = 'Dimka'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19991020
-else
-	npc_dob['A<<npctemp>>'] = 20001020
-end
+npc_dob['A<<npctemp>>'] = 19991020
 $npc_notes['A<<npctemp>>'] = 'Dimka Nosov is a cute guy and all the girls adore him, he is considered the coolest kid in school. The guys tend to either befriend him or loath him. He comes from a fairly wealthy family, and is always dressed in expensive stylish clothes. Despite his pleasant smile and friendly demeanor, there are rumors saying he is a sadist bastard that always gets what he wants.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -134,11 +126,7 @@ $npc_firstname['A<<npctemp>>'] = 'Artyom'
 $npc_nickname['A<<npctemp>>'] = 'Artem'
 $npc_lastname['A<<npctemp>>'] = 'Chebotarev'
 $npc_usedname['A<<npctemp>>'] = 'Artem'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000209
-else
-	npc_dob['A<<npctemp>>'] = 20010209
-end
+npc_dob['A<<npctemp>>'] = 20000209
 $npc_notes['A<<npctemp>>'] = 'Artem Chebotarev is a typical geek but one could easily be deceived by his looks as he is actually not that bad looking. He does very well in school and is popular with the other geeks, not to mention that thanks to his looks he has befriended a lot of jocks as he is also their tutor outside of school.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -156,11 +144,7 @@ $npc_firstname['A<<npctemp>>'] = 'Ivan'
 $npc_nickname['A<<npctemp>>'] = 'Ivan'
 $npc_lastname['A<<npctemp>>'] = 'Prokhorov'
 $npc_usedname['A<<npctemp>>'] = 'Ivan'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19990717
-else
-	npc_dob['A<<npctemp>>'] = 20000717
-end
+npc_dob['A<<npctemp>>'] = 19990717
 $npc_notes['A<<npctemp>>'] = 'Ivan Prokhorov is a talented athlete who is able to succeed in any sport he takes part of. He is mostly into boxing and running at this time and is considered to be very good looking by the girls in school. He spends a lot of time training and regularly is away competing. He isn''t very sociable and, other than when he is training, tends to keep to himself, a true lone wolf. He is calm and collected by nature, some might even say apathetic.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -176,11 +160,7 @@ $npc_firstname['A<<npctemp>>'] = 'Igor'
 $npc_nickname['A<<npctemp>>'] = 'Igor'
 $npc_lastname['A<<npctemp>>'] = 'Kruglov'
 $npc_usedname['A<<npctemp>>'] = 'Igor'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19991222
-else
-	npc_dob['A<<npctemp>>'] = 20001222
-end
+npc_dob['A<<npctemp>>'] = 19991222
 $npc_notes['A<<npctemp>>'] = 'Igor Kruglov is Dimka''s best friends and whenever you see one of them the other is usually not too far away. With a small stature, high pitched voice, and pretty face many consider him to be very feminine. Normally a boy like him would be mocked but his friendship with Dimka, the most popular boy in school, shields him from such abuse. Many wonder about their friendship as Igor follows Dimka around so often and they seem to have always been friends. Some would even say that Igor is overly attached to Dimka. Other than Dimka though Igor doesn''t seem to have any other close friends.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -197,11 +177,7 @@ $npc_firstname['A<<npctemp>>'] = 'Fyodor'
 $npc_nickname['A<<npctemp>>'] = 'Fedor'
 $npc_lastname['A<<npctemp>>'] = 'Kozlov'
 $npc_usedname['A<<npctemp>>'] = 'Fedor'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000324
-else
-	npc_dob['A<<npctemp>>'] = 20010324
-end
+npc_dob['A<<npctemp>>'] = 20000324
 $npc_notes['A<<npctemp>>'] = 'Fedor Kozlov is a decent athlete. He often trains with his good friend Ivan, but lacks the level of talent that Ivan does have. He is decent looking and often is seen chasing Ivan''s leftovers.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -220,11 +196,7 @@ $npc_firstname['A<<npctemp>>'] = 'Peter'
 $npc_nickname['A<<npctemp>>'] = 'Petka'
 $npc_lastname['A<<npctemp>>'] = 'Klyuyev'
 $npc_usedname['A<<npctemp>>'] = 'Petka'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19990915
-else
-	npc_dob['A<<npctemp>>'] = 20000915
-end
+npc_dob['A<<npctemp>>'] = 19990915
 $npc_notes['A<<npctemp>>'] = 'Petka Klyuyev is a nerd who usually doesn''t interact with other people, he mostly spends his time reading. He''s good friends with Artem and you can usually hear them recommending what to read to each other.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -242,11 +214,7 @@ $npc_firstname['A<<npctemp>>'] = 'Lesco'
 $npc_nickname['A<<npctemp>>'] = 'Lesco'
 $npc_lastname['A<<npctemp>>'] = 'Tsarev'
 $npc_usedname['A<<npctemp>>'] = 'Lesco'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19990703
-else
-	npc_dob['A<<npctemp>>'] = 20000703
-end
+npc_dob['A<<npctemp>>'] = 19990703
 $npc_notes['A<<npctemp>>'] = 'Everyone at school always bullies Lesco about anything and everything. He is the nephew of Mr. Tsarev and cousin of Lera. He resides with the Tsarev''s after his mother abandoned him for a week on one of her drug binges.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -265,11 +233,7 @@ $npc_firstname['A<<npctemp>>'] = 'Svyatoslav'
 $npc_nickname['A<<npctemp>>'] = 'Svyatoslav'
 $npc_lastname['A<<npctemp>>'] = 'Voinov'
 $npc_usedname['A<<npctemp>>'] = 'Svyatoslav'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000503
-else
-	npc_dob['A<<npctemp>>'] = 20010503
-end
+npc_dob['A<<npctemp>>'] = 20000503
 $npc_notes['A<<npctemp>>'] = 'Svyatoslav Voinov is an athletic guy with a very competitive spirit. He is always engaged in sports one way or another. He runs track and often competes with Ivan to be the fastest boy at school. His other focus is football as well as many other sports the school offers. He''s always trying to one up Ivan but rarely manages to beat him at anything.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -287,11 +251,7 @@ $npc_firstname['A<<npctemp>>'] = 'Viktor'
 $npc_nickname['A<<npctemp>>'] = 'Vitek'
 $npc_lastname['A<<npctemp>>'] = 'Kotov'
 $npc_usedname['A<<npctemp>>'] = 'Vitek'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19991125
-else
-	npc_dob['A<<npctemp>>'] = 20001125
-end
+npc_dob['A<<npctemp>>'] = 19991125
 $npc_notes['A<<npctemp>>'] = 'Vitek Kotov is an aggressive and strong guy, who considers himself a gangsta. He is very loud, obnoxious and not very attractive. Lena is his twin-sister, whom he is overly protective of and that has caused more than a fair share of drama. He is the local leader of the Gopniks and as such is the most feared boy in school. Even some adults are afraid of him. He is even rumored to be involved with the local organized crime selling drugs.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -308,11 +268,7 @@ $npc_firstname['A<<npctemp>>'] = 'Denis'
 $npc_nickname['A<<npctemp>>'] = 'Dan'
 $npc_lastname['A<<npctemp>>'] = 'Ryzhov'
 $npc_usedname['A<<npctemp>>'] = 'Dan'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19990728
-else
-	npc_dob['A<<npctemp>>'] = 20000728
-end
+npc_dob['A<<npctemp>>'] = 19990728
 $npc_notes['A<<npctemp>>'] = 'Dan Ryzhov is a tall and skinny guy, whose body language screams his disdain and contempt for others. He''s a very stubborn guy who will never let an argument be. He''s best friends with Vitek and Vasily, and is considered to be the smartest one of the bunch. Though most consider that to not be much of a feat.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -329,11 +285,7 @@ $npc_firstname['A<<npctemp>>'] = 'Vasily'
 $npc_nickname['A<<npctemp>>'] = 'Shulga'
 $npc_lastname['A<<npctemp>>'] = 'Shulgin'
 $npc_usedname['A<<npctemp>>'] = 'Shulga'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000425
-else
-	npc_dob['A<<npctemp>>'] = 20010425
-end
+npc_dob['A<<npctemp>>'] = 20000425
 $npc_notes['A<<npctemp>>'] = 'Vasily is always hanging out with Dan and Vitek, who are his best friends. His nickname is Shulga. He''s physically considered the weakest one of the bunch, but is a bit of a prankster and is always making the other ones laugh. He was raised just by his father, after his mother left when he was still an infant.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -353,11 +305,7 @@ $npc_firstname['A<<npctemp>>'] = 'Julia'
 $npc_nickname['A<<npctemp>>'] = 'Julia'
 $npc_lastname['A<<npctemp>>'] = 'Milov'
 $npc_usedname['A<<npctemp>>'] = 'Julia'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000330
-else
-	npc_dob['A<<npctemp>>'] = 20010330
-end
+npc_dob['A<<npctemp>>'] = 20000330
 $npc_notes['A<<npctemp>>'] = 'Julia is a diligent and silent girl. She''s very nerdy, and doesn''t really have any friends in school. She seems to like keeping to herself, but has sometimes been caught eyeing the other girls while they changing after the gym lessons.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
@@ -380,11 +328,7 @@ if zverSlutQW = 2:
 else
 	$npc_notes['A<<npctemp>>'] = 'Lariska is a very athletic girl, with an exceptional talent for volleyball. She has a very weak personality though, and is very dependent on other people''s opinions of her. Her best friend is Christina and one can often see Lariska chasing after Christina.'
 end
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000603
-else
-	npc_dob['A<<npctemp>>'] = 20010603
-end
+npc_dob['A<<npctemp>>'] = 20000603
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'jock'
@@ -401,11 +345,7 @@ $npc_firstname['A<<npctemp>>'] = 'Ekaterina'
 $npc_nickname['A<<npctemp>>'] = 'Katja'
 $npc_lastname['A<<npctemp>>'] = 'Meynold'
 $npc_usedname['A<<npctemp>>'] = 'Katja'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000224
-else
-	npc_dob['A<<npctemp>>'] = 20010224
-end
+npc_dob['A<<npctemp>>'] = 20000224
 $npc_notes['A<<npctemp>>'] = 'Katja Meynold is a very attractive and petite girl; a redhead with a special interest in fashion and cosmetics. She and her twin sister, Vicky, are like two sides of the same coin. As a quiet and sensible girl, Katja is shy and intelligent, but at times can also be impulsive. She can often be found at the disco with her sister.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
@@ -423,11 +363,7 @@ $npc_firstname['A<<npctemp>>'] = 'Viktoria'
 $npc_nickname['A<<npctemp>>'] = 'Vicky'
 $npc_lastname['A<<npctemp>>'] = 'Meynold'
 $npc_usedname['A<<npctemp>>'] = 'Vicky'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000224
-else
-	npc_dob['A<<npctemp>>'] = 20010224
-end
+npc_dob['A<<npctemp>>'] = 20000224
 $npc_notes['A<<npctemp>>'] = 'Vicky Meynold is the opposite of her sister, on one side a smart ass and on the other a cheerful girl. She is very sociable, being friends with many of the students in school and is considered to be one of the most popular girls in school. With a passionate love for dancing, Vicky can often be found at the disco with her sister and good friend Vanya Yanka. A good humored girl she loves bright and crazy colored clothing. As a child she took gymnastics and as a result has excellent flexibility. A bit flighty and unpredictable, you never know what thoughts she will come up with next. Logic and reason were never her strong suit as she lives by her emotions and feelings, making decisions from her heart rather than her head more often than not. Despite her flighty and unpredictable nature her liveliness and spontaneity make her fun to hang out with.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
@@ -446,11 +382,7 @@ $npc_firstname['A<<npctemp>>'] = 'Natasha'
 $npc_nickname['A<<npctemp>>'] = 'Natasha'
 $npc_lastname['A<<npctemp>>'] = 'Belova'
 $npc_usedname['A<<npctemp>>'] = 'Natasha'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19990706
-else
-	npc_dob['A<<npctemp>>'] = 20000706
-end
+npc_dob['A<<npctemp>>'] = 19990706
 $npc_notes['A<<npctemp>>'] = 'Natasha is an excellent student and one of the smartest people in your school. Even though you are living in the same building, her parents are very poor, and it shows as Natasha is always dressed in second-hand clothes and can never afford to do anything fun. As a result, she doesn''t have many friends, as most of the other girls shun her or mock her poor clothing.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
@@ -468,11 +400,7 @@ $npc_firstname['A<<npctemp>>'] = 'Irina'
 $npc_nickname['A<<npctemp>>'] = 'Inna'
 $npc_lastname['A<<npctemp>>'] = 'Devyatova'
 $npc_usedname['A<<npctemp>>'] = 'Irina'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000329
-else
-	npc_dob['A<<npctemp>>'] = 20010329
-end
+npc_dob['A<<npctemp>>'] = 20000329
 $npc_notes['A<<npctemp>>'] = 'Inna Devyatova is a tall and pretty girl, she knows it and takes full advantage of it. She has a very arrogant and haughty personality hidden behind her sweet smile. She often makes the boys do her dirty work.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
@@ -495,11 +423,7 @@ if zverSlutQW = 2:
 else
 	$npc_notes['A<<npctemp>>'] = 'Christina is one of your school''s best athletes, and is the strongest girl you know. She has leadership abilities that, together with her tenacity and intelligence, make her having a dominant presence wherever she goes. She is also more than a bit of a bully to most of the other girls in school.'
 end
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19991226
-else
-	npc_dob['A<<npctemp>>'] = 20001226
-end
+npc_dob['A<<npctemp>>'] = 19991226
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 $npc_firstpart['A<<npctemp>>'] = 'A69'
@@ -522,11 +446,7 @@ $npc_firstname['A<<npctemp>>'] = 'Avelina'
 $npc_nickname['A<<npctemp>>'] = 'Lina'
 $npc_lastname['A<<npctemp>>'] = 'Starov'
 $npc_usedname['A<<npctemp>>'] = 'Lina'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000224
-else
-	npc_dob['A<<npctemp>>'] = 20010224
-end
+npc_dob['A<<npctemp>>'] = 20000224
 $npc_notes['A<<npctemp>>'] = 'Lina Starov is a mediocre athlete. She''s sort of Christina''s friend... but not really, the right term you would use is Christina''s lapdog. She usually does anything Christina wants her to do as if she doesn''t have a mind of her own.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
@@ -544,11 +464,7 @@ $npc_firstname['A<<npctemp>>'] = 'Yalena'
 $npc_nickname['A<<npctemp>>'] = 'Lena'
 $npc_lastname['A<<npctemp>>'] = 'Kotov'
 $npc_usedname['A<<npctemp>>'] = 'Lena'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19991125
-else
-	npc_dob['A<<npctemp>>'] = 20001125
-end
+npc_dob['A<<npctemp>>'] = 19991125
 $npc_notes['A<<npctemp>>'] = 'Lena Kotov is Vitek''s twin sister. Just like her brother, she is one of the local Gopniks. With a chip on her shoulder, she can be aggressive and unpredictable. She''s best friends with Lera, and they can often be found together smoking in the school''s restrooms during school, or hanging out together after school.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
@@ -566,11 +482,7 @@ $npc_firstname['A<<npctemp>>'] = 'Valeria'
 $npc_nickname['A<<npctemp>>'] = 'Lera'
 $npc_lastname['A<<npctemp>>'] = 'Tsarev'
 $npc_usedname['A<<npctemp>>'] = 'Lera'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19990702
-else
-	npc_dob['A<<npctemp>>'] = 20000702
-end
+npc_dob['A<<npctemp>>'] = 19990702
 $npc_notes['A<<npctemp>>'] = 'Lera Tsarev comes from a poor family, her father works at the school as a teacher. She often hangs out with the Gopniks in your class and is liked by them. She''s best friends with Lena, and they can often be found together smoking in the school''s restrooms, or hanging out together after school. She is protective of Lena and always takes Lena''s lead.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'group', 'gopnik'

+ 5 - 5
locations/npcstatic2.qsrc

@@ -137,7 +137,7 @@ $npc_nickname['A<<npctemp>>'] = 'Mira'
 $npc_usedname['A<<npctemp>>'] = 'Mira'
 $npc_lastname['A<<npctemp>>'] = 'Maximova'
 $npc_notes['A<<npctemp>>'] = 'Girl from Gadukino. Daughter of Afanasiy'
-npc_dob['A<<npctemp>>'] = ((school_year - 1) * 10000) + 0805
+npc_dob['A<<npctemp>>'] = 20000805
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 npc_bust['A<<npctemp>>'] = 9
@@ -150,7 +150,7 @@ $npc_firstname['A<<npctemp>>'] = 'Kolyamba'
 $npc_nickname['A<<npctemp>>'] = 'Kolyamba'
 $npc_usedname['A<<npctemp>>'] = 'Kolyamba'
 $npc_lastname['A<<npctemp>>'] = 'Rostislav'
-npc_dob['A<<npctemp>>'] = (school_year * 10000) + 65
+npc_dob['A<<npctemp>>'] = 20000065
 $npc_notes['A<<npctemp>>'] = 'Boy from Gadukino'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -165,7 +165,7 @@ $npc_nickname['A<<npctemp>>'] = 'Vasyan'
 $npc_usedname['A<<npctemp>>'] = 'Vasyan'
 $npc_lastname['A<<npctemp>>'] = 'Makarovich'
 $npc_notes['A<<npctemp>>'] = 'Boy from Gadukino'
-npc_dob['A<<npctemp>>'] = (school_year * 10000) + 96
+npc_dob['A<<npctemp>>'] = 20000096
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'thicker than average'
@@ -179,7 +179,7 @@ $npc_nickname['A<<npctemp>>'] = 'Mitka'
 $npc_usedname['A<<npctemp>>'] = 'Mitka'
 $npc_lastname['A<<npctemp>>'] = 'Ruslanov'
 $npc_notes['A<<npctemp>>'] = 'He is barely older than you, you remember him from your childhood.  You both used to swim in the local river together.'
-npc_dob['A<<npctemp>>'] = (school_year * 10000) + 117
+npc_dob['A<<npctemp>>'] = 20000117
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'thick'
@@ -209,7 +209,7 @@ $npc_nickname['A<<npctemp>>'] = 'Vitaliy'
 $npc_usedname['A<<npctemp>>'] = 'Vitaliy'
 $npc_lastname['A<<npctemp>>'] = 'Maximov'
 $npc_notes['A<<npctemp>>'] = 'Mira''s Brother'
-npc_dob['A<<npctemp>>'] = (school_year * 10000) + 643
+npc_dob['A<<npctemp>>'] = 20000643
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'thick'

+ 8 - 40
locations/npcstatic4.qsrc

@@ -532,11 +532,7 @@ $npc_nickname['A<<npctemp>>'] = 'Niko'
 $npc_lastname['A<<npctemp>>'] = 'Volkov'
 $npc_usedname['A<<npctemp>>'] = 'Niko'
 $npc_notes['A<<npctemp>>'] = 'Nikolai Volkov is suave and clever but always finds ways of getting into trouble. When he is not drinking and partying then he is hanging out with Roman Yakovlev. Many students say that he only keeps Roman around as his own personal attack dog. Niko always seems confident, well spoken and knows how to get what he wants but when angered, Niko can become erratic and unstable.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000405
-else
-	npc_dob['A<<npctemp>>'] = 20010405
-end
+npc_dob['A<<npctemp>>'] = 20000405
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'gopnik'
@@ -554,11 +550,7 @@ $npc_nickname['A<<npctemp>>'] = 'Yurik'
 $npc_lastname['A<<npctemp>>'] = 'Volkov'
 $npc_usedname['A<<npctemp>>'] = 'Yurik'
 $npc_notes['A<<npctemp>>'] = 'Yurik Volkov is a burly biker, who spends most of his time customizing, upgrading and tuning his motorcycle when he is not on the road. He is the older brother of Nikolai Volkov. Yurik is 5 years older then Niko, and tries his best to advise, and provide a future for his brother even though Niko continuously pushes him away, still blaming him for their sister''s death.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19951116
-else
-	npc_dob['A<<npctemp>>'] = 19961116
-end
+npc_dob['A<<npctemp>>'] = 19951116
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_firstpart['A<<npctemp>>'] = 'V'
@@ -575,11 +567,7 @@ $npc_nickname['A<<npctemp>>'] = 'Bella'
 $npc_lastname['A<<npctemp>>'] = 'Belova'
 $npc_usedname['A<<npctemp>>'] = 'Isabella'
 $npc_notes['A<<npctemp>>'] = 'Your classmate Natasha''s mother, Isabella Belova.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19820922
-else
-	npc_dob['A<<npctemp>>'] = 19830922
-end
+npc_dob['A<<npctemp>>'] = 19820922
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 npc_bust['A<<npctemp>>'] = 23
@@ -603,11 +591,7 @@ $npc_nickname['A<<npctemp>>'] = 'Alexei'
 $npc_lastname['A<<npctemp>>'] = 'Radimov'
 $npc_usedname['A<<npctemp>>'] = 'Porn actor Alexei Steel'
 $npc_notes['A<<npctemp>>'] = 'Alexei works as a porn actor ever since he lost his job as a steel worker. He has a son and a daughter, and happily married. He planned porn as a temporary thing, but it become permanent, since he can spend more time with his family doing this, earning more money than with any other physical job. And he is sellable, being almost two meters tall and built like a blond, blue eyed, braided viking.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19851110
-else
-	npc_dob['A<<npctemp>>'] = 19861110
-end
+npc_dob['A<<npctemp>>'] = 19851110
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'monstrous'
@@ -626,11 +610,7 @@ $npc_nickname['A<<npctemp>>'] = 'Seryozha'
 $npc_lastname['A<<npctemp>>'] = 'Tatarov'
 $npc_usedname['A<<npctemp>>'] = 'Porn actor Sergei Stone'
 $npc_notes['A<<npctemp>>'] = 'Sergei is smooth, charming and handsome, but a real ass. Nobody likes to work with him, but he is a true professional and a really good actor. There are rumors about him raping a schoolgirl, but nobody knows anything.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19960311
-else
-	npc_dob['A<<npctemp>>'] = 19970311
-end
+npc_dob['A<<npctemp>>'] = 19960311
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'
@@ -650,11 +630,7 @@ $npc_nickname['A<<npctemp>>'] = 'Egori'
 $npc_lastname['A<<npctemp>>'] = 'Klyuyev'
 $npc_usedname['A<<npctemp>>'] = 'Porn actor George Drake'
 $npc_notes['A<<npctemp>>'] = 'Egor''s wife has been passed away for three years, he was cooped up in his home alone and his pension was really low when he saw a porn movie about an old guy fucking schoolgirls. He thought he would like to try out this, because he missed female company and the pay must be good too. He tried it out, and sticked with it. Everyone likes him, being a nice old grandpa who proudly shows his grandson''s pictures to everyone.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19550311
-else
-	npc_dob['A<<npctemp>>'] = 19560311
-end
+npc_dob['A<<npctemp>>'] = 19550311
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'slim'
@@ -674,11 +650,7 @@ $npc_nickname['A<<npctemp>>'] = 'Ignat'
 $npc_lastname['A<<npctemp>>'] = 'Vedenin'
 $npc_usedname['A<<npctemp>>'] = 'Porn actor Jason Black'
 $npc_notes['A<<npctemp>>'] = 'Ignat is from Kaliningrad and he lives in his own rented apartment near campus. He is a university student, and he thought this is a good way to make money and fuck girls at the same time. He is athletic, handsome and intelligent.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19980501
-else
-	npc_dob['A<<npctemp>>'] = 19990501
-end
+npc_dob['A<<npctemp>>'] = 19980501
 npc_vital['A<<npctemp>>'] = rand(40,50)
 npc_stren['A<<npctemp>>'] = rand(40,50)
 npc_intel['A<<npctemp>>'] = rand(40,50)
@@ -705,11 +677,7 @@ $npc_nickname['A<<npctemp>>'] = 'Syoma'
 $npc_lastname['A<<npctemp>>'] = 'Rodionov'
 $npc_usedname['A<<npctemp>>'] = 'Porn actor Simon Lee'
 $npc_notes['A<<npctemp>>'] = 'Symoa appears quite average: not athletic, average height, brown hair and brown eyes. He was a clerk at a store before he quit and traveled to the city looking for a new job. One of the actresses recommended him to try porn, because he appears inexhaustible in bed, capable to do it for hours, and his refactory period is nonexistent, meaning he could come in a girl and keep going without break. He obviously always has a job.'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 19941212
-else
-	npc_dob['A<<npctemp>>'] = 19951212
-end
+npc_dob['A<<npctemp>>'] = 19941212
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'

+ 1 - 5
locations/npcstatic5.qsrc

@@ -689,11 +689,7 @@ $npc_firstname['A<<npctemp>>'] = 'Natalia'
 $npc_nickname['A<<npctemp>>'] = 'Nat'
 $npc_lastname['A<<npctemp>>'] = 'Pavlova'
 $npc_usedname['A<<npctemp>>'] = 'Natalia'
-if school_year = 2000:
-	npc_dob['A<<npctemp>>'] = 20000330
-else
-	npc_dob['A<<npctemp>>'] = 20010330
-end
+npc_dob['A<<npctemp>>'] = 20000330
 $npc_notes['A<<npctemp>>'] = 'Natalia is a very smart but weak willed girl. She constantly struggles to maintain friendships but her good looks and eagerness to help others, prevents her from being an outcast. She is rarely seen with anyone but one thing she always keeps with her, is a special notebook that she never lets anyone touch.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'

+ 0 - 2
locations/preCUST.qsrc

@@ -194,7 +194,6 @@ if $ARGS[0] = 'Done':
 			birthyear = year - age
 			birthmonth = 4
 			birthday = 1
-			school_year = 1998
 		end
 
 !!		Body
@@ -253,7 +252,6 @@ if $ARGS[0] = 'Done':
 			birthyear = year - age
 			birthmonth = 4
 			birthday = 1
-			school_year = 1998
 		end
 
 !!		Body

+ 0 - 2
locations/preSYS.qsrc

@@ -71,7 +71,6 @@ if $ARGS[0] = 'CSBStart':
 	if birthday = 0: birthday = 1
 	
 	birthyear = 2000
-	school_year = 2000
 	yearlefttemp = 1
 	
 	!!Looks
@@ -190,7 +189,6 @@ if $ARGS[0] = 'SGStart':
 	StoryLine = 1
 
 	birthyear = 2000
-	school_year = 2000
 	yearlefttemp = 1
 	
 	if player_avatar = 0:

+ 2 - 3
locations/pussykats_clothes.qsrc

@@ -16,13 +16,12 @@ if $ARGS[0] = 'start':
 		gt 'pussykats', 'start'
 	end
 
+	clothingfilter['qualitycheck'] = 7
+	:loopquality
 		i = Clothingstock + 1
 
 		if Clothingstock - 12 >= 0:i -= 12
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-
 		:loopaverage
 			if average[i] = 0:
 				gs 'clothing_attributes', 'average', i

+ 1 - 5
locations/saveupdater.qsrc

@@ -600,11 +600,7 @@ if $npc_firstname['A191'] ! 'Isabella':
 	$npc_lastname['A<<npctemp>>'] = 'Belova'
 	$npc_usedname['A<<npctemp>>'] = 'Isabella'
 	$npc_notes['A<<npctemp>>'] = 'Your classmate Natasha''s mother, Isabella Belova.'
-	if school_year = 2000:
-		npc_dob['A<<npctemp>>'] = 19820922
-	else
-		npc_dob['A<<npctemp>>'] = 19830922
-	end
+	npc_dob['A<<npctemp>>'] = 19820922
 	npc_gender['A<<npctemp>>'] = 1
 	gs 'npcstaticdefaults', 'defaults'
 	npc_bust['A<<npctemp>>'] = 23

+ 9 - 10
locations/scandalicious.qsrc

@@ -44,18 +44,17 @@ if $ARGS[0] = 'swim':
 		gt 'scandalicious', 'start'
 	end
 
-	if Clothingstock > 18:
-		i = 1
-	elseif Clothingstock > 12:
-		i = 2
-	elseif Clothingstock > 6:
-		i = 3
-	else
-		i = 4
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		if Clothingstock > 18:
+			i = 1
+		elseif Clothingstock > 12:
+			i = 2
+		elseif Clothingstock > 6:
+			i = 3
+		else
+			i = 4
+		end
 
 		:loopbeach
 			if beach[i] = 0:

+ 13 - 14
locations/sexshop.qsrc

@@ -648,22 +648,21 @@ if $ARGS[0] = 'clo':
 
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	i = Clothingstock + 1
-
-	if Clothingstock > 20:
-		i -= 20
-	elseif Clothingstock > 16:
-		i -= 16
-	elseif Clothingstock > 12:
-		i -= 12
-	elseif Clothingstock > 8:
-		i -= 8
-	elseif Clothingstock > 4:
-		i -= 4
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+		i = Clothingstock + 1
+
+		if Clothingstock > 20:
+			i -= 20
+		elseif Clothingstock > 16:
+			i -= 16
+		elseif Clothingstock > 12:
+			i -= 12
+		elseif Clothingstock > 8:
+			i -= 8
+		elseif Clothingstock > 4:
+			i -= 4
+		end
 
 		:loopfetish
 			if fetish[i] = 0:

+ 17 - 19
locations/sportShop.qsrc

@@ -121,16 +121,15 @@ if $ARGS[0] = 'clo':
 		gt 'sportshop', 'start'
 	end
 
-	if Clothingstock > 16:
-		i = 1
-	elseif Clothingstock > 8:
-		i = 2
-	else
-		i = 3
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality2
+		if Clothingstock > 16:
+			i = 1
+		elseif Clothingstock > 8:
+			i = 2
+		else
+			i = 3
+		end
 
 		:loopexercise
 			if exercise[i] = 0:
@@ -186,19 +185,18 @@ if $ARGS[0] = 'swim':
 		gt 'sportshop', 'start'
 	end
 
-!!4 is in he supermarket, so skipped
-	if Clothingstock > 18:
-		i = 1
-	elseif Clothingstock > 12:
-		i = 2
-	elseif Clothingstock > 6:
-		i = 3
-	else
-		i = 8
-	end
-
 	clothingfilter['qualitycheck'] = 7
 	:loopquality
+	!!4 is in he supermarket, so skipped
+		if Clothingstock > 18:
+			i = 1
+		elseif Clothingstock > 12:
+			i = 2
+		elseif Clothingstock > 6:
+			i = 3
+		else
+			i = 8
+		end
 
 		:loopswim
 			if swimwear[i] = 0:

+ 2 - 2
locations/telefon.qsrc

@@ -1223,8 +1223,8 @@ if $ARGS[0] = 'Phone_notebook':
 			if m1 = 1 and d1 = 15:$calendarday += $list + 'Last day of Winter break.'
 			if m1 = 3 and d1 = 20:$calendarday += $list + 'First day of Spring break.'
 			if m1 = 3 and d1 = 26:$calendarday += $list + 'Last day of Spring break.'
-			if school_year = 2003 and y1 = 2020 and m1 = 5 and d1 = 25:$calendarday += $list + 'Graduation Day!'
-			if school_year = 2004 and y1 = 2021 and m1 = 6 and d1 = 1:$calendarday += $list + 'First day of Summer break.'
+			if y1 = 2017 and m1 = 5 and d1 = 25:$calendarday += $list + 'Graduation Day!'
+			if m1 = 6 and d1 = 1:$calendarday += $list + 'First day of Summer break.'
 			if m1 = 8 and d1 = 31:$calendarday += $list + 'Last day of Summer break.'
 			if m1 = 11 and d1 = 4:$calendarday += $list + 'First day of Autumn break.'
 			if m1 = 11 and d1 = 11:$calendarday += $list + 'Last day of Autumn break.'

+ 1 - 0
locations/version.qsrc

@@ -2,6 +2,7 @@
 
 act 'Return': gt 'start'
 '0.8.1'
+'- Albina rework by vengeance11 and Philo'
 '- Reminder for work at salon in stat window from hornguy6'
 '- Rework of the runner race structure from THX'
 '- Shower dildos! And new virginity lose to them with reactions thanks to hornguy6'