Merge remote-tracking branch 'slanon/master'

locations/sister.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'pav_commcenter':
 	if npc_rel['A33'] < 20:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma1.jpg"></center>'
 		'"What do you want? Fuck off!" Anya and her friends laugh and point at you until you leave them alone.'
-		act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+		act 'Move away': gt $loc, $loc_arg
 	! Showing up after party invite
 	elseif week = 5 and (daystart / 7) mod 2 = 0 and sisterQW['party'] = 1 and daystart - sisterQW['partyday'] < 5:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma2.jpg"></center>'
@@ -58,7 +58,7 @@ if $ARGS[0] = 'pav_commcenter':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma1.jpg"></center>'
 				'You meet Anya''s friends, who are all her former classmates. There''s the small and nimble Lusya, the ditzy Ira, a tall athletic guy whom everyone calls "Rex" and a lanky, red-haired guy named Roma. After the introductions, you sit down with them, drinking beer and chatting with Anya and her friends.'
 			end
-			act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+			act 'Move away': gt $loc, $loc_arg
 		end
 		gs 'willpower', 'drink', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
@@ -76,18 +76,18 @@ if $ARGS[0] = 'partyanswer':
 			if mesec > 0:
 				'"Sorry Anya, I''m not in the mood today. You go without me."'
 				'"What, are you on the rag today? You should have told me! Alright, go home and get some rest."'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			elseif pcs_mood < 25:
 				'"Sorry Anya, I''m not in the mood today. You go without me."'
 				'"You do look a little pale sis. Go home and get some rest."'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			elseif alko >= 3:
 				'"<<$pcs_nickname>>, how the hell did you get so drunk already? I was going to invite you to a party, but you look like you have already been to one. Go home and sleep it off!"'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			else
 				'Her smile fades and she seems confused for a moment before a look of disgust appears on her blushing face. "My God, why are you walking around with cum all over your face!? You''ll get yourself a reputation! Go home and wash that off, quickly!" She then shoos you away as her friends stare at you.'
 				'You feel a little ashamed that you have embarrassed yourself and your sister by walking around like this in public.'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			end
 		else
 			act 'Decline':
@@ -98,7 +98,7 @@ if $ARGS[0] = 'partyanswer':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_sister_1.jpg"></center>'
 				'"I''d love to, but I have a lot of homework to do. I''m sorry."'
 				'"Don''t worry. Maybe you can come next time?"'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			end
 			act 'Go to the party': if sisterQW['partycount'] > 0: gt 'sbReksHome', 'party' else gt 'sister_party', 'sisboyQW_party'
 		end
@@ -114,22 +114,22 @@ if $ARGS[0] = 'partyanswer':
 				'"I don''t know what came over me. I wasn''t myself. Please, forgive me if you can."'
 				'"Listen, everything''s OK, but let''s just be friends and forget being together. Okay?"'
 				'"Okay..."'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			else
 				'"Shit <<$pcs_nickname>>, is that cum?" He leans in to get a better look then recoils in disgust.'
 				'Your hand goes up to the dried cum on your face that you forgot to wipe off. "I don''t know what came over me, I wasn''t myself. Please, forgive me if you can."'
 				'"Whatever slut. Just get away from me." He moves away from you and you see everyone giving you either a disgusted or angry look.'
 				'"Okay..." Not knowing what else to say, you walk away disheartened.'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			end
 		elseif mesec > 0 or pcs_mood < 50:
 			'"Sorry sweetie, but I''m not feeling too good today. You go without me."'
 			'"Babe, I don''t want to leave you alone, but I need to go with the guys. Take care and do not be sad."'
 			'Rex gives you a gentle kiss on the cheek and leaves.'
-			act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+			act 'Move away': gt $loc, $loc_arg
 		elseif alko >= 3:
 			'"<<$pcs_nickname>>, are you drunk? I wanted to invite you to the party, but you look like you just left one. Go home and sleep it off."'
-			act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+			act 'Move away': gt $loc, $loc_arg
 		else
 			'"Babe, let''s go to my place. I''m throwing another one of my parties."'
 			act 'Decline':
@@ -139,7 +139,7 @@ if $ARGS[0] = 'partyanswer':
 				gs 'stat'
 				'"Sorry Rex, but I have a lot of homework. I''d love to come, but I don''t want to fail my exams."'
 				'"Well, go on then. But you''re definitely coming next time, okay?"'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			end
 			act 'Accept': gt 'sbReksHome', 'party'
 		end
@@ -430,7 +430,7 @@ if $ARGS[0] = 'scene1':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_3.jpg"></center>'
 				'You turn down the invitation.'
 				'"Sorry Roma, I would love to, but I can''t get behind at school. I have homework to do and books to read, you know what it''s like."'
-				act 'Finish':SiSgdk = 0 & gt 'sister', 'pav_commcenter'
+				act 'Finish': gt 'sister', 'pav_commcenter'
 			end
 			if razradbeg > 0:
 				act 'No (training)':
@@ -439,7 +439,7 @@ if $ARGS[0] = 'scene1':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_4.jpg"></center>'
 					'You turn down the invitation.'
 					'"I would love to, but I have a competition to prepare for. I have to train."'
-					act 'Finish':SiSgdk = 0 & gt 'sister', 'pav_commcenter'
+					act 'Finish': gt 'sister', 'pav_commcenter'
 				end
 			end
 			if volleysostav = 1 or volleysostav = 2:
@@ -449,7 +449,7 @@ if $ARGS[0] = 'scene1':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_5.jpg"></center>'
 					'You turn down the invitation.'
 					'"Sorry, but I can''t. The coach doesn''t allow me to stay out late and drinking is also prohibited."'
-					act 'Finish':SiSgdk = 0 & gt 'sister', 'pav_commcenter'
+					act 'Finish': gt 'sister', 'pav_commcenter'
 				end
 			end
 			act 'Yes':
@@ -459,7 +459,7 @@ if $ARGS[0] = 'scene1':
 				'You agree to go to the party.'
 				'"Awesome <<$pcs_nickname>>, it''ll be fun. We will meet here. Just don''t forget to be here before 18:00, otherwise we will leave without you."'
 				'Anya gives Roma a dirty look, but he just shrugs it off.'
-				act 'Finish':SiSgdk = 0 & gt 'sister', 'pav_commcenter'
+				act 'Finish': gt 'sister', 'pav_commcenter'
 			end
 		end
 	end
@@ -471,7 +471,7 @@ if $ARGS[0] = 'scene2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma1.jpg"></center>'
 	'The bottles of beer are quickly drained and everyone seems a little tipsy at this point. Soon everyone gets up and staggers inside. As they go, they all shout goodbye at you, so you wave to them and head on your way.'
-	act 'Leave':SiSonWork = 0 & SiSgdk = 0 & gt 'pav_commcenter'
+	act 'Leave': gt 'pav_commcenter'
 end
 
 --- sister ---------------------------------

locations/sister_party.qsrc

@@ -438,10 +438,10 @@ if $ARGS[0] = 'anya_kit':
 					if hour < 22:
 						minut += ((21 - hour) * 60) + (60 - minut)
 						gs 'arousal', 'end'
-						act 'Leave': SiSonWork = 0 & SiSgdk = 0 & gt 'bedrPar'
+						act 'Leave': gt 'bedrPar'
 					else
 						gs 'arousal', 'end'
-						act 'Leave': SiSonWork = 0 & SiSgdk = 0 & minut += 15 & gt 'bedrPar'
+						act 'Leave': minut += 15 & gt 'bedrPar'
 					end
 				end
 			end