Browse Source

[removed] all instances of Christina relationship checks

Anya 2 years ago
parent
commit
69e657aed8

+ 1 - 1
locations/Zvereva_events.qsrc

@@ -2,7 +2,7 @@
 
 
 if $ARGS[0] = 'cikl':
-	if npc_rel['A18'] >= 21:
+	if npc_rel['A18'] > 20:
 		gs 'npc_relationship', 'set', 'A18', '20'
 	end
 end

+ 2 - 2
locations/fbgameout.qsrc

@@ -111,8 +111,8 @@ if $ARGS[0] = 'football':
 					ftbll_exp += rand(0,2)
 					stren_exp += 1
 					grupvalue[2] -= 1
-					npc_rel['A18'] -= 1
-					npc_rel['A19'] -= 1
+					gs 'npc_relationship', 'modify', 'A18', 'dislike'
+					gs 'npc_relationship', 'modify', 'A19', 'dislike'
 					gs 'stat'	
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/football/tackle.jpg"></center>'					
 					'You nod steadfast and quickly start running after Lina. You are almost galloping as you catch up and can almost grab hold of her...'

+ 6 - 12
locations/gschool_chats1.qsrc

@@ -1094,7 +1094,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: gs 'npc_relationship', 'modify', 'A18', -10
+			if npc_rel['A18'] > 20: gs 'npc_relationship', 'modify', 'A18', 'loathe'
 			if LariskaQW['story'] = 3:
 				LariskaQW['story'] = 4
 				christinaQW['dompath'] = 3
@@ -1136,7 +1136,11 @@ 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'] <= 20 and fame['pav_slut'] < 200:
+		if fame['pav_slut'] >= 200:
+			'"What does the biggest school slut want from me? Don''t you have a cock to suck somewhere?" Christina says mockingly.'
+			'"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
 			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."'
@@ -1146,16 +1150,6 @@ if $ARGS[0] = 'christina':
 				'"Well excuse me, your highness," you sarcastically take a bow in front of her. You hear some snickering behind you.'
 				'Christina turns a bit red as she pushes you away and storms off with Lina trying to keep up behind her.'
 			end
-		elseif fame['pav_slut'] >= 200:
-			'"What does the biggest school slut want from me? Don''t you have a cock to suck somewhere?" Christina says mockingly.'
-			'"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
-			'"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.'
-			'You take a deep breath. "I wanted to join..."'
-			'Before you end your sentence, she starts walking away and you can hear her say "Yeah yeah, you do that <<$pcs_nickname>>..."'
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'

+ 4 - 4
locations/gschool_grounds.qsrc

@@ -698,18 +698,18 @@ if $ARGS[0] = 'SchoolRun2_result':
 		end
 	elseif swinbeggor = 2 and begresult >= 130:
 		if christinaQW['dompath'] >= 6:
-			npc_rel['A19'] += 5
+			gs 'npc_relationship', 'modify', 'A19', 'love'
 			'Lina stands at at the finish line, gasping for breath. Even though you beat her a second time, she flashes you a bright smile in congratulations.'
 		else
-			npc_rel['A18'] -= 10
+			gs 'npc_relationship', 'modify', 'A18', 'loathe'
 			'Christina is gasping for breath at the finish line. She was unable to overtake you, and came second again. Christina avoids your gaze, not wanting to look you in the eye.'
 		end
 	elseif swinbeggor = 1 and begresult >= 130:
 		if christinaQW['dompath'] >= 6:
-			npc_rel['A19'] += 5
+			gs 'npc_relationship', 'modify', 'A19', 'love'
 			'Lina stands at at the finish line, gasping for breath. Even though you beat her, she flashes you a bright smile in congratulations.'
 		else
-			npc_rel['A18'] -= 10
+			gs 'npc_relationship', 'modify', 'A18', 'loathe'
 			'Christina is gasping for breath at the finish line. She was unable to overtake you, and came second yet again. You just flash her a toothy grin and continue your victory lap. Through clenched teeth Christina growls at you. "You bitch!"'
 		end
 	end

+ 2 - 19
locations/gschool_lessons4.qsrc

@@ -211,27 +211,10 @@ if $ARGS[0] = 'math':
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
 			'The day seems to be dragging in and you find yourself constantly staring at the clock, waiting for the class to finally be over. You decide to play on your phone to pass the time.'
-		    if VK = 1 and npc_rel['A18'] <= 60 and (christinaQW['fight'] = -1 or christinaQW['subpath'] >= 2) and salocatnow >= 5:
-				if npc_rel['A18'] > 30:npc_rel['A18'] = 30
+		    if VK = 1 and (christinaQW['fight'] = -1 or christinaQW['subpath'] >= 2) and salocatnow >= 5:
+				gs 'npc_relationship', 'modify', 'A18', 'loathe'
 				'As you are browsing the web, you receive a text message from Christina reading; "Hey there piggy, are you looking up discounts on Peremech so that you can shove them down your throat? Why don''t you lose some weight before the teachers decide to add bovine etiquette to the curriculum because they may feel it necessary to teach the students how to talk to a cow like you?" You can feel your face flushing in embarrassment while reading Christina''s hurtful comments. You quickly turn off your phone and try not to make eye contact with Christina for the rest of the lesson.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
-			elseif (VK = 1 and npc_rel['A18'] >= 80 and npc_grupTipe['A18'] = 2 and (christinaQW['subpath'] < 2 or christinaQW['dompath'] < 4)) or (VK = 1 and grupTipe = 2 and npc_grupTipe['A18'] = 2 and (christinaQW['subpath'] < 2 or christinaQW['dompath'] < 4)):
-				VKrand = rand(1,3)
-				if salocatnow >= 5:
-					'As you are browsing the web, you receive a text message from Christina reading; "Hey <<$pcs_nickname>>, I can''t help but notice that you''ve been putting some weight on. Would you like to run with Lina and I after school to maybe burn some of those calories?" Feeling embarrassed, you reply "Um maybe another time." Christina replies immediately. "<<$pcs_nickname>>, the other girls are starting to talk about you. You don''t want to be known as the fat girl of the school, do you?" You look toward Christina and see a mildly concerned look on her face before she texts one last message; "A few workouts a day and a proper diet can do wonders for your future. Think about it <<$pcs_firstname>>." She gives you an assuring nod before turning back towards the teacher.'
-				elseif VKrand = 1:
-					'As you are browsing the web, you receive a text message from Christina reading; "Hey <<$pcs_nickname>>, when are you getting those track shoes that I told you about? I still see you wearing those raggedy ones at PE." You giggle then reply "I keep forgetting to check them out when I stop by the shop." Christina immediately replies. "I know what you mean. I always get distracted by the other clothes then forget why I went in there in the first place."'
-					*nl
-					'You both look at each other with a smile when you hear Mr. Tsarev say "Hey, eyes up here you two." You both look back toward the teacher until he turns around to write on the board. You and Christina continue chatting via text message as Mr. Tsarev continues his lesson.'
-				elseif VKrand = 2:
-					'As you are browsing the web, you receive a text message from Christina reading; "Have you heard what that bitch Bella said the other day? I''m so sick of her lording over everyone as if she''s too good to have a simple conversation with someone without rudely scoffing at them. She has nothing going for her. She isn''t good at anything except making enemies. That brainless uptight bitch!" You reply. "What did she say exactly?"'
-					'Christina replies. "Lizaveta told me about how Bella said that running track is only for fat girls wanting to lose weight. If she ever says that to my face, then I''ll show her just how inferior she truly is." You try to calm Christina. "Maybe she didn''t say that. It could just be a rumor."'
-					'Christina replies back. "Bella better hope that you are right. I will find out one way or another." Christina quickly turns off her phone then slams her hand on the table, causing Mr. Tsarev to jump up in surprise before quickly looking around the room for the source of the noise before shrugging and continuing with his lesson.'
-				else
-					'As you are browsing the web, you receive a text message from Christina reading; "Have you seen what Zinaida was wearing this morning? Another hessian sack. Doesn''t she realize how bad she looks? Would it kill her to comb her hair? She looks like a fucking scarecrow." You reply. "Yeah she doesn''t really seem to care about her appearance at all." Christina replies. "Exactly! She is such an eyesore. Anyway have you been watching my races? I have been undefeated since I have started." You text back. "I have seen a few and I am always impressed at how fast you can move." Christina gives you a wink before replying. "Keep training and maybe you and I will keep the first two spots reserved for us. You can be the one in second of course."'
-					'You giggle as you reply. "Sure sounds like fun." You then stick your tongue out at her, causing you both to giggle before turning back to your phones.'
-				end
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			elseif VK = 1 and christinaQW['dompath'] >= 7:
 				'As you are browsing the web, you receive a text message from Christina reading; "Hey <<$pcs_nickname>>, can I please take this buttplug out? It''s really uncomfortable and it makes it hard to focus in class."' 
 				'"Tough shit, bitch," you reply. "You''re a buttslut now, get used to it." You send a smirk in her direction, before you go back to playing with your phone.'

+ 1 - 3
locations/gschool_socialchg.qsrc

@@ -646,9 +646,7 @@ if $ARGS[0] = 'group_student_rel_change':
 		if npc_rel['A16'] >= 60: grupvalue[3] += 1     
 		if npc_rel['A16'] <= 20: grupvalue[3] -= 1   
 		if npc_rel['A17'] >= 60: grupvalue[1] += 1     
-		if npc_rel['A17'] <= 20: grupvalue[1] -= 1   
-		if christinaQW['dompath'] < 6 and npc_rel['A18'] >= 60: grupvalue[3] += 1     
-		if christinaQW['dompath'] < 6 and npc_rel['A18'] <= 20: grupvalue[3] -= 1   
+		if npc_rel['A17'] <= 20: grupvalue[1] -= 1
 		if npc_rel['A19'] >= 60: grupvalue[2] += 1     
 		if npc_rel['A19'] <= 20: grupvalue[2] -= 1   
 		if npc_rel['A200'] >= 60: grupvalue[4] += 1