Explorar el Código

[changed] just some code updates to my girls

Anya hace 2 años
padre
commit
7360f5dd98

+ 16 - 16
locations/LariskaHome.qsrc

@@ -159,7 +159,7 @@ if $ARGS[0] = 'livingroom_tv_1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_tv_1.jpg"></center>'
 	'You decide to join Lariska on the couch, and watch some tv with her.'
 	minut += 30
-	npc_rel['A13'] += 2
+	gs 'npc_relationship', 'modify', 'A13', 'like'
 	pcs_mood += 20
 	gs 'stat'
 	act 'Continue':gt 'LariskaHome', 'livingroom'
@@ -171,7 +171,7 @@ if $ARGS[0] = 'livingroom_exercise_1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_exercise_1.jpg"></center>'
 	'You find Lariska stretching in front of her tv. Since you don''t feel like working out right now, you simply keep her company for awhile.'
 	minut += 20
-	npc_rel['A13'] += 2
+	gs 'npc_relationship', 'modify', 'A13', 'like'
 	pcs_mood += 5
 	gs 'stat'
 	act 'Continue':gt 'LariskaHome', 'livingroom'
@@ -183,7 +183,7 @@ if $ARGS[0] = 'livingroom_clean_1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_cleaning_3.jpg"></center>'
 	'You find Lariska dusting and doing some general cleaning. Sitting nearby, you strike up a conversation.'
 	minut += 15
-	npc_rel['A13'] += 1
+	gs 'npc_relationship', 'modify', 'A13', 'like'
 	pcs_mood += 5
 	gs 'stat'
 	act 'Continue':gt 'LariskaHome', 'livingroom'
@@ -279,7 +279,7 @@ if $ARGS[0] = 'kitchen_meal_1':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_meal.jpg"></center>'
 	'You grab a plate of food and join Lariska at the table. The two of you chat about random things as you eat. When you''re done you place the dishes in the sink.'
-	npc_rel['A13'] += 2
+	gs 'npc_relationship', 'modify', 'A13', 'like'
 	minut += 30
 	pcs_health += 25
 	pcs_mood += 25
@@ -307,7 +307,7 @@ if $ARGS[0] = 'kitchen_cooking_1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_cooking_1.jpg"></center>'
 	'You find Lariska in the kitchen, cooking dinner. Leaning up against the counter, you start chatting with her about random things, just passing the time.'
 	minut += 10
-	npc_rel['A13'] += 1
+	gs 'npc_relationship', 'modify', 'A13', 'like'
 	pcs_mood += 5
 	gs 'stat'
 	act 'Finish the conversation':gt 'LariskaHome', 'kitchen'
@@ -319,7 +319,7 @@ if $ARGS[0] = 'kitchen_cleaning_1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_cleaning_2.jpg"></center>'
 	'You find Lariska in the kitchen, cleaning. You keep her company while she wipes down counters and mops the floor.'
 	minut += 15
-	npc_rel['A13'] += 1
+	gs 'npc_relationship', 'modify', 'A13', 'like'
 	pcs_mood += 5
 	gs 'stat'
 	act 'Continue':gt 'LariskaHome', 'kitchen'
@@ -358,7 +358,7 @@ if $ARGS[0] = 'bathroom_cleaning_1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_cleaning_1.jpg"></center>'
 	'Leaning up against wall, you have short conversation with Lariska while she cleans.'
 	minut += 15
-	npc_rel['A13'] += 1
+	gs 'npc_relationship', 'modify', 'A13', 'like'
 	pcs_mood += 5
 	gs 'stat'
 	act 'Continue':gt 'LariskaHome', 'bathroom'
@@ -572,19 +572,19 @@ if $ARGS[0] = 'lariska_bedroom':
 			*nl
 			if lariskalove = 0:
 				'Startled, her body stiffens up and she refuses to look anywhere but straight down. After what you did to Christina, she knows she is no match for you and is probably terrified of having traded one Mistress for another. You take your time, slowly running your hand across her back until she calms down a bit and suprisingly leans against you, still looking down. You reach across with your right hand and place it on top of hers and start softly running your fingers across it. You do this for a few minutes before she finally looks up and leans her face in, a happy look in her eye. Tilting your head to one side a bit, you close the distance left between your lips until they touch. She shivers a bit in pleasure, obviously not used to such a gentle touch, before pulling away, her face bright red.'
-				npc_rel['A13'] += 2
+				gs 'npc_relationship', 'modify', 'A13', 'like'
 				lariskalove = 1
 				gs 'arousal', 'kiss', 3, 'lesbian'
 				gs 'stat'
 			elseif lariskalove <= 5:
 				'She reacts better this time, cuddling up against you with a shy smile on her face. You let your left hand trail its way down her back until you reach her hips, then slide it around her waist. The two of you sit like that for a few minutes, enjoying each other company and the closeness it''s bringing. Eventually she sits up a bit, cheeks blushed, and puts her face next to yours, obviously hoping for another kiss. You lean the rest of the way in until your lips touch hers. The kiss lasts longer than the first time, by the time she pulls back you are both a little breathless. Suddenly she seems to realize what the two of you were just doing and gets nervous, standing up she starts moving around the room trying to come to terms with the feelings racing through her. Wisely, you decide to give her space for now.'
-				npc_rel['A13'] += 2
+				gs 'npc_relationship', 'modify', 'A13', 'like'
 				lariskalove += 1
 				gs 'arousal', 'kiss', 5, 'lesbian'
 				gs 'stat'
 			else 
 				'No longer shy around you, she wraps her hands around your waist and starts kissing you. You move your left hand down to the top of her butt while putting your right on her stomach and start rubbing in circular motions. You slowly start leaning back, pulling her with you until you are both laying on your sides, and her tongue slips between your lips and starts playing with yours. You feel her left hand slide down from your waist and starts rubbing your butt before working its way down from there to your thigh. Hooking her hand around it, she pulls your leg up and over her own before going back to massaging your butt again. Eventually she pulls back from your tongue fight, face flushed a deep red and panting from lack of breath. She gives you a long, hungry look, telling you without words she wants, no, NEEDS, to keep going.'
-				npc_rel['A13'] += 2
+				gs 'npc_relationship', 'modify', 'A13', 'like'
 				lariskalove += 1
 				if LariskaQW['story'] = 9: LariskaQW['story'] = 10
 				gs 'arousal', 'kiss', 5, 'foreplay','lesbian'
@@ -606,7 +606,7 @@ if $ARGS[0] = 'lariska_asleep_1':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_sleeping_1.jpg"></center>'
 	'She is fast asleep in her bed, uncovered and nude. You cannot stop yourself from staring at her for a few minutes, before ripping your eyes away and deciding what you should do next.'
-	npc_rel['A13'] += 2
+	gs 'npc_relationship', 'modify', 'A13', 'like'
 	minut += 10
 	gs'stat'
 	act 'Move away from the bed':gt 'LariskaHome', 'lariska_bedroom'
@@ -617,7 +617,7 @@ if $ARGS[0] = 'lariska_dressing_1':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_dressing_1.jpg"></center>'
 	'She blushes a bit when she realizes you are looking at her, but does not stop. You just sit and watch, while chatting with her.'
-	npc_rel['A13'] += 2
+	gs 'npc_relationship', 'modify', 'A13', 'like'
 	minut += 10
 	gs'stat'
 	act 'Finish this conversation':gt 'LariskaHome', 'lariska_bedroom'
@@ -628,7 +628,7 @@ if $ARGS[0] = 'lariska_cleaning_1':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_cleaning_1.jpg"></center>'
 	'Sitting on the bed, you have short conversation with Lariska while she cleans.'
-	npc_rel['A13'] += 2
+	gs 'npc_relationship', 'modify', 'A13', 'like'
 	minut += 15
 	gs'stat'
 	act 'Finish this conversation':gt 'LariskaHome', 'lariska_bedroom'
@@ -639,7 +639,7 @@ if $ARGS[0] = 'lariska_reading_1':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_reading_1.jpg"></center>'
 	'You lay next to her, your bodies pressed together, and chat aimlessly with her while she keeps reading.'
-	npc_rel['A13'] += 2
+	gs 'npc_relationship', 'modify', 'A13', 'like'
 	minut += 20
 	gs'stat'
 	act 'Finish this conversation':gt 'LariskaHome', 'lariska_bedroom'
@@ -649,7 +649,7 @@ if $ARGS[0] = 'homework':
 	menu_off = 1
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
-	npc_rel['A13'] += 2
+	gs 'npc_relationship', 'modify', 'A13', 'like'
 	if LariskaQW['story'] = 6: LariskaQW['story'] = 7
 	gs 'grades', 'homework', 'school', 'yes', 1, 1, 'A13'
 	lern += 1
@@ -667,7 +667,7 @@ if $ARGS[0] = 'chat':
 	menu_off = 1
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
-	npc_rel['A13'] += 2
+	gs 'npc_relationship', 'modify', 'A13', 'like'
 	minut += 10
 	gs'stat'
 	if LariskaQW['story'] = 7:

+ 22 - 36
locations/gschool_chats1.qsrc

@@ -1088,7 +1088,6 @@ if $ARGS[0] = 'christina':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
 	if christinaQW['subpath'] >= 2 or christinaQW['dompath'] >= 2:
 		if christinaQW['subpath'] >= 3:
-			npc_rel['A18'] += 1
 			'As you pass by Christina, she looks at you triumphantly. "Don''t forget my little slave! Showers after the gym class..."'
 			'Before you''re able to respond, she turns around and walks away...'
 		elseif christinaQW['subpath'] = 2:
@@ -1096,7 +1095,7 @@ if $ARGS[0] = 'christina':
 			'"W-Why? What happens after class?"'
 			'"Oh, I don''t want to ruin the suprise, pet." Throwing one last smirk in your direction, she heads off to her next class.'
 		elseif christinaQW['dompath'] = 2:
-			if npc_rel['A18'] > 20: npc_rel['A18'] -= 10
+			if npc_rel['A18'] > 20: gs 'npc_relationship', 'modify', 'A18', -10
 			if LariskaQW['story'] = 3:
 				LariskaQW['story'] = 4
 				christinaQW['dompath'] = 3
@@ -1123,7 +1122,6 @@ if $ARGS[0] = 'christina':
 				'"Oh, you wont, as long as you keep your word," you say with a fake smile that doesn''t quite reach your eyes." Turning on your heels, you head off to your next class, smiling.'
 			end
 		elseif christinaQW['dompath'] = 3:
-			npc_rel['A18'] += 1
 			'Christina takes one look at you coming over to talk with her and says, "What now?"'
 			'"Nothing," you say cheerfully. "Just came over to say hi."'
 			'"Well don''t. We''re not friends, you got what you wanted, now leave me alone unless it''s important."'
@@ -1139,21 +1137,7 @@ if $ARGS[0] = 'christina':
 			'Before she''s able to respond, you grab her arm, force her to bend over, and flip up her skirt. Finding her buttplug in place, and no panties, you let her go and walk away.'
 		end
 	else
-		if npc_rel['A18'] >= 50 and fame['pav_slut'] < 200:
-			npc_rel['A18'] += 1
-			if grupTipe = 2:
-				'"Hi <<$pcs_nickname>>! Do you want to work out together since, you know, you''re the only one that is on the same level as me?" she confidently asks.'
-				'"I don''t know if I could keep up with you." you jokingly reply.'
-				'Christina lets out a loud laugh. "Well you know where to find me if you ever want to work out."'
-				'You give her a nod and say your goodbyes.'
-			else
-				'"Hi <<$pcs_nickname>>! So what are you up to?" Christina asks.'
-				'"Nothing much, trying to figure out what I could do after school." you answer.'
-				'"You should join one of the sports teams. I''m sure you''d do great there," she says, trying to entice you.'
-				'"That''s something I will definitely consider. Thanks for the suggestion." you reply.'
-			end
-		elseif npc_rel['A18'] <= 20 and fame['pav_slut'] < 200:
-			npc_rel['A18'] += 1
+		if npc_rel['A18'] <= 20 and fame['pav_slut'] < 200:
 			if grupTipe = 2:
 				'"Look at the biggest joke among us. You shouldn''t even be allowed to call yourself a jock. What a joke..." Christina shakes her head.'
 				'You fiercely reply. "Oh, yeah? I could beat you in whatever you want. Just name the place and time."'
@@ -1168,7 +1152,6 @@ if $ARGS[0] = 'christina':
 			'"Shut up Christina! I''m tired of your bullshit." you tiredly reply.'
 			'"Poor little thing. It must''ve been, what, at least a few minutes since you last spread your legs for someone?" She begins to laugh as she walks away.'
 		else
-			npc_rel['A18'] += 1
 			'"What do you want <<$pcs_nickname>>? I don''t really have the time right now." She''s looking around, for someone or something.'
 			'"Well... I wanted to ask you..." you choke up a little.'
 			'"Out with it <<$pcs_nickname>>!" Christina gets a bit irritated.'
@@ -1368,7 +1351,7 @@ if $ARGS[0] = 'lina':
 			'"I...um...she never..." she stammers in response. Obviously she didn''t know.'
 			'"It''s okay, sweetie. She made her own choices and they''ve finally caught up to her." You smile at her, before heading off to the next class.'
 		else
-			npc_rel['A19'] += 1
+			gs 'npc_relationship', 'modify', 'A19', 'like'
 			if avelinaQW['encourage'] >= 1:
 				'Lina sees you approaching and her face lights up. "Hey, <<$pcs_nickname>>!"'
 				'"Hey Lina. How are you doing?"'
@@ -1376,7 +1359,11 @@ if $ARGS[0] = 'lina':
 				'"Great news! I''m glad you''re improving," you encourage her.'
 			else
 				avelinaQW['encourage'] = 1
-				if npc_rel['A13'] < 60: npc_rel['A13'] = 60
+				if npc_rel['A19'] < 60:
+					gs 'npc_relationship', 'set', 'A19', 60
+				else
+					gs 'npc_relationship', 'modify', 'A19', 'adore'
+				end
 				'You find Lina standing alone, looking lost and sad.'
 				'"Looks like your role model made some bad choices," you say to her sternly. "Be careful spending time around her, you may find yourself dragged down with her."'
 				'She looks at her feet, obviously afraid of you.'
@@ -1386,7 +1373,7 @@ if $ARGS[0] = 'lina':
 		end
 	else
 		if npc_rel['A19'] >= 50 and fame['pav_slut'] < 250:
-			npc_rel['A19'] += 1
+			gs 'npc_relationship', 'modify', 'A19', 'like'
 			if grupTipe = 2:
 				'"I''ve finally been improving my lap times." Lina proudly tells you.'
 				'"Great news! I''m glad you''re improving." you encourage her.'
@@ -1397,7 +1384,7 @@ if $ARGS[0] = 'lina':
 				'With a nervous laughter Lina replies. "I should stop, you''re probably not interested in this anyway." Before you''re able to answer, you can hear Christina calling her over and Lina quickly runs over to her, leaving you alone.'
 			end
 		elseif npc_rel['A19'] <= 20 and fame['pav_slut'] < 250:
-			npc_rel['A19'] += 1
+			gs 'npc_relationship', 'modify', 'A19', 'like'
 			if grupTipe = 2:
 				'"I always hear that I''m bad at sports, but you''re even worse than me!" Lina spares no time to insult you.'
 				'"Where did this come from?" you ask.'
@@ -1408,13 +1395,13 @@ if $ARGS[0] = 'lina':
 				'"Oh shut up <<$pcs_nickname>>. Don''t you have anything better to do? At least I have a friend unlike <i>some</i> people." Lina fires back.'
 			end
 		elseif fame['pav_slut'] >= 250:
-			npc_rel['A19'] -= 1
+			gs 'npc_relationship', 'modify', 'A19', 'dislike'
 			'"Christina says that you fuck anyone." Lina says while glaring at you.'
 			'"Christina doesn''t know what she''s talking about it." you reply.'
 			'"I knew it! It''s true isn''t it? Christina is always correct... Go and suck someone off!" she fires back.'
 			'"Whatever, bitch. Like you know anything about me," you laugh, and walk away.'
 		else
-			npc_rel['A19'] += 1
+			gs 'npc_relationship', 'modify', 'A19', 'like'
 			'"What do you want <<$pcs_nickname>>? Christina is looking for me..." Lina says irritatingly.'
 			'"I wanted to ask you if you had the notes from the class. I need to copy it." you tell her.'
 			'"We''ll do it later. I have to find Christina right away or else she''ll get mad..." Lina excuses herself.'
@@ -1432,7 +1419,7 @@ if $ARGS[0] = 'lariska':
 		if LariskaQW['story'] = 2:
 			if christinaQW['dompath'] >= 3 or christinaQW['subpath'] >= 2:
 				if christinaQW['subpath'] >= 2 or christinaQW['dompath'] < 6:
-					npc_rel['A13'] += 1
+					gs 'npc_relationship', 'modify', 'A13', 'like'
 					LariskaQW['story'] = 4
 					'Pulling out the the volleyball she dropped outside your parents apartment the other day, you hand it to her. "You dropped this, Lariska."'
 					'When she sees the ball, her eyes grow wide and she looks around fearfully. Seeing that Christina is engrossed in her conversation with Lina, she snatches the ball and stuffs it out of sight.'
@@ -1443,7 +1430,7 @@ if $ARGS[0] = 'lariska':
 					'She looks at you, a bit dazed, but manages to nod.'
 					'Giving her a soft smile, you head off to your next class.'
 				else
-					npc_rel['A13'] += 1
+					gs 'npc_relationship', 'modify', 'A13', 'like'
 					LariskaQW['story'] = 4
 					'Pulling out the the volleyball she dropped outside your parents apartment the other day, you hand it to her. "You dropped this, Lariska."'
 					'When she sees the ball, her eyes grow wide and her face turns bright red. She grabs the ball like it''s evidence of a conspiracy and stuffs it out of sight.'
@@ -1455,7 +1442,7 @@ if $ARGS[0] = 'lariska':
 				end
 			else
 				LariskaQW['story'] = 3
-				npc_rel['A13'] += 1
+				gs 'npc_relationship', 'modify', 'A13', 'like'
 				'Pulling out the the volleyball she dropped outside your parents apartment the other day, you hand it to her. "You dropped this, Lariska."'
 				'When she sees the ball, her eyes go wide and she looks around fearfully. Seeing that Christina is engrossed in her conversation with Lina, she snatches the ball and stuffs it out of sight.'
 				'"I''m sorry, <<$pcs_nickname>>. If Christina finds out I was there instead of the sports center like I told her I would be..."'
@@ -1468,7 +1455,7 @@ if $ARGS[0] = 'lariska':
 				'"I can take it, sweetie. Especially when it''s worth it." You give her a sweet smile and head off to class.'
 			end
 		elseif LariskaQW['story'] = 3:
-			npc_rel['A13'] += 1
+			gs 'npc_relationship', 'modify', 'A13', 'like'
 			'"Hey, Lariska! How is your day going?"'
 			'"I''m sorry, <<$pcs_nickname>>, but I told you, Christina doesn''t really want me hanging out with you after school."'
 			'"I know Lariska, I''m working on it. In the meantime, I was just saying hi."'
@@ -1476,19 +1463,17 @@ if $ARGS[0] = 'lariska':
 			'"Hang in there, sweetie. I''ll convince her, I promise."'
 		elseif LariskaQW['story'] = 4:
 			LariskaQW['story'] = 5
-			npc_rel['A13'] += 1
+			gs 'npc_relationship', 'modify', 'A13', 'like'
 			'"Ok, <<$pcs_nickname>>. I guess Christina wont stop me from hanging out with you now." She smiles a bit shyly and says "Do you want to come over afterschool and work on our homework together?"'
 			'You smile in response, and say "Sure, Lariska. I will meet up with you afterschool!"'
 			'She blushes a bit and says "Good, I''m looking forward to it!"'
 		else
-			npc_rel['A13'] += 2
+			gs 'npc_relationship', 'modify', 'A13', 'love'
 			'"Hey, cutie," you say when you see Lariska. She blushes a little, but still smiles at you. You spend the rest of the break chatting with her.'
 		end
 	else
-		!!if LariskaQW['LariskaHelp'] = -1:
-		!!	'She looks at you rejectingly and softly says: "Leave me alone <<$pcs_nickname>>. I want nothing to do with you any more."'
 		if npc_rel['A13'] >= 50 and fame['pav_slut'] < 250:
-			npc_rel['A13'] += 1
+			gs 'npc_relationship', 'modify', 'A13', 'like'
 			if grupTipe = 2:
 				'"Hey <<$pcs_nickname>>, have you seen Christina around?" Lariska asks.'
 				'"No, why?" You can sense the desperation in her demeanor.'
@@ -1500,7 +1485,7 @@ if $ARGS[0] = 'lariska':
 				'"Well... I need to impress Christina and need your help with coming up with something fitting..." she starts and goes on a long tirade about what might impress Christina.'
 			end
 		elseif npc_rel['A13'] <= 20 and fame['pav_slut'] < 250:
-			npc_rel['A13'] += 1
+			gs 'npc_relationship', 'modify', 'A13', 'like'
 			if grupTipe = 2:
 				'"I sure beat your ass during gym class. You had no chance against me!" Lariska is gleefully trash-talking you.'
 				'"Well at least I don''t have to fish for other people''s approval." you ferociously tell her off.'
@@ -1511,11 +1496,12 @@ if $ARGS[0] = 'lariska':
 				'You start laughing. "Yeah, ''friends.''"'
 			end
 		elseif fame['pav_slut'] >= 250:
+			gs 'npc_relationship', 'modify', 'A13', 'dislike'
 			'"Aren''t you looking for a cock to suck you big slut?" Lariska says mockingly.'
 			'"Shut up Lariska! Don''t you have Christina''s tail to run after or something?" you tiredly reply.'
 			'"Poor little slut. Go chase another cock." she begins to laugh as she walks away.'
 		else
-			npc_rel['A13'] += 1
+			gs 'npc_relationship', 'modify', 'A13', 'like'
 			'"What do you want <<$pcs_nickname>>? I don''t really have the time right now." Lariska says as she quickly walks towards the classroom.'
 			'"Well... I wanted to ask you..." you choke up a little.'
 			'"Out with it <<$pcs_nickname>>!" Lariska seems a bit irritated.'

+ 2 - 65
locations/gschool_socialchg1.qsrc

@@ -801,73 +801,10 @@ if $ARGS[0] = 'Chris_Lina_park':
 	gs 'npc_relationship', 'modify', 'A18', 'like'
 	gs 'npc_relationship', 'modify', 'A19', 'like'
 	gs 'stat'
-	if npc_rel['A18'] >= 50 and fame['pav_slut'] < 200:
-		'You give them a friendly wave as they get closer and Christina calls out "Hey, girl! Come join us for a run."'
-		if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
-			if daybegskver ! daystart:
-				if pcs_energy >= 10:
-					act 'Okay':
-						*clr & cla
-						menu_off = 1
-						gs 'exercise', 'tier1', 60, 'run_exp'
-						daybegskver = daystart
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
-						'You spend the next hour running around the park with the girls. Christina sets a pretty grueling pace, but you''re able to keep up just fine. Once you''re done, you say your goodbyes and head back to the park entrance.'
-						act 'Continue':gt 'pav_park', 'start'
-					end
-				else
-					act 'Okay': '<br><font color="red">You feel too hungry to do this.</font>'
-				end
-				act 'No thanks':
-					'"Sorry, I have a few things I still need to do. Next time though."'
-					'Christina just shrugs. "Okay, see you <<$pcs_nickname>>."'
-					act 'Leave':gt 'pav_park', 'start'
-				end
-			else
-				'"Sorry, I already done my run for today. Maybe next time."'
-				'Christina just shrugs. "Okay, see you <<$pcs_nickname>>."'
-			end
-		else
-			'"Sorry, I''m not really dressed for it right now. Another time, maybe."'
-			'Christina just shrugs. "Okay, see you <<$pcs_nickname>>."'
-		end
-	elseif npc_rel['A18'] <= 20 and fame['pav_slut'] < 200:
+	if fame['pav_slut'] < 200:
 		'You give a friendly wave to the girls as they get closer, but Christina just says something to Lina and they both laugh without slowing down.'
-	elseif fame['pav_slut'] >= 200:
-		'You give a friendly wave to the girls as they get closer, but Christina just gives you a disgusted look and they continue running without slowing down.'
 	else
-		'You give a friendly wave to the girls as they get closer and Christina calls out "Hey <<$pcs_nickname>>! Come join us for a run, you look like you need it."'
-		'Lina giggles, but doesn''t say anything.'
-		if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
-			if daybegskver ! daystart:
-				if pcs_energy >= 10:
-					act 'Okay':
-						*clr & cla
-						menu_off = 1
-						gs 'exercise', 'tier1', 60, 'run_exp'
-						daybegskver = daystart
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
-						'You spend the next hour running around the park with the girls. Christina sets a pretty grueling pace, but you''re able to keep up just fine. Once you''re done, you say your goodbyes and head back to the park entrance.'
-						act 'Continue':gt 'pav_park', 'start'
-					end
-				else
-					act 'Okay': '<br><font color="red">You feel too hungry to do this.</font>'
-				end
-				act 'No thanks':
-					'"Sorry, I have a few things I still need to do. Next time though."'
-					'Christina just shrugs. "Okay, your loss. See you <<$pcs_nickname>>."'
-					act 'Leave':gt 'pav_park', 'start'
-				end
-			else
-				'"Sorry, I already did my run for today. Maybe next time."'
-				'Christina just shrugs. "Okay, your loss. See you <<$pcs_nickname>>."'
-			end
-		else
-			'"Sorry, I''m not really dressed for it right now. Another time, maybe."'
-			'Christina just shrugs. "Okay, your loss. See you <<$pcs_nickname>>."'
-		end
+		'You give a friendly wave to the girls as they get closer, but Christina just gives you a disgusted look and they continue running without slowing down.'
 	end
 	act 'Leave':gt 'pav_park', 'start'
 end

+ 10 - 11
locations/lariska_storyline.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'story_intro':
 	act 'Yes!':
 		cla & *clr
 		minut += 10
-		npc_rel['A13'] += 2
+		gs 'npc_relationship', 'modify', 'A13', 'like'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
 		'You nod your head, "Yeah, you''re amazing, Lariska. I didn''t know you were such a good volleyball player!'
@@ -26,10 +26,9 @@ if $ARGS[0] = 'story_intro':
 		'"No need to be humble, it was really amazing, trust me. I''ll let you go back to it, I don''t want to bother you." you say with a smile.'
 		'Smiling back, Lariska turns uncertainly back towards the wall and hits the ball again, only this time she misses it and it smacks her hard in the face.'
 		minut += 10
-		npc_rel['A13'] += 1
 		gs 'stat'
 		act 'Pretend not to see that':
-			npc_rel['A13'] += 1
+			gs 'npc_relationship', 'modify', 'A13', 'like'
 			gs 'stat'
 			gt 'pav_complex', 'start'
 		end
@@ -41,7 +40,7 @@ if $ARGS[0] = 'story_intro':
 			+$OpenInnerThought+'"Does she have a crush on me? Is that why she''s hanging around here, maybe looking for me? Should I try to kiss her and find out?"'+$CloseInnerThought
 			'This might be a dangerous thing to do, Christina controls Lariska, and she may not like you messing with her. Kissing her would pretty much be declaring war on Christina, if she ever found out.' 
 			minut += 5
-			npc_rel['A13'] += 2
+			gs 'npc_relationship', 'modify', 'A13', 'love'
 			gs 'stat'
 			act 'Let her go':
 				cla & *clr
@@ -62,7 +61,7 @@ if $ARGS[0] = 'story_intro':
 	act 'Play it off':
 		cla & *clr
 		minut += 10
-		npc_rel['A13'] -= 2
+		gs 'npc_relationship', 'modify', 'A13', 'dislike'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
 		'Wanting to play it off nonchalantly, you shake your head, chuckle, and tell her you''ve seen others pull off even more impressive moves.'
@@ -125,7 +124,7 @@ if $ARGS[0] = 'Boyfriend_1':
 		'"Thanks, <<$pcs_nickname>>. I was worried you would be mad at me for wanting that." She leans in and gives you a kiss on the cheek.'
 		LariskaQW['boyfriend'] = 1
 		lariskalove += 2
-		npc_rel['A13'] += 10
+		gs 'npc_relationship', 'modify', 'A13', 'adore'
 		pcs_mood += 5
 		gs 'stat'
 		act 'Finish this conversation':gt 'LariskaHome', 'lariska_bedroom'
@@ -140,7 +139,7 @@ if $ARGS[0] = 'Boyfriend_1':
 		if lariskalove > 6:
 			lariskalove -= 1
 		else
-			npc_rel['A13'] -= 10
+			gs 'npc_relationship', 'modify', 'A13', 'loathe'
 		end
 		pcs_mood -= 5
 		gs 'stat'
@@ -170,7 +169,7 @@ if $ARGS[0] = 'Boyfriend_2':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_cooking_4.jpg"></center>'
 			'"Ok," you say, laughing at how adorable she is, needing your approval. Before long, the two of you are back to laughing and joking as you finish setting up the meal.'
 			'Once everything is cooked you sit down together and eat, chatting comfortably with each other.'
-			npc_rel['A13'] += 2
+			gs 'npc_relationship', 'modify', 'A13', 'love'
 			lariskalove += 1
 			minut += 30
 			pcs_health += 25
@@ -340,7 +339,7 @@ if $ARGS[0] = 'Boyfriend_6':
 		if lariskalove >= 8:
 			lariskalove -= 2
 		else
-			npc_rel['A13'] -= 15
+			gs 'npc_relationship', 'modify', 'A13', '-15'
 		end
 		pcs_mood -= 10
 		gs 'stat'
@@ -356,7 +355,7 @@ if $ARGS[0] = 'Boyfriend_6':
 		if lariskalove > 6:
 			lariskalove -= 1
 		else
-			npc_rel['A13'] -= 10
+			gs 'npc_relationship', 'modify', 'A13', '-10'
 		end
 		pcs_mood -= 10
 		gs 'stat'
@@ -398,7 +397,7 @@ if $ARGS[0] = 'Boyfriend_7':
 		if lariskalove >= 8:
 			lariskalove -= 2
 		else
-			npc_rel['A13'] -= 10
+			gs 'npc_relationship', 'modify', 'A13', '-10'
 		end
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'	
 		'"Abortion is always an option. You could still do your sports thing and attend University."'

+ 37 - 157
locations/pav_disco_jocks.qsrc

@@ -580,7 +580,6 @@ end
 if $ARGS[0] = 'christina':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A18', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
 	if rand(1,4) = 1:
@@ -596,10 +595,7 @@ if $ARGS[0] = 'christina':
 				act 'Dance with her': gt 'pav_disco_jocks', 'christina_dance'
 			else
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-				if npc_rel['A18'] >= 50 and fame['pav_slut'] < 200:
-					'"Hey, girl! You going to dance with me?"'
-					act 'Dance with her': gt 'pav_disco_jocks', 'christina_dance'
-				elseif npc_rel['A18'] <= 20 and fame['pav_slut'] < 200:
+				if fame['pav_slut'] < 200:
 					if grupTipe = 2:
 						'"What the fuck do you want, bitch?"'
 						'"I want to dance, Christina."'
@@ -609,15 +605,12 @@ if $ARGS[0] = 'christina':
 						'"I want to dance, Christina."'
 						'"No. Get the fuck out of here."'
 					end
-				elseif fame['pav_slut'] >= 200:
+				else
 					if grupTipe = 2:
 						'"Oh look. The little skank must be doing her slut rounds. I don''t care if you''re one of us, I''m still not going to fuck you. Get lost, whore!"'
 					else
 						'"Oh look. The little skank must be doing her slut rounds. Well, I''m certainly not going to fuck you. Get lost, whore!"'
 					end
-				else
-					'"What do you want, <<$pcs_nickname>>? I''m busy enjoying myself right now.'
-					act 'Dance with her': gt 'pav_disco_jocks', 'christina_dance'
 				end
 			end
 		end
@@ -643,16 +636,7 @@ if $ARGS[0] = 'christina':
 				end
 			else
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-				if npc_rel['A18'] >= 50 and fame['pav_slut'] < 200:
-					'"Hey, girl! You enjoying your night?" She seems to be in a good mood, and the two of you talk about random things for a little bit.'
-					act 'Ask her to dance':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
-						'"Hell yes! Let''s go, girl!" She grabs your hand and drags you out to the dance floor.'
-						act 'Go dancing': gt 'pav_disco_jocks', 'christina_dance'
-					end
-					act 'Chat with her some more': gt 'pav_disco_jocks', 'christina_chat'
-				elseif npc_rel['A18'] <= 20 and fame['pav_slut'] < 200:
+				if fame['pav_slut'] < 200:
 					if grupTipe = 2:
 						'"What the fuck do you want, bitch?"'
 						'"I just wanted to talk, Christina."'
@@ -662,146 +646,54 @@ if $ARGS[0] = 'christina':
 						'"I just wanted to talk, Christina."'
 						'"No. Get the fuck out of here."'
 					end
-				elseif fame['pav_slut'] >= 200:
+				else
 					if grupTipe = 2:
 						'"Oh look. The little skank must be doing her slut rounds. I don''t care if you''re one of us, I''m still not going to fuck you. Get lost, whore!"'
 					else
 						'"Oh look. The little skank must be doing her slut rounds. Well, I''m certainly not going to fuck you. Get lost, whore!"'
 					end
-				else
-					'"What do you want, <<$pcs_nickname>>? I''m busy enjoying myself right now.'
-					'"I just wanted to chat."'
-					'She rolls her eyes a little, but doesn''t run you off. The two of you chat for a while, though it''s mostly you doing the talking.'
-					act 'Ask her to dance':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
-						'"Sure, why not." She grabs your hand and drags you out to the dance floor.'
-						act 'Go dancing': gt 'pav_disco_jocks', 'christina_dance'
-					end
-					act 'Chat with her some more': gt 'pav_disco_jocks', 'christina_chat'
 				end
 			end
 		end
 	end
 end
 
-if $ARGS[0] = 'christina_chat':
+if $ARGS[0] = 'christina_dance':
 	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
-	'She looks at you, waiting for you to speak.'
-	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Ask her to dance':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
-		if npc_rel['A18'] >= 50:
-			'"Hey, girl! You enjoying your night?" She seems to be in a good mood, and the two of you talk about random things for a little bit.'
-		else
-			'"Sure, why not." She grabs your hand and drags you out to the dance floor.'
-		end
-		act 'Go dancing': gt 'pav_disco_jocks', 'christina_dance'
-	end
-	!!Not sure if random chat would be too OP in gaining relationship points
-	act 'Chat about random things': 
-		*clr & cla
-		minut += 15
-		gs 'npc_relationship', 'modify', 'A18', 'like'
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
-		'The two of you talk about whatever comes to mind.'
-		act 'Ask about something else': gt 'pav_disco_jocks', 'christina_chat'
-	end
-	if chris_dico_talk['track'] ! daystart:
-		act 'Ask about track':
-			*clr & cla
-			minut += 15
-			chris_dico_talk['track'] = daystart
-			gs 'npc_relationship', 'modify', 'A18', 'like'
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
-			if razradbeg >= 3:
-				'The two of you talk about the last race. She cannot help but brag about being the team captain every chance she gets.'
-			else
-				'Smiling, she talks about how the last practice went. '
-			end
-			act 'Ask about something else': gt 'pav_disco_jocks', 'christina_chat'
+	if $pantyworntype = 'none' and PCloSkirt > 2:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
+		'The two of you start dancing, separately at first, before she starts sliding closer to you. Getting behind you, she wraps an arm around your waist and begins grinding her crotch up against your ass. Your skirt slides up enough to show your bare pussy and you desperately hope no one is paying enough attention to notice.'
+		$orgasm_or = 'no'
+		pcs_stam -= 5
+		gs 'sweat', 'add', 3
+		fat -= 1
+		danc_exp += 1
+		frost = 0
+		inhib_exp += 1
+		gs 'arousal', 'erotic', 15
+		gs 'stat'
+		act 'Do something else':
+			gs 'arousal', 'end'
+			gt 'pav_disco_coolkids', 'classmates'
 		end
-	end
-	if chris_dico_talk['cheer'] ! daystart:
-		act 'Ask about cheerleading':
+		act 'Keep dancing':
 			*clr & cla
-			minut += 15
-			chris_dico_talk['cheer'] = daystart
-			gs 'npc_relationship', 'modify', 'A18', 'like'
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
-			if cheerleadingQW['quest_stage'] >= 3:
-				'The two of you talk about how the last practice went. She can''t seem to stop herself from complaining about the way Albina runs things.'
-			else
-				'Smiling, she talks about how the last practice went.'
-			end
-			act 'Ask about something else': gt 'pav_disco_jocks', 'christina_chat'
-		end
-	end
-end
-
-if $ARGS[0] = 'christina_dance':
-	*clr & cla
-	if christinaQW['subpath'] >= 2:
-		if $pantyworntype = 'none' and PCloSkirt > 2:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
-			'The two of you start dancing, separately at first, before she starts sliding closer to you. Getting behind you, she wraps an arm around your waist and begins grinding her crotch up against your ass. Your skirt slides up enough to show your bare pussy and you desperately hope no one is paying enough attention to notice.'
-			$orgasm_or = 'no'
+			inhib_exp += 2
 			pcs_stam -= 5
 			gs 'sweat', 'add', 3
 			fat -= 1
 			danc_exp += 1
 			frost = 0
-			inhib_exp += 1
 			gs 'arousal', 'erotic', 15
 			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
+			'You respond by grinding your ass back into her, looking over your shoulder in time to see her smile. You continue dancing together for a few songs before she finally lets you go, saying something about needing to pee.'
 			act 'Do something else':
 				gs 'arousal', 'end'
 				gt 'pav_disco_coolkids', 'classmates'
 			end
-			act 'Keep dancing':
-				*clr & cla
-				inhib_exp += 2
-				pcs_stam -= 5
-				gs 'sweat', 'add', 3
-				fat -= 1
-				danc_exp += 1
-				frost = 0
-				gs 'arousal', 'erotic', 15
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
-				'You respond by grinding your ass back into her, looking over your shoulder in time to see her smile. You continue dancing together for a few songs before she finally lets you go, saying something about needing to pee.'
-				act 'Do something else':
-					gs 'arousal', 'end'
-					gt 'pav_disco_coolkids', 'classmates'
-				end
-				!!Possible bathroom sex
-				!!act 'Follow her': gt '', ''
-			end
-		else
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
-			minut += 15
-			pcs_stam -= 5
-			gs 'sweat', 'add', 3
-			fat -= 1
-			danc_exp += 1
-			frost = 0
-			gs 'stat'
-			'The two of you start dancing, separately at first, before she starts sliding closer to you. Getting behind you, she wraps an arm around your waist and begins grinding her crotch up against your ass. You dance together like this for a while.'
-			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			act 'Keep dancing':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
-				minut += 15
-				gs 'stat'
-				'Surrendering yourself to the music, you dance in sync with Christina. She holds onto you possesively, making it clear to any boys watching that you belong to her.'
-				'She eventually lets you go, muttering something about the bathroom, and disappears into the crowd.'
-				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-				!!Possible bathroom sex
-				!!act 'Follow her': gt '', ''
-			end
+			!!Possible bathroom sex
+			!!act 'Follow her': gt '', ''
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
@@ -812,30 +704,18 @@ if $ARGS[0] = 'christina_dance':
 		danc_exp += 1
 		frost = 0
 		gs 'stat'
-		if $pantyworntype = 'none' and PCloSkirt > 2:
-			inhib_exp += 1
-			'You start dancing with Christina and you both have a good time, twisting in sync with the music and each other. Knowing that anybody watching will catch glimpses of your bare ass peeking out of your skirt fills you with excitement.'
-			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			act 'Keep dancing':
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
-				inhib_exp += 1
-				minut += 15
-				gs 'stat'
-				'The two of you bounce in tune with the music, having a great time. The breeze coming up your skirt keeps you smiling, and wondering if anybody is getting a good look at your bare pussy.'
-				'Christina eventually gets tired of dancing and wanders off, saying something about needing a drink.'
-				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			end
-		else
-			'You start dancing with Christina and you both have a good time, twisting in sync with the music and each other.'
+		'The two of you start dancing, separately at first, before she starts sliding closer to you. Getting behind you, she wraps an arm around your waist and begins grinding her crotch up against your ass. You dance together like this for a while.'
+		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+		act 'Keep dancing':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
+			minut += 15
+			gs 'stat'
+			'Surrendering yourself to the music, you dance in sync with Christina. She holds onto you possesively, making it clear to any boys watching that you belong to her.'
+			'She eventually lets you go, muttering something about the bathroom, and disappears into the crowd.'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			act 'Keep dancing':
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
-				minut += 15
-				gs 'stat'
-				'The two of you bounce in tune with the music, having a great time.'
-				'Christina eventually gets tired of dancing and wanders off, saying something about needing a drink.'
-				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			end
+			!!Possible bathroom sex
+			!!act 'Follow her': gt '', ''
 		end
 	end
 end

+ 1 - 1
locations/pav_park.qsrc

@@ -132,7 +132,7 @@ if $ARGS[0] = 'start':
 
 	if week >= 6 and hour >= 8 and hour <= 9 and StoryLine = 1 and socialchg['tVanya_day'] ! daystart: '<a href="exec:gt ''gschool_socialchg1'',''tVanya''">Vanya</a> is out on a light jog and is slowly approaching you.'
 
-	if week < 6 and hour >= 16 and hour <=20 and storyline = 1 and christinaQW['dompath'] = 0 and christinaQW['subpath'] = 0 and socialchg['tChris_Lina_jog'] ! daystart:
+	if month > 8 and month < 6 and week < 6 and hour >= 16 and hour <=20 and storyline = 1 and christinaQW['dompath'] = 0 and christinaQW['subpath'] = 0 and socialchg['tChris_Lina_jog'] ! daystart:
 		if rand(1,3) = 1:'You spot <a href="exec:gt ''gschool_socialchg1'',''Chris_Lina_park''">Christina</a> and Lina jogging around the park.'
 	end