Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/artemEv.qsrc

@@ -439,11 +439,11 @@ if $ARGS[0] = 'learn':
 						'"The girl can also face the other way, that''s called the ''reverse cowgirl'' position."'
 						'You take the condom off Artem''s cock and give him a vigorous blowjob, while you slowly grind your hips against Peter''s. Within seconds you feel Peter''s grip tighten around your waist, and he groans as he shoots his load into the condom.'
 						gs 'arousal','vaginal',7,'dick[2]','dom','group'
-						gs 'cum_call','',$boy[2],1,3
+						gs 'cum_call','','A6',1,3
 						'You release Artem for a second and smile at Peter: "That was fast! Don''t worry, Petka... it''s completely normal for inexperienced guys. You''ll last longer the next time, you''ll see. We''ll keep practising until you can hold it back for as long as you need". You then turn to Artem: "How about you Artem, are you getting close yet?"'
 						'You give him a devious smile as you redouble your efforts, and soon you can feel his jets of sperm hitting the back of your mouth."'
 						gs 'arousal','bj',5,'dick[1]'
-						gs 'cum_call','mouth',$boy[1],1
+						gs 'cum_call','mouth','A2',1
 						'The guys take a while to recover, and then give you 1000 <b>₽</b> after you get dressed. You wink at them as you leave: "See you next time, boys!"'
 						artemBJQW += 1
 						swallow += 1
@@ -475,8 +475,8 @@ if $ARGS[0] = 'learn':
 			gs 'arousal','bj',5,'dick[2]','sub'
 			gs 'arousal','vaginal',5,'dick[2]','sub'
 			minut -= 5
-			gs 'cum_call','butt',$boy[2],1
-			gs 'cum_call','back',$boy[1],1
+			gs 'cum_call','butt','A6',1
+			gs 'cum_call','back','A2',1
 			'He comes close to giving you an orgasm, but doesn''t quite manage. When he''s about to burst Peter pulls out and jerks himself off, his warm jets of sperm landing on your ass cheeks. Artem does the same, and cums on your lower back.'
 			gang += 1
 			gs 'arousal','end'
@@ -525,7 +525,7 @@ if $ARGS[0] = 'learn':
 				$orgasm_or = 'yes'
 				gs 'arousal','cuni',5,'dick[2]','dom'
 				gs 'arousal','bj',5,'dick[1]','sub'
-				gs 'cum_call','face',$boy[1],1
+				gs 'cum_call','face','A2',1
 				'Artem cums all over your face, just as you have the strongest orgasm you''ve had in quite a while. You lick up Artem''s cum automatically in your current state of euphoria, not even realizing what you''re doing until you already swallowed most of it.'
 				'When you recover, you praise them: "Wow boys, that felt great! In fact... it felt so good, I''d feel bad taking your money. Today''s lesson is on me."'
 				'Peter seems to be in shock, and you reassure him: "Petka, I know that must''ve looked strange, but that''s what it looks like when a girl has an orgasm. You did great!"'
@@ -562,7 +562,7 @@ if $ARGS[0] = 'learn':
 				'You quickly walk back to Artem''s apartment with him, and give yourself an enema in the bathroom.'
 				'When you return to the garage, you get down on your hand and feet on the couch and wiggle your ass at them. You ask Artem: "So, now that I''m clean... do you have something we can use as lubricant? Maybe some petroleum jelly, or vegetable oil?"'
 				'Artem comes back with a jar of Vaseline. You smile at him and say: "That will do just fine. Now put some on your finger and slowly put it in my ass... don''t be stingy, use lots of it. It''ll feel much better for both of us."'
-				gs 'dinSex','boy_wants_anal',$boy[1],'lubri'
+				gs 'dinSex','boy_wants_anal','A2','lubri'
 				'He does as you say, and testily slides his finger inside your ass a few times. When he''s satisfied it''s going smooth enough, he adds a second finger and fucks your ass carefully.'
 				'"Very good, Artem... now take some more and smear it all over your cock". When you see he''s using good amounts, you nod: "Alright, now put it in slowly."'
 				'Artem slowly guides his dick into your tight asshole. Once the head is in, he groans: "Wow... it''s so tight, and so warm! I feel like I''m going to cum already!"'
@@ -573,8 +573,8 @@ if $ARGS[0] = 'learn':
 				'Peter nods and carefully slides his cock in. He slowly fucks your ass, making sure he''s not hurting you while you suck Artem off, ignoring the taste of your ass on his cock.'
 				'Neither of them last long, and soon you feel Peter shooting his load in your ass while Artem cums inside your mouth.'
 				minut -= 5
-				gs 'cum_call','mouth',$boy[1],1
-				gs 'cum_call','anus',$boy[2],1
+				gs 'cum_call','mouth','A2',1
+				gs 'cum_call','anus','A6',1
 				gang += 1
 				artemBJQW += 1
 				swallow += 1
@@ -629,8 +629,8 @@ if $ARGS[0] = 'learn':
 				gs 'arousal','',5,'dick[2]','sub'
 				gs 'arousal','anal',5,'dick[1]','sub'
 				'You wonder why he was so explicit in using your full name, but don''t think much of it. Again, you do as he says and take off your clothes. For the next half hour, the boys fuck you in all of your holes. While you''re too drunk to care, Artem makes sure he catches all of it on film."'
-				gs 'cum_call','mouth',$boy[1],1
-				gs 'cum_call','mouth',$boy[2],1
+				gs 'cum_call','mouth','A2',1
+				gs 'cum_call','mouth','A6',1
 				'They cum in your mouth, but tell you not to swallow just yet. You sit there on your haunches, your mouth full of sperm, obediently waiting for their next order.'
 				'Peter takes a glass and pisses in it... then Artem does the same. They offer you the glass, and tell you to drink it while you swallow their sperm.'
 				artemBJQW += 1

locations/gschool_lunch.qsrc

@@ -60,7 +60,6 @@ if $ARGS[0] = 'cafeteria':
 		end
 	end
 	if dimaRevenge = 5 and dimaRevChoice = 5:
-		!!during lunch!!
 		'<center><b><font color="maroon">Cafeteria</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/lunch/lunch.jpg"></center>'
 		'As you wait in line for your meal, you hear the other students talking about a girl you don''t know. None of them are talking about you anymore. Dimka works quick. You enjoy the rest of your lunch break.'
@@ -68,6 +67,23 @@ if $ARGS[0] = 'cafeteria':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/lunch.jpg"></center>'
 		'During the break, students and some of the <a href="exec:gt ''Sgrup''">teachers</a> are standing in line near the kitchen, waiting for their food.'
 	end
+
+	act 'Skip lunch':
+		cla
+		menu_off = 1
+		gs 'gschool_gossip', 'skipping'
+		act 'Continue': gt 'gschool_lunch', 'break'
+	end
+	
+	act 'Eat bagged lunch':
+		cla
+		menu_off = 1
+		gs 'food', 'bag_lunch'
+		delact 'Finish'
+		gs 'gschool_gossip', 'bagged'
+		act 'Continue': gt 'gschool_lunch', 'break'
+	end
+
 	if money >= 50:
 		act 'Buy food (50 <b>₽</b>)':
 			cla
@@ -78,20 +94,8 @@ if $ARGS[0] = 'cafeteria':
 			gs 'gschool_gossip', 'buying'
 			act 'Continue': gt 'gschool_lunch', 'break'
 		end
-	end
-	act 'Eat bagged lunch':
-		cla
-		menu_off = 1
-		gs 'food', 'bag_lunch'
-		delact 'Finish'
-		gs 'gschool_gossip', 'bagged'
-		act 'Continue': gt 'gschool_lunch', 'break'
-	end
-	act 'Skip lunch':
-		cla
-		menu_off = 1
-		gs 'gschool_gossip', 'skipping'
-		act 'Continue': gt 'gschool_lunch', 'break'
+	else
+		'You don''t have enough money (50 <b>₽</b>) to buy food.'
 	end
 end
 
@@ -110,7 +114,7 @@ if $ARGS[0] = 'break':
 		'"Hi Nat did you happen to see Dimka?" "Hi <<$pcs_nickname>>, he was here before speaking with Lena and Lera.'
 	end
 	gs'stat'
-!!Lunch events requiring unlock
+	
 	if dimaRevenge = 2:
 		gt 'dimaRevenge', 2
 	elseif fedorKozlovQW = 0 and FedorIntro = 0 and pcs_apprnc >= 20:
@@ -140,19 +144,18 @@ if $ARGS[0] = 'break':
 		lunch_event = daystart
 		gt 'gschool_lunch', 'events'
 	end
-	if lunch_event ! daystart:lunch_event = daystart & gt 'gschool_lunch', 'events'
-	if soniaPS = 2:soniaPS = 3 & 'During break, while you''re wandering through the school hallways killing time, you notice Sonia Ivanko and Vitek Kotov talking about something. Sonia looks like she''s about to cry, but eventually she gives a quiet nod as Vitek whispers something in her ear.'
-!!new options
+	
+	if lunch_event ! daystart: lunch_event = daystart & gt 'gschool_lunch', 'events'
+	if soniaPS = 2: soniaPS = 3 & 'During break, while you''re wandering through the school hallways killing time, you notice Sonia Ivanko and Vitek Kotov talking about something. Sonia looks like she''s about to cry, but eventually she gives a quiet nod as Vitek whispers something in her ear.'
+
 	act 'Use water cooler': gt 'gschool_break', 'watercooler'
 	act 'Go to the girls restroom': gt 'gschool_break', 'Go to the girls restroom'
 	act 'Go to the boys restroom': gt 'gschool_break', 'Go to the boys restroom'
-!!after using these options after the long break or lunch then the three below of going to chat to school friends should still be a option. not sure how you want to code that
 
-!!this next three acts are only a option during the long break and lunch
 	act 'Relax in a classroom': gt 'gschool_chats', 'nerds'
 	act 'Hang out in the hallway': gt 'gschool_chats', 'cooljocks'
 	act 'Go hangout with the gopniks': gt 'gschool_chats', 'gopniks'
-!!end of limited break options
+
 	if school_period = 6:
 		act 'Stay in cafeteria':
 			*clr & cla
@@ -174,6 +177,7 @@ if $ARGS[0] = 'break':
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		end
 	end
+	
 	if zverevaQW = 2 and zverRageQW = 0 or zverevaQW = 3 and zverRageQW = 0:
 		act 'Spread rumors about Christina':
 			*clr & cla
@@ -286,7 +290,7 @@ if $ARGS[0] = 'marcus_event':
 		end
 	end
 end
-!!for the events they are kinda scatter, shouldn''t we combine them all into a single list of random events with a chance a event happens then randomly roll one of the following instead of them all being their own things?
+
 if $ARGS[0] = 'events':
 	menu_off = 1
 	if npcSex[14] = 1 and KatjaLust >= 50 and Katjahorny + KatjaSlut >= 100 and KatjaHorny > 50:
@@ -325,15 +329,7 @@ if $ARGS[0] = 'events':
 		act 'Refuse': KatjaDom -= 1 & gt 'gschool_lunch', 'break'
 	elseif pav_slut >= 75 and kotovLoveQW <= 0:
 		gt 'gschool_lunch', 'bjs'
-
-!!question, shouldn''t the Ivan asking Sveta if she is bored be moved here to the lunch area and be part of the unlock? since it only happens if Sveta has had sex with him and then talked to him during lunch and agreed about hooking up when bored.
-
-!!Anushka lesbian unlock. There is two ways for this to happen, I am putting them both here.
-
-!!alternative way for this to trigger with out talking to Anushka, instead she approaches Sveta 1 and 5.
-!!requirements, have done this scene once before, or Sveta is a gopnik.
-!!Event Anushka is horny
-	elseif (Anush_lunch > 0 or grupTipe = 4) and rand(0, 5) = 0:
+	elseif (Anush_lunch > 0 or grupTipe = 4) and rand(0,5) = 0:
 		pcs_horny += 20
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/school/want.jpg"></center>'
 		'As you are leaving the canteen, Anushka grabs you and pushes you up against the wall. She starts kissing you passionately, while one of her hands slides up your skirt and starts rubbing your clit. You can hear several of your fellow classmates whistling, hooting and hollering, but right now you don''t really care. She breaks the kiss just long enough to moan into your ear. "I want to fuck you, come with me," her fingers sliding up into your pussy as she says it.'
@@ -352,9 +348,6 @@ if $ARGS[0] = 'events':
 			'As her fingers invade your already dripping pussy, you spread your legs a bit wider to give her easier access, barely even aware of your fellow students in the hall and you softly moan back at her. "Mmm yes, I want you to fuck me." She smiles and grabs you by the hand and leads you away so you can find somewhere private.'
 			act 'Go somewhere private': gt 'gschool_sex', 'Anush_private'
 		end
-
-!!This unlocks once the above scene Anushka is horny has happened once or if Sveta is a gopnik. After that has happened then there is a 50/50 if Anushka is horny event triggers that it will be that scene or this scene.
-!!Event Anushka is horny with friends
 	elseif (Anush_lunch > 1 or grupTipe = 4) and rand(0, 1) = 0:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hall.jpg"></center>'
 		'As you stop by your locker after lunch, Anushka comes over and rests against the locker next to yours. She leans in close to you "Hey <<$pcs_nickname>>, you wanna come have some fun? The boys brought something special and they are waiting for us in one of the unused classrooms." By the look in her eye and the way she is acting, you know exactly what she means by having fun with the boys.'
@@ -367,10 +360,7 @@ if $ARGS[0] = 'events':
 			act 'Continue': gt 'gschool_lunch', 'break'
 		end
 		act 'Go somewhere private':gt 'gschool_sex', 'Anush_private2'
-
-	!!This part I moved because it was in the middle of parts I felt was connected and I wanted this one to no longer be connected to that group of scenes. Instead I wanted it to be an unlock lunch scene because it can only trigger if Sveta has enough rep with the gopnik to be considered a hanger on or higher.
-	!!chance this happens is 1 in 4, if the other unlock scenes don''t trigger first of course.
-	elseif gruptipe = 4 and rand(0, 3) = 0:
+	elseif gruptipe = 4 and rand(0,3) = 0:
 		cla
 		'During the break, you are approached by some of the local Gopniks in your school, "<<$pcs_nickname>>, come to the bathroom with us so we can have a little fun. You look like you could use a protein snack anyways." A couple of them snicker at that, as they put their hands around your arms and try to guide you towards the restrooms.'
 		*nl
@@ -413,7 +403,6 @@ if $ARGS[0] = 'events':
 				act 'Continue': gt 'gschool_lessons', 'short_break'
 			end
 		end
-	!! Random lunch events
 	elseif rand(1,100) < 3:
 		cla
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/foodfight.mp4"></video></center>'
@@ -424,29 +413,25 @@ if $ARGS[0] = 'events':
 		gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 0, 0
 		gs 'gschool_events', 'rand_girl_arg1', 1, 1, 0, 1, 0, 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/hallbutt.jpg"></center>'
-		!!<<$rand_girl1>> random chance to be 1 cool girl, 2 jock girl, 3 gopnik girl.
-		!!<<$rand_girl>> random chance is 1 jock girl, 2 gopnik girl
-		!!if <<$rand_girl1>> is a gopnik, then so is <<$rand_girl>>
 		'Two girls are dancing around in the hall, at one point they turn to face the lockers. As they do <<$rand_girl>> grabs the back of <<$rand_girl1>> gym pants and pulls them part way down, exposing her naked butt to everyone in the hall. <<$rand_girl1>> quickly pulls up her pants while swearing at <<$rand_girl>>, with her friend joining in. Before it can go any further a teacher breaks things up. It is hard to tell if it was friendly messing around or if there is now bad blood.'
 		act 'Continue your break': gt 'gschool_lunch', 'break'
-!!new events added here
 	elseif rand(1,100) < 3:
 		cla
+		gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 0, 0, 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sex/lunchsleep.jpg"></center>'
-!!random girl one of the cool girls or jocks.
 		'While in the cafeteria you notice <<rand_girl>> is laying down on her back on one of the benches. Her eyes are closed, her chest raises up slowly as she breathes. You think she has fallen asleep, despite all the noise around her. She must really be tired.'
 		act 'Continue your break': gt 'gschool_lunch', 'break'
 	elseif rand(1,100) < 3:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/lunchdhump.jpg"></center>'
 		'While in the cafeteria you see a couple of the gopnik girls hanging out by one of the tables. One of them is slightly bent over with her skirt hiked almost all the way up to her breasts, her panties and tight ass exposed to anyone who cares to look. The second girl stands behind her with her hands on her hips. She thrusts her hips forward hard, bouncing off the panty clad ass of the first girl, pretending like she is giving her a pounding fuck. Both girls let out loud fake moans with each slap of their bodies. The quite public fake fucking gets laughs from all the other gopniks, while most of the other boys and more than one teacher watch with a gleam of lust in their eyes at their antics. The raunchy display has an obvious effect and many of the boys in the audience do their best to inconspicuously cover their groins with whatever happens to be available. Even a couple of the girls seem to be lightly rubbing their legs together, faces slightly flushed, possibly even unaware of how they are affected. But knowing many of the girls of this school, they are probably quite aware.'
-		gs 'arousal', 'voyeur', 10, 'unknown'
+		gs 'arousal', 'voyeur', 10
 		act 'Continue your break': gt 'gschool_lunch', 'break'
 	elseif rand(1,100) < 3:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/bust.jpg"></center>'
 		'You walk into the bathroom and find two other girls in there. One of them has her shirt half unbuttoned with her hands on either side of her breasts, looking at them in the mirror. "Do my tits look bigger? I don''t think they''re bigger," she says as she turns from side to side, then leans forward a bit, her lips slightly pursed as she evaluates her melons from every angle. She has a fairly impressive bust already, you don''t know why she is so worried about it. Her friend replies as you wash your hands. "They look bigger to me, I think they are still growing, unlike mine." True, her breasts are a lot smaller than her friend''s, you think as you walk out.'
-		gs 'arousal', 'voyeur', 5, 'unknown'
+		gs 'arousal', 'voyeur', 5
 		act 'Continue your break': gt 'gschool_lunch', 'break'
 	else
 		gt 'gschool_lunch', 'break'
@@ -463,7 +448,7 @@ if $ARGS[0] = 'rolan_meet':
 		gs 'stat'
 		rolanmeet += 1
 		'<center><img src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet0.jpg"></center>'
-		!! LURK MORRISON images are currently located in ''...images\locations\pavlovsk\resident\apartment\aptrolan\rolanmeet'\'
+!! LURK MORRISON images are currently located in ''...images\locations\pavlovsk\resident\apartment\aptrolan\rolanmeet'\'
 		'He looks like he''s sleeping. You try waking him, "Hey mister, you shouldn''t sleep here!"'
 		'He''s snoring pretty loudly. It''s a wonder no one else has tried to wake him.'
 		'"Hey... Hey... Wake up!"'

locations/npcstatic4.qsrc

@@ -421,9 +421,25 @@ discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 165 & gt ''Snpc''"><<$npc_firstname[''A165'']>> <<$npc_lastname[''A165'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A165'
 
-
 npctemp = 166
-!!RIP Rex
+gs 'npcstaticdefaults', 'defaults'
+$npc_dna['A<<npctemp>>'] = '8678987195 3857034937 9131318721 1506516098 6640960268 3377018962 2108967494'
+$npc_firstname['A<<npctemp>>'] = 'Nikita'
+$npc_lastname['A<<npctemp>>'] = 'Kirill'
+$npc_usedname['A<<npctemp>>'] = 'Nikita'
+$npc_notes['A<<npctemp>>'] = 'Father Kirill is a kindly man that entered the church as a young man and became a priest. Now in his fifties, he serves the people of Pavlovsk. Not one to feed into the gossip or judge those around him, he keeps an open heart and mind, believing everyone deserves forgiveness and a chance to repent for their sins. He is a good listener, well known for giving sound advice to help people resolve their problems. Even some that don''t regularly attend church seek him out for advice.'
+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>>'] = 0
+$npc_thdick['A<<npctemp>>'] = 'well proportioned'
+npc_dick['A<<npctemp>>'] = 14
+npc_spermpot['A<<npctemp>>'] = 10000
+npc_vag['A<<npctemp>>'] = -1
+npc_hymen['A<<npctemp>>'] = -1
+npc_nips['A<<npctemp>>'] = 1
 
 npctemp = 167
 gs 'npcstaticdefaults', 'defaults'