locations/Cheatmenu_din.qsrc

@@ -580,8 +580,8 @@ $cheatmenu['permanent'] = {
 	if cheat_street_robbers = 1: $cheat_street_robbers = 'Disabled'
 	if cheat_street_rapists = 0: $cheat_street_rapists = 'Enabled'
 	if cheat_street_rapists = 1: $cheat_street_rapists = 'Disabled'
-	if cheatShaveLegs = 0: $cheatShaveLegs = 'Enabled'
-	if cheatShaveLegs = 1: $cheatShaveLegs = 'Disabled'
+	if cheatShaveLegs = 0: $cheatShaveLegs = 'Currently OFF'
+	if cheatShaveLegs = 1: $cheatShaveLegs = 'Currently ON'
 
 	'<center><h1>Cheat Menu - Recurrent Cheats</h1></center>'
 	'<center><font color="red"><b>WARNING!</b></font>: Disabling states may cause some events not to trigger. Use at your own risk!</center>'

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'] = 0:
+			if stat['think_virgin'] = 1:
 				'"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.'

locations/alexandriaSex.qsrc

@@ -103,7 +103,7 @@ end
 
 if $ARGS[0] = 'grumpy1':
 	*clr & cla
-	$orgasm_or 'no'
+	$orgasm_or = 'no'
 	gs 'arousal', 'massage', 5, 'sub', 'lesbian'
 	gs 'arousal', 'BDSM', 5, 'sub', 'lesbian'
 	gs 'stat'
@@ -130,7 +130,7 @@ if $ARGS[0] = 'grumpy1':
 		act 'The torture continues':
 			*clr & cla
 			gs 'arousal', 'BDSM', 5, 'sub', 'lesbian'
-			$orgasm_or 'yes'
+			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal_finger', 5, 'sub', 'lesbian', 'no_orgasm_msg'
 			'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/G3.jpg"></center>'
 			'Finally, after who knows how long, Aleksei breaks away from you and stands up, looking down at you with a critical eye as he drags slowly on a cigarette, the silence eternalizing as you kneel before him.'

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 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 and colour 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 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.'
+	'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.'
 
 	*nl
 	'If you are playing with Quest player for Android, click '

locations/gschool_socialchg.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'coolkid warn 1':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
 	'You walk down the hallway and stop at your locker. You sense someone standing behind you and turn to see Vicky, Andrey and Stasya giving you friendly smiles. "Hey, <<$pcs_nickname>>, is everything okay?"'
 	'Before you can answer, Stasya chimes in. "You haven''t been setting the right example of late. You''re acting more like the losers than us, so do you want to keep hanging around with us?"'
-	'You are again interrupted before you can speak. "Cool it, Stasya! Look, <<$pcs_nickname>>, if you want to hang out with us, just act like you normally do, okay? That's all we're saying." Vicky says before the bell rings, and you all hurry to class. You can''t help but worry. Your recent activity has made the other cool kids question whether you belong in the group or not...'
+	'You are again interrupted before you can speak. "Cool it, Stasya! Look, <<$pcs_nickname>>, if you want to hang out with us, just act like you normally do, okay? That''s all we''re saying." Vicky says before the bell rings, and you all hurry to class. You can''t help but worry. Your recent activity has made the other cool kids question whether you belong in the group or not...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -462,7 +462,7 @@ if $ARGS[0] = 'coolkid outcast':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/outcast.jpg"></center>'
-	'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe shaking her head. Just as you''re about to speak, Irina cuts you off. "Save it. We don't care. I don't know what happened, but you used to be cool. Now? Well, you made your choice. You''re no longer welcome to hang out with us." With that, Irina turns and walks away as Dimka gives you a final look and shakes his head.'
+	'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe shaking her head. Just as you''re about to speak, Irina cuts you off. "Save it. We don''t care. I don''t know what happened, but you used to be cool. Now? Well, you made your choice. You''re no longer welcome to hang out with us." With that, Irina turns and walks away as Dimka gives you a final look and shakes his head.'
 	'"Now you''re where you always belonged. With the other losers." he says before leaving as well. You hear the other students laughing as you look around. Having been publicly disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 

locations/metro_events.qsrc

@@ -1033,7 +1033,7 @@ if $ARGS[0] = 'twobbc':
 				gs 'arousal', 'foreplay', 3, 'exhibitionism'
 				gs 'arousal', 'end'
 				gs 'stat'
-				'Leave':minut += 5 & gt $loc, $loc_arg
+				act 'Leave': minut += 5 & gt $loc, $loc_arg
 			end
 		else
 			act 'Change your mind (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/natbel_friend.qsrc

@@ -171,7 +171,7 @@ if $ARGS[0] = 'go_to_del_greco':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/friends/Hands.jpg"></center>'
 		'You reach over, place your hand on hers, and gently squeeze it, leaving your hand holding hers. "I know; I just wanted to treat you. You mean a lot to me. Maybe we can do more like this in the future if you like?"'
-		'Natasha smiles, then after a moment, she looks around at the other people, after which she gently pulls her hand away. You can tell it made her uncomfortable, but she didn''t seem to mind it too much. "There''s nothing I''d like more, but I simply can''t afford it. Sometimes I kid myself, but that's when I've borrowed money, and I need to stop doing that as it keeps getting on top of me."'
+		'Natasha smiles, then after a moment, she looks around at the other people, after which she gently pulls her hand away. You can tell it made her uncomfortable, but she didn''t seem to mind it too much. "There''s nothing I''d like more, but I simply can''t afford it. Sometimes I kid myself, but that''s when I''ve borrowed money, and I need to stop doing that as it keeps getting on top of me."'
 		*nl
 		'Natasha continues, "You know, <<$pcs_nickname>>, this has been great... A lovely walk with a real friend who speaks to me as a person rather than judging me." She lets out a big sigh, "Also, sometime when I can just switch off."'
 		'You are a little confused and look at her quizzically. "Well, I don''t judge, but I like you. You are a good friend who is nice to me. That means a lot."'

locations/nichTanya.qsrc

@@ -488,7 +488,7 @@ if $ARGS[0] = 'date':
 				gt 'nichTanya','date'
 			end
 		else
-			killvar 'nichTanya['Date']'
+			gs 'shortgs', 'remove_array_element', 'nichTanya', 'Date'
 			killvar 'nichDateState'
 			gt 'nichBedroomTanja'
 		end
@@ -1080,7 +1080,9 @@ if $ARGS[0] = 'chat':
 			else
 				gt 'nichTanya', 'sexL'
 			end
-		gt $loc, 'return'
+		else
+			gt $loc, 'return'
+		end
 	end
 end
 

locations/nichUtil.qsrc

@@ -148,7 +148,7 @@ elseif $ARGS[0] = 'debug':
 	'-<a href="exec: nichTanya[''Relationship''] = 1 & nichTanya[''RelationshipState''] = 10   & gt ''nichUtil'', ''debug''">Casually dating</a>'
 	'-<a href="exec: nichTanya[''Relationship''] = 1 & nichTanya[''RelationshipState''] = 20   & gt ''nichUtil'', ''debug''">In a relationship</a>'
 	'You fucked Tanya <<nichTanya[''FuckCounter'']>> times'
-	'The last time you fucked Tanya was '+(daystart-nichTanya[''FuckLast''])+' days ago'
+	'The last time you fucked Tanya was '+(daystart-nichTanya['FuckLast'])+' days ago'
 	'Tanya has a dominance of <<nichTanya[''Dominance'']>> (range: -100 - 100)'
 	
 	act 'DEBUG: New Workday': gs 'nichUtil', 'startWorkday'

locations/pav_disco_coolkids.qsrc

@@ -4,7 +4,7 @@
 if $ARGS[0] = 'dimka':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A1', 'like'
+	gs 'npc_relationship', 'modify', 'A1', 'like', 1, 'pav_disco'
 	gs 'stat'
 	gs 'dinnpc'
 	if rand(1,4) = 1:
@@ -281,8 +281,8 @@ end
 
 if $ARGS[0] = 'marcus':
 	*clr & cla
-	minut += 5
-	gs 'npc_relationship', 'modify', 'A146', 'like'
+	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:
@@ -454,8 +454,8 @@ 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'
-	gs 'npc_relationship', 'modify', 'A139', 'like'
+	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>'
@@ -485,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?"'
@@ -497,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?"'
@@ -548,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?"'
@@ -560,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?"'
@@ -604,7 +604,7 @@ end
 if $ARGS[0] = 'mefodiy':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A148', 'like'
+	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:
@@ -733,7 +733,7 @@ end
 if $ARGS[0] = 'igor':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A4', 'like'
+	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:
@@ -925,7 +925,7 @@ end
 if $ARGS[0] = 'bella':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A22', 'like'
+	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.'
@@ -970,7 +970,7 @@ end
 if $ARGS[0] = 'vicky':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A15', 'like'
+	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.'
@@ -1012,7 +1012,7 @@ end
 if $ARGS[0] = 'inna':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A17', 'like'
+	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.'
@@ -1050,7 +1050,7 @@ end
 if $ARGS[0] = 'katja':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A14', 'like'
+	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>'
@@ -1389,7 +1389,7 @@ end
 if $ARGS[0] = 'lizaveta':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A140', 'like'
+	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.'
@@ -1428,7 +1428,7 @@ end
 if $ARGS[0] = 'sonia':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A25', 'like'
+	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>'
@@ -1480,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."'
@@ -1525,7 +1525,7 @@ end
 if $ARGS[0] = 'sonia_outcast':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A25', 'like'
+	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>'
@@ -1577,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."'
@@ -1604,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."'
@@ -1619,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?"'
@@ -1689,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
@@ -1723,7 +1723,7 @@ end
 if $ARGS[0] = 'natasha':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A16', 'like'
+	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>'

locations/pav_disco_gopniks.qsrc

@@ -7,9 +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
-	gs 'npc_relationship', 'modify', 'A9', 'like'
-	gs 'npc_relationship', 'modify', 'A10', 'like'
-	gs 'npc_relationship', 'modify', 'A11', 'like'
+	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.'
@@ -54,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."'
@@ -82,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."'
@@ -140,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."'
@@ -168,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."'
@@ -371,7 +371,7 @@ end
 if $ARGS[0] = 'radomir':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A154', 'like'
+	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>'
@@ -392,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!"'
@@ -429,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!"'
@@ -467,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."'
@@ -512,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!"'
@@ -536,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."'
@@ -626,7 +626,7 @@ end
 if $ARGS[0] = 'roman':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A157', 'like'
+	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.'
@@ -660,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."'
@@ -717,7 +717,7 @@ end
 if $ARGS[0] = 'valentin':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A158', 'like'
+	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.'
@@ -830,7 +830,7 @@ end
 if $ARGS[0] = 'arkadi':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A156', 'like'
+	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.'
@@ -914,7 +914,7 @@ end
 if $ARGS[0] = 'niko':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A189', 'like'
+	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
@@ -924,7 +924,7 @@ end
 if $ARGS[0] = 'lavrenti':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A155', 'like'
+	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>'
@@ -1077,7 +1077,7 @@ end
 if $ARGS[0] = 'pauline':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A24', 'like'
+	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.'
@@ -1180,8 +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
-	gs 'npc_relationship', 'modify', 'A20', 'like'
-	gs 'npc_relationship', 'modify', 'A21', 'like'
+	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>'
@@ -1363,7 +1363,7 @@ end
 if $ARGS[0] = 'nush':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A144', 'like'
+	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>'
@@ -1666,7 +1666,7 @@ end
 if $ARGS[0] = 'alyona':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A143', 'like'
+	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>'

locations/pav_disco_jocks.qsrc

@@ -4,7 +4,7 @@
 if $ARGS[0] = 'lazar':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A149', 'like'
+	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:
@@ -134,7 +134,7 @@ end
 if $ARGS[0] = 'ivan':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A3', 'like'
+	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.'
@@ -192,7 +192,7 @@ end
 if $ARGS[0] = 'fedor':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A5', 'like'
+	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:
@@ -205,7 +205,7 @@ end
 if $ARGS[0] = 'svyatoslav':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A8', 'like'
+	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:
@@ -315,7 +315,7 @@ end
 if $ARGS[0] = 'vanya':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A165', 'like'
+	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.'
@@ -366,7 +366,7 @@ end
 if $ARGS[0] = 'erast':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A150', 'like'
+	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.'
@@ -425,7 +425,7 @@ end
 if $ARGS[0] = 'albina':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A23', 'like'
+	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:
@@ -749,7 +749,7 @@ end
 if $ARGS[0] = 'lariska':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A13', 'like'
+	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:
@@ -870,7 +870,7 @@ end
 if $ARGS[0] = 'lina':
 	*clr & cla
 	minut += 5
-	gs 'npc_relationship', 'modify', 'A19', 'like'
+	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:

locations/pav_disco_sex.qsrc

@@ -2370,7 +2370,7 @@ end
 if $ARGS[0] = 'no drugs':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/hotel/leave.jpg"></center>'
-	'"There's no way I'm doing that! Who knows what that powder is? I don''t want to get raped. Have fun, loser."'
+	'"There''s no way I''m doing that! Who knows what that powder is? I don''t want to get raped. Have fun, loser."'
 	'<<$npc_firstname[$npclastsaved]>> snorts deeply and looks over at you. "Too bad. You''ll be missing out on a great party. This is some quality stuff..."'
 	'"I think I''ll be fine, thanks." you retort as you leave the room. <<$npc_firstname[$npclastsaved]>> just shrugs his shoulders and jumps straight back into what he started.'
 	act 'Leave the room': gt 'pav_market'