locations/blackmailer.qsrc

@@ -86,10 +86,10 @@ if $ARGS[0] = 'blackmail_dreams':
 	elseif blackmailQW['stage'] = 2:
 		$sleep_events_priority[] = 'gt ''blackmailer'', ''photo_dream2'' '
 	else
-		temp_rand = rand(0, 1)
+		temp_rand = rand(-2, 1)
 		if temp_rand >= 1 and blackmailQW['stage'] >= 2:
 			$sleep_events[] = 'gt ''blackmailer'', ''photo_dream2'' '
-		else
+		elseif temp_rand = 0:
 			$sleep_events[] = 'gs ''blackmailer'', ''photo_dream1'' '
 		end
 	end
@@ -98,7 +98,7 @@ end
 
 if $ARGS[0] = 'photo_dream1':
 	if blackmailQW['stage'] = 1: blackmailQW['stage'] = 2
-	blackmailQW['dream_day'] = daystart + 3
+	blackmailQW['dreamday'] = daystart + 3
 	if strpos('panty_pantyrear_bra', $blackmailQW['init_flashaction']):
 		gs 'arousal', 'flashlite', -5
 	else

locations/bus_incidental.qsrc

@@ -33,6 +33,5 @@ if $ARGS[0] = 'end1':
 	act 'Continue': gt $loc, $loc_arg
 end
 
+--- bus_incidental ---------------------------------
 
-
---- bus_incidental ---------------------------------------

locations/core_library.qsrc

@@ -81,6 +81,9 @@ end
 !! clothing_status - fnct to determine clothing status
 
 if $ARGS[0] = 'clothing_status':
+	$apparel['panty'] = ''
+	$apparel['bra'] = ''
+	$apparel['status'] = ''
     if $pantyworntype = 'none': $apparel['panty'] = 'pantyless'
     if $braworntype = 'none': $apparel['bra'] = 'braless'
     if $clothingworntype =  'nude': $apparel['status'] = 'nude'

locations/din_bad.qsrc

@@ -223,7 +223,7 @@ if $ARGS[0] = 'd_bag':
 	elseif mc_inventory['mentats'] > 0:
 		'There are <b><<mc_inventory[''mentats'']>></b> neurobooster pills left. You really shouldn''t take any more pills today.'
 	end
-	if mc_inventory['steroids'] > 0:'<a href="exec:dynamic gs ''drugs'', ''steroids'' & gs ''din_bad'', ''d_bag''">Use steroids.</a> You have <b><<mc_inventory[''steroids'']>></b> steroids left in your purse.'
+	if mc_inventory['steroids'] > 0:'<a href="exec: gs ''drugs'', ''steroids'' & gs ''din_bad'', ''d_bag''">Use steroids.</a> You have <b><<mc_inventory[''steroids'']>></b> steroids left in your purse.'
 	if mc_inventory['breastcream'] > 0:'<a href="exec: gs ''drugs'', ''breastcream'' & gs ''din_bad'', ''d_bag''">Apply breast cream.</a> You have <b><<mc_inventory[''breastcream'']>></b> cream left in your purse.'
 	if mc_inventory['aphrodisiac'] > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $drugVars[''aphrodisiac_msg''] & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<mc_inventory[''aphrodisiac'']>></b> gum left in your purse.'
 

locations/girl.qsrc

@@ -61,10 +61,10 @@ if $ARGS[0] = 'set_boybody':
 
 	boybodrand = rand(1, 4)
 
-	if boybodrand = 1 and boyboyrand = 1: 
+	if boybodrand = 1 and boybodyrand = 1: 
 		$boybod = 'petite'
 		$boybod_pref = 'a petite'
-	elseif boybodrand = 1 and boybodyrand = 1: 
+	elseif boybodrand = 1 and boybodyrand = 2: 
 		$boybod = 'slender'
 		$boybod_pref = 'a slender'
 	elseif boybodrand = 2: 

locations/gopnik_house.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'rape':
 		if ciklkm < placerParameter['number_of_man']:'Once the Gopnik finishes, his friend quickly takes his place between your legs.'
 		gs 'npcgeneratec', 0, 'Gopnik from the park', rand(16,26)
 		gs 'boyStat', $npclastgenerated
-		act 'Continue' gt 'gopnik_house', 'rape'
+		act 'Continue': gt 'gopnik_house', 'rape'
 	else
 		gt 'gopnik_house', 'rape_end'
 	end

locations/pav_library.qsrc

@@ -98,8 +98,8 @@ if hour >= 8 and hour < 18:
 		act 'Do your homework (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	
-	if mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14 and SchoolAtestat = 0 and SchoolBlock = 0 _
-	and (class['school_grades_above_40'] + class['school_grades_above_70'] + class['school_grades_above_90'] <= 20 or grupTipe = 3):
+	if mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14 and SchoolAtestat = 0 and SchoolBlock = 0 and _
+	(class['school_grades_above_40'] + class['school_grades_above_70'] + class['school_grades_above_90'] <= 20 or grupTipe = 3):
 		act 'Join the nerd''s study group': gt 'pav_library_nerdstudy', 'nerd_study_night'
 	end
 else

locations/praiders_garage_chat.qsrc

@@ -63,7 +63,7 @@ if $ARGS[0] = 'chat_radomir':
 					'Interested in his advances, you decide to return his flirting, turning to face him, before placing your hand on his thigh. "Pretty huh? So you''re interested in me?" Radomir replies, "I might be. You know, you remind me of a girl we had back at our last concert. She was a pretty girl, that really knew how to follow instructions, and was very obedient. She was very smart, and I believe that you''re smart too. Maybe we can spend a little time together after the show. You are far hotter than the other girls."'
 					*nl
 					'He reaches up to run his hand through your hair. "I just love your hair." He says, as his firm touch, leaves your body feeling hot, which is only heightened by his compliments, and the attention he is giving you. He then leans in close, as you can feel the heat of his breath across your neck. "Damn, you''re fine." he says, as you feel his hand sliding up your thigh.'
-					'The sensuous moment is then interrupted by Niko wrapping his arm around your shoulder, before dropping down between you & Radomir, as he says, "Hey <<pcs_nickname>>, you wouldn''t be drinking without me, would you?" You look back at Niko, before replying, "Oh, I was just chatting about the band. It''s good to see you." Niko leans in closer, before giving you a kiss on your lips, making sure to let Radomir see, as he pulls you up off the chair, guiding you away from Radomir, and out of the garage.'
+					'The sensuous moment is then interrupted by Niko wrapping his arm around your shoulder, before dropping down between you & Radomir, as he says, "Hey <<$pcs_nickname>>, you wouldn''t be drinking without me, would you?" You look back at Niko, before replying, "Oh, I was just chatting about the band. It''s good to see you." Niko leans in closer, before giving you a kiss on your lips, making sure to let Radomir see, as he pulls you up off the chair, guiding you away from Radomir, and out of the garage.'
 					gs 'arousal', 'foreplay', 1, 'exhibitionism'
 					gs 'stat'
 					act 'Go with Niko': gt 'NikoEv', 'Garage Sex'
@@ -1546,7 +1546,7 @@ if $ARGS[0] = 'chat_niko1':
 				'Obviously not believing what you said, he playfully shakes his head, as he responds, "So you need time huh? I can wait."'
 			elseif Rex_Love = 1:
 				'You shake your head, before playfully pushing Niko away from you, as you say, "Sorry, but I''m already with someone."'
-				'Niko tilts his head, before replying, "And who would that be? I don''t see you with any of the guys around here." To which, you reply, "He is a sweet guy that I met a little while ago, named Rex." Niko gives you a puzzled look, as he says, "Rex? That sounds like a dog''s name. Listen <<pcs_nickname>>, you don''t need a dog in your life when you can have a real man. With me, there will be no need to worry about anything. I will keep you safe, and well satisfied. You won''t ever need anyone else."'
+				'Niko tilts his head, before replying, "And who would that be? I don''t see you with any of the guys around here." To which, you reply, "He is a sweet guy that I met a little while ago, named Rex." Niko gives you a puzzled look, as he says, "Rex? That sounds like a dog''s name. Listen <<$pcs_nickname>>, you don''t need a dog in your life when you can have a real man. With me, there will be no need to worry about anything. I will keep you safe, and well satisfied. You won''t ever need anyone else."'
 				*nl
 				'Not really trusting his sincerity, you can only say, "That is quite a claim you''re making there. I wonder how much of it, you actually believe."'
 				'Niko brings his face to yours before whispering, "Everything... You just need to trust me. You do trust me right?"'
@@ -1554,7 +1554,7 @@ if $ARGS[0] = 'chat_niko1':
 				'Obviously not believing what you said, he playfully shakes his head, as he responds, "So you need time huh, I can wait."'
 			!! elseif Dimka Relationship Variable:
 			!!	'You shake your head, before playfully pushing Niko away from you, as you say, "Sorry, but I''m already with someone."'
-			!!	'Niko shakes his head, before replying, "You mean that thick headed dick, Dimka? Unlike me, he doesn''t care about anyone but himself. He is trying to use you <<pcs_nickname>>, you know that. With me, there will be no need to worry about anything. I will keep you safe, and well satisfied. You won''t ever need anyone else."'
+			!!	'Niko shakes his head, before replying, "You mean that thick headed dick, Dimka? Unlike me, he doesn''t care about anyone but himself. He is trying to use you <<$pcs_nickname>>, you know that. With me, there will be no need to worry about anything. I will keep you safe, and well satisfied. You won''t ever need anyone else."'
 			!!	*nl
 			!!	'Not really trusting his sincerity, you can only say, "That is quite a claim you''re making there. I wonder how much of it, you actually believe."'
 			!!	'Niko brings his face to yours before whispering, "Everything... You just need to trust me. You do trust me right?"'
@@ -1562,7 +1562,7 @@ if $ARGS[0] = 'chat_niko1':
 			!!	'Obviously not believing what you said, he playfully shakes his head, as he responds, "So you need time huh, I can wait."'
 			else
 				'Unsure if his words are true, you can only reply with, "Well, I''m not really dating anyone, so we will have to see."'
-				'Niko''s eyes glimmer with hope, as his smile widens, "Simply considering an afternoon with me, is enough to keep me hopeful. I can take very good care of you <<pcs_nickname>>, you need only [place your trust in me."'
+				'Niko''s eyes glimmer with hope, as his smile widens, "Simply considering an afternoon with me, is enough to keep me hopeful. I can take very good care of you <<$pcs_nickname>>, you need only [place your trust in me."'
 				'You coyly smile back at Niko, as you notice everyone else begin to stand up, signaling the end of the party.'
 			end
 			act 'Hang out': gt 'praiders_garage', $hangout_rand
@@ -1614,7 +1614,7 @@ if $ARGS[0] = 'chat_niko1':
 			'"What''s the story with Anushka? She certainly seems popular around here." Niko shrugs, "She is a cocky little bitch. She plays with the band, on the stage, and off. When she''s not playing guitar, she is fucking one of the other guys."'
 			'You reply, "Wow, she seems kind of wild. Does she fuck all the guys, or only the band?"'
 			if NikoVolkovQW >= 5:
-				'"She fucks most of them, she even tries to seduce me, but I''m happily taken," You coyly reply, "I hope I''m not having some competition," Niko seductively responds, "There is no beauty, more refined, then yours <<pcs_nickname>>, so you have nothing to fear. My eyes are glued to you, and you alone."'			
+				'"She fucks most of them, she even tries to seduce me, but I''m happily taken," You coyly reply, "I hope I''m not having some competition," Niko seductively responds, "There is no beauty, more refined, then yours <<$pcs_nickname>>, so you have nothing to fear. My eyes are glued to you, and you alone."'			
 			else
 				'"She fucks most of them, but thinks that she is too good for me. The cocky little bitch, will learn eventually." Niko says, as he angrily slams his beer on the table.'
 			end			
@@ -1668,7 +1668,7 @@ if $ARGS[0] = 'chat_niko1':
 			'"She is a lesbian for sure."'
 			'"But how would you know?." Niko replies, "It''s simple, she won''t go out with me." You give Niko a sarcastic grin, as you respond, "Is that all it takes to become a lesbian? because we might have more lesbians in the school than I thought."'
 			*nl
-			'Niko makes an exaggerated emote, or being stabbed in the head, and falling over, before says, "Oh, you wound me <<pcs_nickname>>, but in all honesty, she seems to be obsessed with Lena, and does does everything she wants to do, even if it means fucking the guys together."'
+			'Niko makes an exaggerated emote, or being stabbed in the head, and falling over, before says, "Oh, you wound me <<$pcs_nickname>>, but in all honesty, she seems to be obsessed with Lena, and does does everything she wants to do, even if it means fucking the guys together."'
 			'"Ohh, so she sleeps with multiple guys?" Niko shakes his head, before replying, "Only when Lena is involved. She is full on lezzy, and it''s pretty fucking lame." You give Niko a coy grin, "Not a fan of lesbians, huh?"'
 			'"Well they are not doing me any good, and Lera gives me so much shit whenever I tried to hook up with Lena. She is just always glued to her side, to look over our shoulders. It''s bad enough when her brother does it, but Vitek is not always around her, Lera is."'
 			*nl
@@ -1688,7 +1688,7 @@ if $ARGS[0] = 'chat_niko1':
 		if VK = 1:
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile1.jpg"></center>'
-			'Not able to think of anything in particular to ask Niko, you decide to casually ask him, "So what''s new with you?" Niko replies, "Check this out, I had this loud mouth mother fucker walking shit the other the other day to Roman, and look what he did to his face."'
+			'Not able to think of anything in particular to ask Niko, you decide to casually ask him, "So what''s new with you?" Niko replies, "Check this out, I had this loud mouth mother fucker talking shit the other day to Roman, and look what he did to his face."'
 			'Niko shows you a picture on his phone of a man cuddles in a corner with a beaten bloody face. The sight of the images disgusts you, so you shove the phone away from your face and say, "Eww, gross. Is this what you guys get up to on your own?"'
 			*nl
 			'Niko casually shrugs, as he replies, "It''s just some of life''s struggles that we guys have to go through. You girls only need to worry about dolling yourselves up, and looking pretty. We guy have to get down & dirty sometimes."'
@@ -1743,7 +1743,7 @@ if $ARGS[0] = 'chat_niko1':
 				*nl
 				'Niko''s interest in this crime lord, leave you feeling very inquisitive, pushing you to say, "What exactly can that man offer you, that would be worth such a risk?" Niko hesitates, before looking toward the ground in silence. He seems to be a bit lost in thought. Realizing that there is definitely something on his mind, you ask, "What''s wrong? Is there something you need from him."'
 				'Niko remains silent for a few seconds, before finally saying, "He might be able to help us. He is a strong man who is feared in this town. If anyone can restore your reputation, it is him." Not wanting to see Niko get mixed with this terrifying man, you exclaim, "Don''t put yourself in danger for me! We can find another way to restore my reputation. we just need to work together."'
-				'Niko slowly nods his head, then says, "You''re probably right. I''m just weighing our options for now. Nothing is set in stone, but  trust me <<pcs_nickname>>, I will restore your reputation, and make things right. I promise." He then leans over to you, before giving you a soft kiss on your lips, before handing you his beer to share.'
+				'Niko slowly nods his head, then says, "You''re probably right. I''m just weighing our options for now. Nothing is set in stone, but  trust me <<$pcs_nickname>>, I will restore your reputation, and make things right. I promise." He then leans over to you, before giving you a soft kiss on your lips, before handing you his beer to share.'
 			else
 				'Curious as to Niko''s interest in this crime lord, you ask, "So what interest do you have in him exactly? Has he made you some offer, or something?" Niko quickly shakes his head. "No way, he is not interested in a small fry like me, but his connections can open so many doors to the right person. It''s just really hard to get close to him."'
 				'Feeling very intimidated by the big man in the photo, you decide to caution Niko, "I wouldn''t get involved with someone like that if I were you Niko. He seems like a brutal person to get close too. One slip up, and he could put you in a world of hurt." Niko slowly nods, as he says, "Maybe... I''m just weighing my options."'
@@ -1760,7 +1760,7 @@ if $ARGS[0] = 'chat_niko1':
 		elseif VK = 5:
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile1.jpg"></center>'
-			'With today feeling like a boring day, you only have the mindset to ask Niko, "Everything has been so dull lately, is there anything new?" Niko curiously rubs on his chin, as he asks, "You know that quiet girl Natalia?" You nod your head. "Yeah, she''s that bookworm from Anatorly''s class, what about her?"' 
+			'With today feeling like a boring day, you only have the mindset to ask Niko, "Everything has been so dull lately, is there anything new?" Niko curiously rubs on his chin, as he asks, "You know that quiet girl Natalia?" You nod your head. "Yeah, she''s that bookworm from Anatoly''s class, what about her?"' 
 			'Niko continues, "She always seems to carry around some book, but no one really knows what''s in it. Has she ever told you anything?" you shake your head, as you reply, "No, it seems to be a mystery. Why do you care anyway? You don''t strike me as the reading type." Niko nods, as he replies, "Well I''m curious... Do you think she keeps her nudes in there?"'
 			*nl
 			'Shocked by Niko''s question, you open your mouth, before playfully slapping his arm. "Is that what you were curious about? You boys are such pervs!" Niko laughs, before he responds, "Well... Why else would she keep it so secret? It must be something she doesn''t want people to see."' 

locations/transport_functions.qsrc

@@ -693,7 +693,7 @@ if $ARGS[0] = 'display_bus_timecost':
 		temp_mins += transportVars['bus_wait_gadukino']
 	elseif ($ARGS[1] = 'pavstation' and $ARGS[2] = 'community') or ($ARGS[1] = 'pushkin' and ($ARGS[2] = 'community' or $ARGS[2] = 'pavstation')) or ($ARGS[1] = 'construction' and $ARGS[2] ! 'gadukino') or ($ARGS[1] = 'gadukino' and ($ARGS[2] ! 'communal' and $ARGS[2] ! 'graveyard' and $ARGS[2] ! 'suburbs')):
 		temp_mins += transportVars['bus_wait_pavlovsk']
-	elseif $ARSG[1] = 'suburbs' or ($ARGS[1] = 'graveyard' and $ARGS[2] ! 'suburbs') or $ARGS[1] = 'communal' and $ARGS[2] = 'gadukino':
+	elseif $ARGS[1] = 'suburbs' or ($ARGS[1] = 'graveyard' and $ARGS[2] ! 'suburbs') or $ARGS[1] = 'communal' and $ARGS[2] = 'gadukino':
 		temp_mins += transportVars['bus_wait_gadukino']
 	else
 		temp_mins += transportVars['bus_wait_suburbs']