1
0
Преглед на файлове

[changed] Limit on npc gains at disco now using the inbuilt npc_relationship daily limiter for both initial gain and secondary actions

Kevin_Smarts преди 1 година
родител
ревизия
0978d6f6e0
променени са 3 файла, в които са добавени 67 реда и са изтрити 104 реда
  1. 26 40
      locations/pav_disco_coolkids.qsrc
  2. 32 46
      locations/pav_disco_gopniks.qsrc
  3. 9 18
      locations/pav_disco_jocks.qsrc

+ 26 - 40
locations/pav_disco_coolkids.qsrc

@@ -4,8 +4,7 @@
 if $ARGS[0] = 'dimka':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A1'] ! daystart: gs 'npc_relationship', 'modify', 'A1', 'like'
-	npc_rel_disco['A1'] = daystart
+	gs 'npc_relationship', 'modify', 'A1', 'like', 1, 'pav_disco'
 	gs 'stat'
 	gs 'dinnpc'
 	if rand(1,4) = 1:
@@ -282,9 +281,8 @@ end
 
 if $ARGS[0] = 'marcus':
 	*clr & cla
-	minut += 5
-	if npc_rel_disco['A146'] ! daystart: gs 'npc_relationship', 'modify', 'A146', 'like'
-	npc_rel_disco['A146'] = daystart
+	minut += 5	
+	gs 'npc_relationship', 'modify', 'A146', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
 	if rand(1,3) = 1:
@@ -456,10 +454,8 @@ if $ARGS[0] = 'andrey' or $ARGS[0] = 'stasya': gt 'pav_disco_coolkids', 'andrey_
 if $ARGS[0] = 'andrey_stasya':
 	*clr & cla
 	minut += 5
-	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 'npc_relationship', 'modify', 'A147', 'like', 1, 'pav_disco'
+	gs 'npc_relationship', 'modify', 'A139', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,5) <= 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya_dance1.jpg"></center>'
@@ -489,7 +485,7 @@ if $ARGS[0] = 'andrey_stasya':
 						gs 'stat'
 						act 'No':
 							*clr & cla
-							gs 'npc_relationship', 'modify', 'A139', 'like'
+							gs 'npc_relationship', 'modify', 'A139', 'like', 1, 'pav_disco2'
 							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?"'
@@ -501,8 +497,8 @@ if $ARGS[0] = 'andrey_stasya':
 						end
 						act 'Yes':
 							*clr & cla
-							gs 'npc_relationship', 'modify', 'A147', 'like'
-							gs 'npc_relationship', 'modify', 'A139', 'dislike'
+							gs 'npc_relationship', 'modify', 'A147', 'like', 1, 'pav_disco2'
+							gs 'npc_relationship', 'modify', 'A139', 'dislike', 1, 'pav_disco2'
 							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?"'
@@ -552,7 +548,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'
+						gs 'npc_relationship', 'modify', 'A139', 'like', 1, 'pav_disco2'
 						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?"'
@@ -564,8 +560,8 @@ if $ARGS[0] = 'andrey_stasya':
 					end
 					act 'Yes':
 						*clr & cla
-						gs 'npc_relationship', 'modify', 'A147', 'like'
-						gs 'npc_relationship', 'modify', 'A139', 'dislike'
+						gs 'npc_relationship', 'modify', 'A147', 'like', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A139', 'dislike', 1, 'pav_disco2'
 						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?"'
@@ -608,8 +604,7 @@ end
 if $ARGS[0] = 'mefodiy':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A148'] ! daystart: gs 'npc_relationship', 'modify', 'A148', 'like'
-	npc_rel_disco['A148'] = daystart
+	gs 'npc_relationship', 'modify', 'A148', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
 	if rand(1,4) = 1:
@@ -738,8 +733,7 @@ end
 if $ARGS[0] = 'igor':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A14'] ! daystart: gs 'npc_relationship', 'modify', 'A14', 'like'
-	npc_rel_disco['A14'] = daystart
+	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
 	if rand(1,4) = 1:
@@ -931,8 +925,7 @@ end
 if $ARGS[0] = 'bella':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A22'] ! daystart: gs 'npc_relationship', 'modify', 'A22', 'like'
-	npc_rel_disco['A22'] = daystart
+	gs 'npc_relationship', 'modify', 'A22', 'like', 1, 'pav_disco'
 	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.'
@@ -977,8 +970,7 @@ end
 if $ARGS[0] = 'vicky':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A15'] ! daystart: gs 'npc_relationship', 'modify', 'A15', 'like'
-	npc_rel_disco['A15'] = daystart
+	gs 'npc_relationship', 'modify', 'A15', 'like', 1, 'pav_disco'
 	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.'
@@ -1020,8 +1012,7 @@ end
 if $ARGS[0] = 'inna':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A17'] ! daystart: gs 'npc_relationship', 'modify', 'A17', 'like'
-	npc_rel_disco['A17'] = daystart
+	gs 'npc_relationship', 'modify', 'A17', 'like', 1, 'pav_disco'
 	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.'
@@ -1059,8 +1050,7 @@ end
 if $ARGS[0] = 'katja':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A14'] ! daystart: gs 'npc_relationship', 'modify', 'A14', 'like'
-	npc_rel_disco['A14'] = daystart
+	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) <= 3:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance1_1.jpg"></center>'
@@ -1399,8 +1389,7 @@ end
 if $ARGS[0] = 'lizaveta':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A140'] ! daystart: gs 'npc_relationship', 'modify', 'A140', 'like'
-	npc_rel_disco['A140'] = daystart
+	gs 'npc_relationship', 'modify', 'A140', 'like', 1, 'pav_disco'
 	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.'
@@ -1439,8 +1428,7 @@ end
 if $ARGS[0] = 'sonia':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A25'] ! daystart: gs 'npc_relationship', 'modify', 'A25', 'like'
-	npc_rel_disco['A125'] = daystart
+	gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) <= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_dance.jpg"></center>'
@@ -1492,7 +1480,7 @@ if $ARGS[0] = 'sonia':
 				end
 				act 'Yes':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her. "Okay, let''s go."'
@@ -1537,8 +1525,7 @@ end
 if $ARGS[0] = 'sonia_outcast':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A125'] ! daystart: gs 'npc_relationship', 'modify', 'A125', 'like'
-	npc_rel_disco['A125'] = daystart
+	gs 'npc_relationship', 'modify', 'A125', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,5) <= 4:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_outcast_dance1.jpg"></center>'
@@ -1590,7 +1577,7 @@ if $ARGS[0] = 'sonia_outcast':
 				end
 				act 'Yes':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her. "Okay, let''s go."'
@@ -1617,7 +1604,7 @@ if $ARGS[0] = 'sonia_outcast':
 				end
 				act 'Yes':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her. "Okay, let''s go."'
@@ -1632,7 +1619,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'
+					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
 					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?"'
@@ -1702,7 +1689,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'
+								gs 'npc_relationship', 'modify', 'A25', 'hate', 1, 'pav_disco2'
 								gs 'willpower', 'pay', 'resist'
 								discoenable['A25'] = 0
 								minut += 5
@@ -1736,8 +1723,7 @@ end
 if $ARGS[0] = 'natasha':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A16'] ! daystart: gs 'npc_relationship', 'modify', 'A16', 'like'
-	npc_rel_disco['A16'] = daystart
+	gs 'npc_relationship', 'modify', 'A16', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) >= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/natasha_dance.jpg"></center>'

+ 32 - 46
locations/pav_disco_gopniks.qsrc

@@ -7,12 +7,9 @@ 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
-	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 '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'
 	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.'
@@ -57,9 +54,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					gs 'npc_relationship', 'modify', 'A9', 'dislike'
-					gs 'npc_relationship', 'modify', 'A10', 'dislike'
-					gs 'npc_relationship', 'modify', 'A11', 'dislike'
+					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 '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."'
@@ -85,9 +82,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						grupvalue[4] -= 1
-						gs 'npc_relationship', 'modify', 'A9', 'dislike'
-						gs 'npc_relationship', 'modify', 'A10', 'dislike'
-						gs 'npc_relationship', 'modify', 'A11', 'dislike'
+						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 '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."'
@@ -143,9 +140,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					gs 'npc_relationship', 'modify', 'A9', 'dislike'
-					gs 'npc_relationship', 'modify', 'A10', 'dislike'
-					gs 'npc_relationship', 'modify', 'A11', 'dislike'
+					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 '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."'
@@ -171,9 +168,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						grupvalue[4] -= 1
-						gs 'npc_relationship', 'modify', 'A9', 'dislike'
-						gs 'npc_relationship', 'modify', 'A10', 'dislike'
-						gs 'npc_relationship', 'modify', 'A11', 'dislike'
+						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 '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."'
@@ -374,8 +371,7 @@ end
 if $ARGS[0] = 'radomir':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A154'] ! daystart: gs 'npc_relationship', 'modify', 'A154', 'like'
-	npc_rel_disco['A154'] = daystart
+	gs 'npc_relationship', 'modify', 'A154', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,3) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/radomir_dance1.jpg"></center>'
@@ -396,7 +392,7 @@ if $ARGS[0] = 'radomir':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							minut += 5
-							gs 'npc_relationship', 'modify', 'A154', 'loathe'
+							gs 'npc_relationship', 'modify', 'A154', 'loathe', 1, 'pav_disco2'
 							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!"'
@@ -433,7 +429,7 @@ if $ARGS[0] = 'radomir':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							minut += 5
-							gs 'npc_relationship', 'modify', 'A154', 'loathe'
+							gs 'npc_relationship', 'modify', 'A154', 'loathe', 1, 'pav_disco2'
 							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!"'
@@ -471,7 +467,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'
+						gs 'npc_relationship', 'modify', 'A154', 'dislike', 1, 'pav_disco2'
 						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."'
@@ -516,7 +512,7 @@ if $ARGS[0] = 'radomir':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							minut += 5
-							gs 'npc_relationship', 'modify', 'A154', 'loathe'
+							gs 'npc_relationship', 'modify', 'A154', 'loathe', 1, 'pav_disco2'
 							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!"'
@@ -540,7 +536,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'
+						gs 'npc_relationship', 'modify', 'A154', 'dislike', 1, 'pav_disco2'
 						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."'
@@ -630,8 +626,7 @@ end
 if $ARGS[0] = 'roman':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A157'] ! daystart: gs 'npc_relationship', 'modify', 'A157', 'like'
-	npc_rel_disco['A157'] = daystart
+	gs 'npc_relationship', 'modify', 'A157', 'like', 1, 'pav_disco'
 	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.'
@@ -665,7 +660,7 @@ if $ARGS[0] = 'roman':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					gs 'npc_relationship', 'modify', 'A157', 'loathe'
+					gs 'npc_relationship', 'modify', 'A157', 'loathe', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 					'You shake your head. "No thanks. Maybe later."'
@@ -722,8 +717,7 @@ end
 if $ARGS[0] = 'valentin':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A158'] ! daystart: gs 'npc_relationship', 'modify', 'A158', 'like'
-	npc_rel_disco['A158'] = daystart
+	gs 'npc_relationship', 'modify', 'A158', 'like', 1, 'pav_disco'
 	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.'
@@ -836,8 +830,7 @@ end
 if $ARGS[0] = 'arkadi':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A156'] ! daystart: gs 'npc_relationship', 'modify', 'A156', 'like'
-	npc_rel_disco['A156'] = daystart
+	gs 'npc_relationship', 'modify', 'A156', 'like', 1, 'pav_disco'
 	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.'
@@ -921,8 +914,7 @@ end
 if $ARGS[0] = 'niko':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A189'] ! daystart: gs 'npc_relationship', 'modify', 'A189', 'like'
-	npc_rel_disco['A189'] = daystart
+	gs 'npc_relationship', 'modify', 'A189', 'like', 1, 'pav_disco'
 	'<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
@@ -932,8 +924,7 @@ end
 if $ARGS[0] = 'lavrenti':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A155'] ! daystart: gs 'npc_relationship', 'modify', 'A155', 'like'
-	npc_rel_disco['A155'] = daystart
+	gs 'npc_relationship', 'modify', 'A155', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lavrenti_dance1.jpg"></center>'
@@ -1086,8 +1077,7 @@ end
 if $ARGS[0] = 'pauline':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A24'] ! daystart: gs 'npc_relationship', 'modify', 'A24', 'like'
-	npc_rel_disco['A24'] = daystart
+	gs 'npc_relationship', 'modify', 'A24', 'like', 1, 'pav_disco'
 	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.'
@@ -1190,10 +1180,8 @@ if $ARGS[0] = 'lena' or $ARGS[0] = 'lera': gt  'pav_disco_gopniks', 'lena_lera'
 if $ARGS[0] = 'lena_lera':
 	*clr & cla
 	minut += 5
-	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 'npc_relationship', 'modify', 'A20', 'like', 1, 'pav_disco'
+	gs 'npc_relationship', 'modify', 'A21', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,3) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lena_lera_dance1.jpg"></center>'
@@ -1375,8 +1363,7 @@ end
 if $ARGS[0] = 'nush':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A144'] ! daystart: gs 'npc_relationship', 'modify', 'A144', 'like'
-	npc_rel_disco['A144'] = daystart
+	gs 'npc_relationship', 'modify', 'A144', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,2) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance1.jpg"></center>'
@@ -1679,8 +1666,7 @@ end
 if $ARGS[0] = 'alyona':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A143'] ! daystart: gs 'npc_relationship', 'modify', 'A143', 'like'
-	npc_rel_disco['A143'] = daystart
+	gs 'npc_relationship', 'modify', 'A143', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/alyona_dance1.jpg"></center>'

+ 9 - 18
locations/pav_disco_jocks.qsrc

@@ -4,8 +4,7 @@
 if $ARGS[0] = 'lazar':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A149'] ! daystart: gs 'npc_relationship', 'modify', 'A149', 'like'
-	npc_rel_disco['A149'] = daystart
+	gs 'npc_relationship', 'modify', 'A149', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
 	if rand(1,4) = 1:
@@ -135,8 +134,7 @@ end
 if $ARGS[0] = 'ivan':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A3'] ! daystart: gs 'npc_relationship', 'modify', 'A3', 'like'
-	npc_rel_disco['A3'] = daystart
+	gs 'npc_relationship', 'modify', 'A3', 'like', 1, 'pav_disco'
 	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.'
@@ -194,8 +192,7 @@ end
 if $ARGS[0] = 'fedor':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A5'] ! daystart: gs 'npc_relationship', 'modify', 'A5', 'like'
-	npc_rel_disco['A5'] = daystart
+	gs 'npc_relationship', 'modify', 'A5', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
 	if FedorLove < 0:
@@ -208,8 +205,7 @@ end
 if $ARGS[0] = 'svyatoslav':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A8'] ! daystart: gs 'npc_relationship', 'modify', 'A8', 'like'
-	npc_rel_disco['A8'] = daystart
+	gs 'npc_relationship', 'modify', 'A8', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big8.jpg"></center>'
 	if rand(1,4) = 1:
@@ -319,8 +315,7 @@ end
 if $ARGS[0] = 'vanya':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A165'] ! daystart: gs 'npc_relationship', 'modify', 'A165', 'like'
-	npc_rel_disco['A165'] = daystart
+	gs 'npc_relationship', 'modify', 'A165', 'like', 1, 'pav_disco'
 	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.'
@@ -371,8 +366,7 @@ end
 if $ARGS[0] = 'erast':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A150'] ! daystart: gs 'npc_relationship', 'modify', 'A150', 'like'
-	npc_rel_disco['A150'] = daystart
+	gs 'npc_relationship', 'modify', 'A150', 'like', 1, 'pav_disco'
 	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.'
@@ -431,8 +425,7 @@ end
 if $ARGS[0] = 'albina':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A23'] ! daystart: gs 'npc_relationship', 'modify', 'A23', 'like'
-	npc_rel_disco['A23'] = daystart
+	gs 'npc_relationship', 'modify', 'A23', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 	if rand(1,4) <= 3:
@@ -756,8 +749,7 @@ end
 if $ARGS[0] = 'lariska':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A13'] ! daystart: gs 'npc_relationship', 'modify', 'A13', 'like'
-	npc_rel_disco['A13'] = daystart
+	gs 'npc_relationship', 'modify', 'A13', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
 	if rand(1,4) <= 3:
@@ -878,8 +870,7 @@ end
 if $ARGS[0] = 'lina':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A19'] ! daystart: gs 'npc_relationship', 'modify', 'A19', 'like'
-	npc_rel_disco['A19'] = daystart
+	gs 'npc_relationship', 'modify', 'A19', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big19.jpg"></center>'
 	if rand(1,4) <= 3: