Browse Source

Merge remote-tracking branch 'Alaratt/master'

KevinSmarts 3 years ago
parent
commit
b1dc6d3480
3 changed files with 92 additions and 32 deletions
  1. 1 1
      locations/JuliaMilHome.qsrc
  2. 31 31
      locations/artemhome.qsrc
  3. 60 0
      locations/journal_quests.qsrc

+ 1 - 1
locations/JuliaMilHome.qsrc

@@ -78,7 +78,7 @@ elseif lernHome = 0:
 
 				act 'Relax in Julia''s room':gt $curloc
 
-				if pcs_horny >= 50:
+				if JulMilBestFrend >= 5:
 					act 'Talk about sex':
 						cls
 						minut += 5

+ 31 - 31
locations/artemhome.qsrc

@@ -606,7 +606,7 @@ if $ARGS[0] = 'livingroom':
 	gs 'stat'
 	'<center><b><font color = maroon>Living room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/living.jpg"></center>'
-	'The living room is clean and neat. A couch rests against one wall, with a throw rug between it and the TV stand. On the throw rug is a nice coffee table. On the TV stand sits a nice but not too big flat screen tv, while in the bottom of the stand is a neatly stored playstation. Along one side of the tv is a stand with several dozen movies.'
+	'The living room is clean and neat. A couch rests against one wall, with a throw rug between it, and the TV stand. On the throw rug is a nice coffee table. On the TV stand sits a nice but not too big flat screen tv, while in the bottom of the stand is a neatly stored playstation. Along one side of the tv is a stand with several dozen movies.'
 	if hour < 6:
 		gt 'artemhome', 'timecheck'
 	elseif hour > 22:
@@ -621,15 +621,15 @@ if $ARGS[0] = 'livingroom':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 			if pav_slut >= 200 or grupTipe = 4:
 				'As the two of you walk into the living room he turns towards you, looking a bit appalled at you, "So <<$pcs_firstname>> how did you and my boy become friends?"'
-				'Stretching out your clothes so they cover you up a little, "I don'' really remember. We kinda just connected and started hanging out... It doesn''t hurt that Artem is really hot so that made it much easier." Artem blushes at the comment.'
-				'Masharin squirms a little by your answer, clears his throat and asks, "My boy is very ambitious and we''re very proud of him, we want him to succeed in school. I really hope that he will be able to continue to pursue that because you know, he''s not used to girls like you..."'
+				'Stretching out your clothes so they cover you up a little, "I don''t really remember. We kinda just connected and started hanging out... It doesn''t hurt that Artem is really hot, so that made it much easier." Artem blushes at the comment.'
+				'Masharin squirms a little by your answer, clears his throat and asks, "My boy is very ambitious and we''re very proud of him, we want him to succeed in school. I really hope that he will be able to continue to pursue that because, you know, he''s not used to girls like you..."'
 				act 'What do you mean?':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 					'You tilt your head and start playing with your hair, "Girls like me...?"'
-					'Masharin starts squirming even more, "You know... Experienced..."'
+					'Masharin starts squirming even more, "You know... experienced..."'
 					'Artem sighs really loud, "Dad, stop embarrassing me..."'
-					'You keep prodding some more, "I don''t really follow what you mean... Experienced, in what way?"'
+					'You keep prodding some more, "I don''t really follow what you mean... experienced, in what way?"'
 					'He''s now looking around avoiding eye-contact, "Ehm, you know sexually..."'
 					act 'Did you just assume something?':
 						*clr & cla
@@ -637,27 +637,27 @@ if $ARGS[0] = 'livingroom':
 						'You start shaking your head, "Did you just assume that I''m a slut just because of what clothes I''m wearing?"'
 						'"N-No, <<$pcs_firstname>>, I d-didn''t assume anything..." you can see Masharin sweat a little.'
 						'You stand in silence for a few seconds as you finally start laughing, "Don''t worry about Artem, I''ll make sure that he keeps his head straight..."'
-						'Masharin sighs, "Well, I think Artem and I will have a talk later..." as he looks sternly at Artem'
+						'Masharin sighs, "Well, I think Artem and I will have to have a talk later..." as he looks sternly at Artem'
 						'You smile, "You do that..." as you and Artem turn around, you show off a bit of your behind as you leave the room without Artem noticing at first, then he turns to hurry to catch up to you and walk you to his room.'
 						act 'Leave': ArtemLoc = 2 & gt 'artemhome','artemroom'
 					end
 				end
 			else 
-				'As the two of you walk into the living room Artem''s father turns around, it seems like you''ve startled him a bit, "Oh, I''m sorry... we didn''t mean to startle you..."'
+				'As the two of you walk into the living room Artem''s father turns around, it seems like you''ve startled him a bit. "Oh, I''m sorry... we didn''t mean to startle you..."'
 				'He waves your fears away, "Don''t worry about it, I''m just happy to see Artem spending time with a nice girl like yourself..."'
 				act 'Thank you':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 					'You nod and give a subtle smile, "You''re making me blush. You''re giving me way too much credit..."'
-					'Masharin shakes his head, "Not at all. Artem has been talking about you quite a lot and he''s really excited when he talks about you so I''m glad that he found someone nice to be friends with."'
+					'Masharin shakes his head, "Not at all. Artem has been talking about you quite a lot and he''s really excited when he talks about you, so I''m glad that he found someone nice to be friends with."'
 					'Artem cries out in embarrassment, "Dad, that was supposed to be a private thing between us two. You weren''t supposed to say that to <<$pcs_nickname>>..." he starts blushing.'
 					act 'Smile':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
-						'Masharin looks worrying at Artem as you decide to ease the tension a bit, you playfully push Artem a little, "Ease up a little, your dad was just looking out for you is all."'
-						'"Still he shouldn''t have talked about it... I said all of that in confidence." Artem is still upset.'
-						'"Artem, I-I''m..." Masharin begins but is cut off by Artem, "Let''s go <<$pcs_nickname>>, that''s enough embarrassment for one day..."'
-						'"Don''t worry, Mr. Chebotarev. I''m sure it''s not a big thing, Artem will be over it soon enough..." you say a couple of encouraging words before leaving the living room and going to Artems room.'
+						'Masharin looks worrying at Artem, so you decide to ease the tension a bit by playfully pushing Artem a little. "Ease up a little, your dad was just looking out for you is all."'
+						'"Still, he shouldn''t have talked about it... I said all of that in confidence." Artem is still upset.'
+						'"Artem, I-I''m..." Masharin begins but is cut off by Artem, "Let''s go <<$pcs_nickname>>, that''s enough embarrassment for one day."'
+						'"Don''t worry, Mr. Chebotarev. I''m sure it''s not a big thing, Artem will be over it soon enough." you say encouragingly before going to Artems room.'
 						act 'Leave': ArtemLoc = 2 & gt 'artemhome','artemroom'
 					end
 				end
@@ -672,22 +672,22 @@ if $ARGS[0] = 'livingroom':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 					if pav_slut >= 200 or grupTipe = 4:
-						'"Didn''t think Artem would still be socializing with you after our talk..." Masharin reacts to seeing you once again...'
-						'"Yeah, well you know how it goes." you nonchalantly answer.'
+						'"Didn''t think Artem would still be socializing with you after our talk..." Masharin reacts to seeing you once again.'
+						'"Yeah, well, you know how it goes." you nonchalantly answer.'
 						'All of a sudden his posture changes and he slouches back in his chair, "<<$pcs_firstname>>, can''t you find some other boy to toy with, other than my son?"'
 						act 'Toy with?':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 							'You look confusingly at Masharin, "Toy with him?"'
-							'"Like I told you the last time my Artem is a smart and a bright boy and he''s doing great in school..." Masharin starts explaining, "And since this is his last year in school I would like him to be able to keep up his grades..."'
+							'"Like I told you the last time, my Artem is a smart and bright boy, and he''s doing great in school." Masharin starts explaining, "Since this is his last year in school I would like him to be able to keep up his grades."'
 							'"So what does this have to do with me?" you cross your arms, looking impatiently at him.'
-							'"We both know the kind of girl you are, you enjoy toying with boys for your own amusement..." he tries to reason, "Can you just leave him alone and I''ll owe you one."'
+							'"We both know the kind of girl you are, you enjoy toying with boys for your own amusement." he tries to reason, "Can you just leave him alone and I''ll owe you one?"'
 							act 'Talk is cheap':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
-								'"Just because you think I''m acting like this, you think I could only be toying with him, just because of how I dress and act?!" you start raising your voice, "You don''t think Artem and I could just be friends?! Aren''t you really judgmental?! And to think Artem was telling me about his non-judgmental parents..."'
-								'"N-No not at all," Masharin starts trembling in his voice, "Y-You may behave however you want..."'
-								'"But I can''t be friends with your son, that''s what you''re saying?!" you continue confronting him...'
+								'"You think I am only be toying with him, just because of how I dress and act?!" you start raising your voice, "You don''t think Artem and I could just be friends?! Aren''t you really judgmental?! And to think Artem was telling me about his non-judgmental parents."'
+								'"N-No not at all," Masharin voice starts trembling, "Y-You may behave however you want..."'
+								'"But I can''t be friends with your son, that''s what you''re saying?!" you continue confronting him.'
 								'Masharin curls up slightly and then sighs and goes almost limp, in apparent defeat, at least for now. "I... just don''t hurt him please?"'
 								'With that your roll your eyes and leave.'
 								act 'Leave':gt 'artemhome','hallway'
@@ -701,15 +701,15 @@ if $ARGS[0] = 'livingroom':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 							'You nod your head, "It''s going good, Artem and I make a great team. If there''s something he doesn''t know, I try to help him out and the same goes when it comes to me."'
-							'"I''m glad to hear that it''s going well. Academics are important, you can get a good job and don''t have to rely on going to a work that you don''t like everyday." Masharin starts in like he is about to start preaching the values of education.'
-							'He continues, "When I was younger I used to spend my days focused on school and got teased for it, but if you look it at it now I have a great job and family, we go on vacations every year. I don''t have to worry about anything."'
+							'"I''m glad to hear that it''s going well. Academics are important, you can get a good job and don''t have to rely on going to a job you don''t like everyday." Masharin starts in like he is about to start preaching the values of education.'
+							'He continues, "When I was younger I used to spend my days focused on school and got teased for it, but if you look it at it now I have a great job and family, we even go on vacations every year. I don''t have to worry about anything."'
 							act 'Listen politely':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 								'You keep quiet and listen to him while he goes on a rant about life and how you should keep a straight head and avoid all the evil stuff that happen around this town.'
-								'All of a sudden he stops, "Oh, sorry. I must be boring you... Sometimes I get way ahead of myself, and then I have to remind myself that no one wants to listen to a boring tale about nothing..."'
-								'You shake your head and reply politely, "Not at all, it''s always good hearing a positive opinion about studying as it''s not always seen in a keen light around here..."'
-								'Masharin sighs, "Well, don''t pay too much attention to it and you''ll see it''ll be easier for you later in life..."'
+								'All of a sudden he stops, "Oh, sorry. I must be boring you... Sometimes I get way ahead of myself, and then I have to remind myself that no one wants to listen to a boring tale about nothing."'
+								'You shake your head and reply politely, "Not at all, it''s always good hearing a positive opinion about studying, as it''s not always seen in a keen light around here."'
+								'Masharin sighs, "Well, don''t pay too much attention to it, and you''ll see how much better life is as time goes by."'
 								act 'Leave':gt 'artemhome','hallway'
 							end
 						end
@@ -721,11 +721,11 @@ if $ARGS[0] = 'livingroom':
 							act 'What is it?':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
-								'Yours eyes widen, "What was it?"'
+								'Your eyes widen, "What was it?"'
 								'Masharin tries to excuse himself, "It worked for me but it doesn''t mean it will work for anyone else. We all have our own quirks that helps us when it comes to that stuff, you have your breaks and I have mine."'
 								'"Well, I would love to hear what you did, it would be of great help." you tell him.'
-								'Masharin smiles, "Fine, fine, I''ll tell you then. I used to close my eyes and think that I''m in the middle of a forest, only hearing those unusual sounds that you can hear in a silent forest. This always cleared my mind and it helped me re-focus."'
-								'Hmm maybe but what does a forest have to do with math or science? "I might try this some time, thanks a lot for the advice but it''s probably best that I head back."'
+								'Masharin smiles, "Fine, fine, I''ll tell you then. I used to close my eyes and think that I''m in the middle of a forest, only hearing those unusual sounds that you can hear in a silent forest. This always cleared my mind and it helped me regain my focus."'
+								'Hmm maybe, but what does a forest have to do with math or science? "I might try this some time, thanks a lot for the advice, but it''s probably best that I head back."'
 								act 'Leave':gt 'artemhome','hallway'
 							end
 						end
@@ -759,21 +759,21 @@ if $ARGS[0] = 'livingroom':
 							minut += 10
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/glinina.jpg"></center>'
-							'"As a matter of fact you can." You continue further inside living room, taking a seat next to Glinina, "I just need to see the first part of that scandalous show they''re showing right now."'
+							'"As a matter of fact you can." You continue further inside living room, taking a seat next to Glinina. "I just need to see the first part of that scandalous show they''re showing right now."'
 							'You grab the controller off the coffee table and switch the channel, "Oh, here it is." The show goes on showing the contestants fight, having sex and other morally questionable actions.'
 							'"I can''t believe he picked that slut," you shout out, "She''s clearly just playing with him to win the whole thing." you tell Glinina.'
 							'"Shouldn''t you head back to Artem?" Masharin asks.'
-							'"Hmm?" and just as you''re about to answer the commercials come on and you let out a sigh, "I guess it''s time to head back. Thanks for letting me watch the first part." You quickly get up and leave them still stunned not really understanding what just happened.'
+							'"Hmm?" and just as you''re about to answer the commercials come on and you let out a sigh, "I guess it''s time to head back. Thanks for letting me watch the first part." You quickly get up and leave them still stunned, not really understanding what just happened.'
 							act 'Leave':gt 'artemhome','hallway'
 						end
 						act 'No':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 							'"No, just needed to get away for a while... You know school work is boring as hell and your son is super serious about that stuff, which is no fun." you reply.'
-							'Masharin looking away from the TV, "Well, school work is important. You''re about to head to the university and you need to be ready for what is waiting there..."'
+							'Masharin looking away from the TV, "Well, school work is important. You''re about to head to the university and you need to be ready for what is waiting there."'
 							'"I don''t know if I''ll end up there, I''m already tired of it and I don''t want to spend more time in school when I could be making money." you explain.'
 							'"Oh, and what would you be doing without a degree?" Masharin asks.'
-							'"Well you know, some odd jobs here and there. I''m sure I''ll get by fine. After all I''m still young and vigorous, so I''ll manage." you confidently reply, "Well, time to head back. Don''t want to keep Artem waiting..." you stretch showing off your curves a little before turning around leaving the Chebotarev''s looking in disbelief.'
+							'"Well you know, some odd jobs here and there. I''m sure I''ll get by fine. After all I''m still young and vigorous, so I''ll manage." you confidently reply, "Well, time to head back. Don''t want to keep Artem waiting..." you stretch showing off your curves a little before turning around leaving the Chebotarev''s looking at you in disbelief.'
 							act 'Leave':gt 'artemhome','hallway'
 						end
 					else 

+ 60 - 0
locations/journal_quests.qsrc

@@ -10,6 +10,66 @@ if $ARGS[0] = 'start':
 
 !!to check Sveta is at school. All school quests must pass this and it should become a category as we expand
 	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+		'<center><h1>Cheerleading</h1></center>'
+		*nl
+		if (month > 11 or month < 6) and cheerleadingQW['quest_stage'] = 0:
+			'For various reasons, I cannot be a cheerleader.'
+		elseif month < 10 and month >= 6 and cheerleadingQW['quest_stage'] = 0:
+			'If I want to be a cheerleader, I should keep my eyes out for the tryout posters that usually go up in the school around October.'
+		elseif (month = 10 or month = 11) and cheerleadingQW['quest_stage'] = 0:
+			'If I want to be a cheerleader, I should keep my eye out for the cheerleader tryout posters that usually go up in school around this time of year.'
+		elseif cheerleadingQW['quest_stage'] = -1 and cheerleadingQW['try_count'] > 0:
+			'If I want to try again to become a cheerleader, I will need to wait until the posters go back up in school.'
+		elseif cheerleadingQW['quest_stage'] = -1:
+			'If I change my mind about joining the cheerleading squad, I will have to wait for the posters to go up again.'
+		elseif cheerleadingQW['quest_stage'] = -2:
+			'For one reason or another, I don''t want to join the cheerleading squad.'
+		elseif cheerleadingQW['quest_stage'] = 1:
+			'I have signed up to tryout for the cheerleading squad.'
+		elseif cheerleadingQW['quest_stage'] = 2:
+			'I was accepted into the cheerleading squad as a backup. Unless people start thinking I am a jock or see me as cool enough, this is as far as Albina will let me go.'
+		elseif cheerleadingQW['quest_stage'] = 3:
+			'I joined the cheerleading squad as a full member.'
+		else
+			'Unknown. You might want to report this as a bug on the TFGS Forum.'
+		end
+		*nl
+		*nl
+		'<center><h1>Julia Milov</h1></center>'
+		*nl
+		if pav_slut < 200:
+			if npc_rel['A12'] >= 60:
+				if JuliaMilLernQW = 1:
+					if BeInJulMilHome = 1:
+						if wine = 1:
+							if JulMilBestFrend >= 5:
+								if SexTalkJulia >= 4:
+									'Julia and I are in a sexual relationship now.'
+								elseif SexTalkJulia > 0:
+									'I should try getting Julia to tell me more about her sexual adventures.'
+								else
+									'I should try talking to Julia about sex.'
+								end
+							else
+								'I should spend some time chatting with Julia. I bet if I get to know her weel enough, she would open up to me more.'
+							end
+						else
+							'I bet if I bought some wine, Julia would drink it with me.'
+						end
+					else
+						'Julia agreed to help me with my homework, she should be waiting for me after school ends.'
+					end
+				else
+					'I should ask Julia to help me with my homework afterschool sometime. I can find her hanging out with the other nerds in a classroom during school breaks.'
+				end
+			else
+				'I need to get to know Julia better before she is willing to hang out with me after school.'
+			end
+		else
+			'As long as people see me as a slut around town, there is no way Julia will give me the time of day.'
+		end
+		*nl
+		*nl
 		'<center><h1>Natasha Belova</h1></center>'
 		*nl
 		!! This might need a note about debt required for most actions to be available, was not sure how to handle that part though.