Merge remote-tracking branch 'Sicaa/master'

locations/cikl.qsrc

@@ -1301,6 +1301,7 @@ killvar 'kanikuli'
 killvar 'pcs_ate'
 killvar 'pcs_drank'
 
+!! THIS IS THE OLD SYSTEM. Only keeping this in while it''s still in use as reference for the old variables, otherwise THESE VALUES ARE NOT THE CORRECT ONES FOR NEW VARIABLES
 !!sisboyparty
 !!-1 - don''t go to the party
 !!0 - don''t know about parties
@@ -1311,7 +1312,7 @@ killvar 'pcs_drank'
 if storyline = 1:
 !!Party refresh if you didn''t see sis
 	if week = 1 and sisboyparty ! 2:
-		if sisterQW['party'] = -1: sisterQW['party'] = 1
+		if sisterQW['party'] = -1: sisterQW['party'] = 0
 
 		if sisboypartyQW >= 2 and sisboyparty > 0:
 			sisboyparty_day = daystart + rand(3,5)

locations/sister.qsrc

@@ -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 and books to read, you know what it''s like."'
-				act 'Finish':SiSgdk = 0 & gt 'sister'
+				act 'Finish':SiSgdk = 0 & gt 'sister', 'gdk'
 			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'
+					act 'Finish':SiSgdk = 0 & gt 'sister', 'gdk'
 				end
 			end
 			if volleysostav = 1 or volleysostav = 2:
@@ -449,19 +449,17 @@ if $ARGS[0] = 'scene1':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_5.jpg"></center>'
 					'You turn down the invitation.'
 					'"I can''t, the coach does not allow my to stay out late, and drinking is also prohibited."'
-					act 'Finish':SiSgdk = 0 & gt 'sister'
+					act 'Finish':SiSgdk = 0 & gt 'sister', 'gdk'
 				end
 			end
 			act 'Yes':
 				sisterQW['party'] = 1
 				*clr & cla
-				!! Sicaa: This image seems wrong, given that doing anything lesbian with your sister is no longer necessary for the party. Changing it to a different picture as a temporary measure
-				!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_2.jpg"></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_03.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma1.jpg"></center>'
 				'You agree to go to the party.'
 				'"Awesome <<$pcs_nickname>>, it''ll be fun. We will meet here, don''t forget to be there 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'
+				act 'Finish':SiSgdk = 0 & gt 'sister', 'gdk'
 			end
 		end
 	end