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

glife.qproj

@@ -1106,6 +1106,7 @@
 		<Location name="Gnpc_cinema"/>
 		<Location name="Gnpc2"/>
 		<Location name="hookup"/>
+		<Location name="hookup_sms"/>
 		<Location name="hookup_sex"/>
 		<Location name="hookup_virgin"/>
 		<Location name="hookup_after"/>

locations/gschool_coolkid_chats.qsrc

@@ -108,6 +108,7 @@ if $ARGS[0] = 'dimka':
 			'He shakes his head. "Let me make this clear. No one wants you around, so why don''t you do something useful for a change and go home and hang yourself or something and make the world a better place?" He starts laughing, along with several of the others.'
 		end
 	end
+	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'dim_drugs':
@@ -402,6 +403,7 @@ if $ARGS[0] = 'igor':
 			'He seems a bit confused. "Oh..." he is all he says as he looks past you and waves at someone. "Sorry, I''ve got to go." He rushes way from you, unsure if he was actually waving at anyone and think he was just trying to get away from you.'
 		end
 	end
+	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'igor_peg':
@@ -609,6 +611,7 @@ if $ARGS[0] = 'katja':
 			'With Katja being a quiet girl, she doesn''t do much talking, the judgmental stares of the other cool kids only making things worse for her. You get the feeling she''d be more comfortable speaking with you if you were closer to her or more popular with your peers.'
 		end
 	end
+	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
 
@@ -804,31 +807,31 @@ if $ARGS[0] = 'lizaveta':
 		if npc_rel['A140'] >= 50:
 			'The perks of being a close friend of Liza go beyond just running in the same social circle. She tells you some gossip that no one else should know about.'
 			'"I heard from a little red bird that one time while Vicky was out partying at the community center, she couldn''t hold it in, so she went to do her business behind a bush, buuuut..." Liza drags it out to build a little suspense. "She was so drunk that she ended up falling into her own piss! Luckily Kat-- her friend, I mean, was there to take her home before anyone saw!"'
-			act 'Latest gossip': gt 'gschool_coolkid_chats', 'latest_gossip'
+			act 'Latest gossip': gt 'gschool_coolkid_chats', 'lizaveta_latest_gossip'
 		elseif npc_rel['A140'] <= 20:
 			'"You know, you really shouldn''t shit where you sleep." Lizaveta says while shaking her head disapprovingly.'
 			'"What? What is that supposed to mean?" you ask, but she just sighs.'
 			'"You''re dumber than I thought..." she mutters. You try to get an answer out of her, but she dances around your questions while talking to Bella.'
 		else
 			'You spend some time talking with Lizaveta, and for a while you manage to avoid talking about anything gossipy, but considering she''s the queen of it, it eventually devolves into some "He said, she said."'
-			act 'Latest gossip': gt 'gschool_coolkid_chats', 'latest_gossip'
+			act 'Latest gossip': gt 'gschool_coolkid_chats', 'lizaveta_latest_gossip'
 		end
 	elseif grupTipe = 2:
 		if npc_rel['A140'] >= 50:
 			'You would think that being close friends with Lizaveta would mean getting some exclusive gossip from her, but she keeps her lips sealed. "I know everyone likes to say I can''t keep my mouth shut, but even I need to have some secrets of my own." she winks.'
 			'"Oh come on!" you plead. "You gotta give me a little bit of something..."'
 			'With a dramatic sigh, Liza caves and shares some harmless, yet juicy gossip you hadn''t heard about until now.'
-			act 'Latest gossip': gt 'gschool_coolkid_chats', 'latest_gossip'
+			act 'Latest gossip': gt 'gschool_coolkid_chats', 'lizaveta_latest_gossip'
 		elseif npc_rel['A140'] <= 20:
 			'The conversation is stale and lifeless as Lizaveta taps away at her phone while you talk, only managing an occasional "Yeah..." or "Uh-huh..."'
 		else
 			'You spend some time talking with Lizaveta, and for a while you manage to avoid talking about anything gossipy, but considering she''s the queen of it, it eventually devolves into some "He said, she said."'
-			act 'Latest gossip': gt 'gschool_coolkid_chats', 'latest_gossip'
+			act 'Latest gossip': gt 'gschool_coolkid_chats', 'lizaveta_latest_gossip'
 		end
 	elseif grupTipe = 3:
 		if npc_rel['A140'] >= 50:
 			'When you sit on the floor next to Lizaveta, she smiles at you and the two of you are soon talking about a variety of subjects. However, she can''t help herself and soon starts asking you all sorts of questions about your fellow nerds. You can barely even get a word in edge wise as she pumps you for gossip. You can''t help yourself and start letting some stuff slip as the two of you talk.'
-			act 'Latest gossip': gt 'gschool_coolkid_chats', 'latest_gossip'
+			act 'Latest gossip': gt 'gschool_coolkid_chats', 'lizaveta_latest_gossip'
 		elseif npc_rel['A140'] <= 20:
 			'When you sit on the floor next to Lizaveta, she looks at you in shock and surprise. "Why are you sitting next to me, loser? Get away from me." Her outburst attracts the attention of the other cool kids and jocks around and now everyone is staring at you, making you feel very unwelcome. She continues to stare at you until you get up and leave.'
 		else
@@ -837,7 +840,7 @@ if $ARGS[0] = 'lizaveta':
 	elseif grupTipe = 4:
 		if npc_rel['A140'] >= 50:
 			'When you sit on the floor next to Lizaveta, she smiles at you and the two of you are soon talking about a variety of subjects. However, she can''t help herself and starts asking you all sorts of questions about your fellow gopniks. You can barely even get a word in edge wise as she pumps you for gossip. You can''t help yourself and start letting some stuff slip as the two of you talk.'
-			act 'Latest gossip': gt 'gschool_coolkid_chats', 'latest_gossip'
+			act 'Latest gossip': gt 'gschool_coolkid_chats', 'lizaveta_latest_gossip'
 		elseif npc_rel['A140'] <= 20:
 			'When you sit on the floor next to Lizaveta, she looks at you in shock and surprise before scooting away. "Why are you sitting next to me, freak? Get away from me." Her outburst attracts the attention of the other cool kids and jocks around and now everyone is staring at you, making you feel very unwelcome. She continues to stare at you until you get up and leave.'
 		else
@@ -851,6 +854,13 @@ if $ARGS[0] = 'lizaveta':
 			'When you sit on the floor next to Lizaveta, she looks at you in shock and surprise before scooting away. "What the fuck, loser? Who said you could leave your cave or wherever it is you hide and socialize with the other freaks?" Her outburst attracts the attention of the other cool kids and jocks around and many of them laugh at her comment. Everyone is staring at you and making you feel very unwelcome as she continues to stare at you until you get up and leave.'
 		end
 	end
+	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+end
+
+if $ARGS[0] = 'lizaveta_latest_gossip':
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big140.jpg"></center>'
+	gs 'gschool_gossip', 'Lizaveta'
+	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'marcus':
@@ -916,6 +926,7 @@ if $ARGS[0] = 'marcus':
 			'You walk up to Marcus and try to talk to him. He mostly ignores you, with only the occasional "uh-huh" for an answer. You notice the others giving you disgusted looks and he finally speaks up. "Look, I don''t mean to be rude, but we''re not friends and I don''t want to talk to you." You sigh and nod before walking away.'
 		end
 	end
+	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'Marcus_Katja_talk':
@@ -1001,6 +1012,7 @@ if $ARGS[0] = 'andrey':
 		'"Hey, Andrey! How''s it been?" you ask with a small smile.'
 		'He gives you a slightly confused look as to why you''re talking to him. "Get lost, loser! No one wants to talk to you." He proceeds to ignore you and you can feel everyone else staring at you. Afraid someone might start picking on you, you quickly leave.'
 	end
+	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'mefodiy':

locations/gschool_jock_chats.qsrc

@@ -340,6 +340,7 @@ if $ARGS[0] = 'albina':
 		else
 			'Albina is on her phone as you approach. She looks up at you before returning her attention to her phone and ignoring you. After a few seconds, she looks up at you again and stares in confusion. "What do you want loser?" She then laughs. "Wait, you want to talk to <i>me</i>? As if that will ever happen! Fuck off and go hang out with the other losers where you belong." She shoos you away with a motion of her hand before going back to her phone.'
 		end
+		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	end
 end
 

locations/gschool_lessonsev1.qsrc

@@ -1295,17 +1295,14 @@ if $ARGS[0] = 'computer':
 					gs 'stat'
 					npc_rel['A129'] += 1
 					if $pantyworntype ! 'none':
-						gs 'arousal', 'flash', -5
-						pcs_horny += 30
+						gs 'flash', 'panties', 'indoors', 5, 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spread.jpg"></center>'
 						'The thoughts of him checking you out so sneakily turns you on a great deal and the fact that you know you should know better makes it even hotter. Throughout the class, you keep spreading your legs whenever he looks your way and you can tell the looks of your panties are causing him a great deal of arousal as well. Unable to control yourself, you occasionally give yourself a quick rub over your pussy lips through your underwear, preferably when he looks at you. Towards the end of the class, your panties have a large damp spot on them; large enough for him to see from across the room. The outline of your pussy is clearly visible in the wet fabric.'
 					else
-						gs 'arousal', 'flash', -5
-						pcs_horny +=40
+						gs 'flash', 'pussy', 'indoors', 5, 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spreadb.jpg"></center>'
 						'The thoughts of him checking you out so sneakily turn you on a great deal and the fact that you know you should know better make it even hotter. Throughout the class, you keep spreading your legs whenever he looks your way and you can tell the looks of your bare pussy are causing him a great deal of arousal as well. Unable to control yourself, you occasionally give yourself a quick rub over your exposed pussy lips, preferably when he looks at you. Towards the end of the class, your pussy lips are soaked in your juices and you absent-mindedly put your finger in your mouth for a taste. '
 					end
-					gs 'arousal', 'end'
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
@@ -1447,7 +1444,6 @@ if $ARGS[0] = 'russian':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back and the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			end
-			gs 'arousal', 'end'
 			gs'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 3:
@@ -1802,13 +1798,11 @@ if $ARGS[0] = 'russian':
 					gs 'stat'
 					npc_rel['A26'] += 1
 					if $pantyworntype ! 'none':
-						gs 'arousal', 'flash', -5
-						pcs_horny += 30
+						gs 'flash', 'panties', 'indoors', 5, 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spread.jpg"></center>'
 						'The thoughts of him checking you out so sneakily turns you on a great deal and the fact that you know you should know better makes it even hotter. Throughout the class, you keep spreading your legs whenever he looks your way and you can tell the looks of your panties are causing him a great deal of arousal as well. Unable to control yourself, you occasionally give yourself a quick rub over your pussy lips through your underwear, preferably when he looks at you. Towards the end of the class, your panties have a large damp spot on them; large enough for him to see from across the room. The outline of your pussy is clearly visible in the wet fabric.'
 					else
-						gs 'arousal', 'flash', -5
-						pcs_horny +=40
+						gs 'flash', 'pussy', 'indoors', 5, 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spreadb.jpg"></center>'
 						'The thoughts of him checking you out so sneakily turns you on a great deal and the fact that you know you should know better makes it even hotter. Throughout the class, you keep spreading your legs whenever he looks your way and you can tell the looks of your bare pussy are causing him a great deal of arousal as well. Unable to control yourself, you occasionally give yourself a quick rub over your exposed pussy lips, preferably when he looks at you. Towards the end of the class, your pussy lips are soaked in your juices and you absent-mindedly put your finger in your mouth for a taste. '
 					end

locations/hookup_sms.qsrc

@@ -0,0 +1,86 @@
+# hookup_sms
+
+$SMSFrM = '<table width=80%><tr><td collspan=2 bgcolor="#D4CEF9"><font color=black> '
+$SMSBkM = '</font></td><td width=10%></td></tr></table>'
+$SMSFrF = '<table width=80%><tr><td width=10%></td><td collspan=2 bgcolor=pink><font color=black>'
+$SMSBkF = '</font></td></tr></table>'
+
+if $ARGS[0] = 'start':
+	$menu_loc = 'hookup_sms'
+	$menu_arg = 'start'
+	menu_off = 0
+	$loc_arg = 'start'
+	minut += 2
+	gs 'stat'
+end
+
+$VM['0'] = 'Come over, I want to have sex'
+
+	$VF['0a'] = 'That is cool, which time?'
+		$VM['1a'] = 'Right now !'
+
+			$VF['1a'] = 'OK !'
+
+	$VF['0b'] = 'I''m busy right now. Can I come by at 8?'
+		$VM['1b'] = 'OK, but I cannot provide the dinner then!'
+
+			$VF['1b'] = 'That is OK, I will suck you dry'
+
+
+if $ARGS[0] = 'Add SMS':
+	$trialSMS  = $SMSFrM+$VM['0']+$SMSBkM
+	$trialSMS += '<table><tr><th> Reply</th></tr>'
+	$trialSMS += '<tr><td><a href="exec: gs ''hookup_sms'', ''V1'',SMSid">'+$VF['0a']+'</a></td></tr>'
+	$trialSMS += '<tr><td><a href="exec: gs ''hookup_sms'', ''V2'',SMSid">'+$VF['0b']+'</a></td></tr></table>'
+	gs 'telefon', 'add_sms', 'A1', $trialSMS
+end
+
+if $ARGS[0] = 'V1':
+	$trialSMS  = $SMSFrM+$VM[ '0']+$SMSBkM
+	$trialSMS += $SMSFrF+$VF['0a']+$SMSBkF
+	$SMSMessage[ARGS[1]] = $trialSMS
+	gs 'telefon', 'show_sms', ARGS[1]
+	wait 1000
+	$trialSMS += $SMSFrM+$VM['1a']+$SMSBkM
+	$trialSMS += '<table><tr><th> Reply</th></tr>'
+	$trialSMS += '<tr><td><a href="exec: gs ''hookup_sms'', ''V11'',SMSid">'+$VF['1a']+'</a></td></tr></table>'
+	$SMSMessage[ARGS[1]] = $trialSMS
+	gs 'telefon', 'show_sms', ARGS[1]
+end
+
+if $ARGS[0] = 'V11':
+	$trialSMS =  $SMSFrM+$VM[ '0']+$SMSBkM
+	$trialSMS += $SMSFrF+$VF['0a']+$SMSBkF
+	$trialSMS += $SMSFrM+$VM['1a']+$SMSBkM
+	$trialSMS += $SMSFrF+$VF['1a']+$SMSBkF
+	$SMSMessage[ARGS[1]] = $trialSMS
+	gs 'telefon', 'show_sms', ARGS[1]
+end
+
+if $ARGS[0] = 'V2':
+	$trialSMS  = $SMSFrM+$VM[ '0']+$SMSBkM
+	$trialSMS += $SMSFrF+$VF['0b']+$SMSBkF
+	$SMSMessage[ARGS[1]] = $trialSMS
+	gs 'telefon', 'show_sms', ARGS[1]
+	wait 1000
+	$trialSMS += $SMSFrM+$VM['1b']+$SMSBkM
+	$trialSMS += '<table><tr><th> Reply</th></tr>'
+	$trialSMS += '<tr><td><a href="exec: gs ''hookup_sms'', ''V21'',SMSid">'+$VF['1b']+'</a></td></tr></table>'
+	$SMSMessage[ARGS[1]] = $trialSMS
+	gs 'telefon', 'show_sms', ARGS[1]
+end
+
+if $ARGS[0] = 'V21':
+	$trialSMS  = $SMSFrM+$VM[ '0']+$SMSBkM
+	$trialSMS += $SMSFrF+$VF['0b']+$SMSBkF
+	$trialSMS += $SMSFrM+$VM['1b']+$SMSBkM
+	$trialSMS += $SMSFrF+$VF['1b']+$SMSBkF
+	$SMSMessage[ARGS[1]] = $trialSMS
+	gs 'telefon', 'show_sms', ARGS[1]
+end
+killvar '$trialSMS'
+killvar '$VF'
+killvar '$MF'
+
+
+--- hookup_sms ---------------------------------