1
0
Prechádzať zdrojové kódy

[fixed] errors found by analyser

Kevin_Smarts 1 rok pred
rodič
commit
f4709d1eba

+ 1 - 1
locations/mother.qsrc

@@ -818,7 +818,7 @@ if $ARGS[0] = 'referral_fail':
 			delin_beh += 1
 			'Your <<$npc_nickname[''A29'']>> is furious and grabs you by the ear, pulling you out of the clinic and onto the street. "Oh, you slut! Your father and I worked so hard to raise you as a decent person, hoping you would find a good husband some day... and now it turns out you''re a whore who has already put her pussy to work."'
 			act 'Stay quiet':
-				*clr $ cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 				'"Get out of my sight!" She storms off, leaving you to find your own way home. When you return home, you make sure you do it quietly so she can''t give you another earful.'
 				act 'Walk home': gt 'korrPar'

+ 47 - 0
locations/mother_chats.qsrc

@@ -262,6 +262,7 @@ if $ARGS[0] = 'reconciliation_talk':
 		'After a very brief pause she continues before you can say anything. "I feel bad about what happened the other day and think that we really need to try and resolve our differences. Please come with me at the café so we can have a chat."'
 
 		act 'Decline':
+			mother['kickedout_pending'] = 1
 			cla & *clr
 			minut += 5
 			'You ponder your response and decide that you don''t feel ready to deal with any more on this so feel it best to decline her offer, however, you do realise that it would have taken a lot for her to come to meet you so you carefully formulate your response.'
@@ -336,4 +337,50 @@ if $ARGS[0] = 'reconciliation_replies':
 	end
 end
 
+
+if $ARGS[0] = 'Knock':
+	gs 'homes_properties', 'give_access', 'parents_home'
+	*clr & cla
+	minut += 5
+	'You have decided to return home and unfortunately when you arrive you find that the door is locked. After a moment''s consideration you decide to knock and see if your parents are in and if they''ll let you return. After all, what have you got to lose? Worst case they turn you away.'
+	'You shrug, take a deep breath and knock on the door then wait.'
+	'A few moments later the door opens and you see your <<$npc_nickname[''A29'']>> standing in front of you with a shocked but happy expression on her face.'
+	'She looks at you and starts to speak. "So the wanderer returns eh?! Where on earth have you been! Do you realise how worried we''ve been?"'
+	'Before you can respond she continues. "Never mind, you''re here now, that''s all that matters. Well don''t just stand there, come in. Despite our differences I still love and care about you." With that she gives you a hug as you enter.'
+	act 'Just visiting':
+		*clr & cla
+		minut += 25
+		'"I''m sorry for worrying you <<$npc_nickname[''A29'']>> but I''m not moving back in. I have my own place now but I wanted to visit to see if at least we can get on talking terms."'
+		'Your <<$npc_nickname[''A29'']>> looks sad. "Oh! Well wouldn''t you reconsider? I... No we miss you."'
+		'No <<$npc_nickname[''A29'']>> I''m happy where I am, here''s the address so you can visit if you want. However, I''d really like it if we could at least talk and try to rebuild our relationship"'
+		' Your <<$npc_nickname[''A29'']>> looks sad but nods and hugs you again. "Okay <<$npc_nickname>>, I guess that''ll have to do for now. Come in anyway and I''ll make us a tea."'
+		'You follow your <<$npc_nickname[''A29'']>> into the kitchen and share a tea with her and have a chat after which you get up to leave.'
+		'Your <<$npc_nickname[''A29'']>> gives you another hug before you leave. You promise to visit again soon before you depart.'
+		act 'Stop talking': gt'pod_ezd','etaj_2'
+	end
+	act 'Move back in':
+		*clr & cla
+		minut += 25
+		'"Thank you <<$npc_nickname[''A29'']>>. I''ve been considering things and wanted to ask if it would be alright if I moved back in. I brought my stuff with me on the off chance."'
+		'"Yes of course <<$npc_nickname>>, welcome home! Let me make a cup of tea and we can chat before you go to your room and unpack."'
+		'You follow your <<$npc_nickname[''A29'']>> into the kitchen and share a tea with her and have a chat after which you both get up. "Thanks <<$npc_nickname[''A29'']>> I guess I''d better go and unpack."'
+		'She smiles at you and hugs you tightly. I''m so happy you decided to come home <<$npc_nickname>>!"'
+		act 'Return to your room': gt 'bedrPar'
+	end
+end
+
+if $ARGS[0] = 'Knock_uni':
+	*clr & cla
+	minut += 30
+	'You have decided to return home to visit and unfortunately when you arrive you find that the door is locked. After a moment''s consideration you decide to knock and see if your parents are in.'
+	'You knock on the door then wait.'
+	'A few moments later the door opens and you see your <<$npc_nickname[''A29'']>> standing in front of you with a happy expression on her face.'
+	'She looks at you and starts to speak. "Hello <<$npc_nickname>>, it''s very nice of you to visit, come in and I''ll make us a cup of tea."'
+	'You follow your <<$npc_nickname[''A29'']>> into the kitchen and share a tea with her and have a chat.'
+	'As you both finish your tea your <<$npc_nickname[''A29'']>> gives you another hug and says. "You can stay over for the night if you wish."'
+	'"Thanks <<$npc_nickname[''A29'']>>, that''s good to know as I can see the rest of the family then." You get up and leave the kitchen.'
+	act 'Stop talking': gt 'korrPar'
+end
+
+
 --- mother_chats ---------------------------------

+ 2 - 2
locations/natbel_chat.qsrc

@@ -631,8 +631,8 @@ if $ARGS[0] = 'chat':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha24.jpg"></center>'
 						'You giggle. "Good girl, I knew all those brains would get the hang of this in the end and you see you can agree without adding a ''but''!"'
 						'The girl joins in the giggling when you say that, remembering the last time and stands up and lifts her skirt.'
-						'She looks at you still smiling and says. "So no smacks then, <<$pcs_nickname>?"'
-						'"Tempting! Yeah, that''s one cute, sexy but, girlfriend. Anyway get your butt back here before we get distracted," you say.'
+						'She looks at you still smiling and says. "So no smacks then, <<$pcs_nickname>>?"'
+						'"Tempting! Yeah, that''s one cute, sexy butt, girlfriend. Anyway get your butt back here before we get distracted," you say.'
 
 						act 'Continue':
 							*clr & cla

+ 2 - 2
locations/natbel_friend.qsrc

@@ -820,7 +820,7 @@ if $ARGS[0] = 'shopping_trip2':
 											'You smile at her, "Yeah, but it''s better that it''s out in the open now."'
 											'"Are you going to tell your parents?"'
 											'When you don''t answer, she prods you questioningly.'
-											'You frown. "Well, I want to but... my <<$npc_nickname[''A29'']> isn''t as open-minded as yours. To be honest, I just don''t know how to do it. We lucked out with your mother, even if it was an embarrassing start. I don''t know how things would have gone down if this was my <<$npc_nickname[''A29'']>>. Worst case, she''d probably disown me and kick me out of the house..."'
+											'You frown. "Well, I want to but... my <<$npc_nickname[''A29'']>> isn''t as open-minded as yours. To be honest, I just don''t know how to do it. We lucked out with your mother, even if it was an embarrassing start. I don''t know how things would have gone down if this was my <<$npc_nickname[''A29'']>>. Worst case, she''d probably disown me and kick me out of the house..."'
 											'Natasha gives you a gentle hug. "Okay, <<$pcs_nickname>>. I won''t press you on it for now, but if we stay together, we''ll need to do something eventually."'
 											'You squeeze her back. "I know."'
 											act 'Return to her room': gt 'natbelapt', 'natroom'
@@ -903,7 +903,7 @@ if $ARGS[0] = 'netbelapt_sex':
 					gs 'arousal', 'vaginal_dildo_give', 5, 'lesbian'
 					gs 'arousal', 'vaginal_dildo', -5, 'lesbian'
 					gs 'stat'
-					'She looks astonished and pulls you in for a long and passionate kiss. "Wow, thank you, <<$pcs_nickname>. You should have said something. I would have stopped."'
+					'She looks astonished and pulls you in for a long and passionate kiss. "Wow, thank you, <<$pcs_nickname>>. You should have said something. I would have stopped."'
 					'"No, I was ready. Anyway enough talk!"'
 					act 'Scissoring': gt 'natbel_friend', 'netbelapt_sex_climax'
 				end

+ 2 - 0
locations/pod_ezd.qsrc

@@ -100,6 +100,8 @@ if $ARGS[0] = 'etaj_2':
 
 	if func('homes_properties', 'has_access', 'parents_home'):
 		act '<b>Apartment 7: Your parents</b>': pavhome_enter = 1 & gt 'korrPar'
+	elseif mother['kickedout_pending'] = 1:
+		act '<b>Apartment 7: Your parents (knock)</b>': gt 'mother_chats', 'Knock'
 	else
 		act '<b>Apartment 7: Your parents</b>': msg 'Your knock is unanswered, and you no longer have a key.<br>It''s obvious you are no longer welcome here.'
 	end

+ 3 - 3
locations/therapist_hotel.qsrc

@@ -433,7 +433,7 @@ if $ARGS[0] = 'event4':
 				'<center><video autoplay loop <<$set_imgh>> src="images/pc/activities/misc/dress_<<rand(1, 2)>>.mp4"></video></center>'
 				'As you stand there naked, you slowly come to and, seeing yourself naked, you quickly get dressed. You are not sure why you are here and decide to leave.'
 
-				if therapistQW['hotel_left'] += 1:
+				if therapistQW['hotel_left'] = 1:
 					'This is the end of this path, more to come!'
 					act 'Leave': gt 'pav_market'
 				else
@@ -492,7 +492,7 @@ if $ARGS[0] = 'event5_submit_end':
 	'You strip down to your birthday suit and turn to show him your body. He pulls you into his lap and moves a hand over your legs before moving it between your legs, feeling you up. "Now, wake up and be my woman."'
 	*nl
 	*nl
-	'<center><font color="red"> >>>Major Choice<<< </font></center>'
+	'<center><font color="red"> ***Major Choice*** </font></center>'
 	'<font color="red">If you continue from this point, you will enter a story moment where there are only 3 ways to break free. If you do not have these conditions meet, they will be passed up and you will fall into this bad end, unless you are into that kind of thing. This is a MAJOR POINT OF NO RETURN.</font>'
 
 	act 'Accept':
@@ -574,7 +574,7 @@ if $ARGS[0] = 'event5_submit_end':
 		'You come to and see that you are naked. "WHAT THE HELL?" you yell and slap the therapist. You quickly get up and grab your clothes and rush out of the hotel room to the front desk to ask them to call the police. After explaining everything, they send a single officer to the hotel room to find it empty. You are slapped with a 500 ₽ fine for public indecency, told not to waste their time, and sent on your way.'
 		pcs_money -= 500
 		if pcs_money < 0: pcs_money = 0
-		'<center><font color="red"> >>>Therapist is no longer an option for now<<< </font></center>'
+		'<center><font color="red"> ***Therapist is no longer an option for now*** </font></center>'
 
 		act 'Get dressed and leave':
 			gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']