Merge remote-tracking branch 'jhawkkaw/dev'

locations/Cheatmenu_din.qsrc

@@ -1119,6 +1119,7 @@ $cheatmenu['reputation'] = {
 			'<<$npc_firstname[''A152'']>> <<$npc_lastname[''A152'']>>: <<npc_rel[''A152'']>>  <a href="exec:npc_rel[''A152''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A152''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A153'']>> <<$npc_lastname[''A153'']>>: <<npc_rel[''A153'']>>  <a href="exec:npc_rel[''A153''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A153''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A142'']>> <<$npc_lastname[''A142'']>>: <<npc_rel[''A142'']>>  <a href="exec:npc_rel[''A142''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A142''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
+			'<<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>>: <<npc_rel[''A231'']>>  <a href="exec:npc_rel[''A231''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A231''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 		end
 		*nl
 		'<i>Gopniks</i>'

locations/Snpc.qsrc

@@ -638,5 +638,104 @@ if numnpc = 31:
 	end
 end
 
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!Aleksandra Kirilenko!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+if numnpc = 62:
+	if npc_rel[$static_num] >= 100 and grupTipe = 3 and npc_QW[$static_num] = 0 and temper >= 15:
+		act 'Ask to join at library after school':
+			*clr & cla
+			minut += 5
+			npc_QW[$static_num] = 1
+			gs 'stat'
+			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/62.jpg"></center>'
+			'"Hi <<$npc_nickname[''<<$static_num>>'']>>! I just finished my last book at home and I''m not sure what I should read next. Can I join you at the library this afternoon so that you can help me find another good one to read?"'
+			'<<$npc_firstname[''<<$static_num>>'']>>''s face quickly shifts from a smile to confusion. You can tell she''s not sure how to respond and there is a long pause as a result.  Finally after about 30 seconds of thought she responds "Sure, that should be alright.  Do you mind going home with me first so that I can change out of our uniform?"'
+			'"That is no problem at all" you reply. "I''ll meet you outside of school after our last period, and then we can head to your house together."'
+			'"Sounds good <<$pcs_nickname>>. See you then" <<$npc_firstname[''<<$static_num>>'']>> replies as she heads off.'
+			if $loc ! 'gdkin':
+				xgt 'gschool_lessons', 'short_break', 'nopict'
+			else
+				act 'Move away': gt $loc, $metka
+			end
+		end
+	elseif npc_rel[$static_num] >= 100 and grupTipe = 3 and npc_QW[$static_num] = 2 and schoolprogul > 0:
+		act 'Ask to study at her house after school':
+			*clr & cla
+			minut += 5
+			npc_QW[$static_num] = 3
+			gs 'stat'
+			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/62.jpg"></center>'
+			'"Hi <<$npc_nickname[''<<$static_num>>'']>>! I ended up missing school the other day because I was sick. Would it be alright with you if we went to your house after school so that you can help me catch up?"'
+			'<<$npc_firstname[''<<$static_num>>'']>> replies "Sure <<$pcs_nickname>>, just as long as you aren''t sick anymore.  I don''t want to get sick with whatever you had and miss school as well."'
+			'You giggle a little bit and reply "Nah, I got over my sickness so you should be fine. I''ll meet you outside of school after our last period, and then we can head to your house together."'
+			'"Sounds good <<$pcs_nickname>>. See you then" <<$npc_firstname[''<<$static_num>>'']>> replies as she heads off.'
+			if $loc ! 'gdkin':
+				xgt 'gschool_lessons', 'short_break', 'nopict'
+			else
+				act 'Move away': gt $loc, $metka
+			end
+		end
+	elseif npc_rel[$static_num] >= 100 and npc_QW[$static_num] = 4 and pcs_dom >= 20:
+		act 'Serious talk':
+			*clr & cla
+			minut += 5
+			gs 'stat'
+			npc_QW['A231'] = 5
+			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/62.jpg"></center>'
+			'As you walk to up <<$npc_firstname[''<<$static_num>>'']>>, you feel your stomach drop to the floor due to how awkward the situation is. However you''re not about to let what happened end your friendship without at least clearing the air.'
+			'After about a minute or so of eye contact, you finally develop enough courage to speak first.'
+			'"Hi <<$npc_nickname[''<<$static_num>>'']>>...." You say in a nervous and defeated voice.'
+			'"Hi <<$pcs_nickname>>...." she replies in an equally nervous voice.'
+			'After taking a couple more seconds to fully collect your thoughs, you say "Look, I think we need to talk about what happened last time at your house. Given the subject, it would be best to do so privately.  Can we meet after school to talk about it?"'
+			'<<$npc_nickname[''<<$static_num>>'']>> doesn''t respond, and almost looks like she''s about to start crying. She finally wimpers "Are you mad at me or are you sickened by me?"'
+			'Not completely surprised by what she said, you hold firm in making sure to wait until the two of you are alone. "I don''t wan''t to discuss things here. Meet me after school so we can talk about this more. I promise I''m not going to hurt you if that is what you''re afraid of."'
+			'Looking a little releaved, <<$npc_firstname[''<<$static_num>>'']>> nods her head in a slow manner and sheds a couple of tears. You walk away without either of you saying another word."'
+			if $loc ! 'gdkin':
+				xgt 'gschool_lessons', 'short_break', 'nopict'
+			else
+				act 'Move away': gt $loc, $metka
+			end
+		end	
+	elseif npc_rel[$static_num] >= 100 and npc_QW[$static_num] = 4 and pcs_dom < 20:
+		act 'Chicken Out':
+			*clr & cla
+			minut += 5
+			gs 'stat'
+			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/62.jpg"></center>'
+			'As you see <<$npc_firstname[''<<$static_num>>'']>>, you feel your stomach drop to the floor due to how awkward the situation is. You don''t have enough courage to bring up what happened the last time you were at <<$npc_firstname[''<<$static_num>>'']>>''s house, so you pretend to not see her and carry on your way.'
+			if $loc ! 'gdkin':
+				xgt 'gschool_lessons', 'short_break', 'nopict'
+			else
+				act 'Move away': gt $loc, $metka
+			end
+		end
+	elseif npc_QW[$static_num] > 5:
+		'Ever since you asked <<$npc_nickname[''<<$static_num>>'']>> to be your girlfriend, she has come out of her shell a bit more. She even kisses you while at school!'
+		act 'Kiss her':
+			*clr & cla
+			minut += 5
+			npc_rel[$static_num] += 10
+			npc_love[$static_num] += 5
+			npc_horny[$static_num] += 15
+			gs 'stat'
+			'<center><b><font color="maroon"><<$npc_firstname[$static_num]>> <<$npc_lastname[$static_num]>></font></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/aleksandra/school_kiss.jpg"></center>'
+			'You lean in to kiss <<$npc_firstname[''<<$static_num>>'']>> and you both close your eyes as your lips meet. You don''t really care what anyone else thinks, you both just enjoy the moment.' 
+			'You eventually break off the kiss and say "See you later cutie" and head on your way.'
+			if $loc ! 'gdkin':
+				xgt 'gschool_lessons', 'short_break', 'nopict'
+			else
+				act 'Move away': gt $loc, $metka
+			end
+		end
+	end
+end
+
 --- Snpc ---------------------------------
 

locations/gschool_grounds.qsrc

@@ -249,6 +249,7 @@ if $ARGS[0] = 'main':
 			if JuliaMilLernQW >= 1:'<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a> is sitting somewhere on the school courtyard, reading a book.'
 			if NatBelLernQW >= 1:'<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a> is standing in a corner.'
 			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0:'<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a> is waiting for you near the school entrance.'
+			if npc_QW['A231'] = 1 or npc_QW['A231'] = 3 or npc_QW['A231'] >= 5:'<a href="exec:minut += 1 & gt ''AlexGo'', ''Start''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a> is waiting for you at the end of the school courtyard, listening to music.'
 
 			if katjaMeynoldday ! daystart and meynoldQW >= 2:'<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a> is walking across the school courtyard, getting ready to go home.'
 			if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:
@@ -287,6 +288,7 @@ if $ARGS[0] = 'main':
 			elseif fedorKozlovQW >= 10:
 				gs'show_table','<a href="exec:gt ''FedorEv'', ''Start''">Fedor</a>','5'
 			end
+			if npc_QW['A231'] = 1 or npc_QW['A231'] = 3 or npc_QW['A231'] >= 5:gs'show_table','<a href="exec:minut += 1 & gt ''AlexGo'', ''Start''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>','5'
 			if st_count > 0 :
 				'Near school yard, you see:'
 				'<TABLE BORDER=1><<$show_table>></TR></TABLE>'

locations/gschool_lessons.qsrc

@@ -3433,6 +3433,14 @@ if $ARGS[0] = 'npc_data':
 	grupTipe[46] = 4
 	$npcGo[46] = '<a href="exec:numnpc = 46 & gt ''Snpc''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
 	$npcSelfie[46] = '<a href="exec:numnpc = 46 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
+	
+!! Aleksandra Kirilenko
+	$school_static_num[62] = 'A231'
+	$npcPol[62] = 1
+	grupTipe[62] = 3
+	$npcGo[62] = '<a href="exec:numnpc = 62 & gt ''Snpc''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>'
+	$npcSelfie[62] = '<a href="exec:numnpc = 62 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>'
+
 
 !!
 !!===========================Teachers=======================

locations/npcstatic5.qsrc

@@ -2859,6 +2859,108 @@ npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 
+npctemp = 231
+$npc_dna['A<<npctemp>>'] = '1263221443 9149303548 9924295213 3412488451 0692260208 9156586673 648903478'
+$npc_firstname['A<<npctemp>>'] = 'Aleksandra'
+$npc_nickname['A<<npctemp>>'] = 'Alex'
+$npc_lastname['A<<npctemp>>'] = 'Kirilenko'
+$npc_usedname['A<<npctemp>>'] = 'Alex'
+if npc_QW['A231'] = -1:
+	$npc_notes['A<<npctemp>>'] = 'Ever since you outed Alex to Lizaveta, she has been tortured endlessly.  The only time the girls will acknowledge her presence is when they''re verbally abusing her, while the guys ignore her completely due to the fear of being considered gay for hitting on someone with a dick.'
+elseif npc_QW['A231'] >= 2 and npc_QW['A231'] < 5:
+	$npc_notes['A<<npctemp>>'] = 'After a complete accident, you now know that Alex is actually a trans woman. It seems that Aleksandra is placing a lot of faith in you to keep her secret, but you''re still not sure how you feel about the situation. You need some more time to process everything in order to make the decision you feel is the correct one.'
+elseif npc_QW['A231'] >= 5:
+	$npc_notes['A<<npctemp>>'] = 'After taking the time to really think about the situation with Alex, you realized that you had feelings for her.  You sat her down and revealed these feelings to her and now have started a secret romantic relationship.'
+else
+	$npc_notes['A<<npctemp>>'] = 'Alex Kirilenko is a very shy and introverted girl who seems to go out of her way to be by herself. No one really knows much about her other than she does really well in school and spends a lot of her afternoons at the library reading.  She has never shown interest any of the guys or girls at the school, and refuses any advances made by the guys.'
+end
+
+npc_dob['A<<npctemp>>'] = 20000229
+npc_vital['A<<npctemp>>'] = rand(20,30)
+npc_stren['A<<npctemp>>'] = rand(30,40)
+npc_intel['A<<npctemp>>'] = rand(10,20)
+npc_agil['A<<npctemp>>'] = rand(20,30)
+npc_sprt['A<<npctemp>>'] = rand(20,30)
+npc_magik['A<<npctemp>>'] = 0
+npc_drunk['A<<npctemp>>'] = 0
+npc_pantys['A<<npctemp>>'] = 0
+npc_cyc['A<<npctemp>>'] = -1
+npc_fert['A<<npctemp>>'] = -1
+$npc_firstpart['A<<npctemp>>'] = 'U'
+$npc_lastpart['A<<npctemp>>'] = 'U'
+$npc_kidpater['A<<npctemp>>'] = 'N'
+npc_gender['A<<npctemp>>'] = 1
+$npc_thdick['A<<npctemp>>'] = 'slim'
+npc_dick['A<<npctemp>>'] = 17
+npc_sexskill['A<<npctemp>>'] = 1
+npc_spermpot['A<<npctemp>>'] = 5000
+npc_vag['A<<npctemp>>'] = -1
+npc_ass['A<<npctemp>>'] = 0
+npc_hymen['A<<npctemp>>'] = -1
+npc_horny['A<<npctemp>>'] = 0
+npc_Pavrep['A<<npctemp>>'] = 0
+npc_Godrep['A<<npctemp>>'] = 0
+npc_apprnc['A<<npctemp>>'] = 0
+npc_lipbalm['A<<npctemp>>'] = 0
+npc_makeup['A<<npctemp>>'] = 0
+npc_sweat['A<<npctemp>>'] = 0
+npc_dye['A<<npctemp>>'] = 0
+npc_hairbsh['A<<npctemp>>'] = 0
+npc_skin['A<<npctemp>>'] = 0
+npc_bodyhair['A<<npctemp>>'] = 0
+npc_breath['A<<npctemp>>'] = 0
+npc_hipcurv['A<<npctemp>>'] = 0
+npc_hgt['A<<npctemp>>'] = 170
+npc_bust['A<<npctemp>>'] = 9
+npc_nips['A<<npctemp>>'] = 4
+npc_fat['A<<npctemp>>'] = 0
+npc_pubes['A<<npctemp>>'] = 0
+npc_hairlng['A<<npctemp>>'] = 300
+npc_haircol['A<<npctemp>>'] = 1
+npc_haircurl['A<<npctemp>>'] = 0
+npc_tan['A<<npctemp>>'] = 1
+npc_lip['A<<npctemp>>'] = 1
+npc_lashes['A<<npctemp>>'] = 0
+npc_eyesize['A<<npctemp>>'] = 0
+npc_eyecol['A<<npctemp>>'] = 1
+npc_dom['A<<npctemp>>'] = 0
+npc_sub['A<<npctemp>>'] = 0
+npc_glasses['A<<npctemp>>'] = 0
+npc_grades['A<<npctemp>>'] = 0
+npc_run['A<<npctemp>>'] = 10
+npc_vball['A<<npctemp>>'] = 0
+npc_shoot['A<<npctemp>>'] = 0
+npc_sewing['A<<npctemp>>'] = 0
+npc_serving['A<<npctemp>>'] = 0
+npc_chess['A<<npctemp>>'] = 0
+npc_dance['A<<npctemp>>'] = 10
+npc_danceero['A<<npctemp>>'] = 0
+npc_jab['A<<npctemp>>'] = 10
+npc_punch['A<<npctemp>>'] = 10
+npc_kick['A<<npctemp>>'] = 10
+npc_def['A<<npctemp>>'] = 10
+npc_vokal['A<<npctemp>>'] = 10
+npc_teach['A<<npctemp>>'] = 0
+npc_QW['A<<npctemp>>'] = 0
+npc_rel['A<<npctemp>>'] = 0
+npc_love['A<<npctemp>>'] = 0
+npc_job['A<<npctemp>>'] = 0
+npc_cloc['A<<npctemp>>'] = 0
+$npc_dad['A<<npctemp>>'] = 'U'
+$npc_mom['A<<npctemp>>'] = 'U'
+$npc_pic['A<<npctemp>>'] = 'xPICx'
+npc_herpes['A<<npctemp>>'] = 0
+npc_syth['A<<npctemp>>'] = 0
+npc_gon['A<<npctemp>>'] = 0
+npc_chlam['A<<npctemp>>'] = 0
+npc_genwart['A<<npctemp>>'] = 0
+npc_thrush['A<<npctemp>>'] = 0
+npc_malen['A<<npctemp>>'] = 0
+npc_chem['A<<npctemp>>'] = 0
+npc_clothpref['A<<npctemp>>'] = 0
+$npc_PersType['A<<npctemp>>'] = 'XXXX'
+
+
 !! {Keep this at the end of file of the npcstatics.}
 aarraynumber = npctemp
 

locations/phone_selfies.qsrc

@@ -549,8 +549,16 @@ if $ARGS[0] = 'schoolselfies':
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
+	elseif numnpc = 62:
+		'<center><h4><font color="maroon">Aleksandra selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/girl/aleksandra/selfies/'
+		$selfienpc = 'aleksandra'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	
 	else
-		!! up to 61, based on the "head" folder
+		!! up to 62, based on the "head" folder
 	end
 	
 	if loopmax > 0:

locations/preSYS.qsrc

@@ -1267,7 +1267,7 @@ if $ARGS[0] = 'socialgroup_setting':
 		npc_rel[$school_static_num] += grup5
 	end
 	r += 1
-	if r <= 61:jump 'socialgroup_loop'
+	if r <= 65:jump 'socialgroup_loop'
 end
 
 if $ARGS[0] = 'socialgroup_setting_boys':
@@ -1302,7 +1302,7 @@ if $ARGS[0] = 'socialgroup_setting_boys':
 		end
 	end
 	r += 1
-	if r <= 61:jump 'socialgroup2_loop'
+	if r <= 65:jump 'socialgroup2_loop'
 end
 
 --- preSYS ---------------------------------