6 Commits 07894259c3 ... 813f344caf

Autore SHA1 Messaggio Data
  Kevin_Smarts 07894259c3 Merge remote-tracking branch 'Anya/master' 1 anno fa
  Kevin_Smarts 82a83d13d7 Merge remote-tracking branch 'LadyAlexa/master' 1 anno fa
  Kevin_Smarts 0978d6f6e0 [changed] Limit on npc gains at disco now using the inbuilt npc_relationship daily limiter for both initial gain and secondary actions 1 anno fa
  Anya 6a691e4164 [fixed] virginity check backwards 1 anno fa
  Kevin_Smarts 9f1ea14518 [fixed] Cleverlyblonde thinks I don't speak good in game text intro text 1 anno fa
  Lady Alexa e11894c983 [fixed] Update the flag when first meeting Dimka's mother. 1 anno fa

+ 1 - 1
locations/Zvereva_house_events.qsrc

@@ -214,7 +214,7 @@ if $ARGS[0] = 'bed_chat':
 			'Giving you an appraising look, she says "Silvestr is the youngest of my older brothers and the only one of them I actually like. He taught me how to fight, and where I learned to push my body to achieve the perfection you see today."'
 			'"When will I meet him?"'
 			'"Why haven''t you already? It''s why I brought you home. What, did you think I wanted to fuck you? Get out there and say hello. He will take it from there. Remember, do what he says or else."'
-			if stat['think_virgin'] = 1:
+			if stat['think_virgin'] = 0:
 				'"But I''m a virgin. My mother makes me do regular check ups at the gynaecologist!"'
 				'Christina starts laughing. "Yeah right!"'
 				'"Really, Mistress. I don''t have a choice. If she finds out I''ve lost my virginity to your brother there will be a lot of trouble." You let the unspoken threat hang in the air.'

+ 3 - 3
locations/begin.qsrc

@@ -141,10 +141,10 @@ if $ARGS[0] = 'real_character':
 	'<center><b><font color = maroon>CHARACTER SELECTION</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/character_creation_1.jpg"></center>'
 	*nl
-	'This game has two ways to display your character''s face, either dynamically depending on your hair style and colour or a fixed image of your choice.'
+	'This game has two ways to display your character''s face, either dynamically depending on your hair style or a fixed image of your choice.'
 	'To use a fixed image, replace the image "avatar" in the "images" folder of the game with a file of the same name and format (.jpg) and select "Use a fixed image".'
-	'Please note, this choice can be changed in the cheat menu at any time. Only one fixed image can be used at a time and will be the same across all saves.'
-	'Your fixed image is your own personal choice, and is based on your personal preferences. By default, the game uses an avatar image from the site wikimedia.org.'
+	'Please note, this choice can only be changed in the cheat menu at any time and only one custom image can be used at anytime across all saves.'
+	'Your selected image is your own personal choice, and is based on your personal preferences. By default, the game uses an avatar image from the site wikimedia.org.'
 
 	*nl
 	'If you are playing with Quest player for Android, click '

+ 0 - 1
locations/dimaHome.qsrc

@@ -403,7 +403,6 @@ if $ARGS[0] = 'kitchen1':
 	*clr & cla
 	menu_off = 1
 	minut += 1
-	met_DimkaMother = 1
 	gs 'stat'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/olya.jpg"></center>'

+ 40 - 26
locations/pav_disco_coolkids.qsrc

@@ -4,7 +4,8 @@
 if $ARGS[0] = 'dimka':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A1', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A1'] ! daystart: gs 'npc_relationship', 'modify', 'A1', 'like'
+	npc_rel_disco['A1'] = daystart
 	gs 'stat'
 	gs 'dinnpc'
 	if rand(1,4) = 1:
@@ -281,8 +282,9 @@ end
 
 if $ARGS[0] = 'marcus':
 	*clr & cla
-	minut += 5	
-	gs 'npc_relationship', 'modify', 'A146', 'like', 1, 'pav_disco'
+	minut += 5
+	if npc_rel_disco['A146'] ! daystart: gs 'npc_relationship', 'modify', 'A146', 'like'
+	npc_rel_disco['A146'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
 	if rand(1,3) = 1:
@@ -454,8 +456,10 @@ if $ARGS[0] = 'andrey' or $ARGS[0] = 'stasya': gt 'pav_disco_coolkids', 'andrey_
 if $ARGS[0] = 'andrey_stasya':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A147', 'like', 1, 'pav_disco'
-	gs 'npc_relationship', 'modify', 'A139', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A147'] ! daystart: gs 'npc_relationship', 'modify', 'A147', 'like'
+	npc_rel_disco['A147'] = daystart
+	if npc_rel_disco['A139'] ! daystart: gs 'npc_relationship', 'modify', 'A139', 'like'
+	npc_rel_disco['A139'] = daystart
 	gs 'stat'
 	if rand(1,5) <= 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya_dance1.jpg"></center>'
@@ -485,7 +489,7 @@ if $ARGS[0] = 'andrey_stasya':
 						gs 'stat'
 						act 'No':
 							*clr & cla
-							gs 'npc_relationship', 'modify', 'A139', 'like', 1, 'pav_disco2'
+							gs 'npc_relationship', 'modify', 'A139', 'like'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya_dance2.jpg"></center>'
 							'You shake your head. "No thanks, I''m having fun here. Maybe some other time?"'
@@ -497,8 +501,8 @@ if $ARGS[0] = 'andrey_stasya':
 						end
 						act 'Yes':
 							*clr & cla
-							gs 'npc_relationship', 'modify', 'A147', 'like', 1, 'pav_disco2'
-							gs 'npc_relationship', 'modify', 'A139', 'dislike', 1, 'pav_disco2'
+							gs 'npc_relationship', 'modify', 'A147', 'like'
+							gs 'npc_relationship', 'modify', 'A139', 'dislike'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya_dance2.jpg"></center>'
 							'You nod your head. "Sure, that sounds like fun. What did you have in mind?"'
@@ -548,7 +552,7 @@ if $ARGS[0] = 'andrey_stasya':
 					'Whatever it is, it seems Stasya isn''t into it but after a bit of back and forth she either relents or changes her mind, because you see Andrey grin before kissing her. After his kiss with Stasya he turns to you. "How about we get out of here and go back to my place? I can get Marcus to come over."'
 					act 'No':
 						*clr & cla
-						gs 'npc_relationship', 'modify', 'A139', 'like', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A139', 'like'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya.jpg"></center>'
 						'You shake your head. "No thanks, I''m having fun here. Maybe some other time?"'
@@ -560,8 +564,8 @@ if $ARGS[0] = 'andrey_stasya':
 					end
 					act 'Yes':
 						*clr & cla
-						gs 'npc_relationship', 'modify', 'A147', 'like', 1, 'pav_disco2'
-						gs 'npc_relationship', 'modify', 'A139', 'dislike', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A147', 'like'
+						gs 'npc_relationship', 'modify', 'A139', 'dislike'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya.jpg"></center>'
 						'You nod your head. "Sure, that sounds like fun. What did you have in mind?"'
@@ -604,7 +608,8 @@ end
 if $ARGS[0] = 'mefodiy':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A148', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A148'] ! daystart: gs 'npc_relationship', 'modify', 'A148', 'like'
+	npc_rel_disco['A148'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
 	if rand(1,4) = 1:
@@ -733,7 +738,8 @@ end
 if $ARGS[0] = 'igor':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A14'] ! daystart: gs 'npc_relationship', 'modify', 'A14', 'like'
+	npc_rel_disco['A14'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
 	if rand(1,4) = 1:
@@ -925,7 +931,8 @@ end
 if $ARGS[0] = 'bella':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A22', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A22'] ! daystart: gs 'npc_relationship', 'modify', 'A22', 'like'
+	npc_rel_disco['A22'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big22.jpg"></center>'
 	'You see Bella hanging out with the other cool kids.'
@@ -970,7 +977,8 @@ end
 if $ARGS[0] = 'vicky':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A15', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A15'] ! daystart: gs 'npc_relationship', 'modify', 'A15', 'like'
+	npc_rel_disco['A15'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big15.jpg"></center>'
 	'You see Vicky hanging out with the other cool kids.'
@@ -1012,7 +1020,8 @@ end
 if $ARGS[0] = 'inna':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A17', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A17'] ! daystart: gs 'npc_relationship', 'modify', 'A17', 'like'
+	npc_rel_disco['A17'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big17.jpg"></center>'
 	'You see Irina hanging out with the other cool kids.'
@@ -1050,7 +1059,8 @@ end
 if $ARGS[0] = 'katja':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A14'] ! daystart: gs 'npc_relationship', 'modify', 'A14', 'like'
+	npc_rel_disco['A14'] = daystart
 	gs 'stat'
 	if rand(1,4) <= 3:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance1_1.jpg"></center>'
@@ -1389,7 +1399,8 @@ end
 if $ARGS[0] = 'lizaveta':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A140', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A140'] ! daystart: gs 'npc_relationship', 'modify', 'A140', 'like'
+	npc_rel_disco['A140'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big140.jpg"></center>'
 	'You see Lizaveta hanging out with the other cool kids.'
@@ -1428,7 +1439,8 @@ end
 if $ARGS[0] = 'sonia':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A25'] ! daystart: gs 'npc_relationship', 'modify', 'A25', 'like'
+	npc_rel_disco['A125'] = daystart
 	gs 'stat'
 	if rand(1,4) <= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_dance.jpg"></center>'
@@ -1480,7 +1492,7 @@ if $ARGS[0] = 'sonia':
 				end
 				act 'Yes':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A25', 'like'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her. "Okay, let''s go."'
@@ -1525,7 +1537,8 @@ end
 if $ARGS[0] = 'sonia_outcast':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A125', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A125'] ! daystart: gs 'npc_relationship', 'modify', 'A125', 'like'
+	npc_rel_disco['A125'] = daystart
 	gs 'stat'
 	if rand(1,5) <= 4:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_outcast_dance1.jpg"></center>'
@@ -1577,7 +1590,7 @@ if $ARGS[0] = 'sonia_outcast':
 				end
 				act 'Yes':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A25', 'like'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her. "Okay, let''s go."'
@@ -1604,7 +1617,7 @@ if $ARGS[0] = 'sonia_outcast':
 				end
 				act 'Yes':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A25', 'like'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her. "Okay, let''s go."'
@@ -1619,7 +1632,7 @@ if $ARGS[0] = 'sonia_outcast':
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 				act 'Ask her to dance':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A25', 'like'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her reaction. "Would you like to dance then?"'
@@ -1689,7 +1702,7 @@ if $ARGS[0] = 'sonia_outcast_dance':
 						if will_cost <= pcs_willpwr:
 							act 'No (<<will_cost>> Willpower)':
 								*clr & cla
-								gs 'npc_relationship', 'modify', 'A25', 'hate', 1, 'pav_disco2'
+								gs 'npc_relationship', 'modify', 'A25', 'hate'
 								gs 'willpower', 'pay', 'resist'
 								discoenable['A25'] = 0
 								minut += 5
@@ -1723,7 +1736,8 @@ end
 if $ARGS[0] = 'natasha':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A16', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A16'] ! daystart: gs 'npc_relationship', 'modify', 'A16', 'like'
+	npc_rel_disco['A16'] = daystart
 	gs 'stat'
 	if rand(1,4) >= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/natasha_dance.jpg"></center>'

+ 46 - 32
locations/pav_disco_gopniks.qsrc

@@ -7,9 +7,12 @@ if $ARGS[0] = 'vitek' or $ARGS[0] = 'dan' or $ARGS[0] = 'shulga': gt 'pav_disco_
 if $ARGS[0] = 'vitek_dan_vasily':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A9', 'like', 1, 'pav_disco'
-	gs 'npc_relationship', 'modify', 'A10', 'like', 1, 'pav_disco'
-	gs 'npc_relationship', 'modify', 'A11', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A9'] ! daystart: gs 'npc_relationship', 'modify', 'A9', 'like'
+	npc_rel_disco['A9'] = daystart
+	if npc_rel_disco['A10'] ! daystart: gs 'npc_relationship', 'modify', 'A10', 'like'
+	npc_rel_disco['A10'] = daystart
+	if npc_rel_disco['A11'] ! daystart: gs 'npc_relationship', 'modify', 'A11', 'like'
+	npc_rel_disco['A11'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 	'Vitek, Dan and Vasily are hanging out in the dark corner of the hall with the other gopniks. It''s dimly lit and hard to make out details, but it looks like they''re sharing some beers they''ve smuggled in.'
@@ -54,9 +57,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					gs 'npc_relationship', 'modify', 'A9', 'dislike', 1, 'pav_disco2'
-					gs 'npc_relationship', 'modify', 'A10', 'dislike', 1, 'pav_disco2'
-					gs 'npc_relationship', 'modify', 'A11', 'dislike', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A9', 'dislike'
+					gs 'npc_relationship', 'modify', 'A10', 'dislike'
+					gs 'npc_relationship', 'modify', 'A11', 'dislike'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 					'You shake your head. "No thanks. Maybe later."'
@@ -82,9 +85,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						grupvalue[4] -= 1
-						gs 'npc_relationship', 'modify', 'A9', 'dislike', 1, 'pav_disco2'
-						gs 'npc_relationship', 'modify', 'A10', 'dislike', 1, 'pav_disco2'
-						gs 'npc_relationship', 'modify', 'A11', 'dislike', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A9', 'dislike'
+						gs 'npc_relationship', 'modify', 'A10', 'dislike'
+						gs 'npc_relationship', 'modify', 'A11', 'dislike'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 						'You shake your head. "No thanks. Maybe later."'
@@ -140,9 +143,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					gs 'npc_relationship', 'modify', 'A9', 'dislike', 1, 'pav_disco2'
-					gs 'npc_relationship', 'modify', 'A10', 'dislike', 1, 'pav_disco2'
-					gs 'npc_relationship', 'modify', 'A11', 'dislike', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A9', 'dislike'
+					gs 'npc_relationship', 'modify', 'A10', 'dislike'
+					gs 'npc_relationship', 'modify', 'A11', 'dislike'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 					'You shake your head. "No thanks. Maybe later."'
@@ -168,9 +171,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						grupvalue[4] -= 1
-						gs 'npc_relationship', 'modify', 'A9', 'dislike', 1, 'pav_disco2'
-						gs 'npc_relationship', 'modify', 'A10', 'dislike', 1, 'pav_disco2'
-						gs 'npc_relationship', 'modify', 'A11', 'dislike', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A9', 'dislike'
+						gs 'npc_relationship', 'modify', 'A10', 'dislike'
+						gs 'npc_relationship', 'modify', 'A11', 'dislike'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 						'You shake your head. "No thanks. Maybe later."'
@@ -371,7 +374,8 @@ end
 if $ARGS[0] = 'radomir':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A154', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A154'] ! daystart: gs 'npc_relationship', 'modify', 'A154', 'like'
+	npc_rel_disco['A154'] = daystart
 	gs 'stat'
 	if rand(1,3) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/radomir_dance1.jpg"></center>'
@@ -392,7 +396,7 @@ if $ARGS[0] = 'radomir':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							minut += 5
-							gs 'npc_relationship', 'modify', 'A154', 'loathe', 1, 'pav_disco2'
+							gs 'npc_relationship', 'modify', 'A154', 'loathe'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 							'You try to twist your arm out of his grasp, but he has a very firm grip on you and unless you want to start a fight in the middle of the disco, you''re unable to get away. "Ow, let go! You''re hurting me!"'
@@ -429,7 +433,7 @@ if $ARGS[0] = 'radomir':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							minut += 5
-							gs 'npc_relationship', 'modify', 'A154', 'loathe', 1, 'pav_disco2'
+							gs 'npc_relationship', 'modify', 'A154', 'loathe'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 							'You try to twist your arm out of his grasp, but he has a very firm grip on you and unless you want to start a fight in the middle of the disco, you''re unable to get away. "Ow, let go! You''re hurting me!"'
@@ -467,7 +471,7 @@ if $ARGS[0] = 'radomir':
 					'"You''re too beautiful to stay here in the shadows. Why don''t we go and dance so I can show you off?"'
 					act 'No':
 						*clr & cla
-						gs 'npc_relationship', 'modify', 'A154', 'dislike', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A154', 'dislike'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 						'You shake your head. "No thanks, I don''t feel like dancing right now."'
@@ -512,7 +516,7 @@ if $ARGS[0] = 'radomir':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							minut += 5
-							gs 'npc_relationship', 'modify', 'A154', 'loathe', 1, 'pav_disco2'
+							gs 'npc_relationship', 'modify', 'A154', 'loathe'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 							'You try to twist your arm out of his grasp, but he has a very firm grip on you and unless you want to start a fight in the middle of the disco, you''re unable to get away. "Ow, let go! You''re hurting me!"'
@@ -536,7 +540,7 @@ if $ARGS[0] = 'radomir':
 					'"You''re too beautiful to stay here in the shadows. Why don''t we go and dance so I can show you off?"'
 					act 'No':
 						*clr & cla
-						gs 'npc_relationship', 'modify', 'A154', 'dislike', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A154', 'dislike'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 						'You shake your head. "No thanks, I don''t feel like dancing right now."'
@@ -626,7 +630,8 @@ end
 if $ARGS[0] = 'roman':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A157', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A157'] ! daystart: gs 'npc_relationship', 'modify', 'A157', 'like'
+	npc_rel_disco['A157'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big157.jpg"></center>'
 	'Roman is hanging out in the dark corner of the hall with the other gopniks. It''s dim and hard to make out details, but he seems to be talking to several of the other gopniks and sharing some beers they''ve smuggled in.'
@@ -660,7 +665,7 @@ if $ARGS[0] = 'roman':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					gs 'npc_relationship', 'modify', 'A157', 'loathe', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A157', 'loathe'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 					'You shake your head. "No thanks. Maybe later."'
@@ -717,7 +722,8 @@ end
 if $ARGS[0] = 'valentin':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A158', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A158'] ! daystart: gs 'npc_relationship', 'modify', 'A158', 'like'
+	npc_rel_disco['A158'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big158.jpg"></center>'
 	'Valentin is hanging out in the dark corner of the hall with the other gopniks. It''s dim and hard to make out details, but he seems to be talking to several of the other gopniks while sharing some beers they''ve smuggled in.'
@@ -830,7 +836,8 @@ end
 if $ARGS[0] = 'arkadi':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A156', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A156'] ! daystart: gs 'npc_relationship', 'modify', 'A156', 'like'
+	npc_rel_disco['A156'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 	'Arkadi is hanging out in the dark corner of the hall with the other gopniks. It''s dim and hard to make out details, but he seems to be talking to several of the other gopniks while sharing some beers they''ve smuggled in.'
@@ -914,7 +921,8 @@ end
 if $ARGS[0] = 'niko':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A189', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A189'] ! daystart: gs 'npc_relationship', 'modify', 'A189', 'like'
+	npc_rel_disco['A189'] = daystart
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big189.jpg"></center>'
 	act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 !!	if dance = 1
@@ -924,7 +932,8 @@ end
 if $ARGS[0] = 'lavrenti':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A155', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A155'] ! daystart: gs 'npc_relationship', 'modify', 'A155', 'like'
+	npc_rel_disco['A155'] = daystart
 	gs 'stat'
 	if rand(1,4) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lavrenti_dance1.jpg"></center>'
@@ -1077,7 +1086,8 @@ end
 if $ARGS[0] = 'pauline':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A24', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A24'] ! daystart: gs 'npc_relationship', 'modify', 'A24', 'like'
+	npc_rel_disco['A24'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big24.jpg"></center>'
 	'Pauline is hanging out in the dark corner of the hall with the other gopniks. It''s dim and hard to make out details, but she seems to be talking to several of the other gopniks while sharing some beers they''ve smuggled in.'
@@ -1180,8 +1190,10 @@ if $ARGS[0] = 'lena' or $ARGS[0] = 'lera': gt  'pav_disco_gopniks', 'lena_lera'
 if $ARGS[0] = 'lena_lera':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A20', 'like', 1, 'pav_disco'
-	gs 'npc_relationship', 'modify', 'A21', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A20'] ! daystart: gs 'npc_relationship', 'modify', 'A20', 'like'
+	npc_rel_disco['A20'] = daystart
+	if npc_rel_disco['A21'] ! daystart: gs 'npc_relationship', 'modify', 'A21', 'like'
+	npc_rel_disco['A21'] = daystart
 	gs 'stat'
 	if rand(1,3) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lena_lera_dance1.jpg"></center>'
@@ -1363,7 +1375,8 @@ end
 if $ARGS[0] = 'nush':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A144', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A144'] ! daystart: gs 'npc_relationship', 'modify', 'A144', 'like'
+	npc_rel_disco['A144'] = daystart
 	gs 'stat'
 	if rand(1,2) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance1.jpg"></center>'
@@ -1666,7 +1679,8 @@ end
 if $ARGS[0] = 'alyona':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A143', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A143'] ! daystart: gs 'npc_relationship', 'modify', 'A143', 'like'
+	npc_rel_disco['A143'] = daystart
 	gs 'stat'
 	if rand(1,4) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/alyona_dance1.jpg"></center>'

+ 18 - 9
locations/pav_disco_jocks.qsrc

@@ -4,7 +4,8 @@
 if $ARGS[0] = 'lazar':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A149', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A149'] ! daystart: gs 'npc_relationship', 'modify', 'A149', 'like'
+	npc_rel_disco['A149'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
 	if rand(1,4) = 1:
@@ -134,7 +135,8 @@ end
 if $ARGS[0] = 'ivan':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A3', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A3'] ! daystart: gs 'npc_relationship', 'modify', 'A3', 'like'
+	npc_rel_disco['A3'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"></center>'
 	'To your surprise, you see Ivan hanging out with the other jocks, talking to a few of them and smiling. You almost never see him here.'
@@ -192,7 +194,8 @@ end
 if $ARGS[0] = 'fedor':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A5', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A5'] ! daystart: gs 'npc_relationship', 'modify', 'A5', 'like'
+	npc_rel_disco['A5'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
 	if FedorLove < 0:
@@ -205,7 +208,8 @@ end
 if $ARGS[0] = 'svyatoslav':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A8', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A8'] ! daystart: gs 'npc_relationship', 'modify', 'A8', 'like'
+	npc_rel_disco['A8'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big8.jpg"></center>'
 	if rand(1,4) = 1:
@@ -315,7 +319,8 @@ end
 if $ARGS[0] = 'vanya':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A165', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A165'] ! daystart: gs 'npc_relationship', 'modify', 'A165', 'like'
+	npc_rel_disco['A165'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big165.jpg"></center>'
 	'You see Vanya hanging out with the cool kids and jocks.'
@@ -366,7 +371,8 @@ end
 if $ARGS[0] = 'erast':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A150', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A150'] ! daystart: gs 'npc_relationship', 'modify', 'A150', 'like'
+	npc_rel_disco['A150'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big150.jpg"></center>'
 	'You''re a little surprised to see Erast hanging out with the cool kids and jocks, standing near one of the tables with his arms crossed. You rarely see him here and you don''t think he''s enjoying himself, but he gives polite smiles to people that talk to him.'
@@ -425,7 +431,8 @@ end
 if $ARGS[0] = 'albina':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A23', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A23'] ! daystart: gs 'npc_relationship', 'modify', 'A23', 'like'
+	npc_rel_disco['A23'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 	if rand(1,4) <= 3:
@@ -749,7 +756,8 @@ end
 if $ARGS[0] = 'lariska':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A13', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A13'] ! daystart: gs 'npc_relationship', 'modify', 'A13', 'like'
+	npc_rel_disco['A13'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
 	if rand(1,4) <= 3:
@@ -870,7 +878,8 @@ end
 if $ARGS[0] = 'lina':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A19', 'like', 1, 'pav_disco'
+	if npc_rel_disco['A19'] ! daystart: gs 'npc_relationship', 'modify', 'A19', 'like'
+	npc_rel_disco['A19'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big19.jpg"></center>'
 	if rand(1,4) <= 3: