Bladeren bron

Merge remote-tracking branch 'Insomniac/praidersgarage'

Kevin_Smarts 7 maanden geleden
bovenliggende
commit
7c022ef47a
2 gewijzigde bestanden met toevoegingen van 42 en 41 verwijderingen
  1. 8 7
      locations/praiders_garage_chat.qsrc
  2. 34 34
      locations/praiders_garage_events.qsrc

+ 8 - 7
locations/praiders_garage_chat.qsrc

@@ -1285,7 +1285,7 @@ if $ARGS[0] = 'chat_lavrenti':
 		if anushkaQW['rad_date'] = 0:
 			act 'Get over Rad?':
 				*clr & cla
-				anushkaQW['rad_date'] = 1:
+				anushkaQW['rad_date'] = 1
 				'<center><img src="images/characters/shared/headshots_main/big155.jpg"></center>'
 				'He gives you a <i>Are you stupid</i> look. "Surely you know they use to date a couple of years ago."'
 				'You nod a bit, you had heard rumors, who hadn''t hear about that? "I mean yeah I hear some people say they use to date, but some people say she cheated on him and others he cheated on her, I never knew what really happened or if it really happened, you know how rumors are."'
@@ -1404,6 +1404,7 @@ if $ARGS[0] = 'chat_roman1':
 		'"I''ve been on her to let me get into those panties, but so far she''s rejected me..." His eyes darken. "One of these days, even if she says no and I''m horny, I might go for it anyway."'
 		if hotcat >= 6:
 			'Then he looks you over. "Maybe I''l have a go with you as well some day." The way he says it and looks at you, you are not sure he means to ask, surely he can''t mean what it sounds like he is saying.'
+		end
 		'"That''s... really disturbing..." you reply before quickly moving away.'
 		act 'Hang out': gt 'praiders_garage', $hangout_rand
 	end
@@ -1461,7 +1462,7 @@ if $ARGS[0] = 'chat_roman1':
 	end
 end
 
-if $ARGS[0] = 'chat_niko0':
+if $ARGS[0] = 'chat_niko':
 	if NikoPayback > 0:
 	!!Niko is angry with Sveta for either, her breaking up with him, or her having someone end his blackmail!!
 		menu_off = 0
@@ -1579,7 +1580,7 @@ if $ARGS[0] = 'chat_niko1':
 			'You reply, "Really? Do you think he has a crush on her?"'
 			*nl
 			'"I bet he does, but why he would want to go out with a girl getting dicked by all the guys, is beyond me. It''s not like she is going to sell her ass on the corner to make him any money."'
-			if NikoVolkovQW >= 5;
+			if NikoVolkovQW >= 5:
 				'You reply, "That seems a little harsh. I hope you don''t think of me that way."'
 				'Niko shakes his head, before bringing his face closer, then whispering in your ear, "Of course not, I will always be true to my brave girl, always."'
 			else
@@ -1612,7 +1613,7 @@ if $ARGS[0] = 'chat_niko1':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/4.jpg"></center>'
 			'"What''s the story with Anushka? She certainly seems popular around here." Niko shrugs, "She is a cocky little bitch. She plays with the band, on the stage, and off. When she''s not playing guitar, she is fucking one of the other guys."'
 			'You reply, "Wow, she seems kind of wild. Does she fuck all the guys, or only the band?"'
-			if NikoVolkovQW >= 5;
+			if NikoVolkovQW >= 5:
 				'"She fucks most of them, she even tries to seduce me, but I''m happily taken," You coyly reply, "I hope I''m not having some competition," Niko seductively responds, "There is no beauty, more refined, then yours <<pcs_nickname>>, so you have nothing to fear. My eyes are glued to you, and you alone."'			
 			else
 				'"She fucks most of them, but thinks that she is too good for me. The cocky little bitch, will learn eventually." Niko says, as he angrily slams his beer on the table.'
@@ -1646,7 +1647,7 @@ if $ARGS[0] = 'chat_niko1':
 			'"Is she really that popular?" Niko shakes his head, "Nah, she just has a clingy friend, who shadows her everywhere. Anyone trying to hook up with her, will either have to either wait until her brother isn''t around, or deal with a two person deal, with her and Lera."'
 			*nl
 			'"Do they share boyfriends or something?" Niko shakes his head, "Sort of, Lera is always shadowing Lena, and wants in on everything she does. She''s like Lena''s girlfriend, but Lena doesn''t see it that way. She knows that guys like me, are much more fun."'
-			if NikoVolkovQW >= 5;
+			if NikoVolkovQW >= 5:
 				'"Well it''s good to know that you are humble." Niko chuckles at your sarcastic response, before saying, "I''m just stating how much I care about women. I don''t block them from doing whatever their heart desires. I''m a gentle, caring lover. As you already know."'
 			else
 				'"Well it''s good to know that you are humble." Niko chuckles at your sarcastic response, before saying, "I''m just stating how much I care about women. I don''t block them from doing whatever their heart desires. I''m a gentle, caring lover. Spend more time with me, and you''ll see."'
@@ -1672,7 +1673,7 @@ if $ARGS[0] = 'chat_niko1':
 			'"Well they are not doing me any good, and Lera gives me so much shit whenever I tried to hook up with Lena. She is just always glued to her side, to look over our shoulders. It''s bad enough when her brother does it, but Vitek is not always around her, Lera is."'
 			*nl
 			'"So she gets in the way of your game huh?" Niko replies, "More like cock blocking. Lesbians only exist to cock block guys, and take away some good options." you jokingly say, "Harsh!" Niko chuckles for a few seconds, before replying, "That just means that they are not good girls, like you. Girls like you, are special gifts to this world, and deserve to be pampered."'
-			if NikoVolkovQW >= 5;
+			if NikoVolkovQW >= 5:
 				'Noticing his demeanor rapidly changing, you coyly respond, "Am I really that special?" Niko brings his face closer to you, before replying, "Of course you are <<pcs_firstname>>, there is no one more perfect than you, and no girl that I''d rather be with." He then gently grips your cheek before giving you a passionate kiss, as the party around you, begins to wrap up.'				
 			else
 				'Noticing his demeanor rapidly changing, you coyly respond, "Is that so?" Niko brings his face closer to you, before replying, "Give me a chance and find out."'
@@ -1736,7 +1737,7 @@ if $ARGS[0] = 'chat_niko1':
 			'With not much to really talk about, you decide to start up a casual conversation with Niko, "Is there anything new around here? It''s been kind of a drag lately." Niko pulls out his phone then shows you a picture of a really tough looking man, before he says, "Check out this guy. Do you know who he is?"'
 			'Not recognizing the man, you shake your head, and say, "No, but he looks really tough." Niko nods, his head slowly, before saying, "He is the toughest mother fucker around here. That is Vadim Belly, a fearsome gangster that owns much of pavlovsk. He has connections everywhere."'
 			*nl
-			if NikoPayback is 0 and NikoDinerSlut > 0:
+			if NikoPayback = 0 and NikoDinerSlut > 0:
 				'Curious as to Niko''s interest in this crime lord, you ask, "So what interest do you have in him exactly? Has he made you some offer, or something?" Niko quickly shakes his head. "No way, he is not interested in a small fry like me, but his connections can open so many doors to the right person, or people. It''s just really hard to get close to him."'
 				'Feeling very intimidated by the big man in the photo, you decide to caution Niko, "I wouldn''t get involved with someone like that if I were you Niko. He seems like a brutal person to get close too. One slip up, and he could put you in a world of hurt." Niko slowly nods, as he says, "Maybe... I''m just weighing my options."'
 				*nl

+ 34 - 34
locations/praiders_garage_events.qsrc

@@ -15,17 +15,16 @@ if $ARGS[0] = 'roman_fight':
 	*nl
 	'Most people scatter trying to avoid the fight as it starts to turn into a brawl, some head for the exit. Radomir takes the girl next to him and heads for the exit loudly saying though most people don''t seem to pay any attention to him. "Mind the instruments." While Arkadi jumps one of the other guys now pounding on Roman. Valentin moves in to try and break up the fight before it gets out of control, while Anushka jumps over the coffee table to start grabbing the instruments and place them out of the way.'
 	*nl
-!!make sure I did this, so if the following is true it adds the extra text same with the ones below
 	if gopnikbandQW['alyona_present'] = 1:
 		'Alyona joins in helping Anushka move the bands instruments out of the way.'
 	end
 	if gopnikbandQW['lena_lara_present'] = 1 and gopnikbandQW['niko_present'] = 1:
-		'Lena & Lera get up, and move out of the way, before watching the fight go on, clearly enjoying the sight of the boys beating on each other, while Niko grabs a beer off a table, before sitting on a table across from the girls, enjoying the chaos as well. Suddenly a bunch of girls that arrived with the outsiders; charge toward the guys fighting, clearly intending to join in, before receiving a deathly stare from Lena & Lera, promising to jump them, if they try.'
+		'Lena & Lera get up, and move out of the way, before watching the fight go on, clearly enjoying the sight of the boys beating on each other, while Niko grabs a beer off a table, before sitting on a table across from the girls, enjoying the chaos as well. Suddenly a bunch of girls that arrived with the outsiders charge toward the guys fighting, clearly intending to join in, before receiving a deathly stare from Lena & Lera, promising to jump them if they try.'
 	elseif gopnikbandQW['lena_lara_present'] = 1:
 		'Lena and Lera get up and move out of the way but watch, they seem to enjoy watching the boys beat on each other. When it looks like a couple of the girls that was with the outsiders are about the join in, they get a look from Lena and Lera promising them they will jump them, if they do.'
 	end
 	if gopnikbandQW['lavrenti_present'] = 1:
-		'Meanwhile Lavrenti gets into a shoving match with another guy, neither of them seem like they really want to throw down. As the both seem more interested in keeping each other form joining the main fight'
+		'Meanwhile Lavrenti gets into a shoving match with another guy. Neither of them seem like they really want to throw down, they both seem more interested in keeping each other form joining the main fight.'
 	end
 	act 'Try and make your way out':
 		*clr & cla
@@ -36,7 +35,7 @@ if $ARGS[0] = 'roman_fight':
 		grupvalue[4] -= 5
 		'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/rfight2.jpg"></center>'
 		'Not wanting to get involved you do your best to avoid them. You have to climb over a chair just barely being missed by Akradi wrestling a guy to the ground. Valentin for his efforts to stop the fight, ends up getting hit in the face, which causes him to stop trying to stop the fight and instead join in. Roman is now on top of the guy he head butted and just beating him to a pulp, it seems almost everyone is now fighting or trying to get out. Just before you make it to the door Radomir, while pulling some girl makes it out the door. You go out the door next, just in time to see Anushka jump on the back of some guy that was hitting Valentin. Once outside the sounds of the fight continue, but nothing you need to worry about now.'
-		act 'Leave':gt 'pavComplex', 'garages'
+		act 'Leave':gt 'pav_complex', 'garages'
 	end
 	act 'Just watch the fight':
 		*clr & cla
@@ -49,6 +48,7 @@ if $ARGS[0] = 'roman_fight':
 			'Not wanting to get involved, but wanting to see this, you stay seated and watch them fight. Valentin for his efforts to stop the fight, ends up getting hit in the face, which causes him to stop trying to stop the fight and instead join in. Roman is now on top of the guy he head butted and just beating him to a pulp, it seems almost everyone is now fighting or trying to get out. Radomir makes it to the door, while pulling some girl along and makes it out the door. You have to get up and leap out of your seat, just as Arkadi and some guy come crashing into where you was just sitting. You turn just in time to see Anushka grab two beer bottles, one in each hand and bust them, on each side of a guys head that was hitting Valentin. While Alyona grabs a hub cap off the wall and bashes the guy in the head as well, he crumples to the ground from the girls hitting him in the head.'
 		else
 			'Not wanting to get involved, but wanting to see this, you stay seated and watch them fight. Valentin for his efforts to stop the fight, ends up getting hit in the face, which causes him to stop trying to stop the fight and instead join in. Roman is now on top of the guy he head butted and just beating him to a pulp, it seems almost everyone is now fighting or trying to get out. Radomir makes it to the door, while pulling some girl along and makes it out the door. You have to get up and leap out of your seat, just as Arkadi and some guy come crashing into where you was just sitting. You turn just in time to see Anushka grab two beer bottles, one in each hand and bust them, on each side of a guys head that was hitting Valentin. Which makes the guy stagger and lets Valentin easily get the upper hand and take the guy to the ground.'
+		end
 		act 'Move out of the way.':
 			*clr & cla
 			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/rfight3.jpg"></center>'
@@ -59,7 +59,7 @@ if $ARGS[0] = 'roman_fight':
 			end
 			*nl
 			'"Fuck help me pull him off." Valentin says to Arkadi and they both rush over and pull Roman off the guy, they wrestle a bit with Roman but finally get him to calm down. With that Arkadi turns to look at the few people that stayed to watch. "Alright, out, lets go, it''s over." He ushers everyone out, while Roman kicks the guy in the ribs he was beating on as he walks out. Valentin and Anushka go to check on their gear after she moved it out of the way. You have no choice but to leave as Arkadi ushers you out as well.'
-			act 'Leave':gt 'pavComplex', 'garages'
+			act 'Leave':gt 'pav_complex', 'garages'
 		end
 	end
 	act 'Help Anushka':
@@ -89,7 +89,7 @@ if $ARGS[0] = 'roman_fight':
 			end
 			*nl
 			'With that Arkadi turns to look at the few people that stayed to watch. "Alright, out, lets go, it''s over." He ushers everyone out, while Roman kicks the guy in the ribs he was beating on as he walks out. Valentin and Anushka go to check on their gear after she moved it out of the way. You have no choice but to leave as Arkadi ushers you out as well. Just as you are about to walk out the door Arkadi says. "Hey thanks, with helping Nush move our stuff, she told me you helped." He smiles to you just as the door closes behind you.'
-			act 'Leave':gt 'pavComplex', 'garages'
+			act 'Leave':gt 'pav_complex', 'garages'
 		end
 		act 'Join Anushka in kicking the guy':
 			*clr & cla
@@ -111,7 +111,7 @@ if $ARGS[0] = 'roman_fight':
 			else
 				'With that Arkadi turns to look at the few people that stayed to watch. "Alright, out, lets go, it''s over. He ushers everyone else out, while Roman kicks the guy in the ribs he was beating on as he walks out. Valentin and Anushka go to check on their gear after she moved it out of the way. Arkadi tells the guys to get out while they can, the one Arkadi was fighting helps his friend Roman was on, while the one you helped kick in the ribs manages to barely leave on his own, likely has some broken ribs. Once everyone else is gone, Anushka starts to check on the boys to see if they are hurt.'
 			end
-			act 'Leave':gt 'pavComplex', 'garages'
+			act 'Leave':gt 'pav_complex', 'garages'
 			act 'Stay':
 				*clr & cla
 				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/rfightafter.jpg"></center>'
@@ -122,7 +122,7 @@ if $ARGS[0] = 'roman_fight':
 				*nl
 				'Arkadi tries to pull away but Anushka just keeps crowding him working on the cut. "I would if you stopped trying to stick your finger in the cut, it''s fine, leave it alone."'
 				'Anushka doesn''t stop, until she cleaned the cut well. "Oh please you cry more than Timofey and he is only eleven." Which gets Valentin to laugh out loud which gets him a dirty look from Arkadi. Soon all the wounds are tended and the garage cleaned up as best as possible and the instruments all put back in place. The four of you head for the door, once outside Arkadi puts the padlock on the door, with a few farewells everyone splits up to go their own way.'
-				act 'Leave': gt 'pavComplex', 'garages'
+				act 'Leave': gt 'pav_complex', 'garages'
 			end
 		end
 	end
@@ -146,14 +146,14 @@ if $ARGS[0] = 'radnush_love':
 		end
 		gs 'arousal', 'voyeur', 2
 		gs 'stat'
-		act 'Leave': gt 'pavComplex', 'garages'
+		act 'Leave': gt 'pav_complex', 'garages'
 		act 'Keep a eye on them':
 			*clr & cla
 			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/radnush2.jpg"></center>'
 			'The rest of the hangout goes on, most people stop paying attention to the love birds and go back to their own thing. You and a few others though occasionally glance there way and each time you do they seem to be acting more and more lovey dovey together.'
 			gs 'arousal', 'voyeur', 2
 			gs 'stat'
-			act 'Leave': gt 'pavComplex', 'garages'
+			act 'Leave': gt 'pav_complex', 'garages'
 			act 'Keep watching':
 				*clr & cla
 				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/radnush3.jpg"></center>'
@@ -175,7 +175,7 @@ if $ARGS[0] = 'radnush_love':
 					if NikoVolkovQW >= 5: 					
 						act 'Confront Niko': gt 'praiders_garage_events', 'Niko Confront'
 					end
-				elseif gopnikbandQW['lena_lara_present'] = 1
+				elseif gopnikbandQW['lena_lara_present'] = 1:
 					'Lena grins a bit. "Some one is going to get some tonight, wish it was me."'
 					'Lera looks at her. "You want Rad to fuck you?"'
 					'Lena rolls her eyes. "I meant I wanted some dick, but..." she gives Radomir a lusty look. "If he wasn''t already busy..."'
@@ -183,7 +183,7 @@ if $ARGS[0] = 'radnush_love':
 				end			
 				gs 'arousal', 'voyeur', 2
 				gs 'stat'
-				act 'Leave': gt 'pavComplex', 'garages'
+				act 'Leave': gt 'pav_complex', 'garages'
 				act 'Watch some more':
 					*clr & cla
 					'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/radnush4.jpg"></center>'
@@ -199,7 +199,7 @@ if $ARGS[0] = 'radnush_love':
 					end
 					gs 'arousal', 'voyeur', 2
 					gs 'stat'
-					act 'Leave': gt 'pavComplex', 'garages'
+					act 'Leave': gt 'pav_complex', 'garages'
 					act 'Keep being a perv':
 						*clr & cla
 						'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/radnush5.jpg"></center>'
@@ -212,7 +212,7 @@ if $ARGS[0] = 'radnush_love':
 						gs 'arousal', 'voyeur', 2
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Leave': gt 'pavComplex', 'garages'
+						act 'Leave': gt 'pav_complex', 'garages'
 					end
 				end
 			end
@@ -235,7 +235,7 @@ if $ARGS[0] = 'Niko Confront':
 	gs 'arousal', 'kiss', 1
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave the garage': gt 'pavComplex', 'garages'
+	act 'Leave the garage': gt 'pav_complex', 'garages'
 end	
 	
 if $ARGS[0] = 'alyona_dad':
@@ -244,13 +244,13 @@ if $ARGS[0] = 'alyona_dad':
 	minut + 15
 	'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/hangout4.jpg"></center>'
 	'Everyone is scattered around the garage, enjoying themselves as they drink and hangout. The atmosphere is relaxed and easy going, slowly people start to head out as it gets late. Before long everyone has left but Anushka, Valentin, Alyona, and yourself. This is when Valentin announces. "Ok girls lets pack it up for the night, unless..." He remarks with a lewd smile on his face, his unless is obviously a foursome with him. Anushka snorts and says. "In your dreams." While Alyona rolls her eyes slightly. With that everyone heads outside and Valentin locks the garage up. The three of them start walking back to the apartments talking, you could go with them of course or call it a night and head home.'
-	act 'Leave': gt 'pavComplex', 'garages'
+	act 'Leave': gt 'pav_complex', 'garages'
 	act 'Leave with them.':
 		*clr & cla
 		'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/zoykov.jpg"></center>'
 		'You decided to go with them, the four of you are still talking and laughing as you walk. Before you make it far though a man comes out of the darkness of the courtyard, he is older, at a guess a bit older than your step dad. He is fairly tall with thick meaty arms, and a bit of a beer gut on him. Everyone stops talking at once, you can feel the tense ratchet up as well. "Where the fuck have you been you little slut?" The man says as he closes in on the group heading right for Alyona.'
 		*nl
-		'Alyona takes a step back as the man walks right up to her face. "I was just hanging out with my friends, chill out." The words barely leave her mouth before the man backhands her hard and sends he sprawling to the ground. Anushka yells out. "What the fuck?" Then goes to Alyona, while Valentin steps up to put himself between Alyona and the man. The man starts to step around Valentin, who just steps in his way. "You better get the fuck out of my, you little peace of shit." Followed by him shoving Valentin hard enough to force him back, causing him to stumble a bit.'
+		'Alyona takes a step back as the man walks right up to her face. "I was just hanging out with my friends, chill out." The words barely leave her mouth before the man backhands her hard and sends he sprawling to the ground. Anushka yells out. "What the fuck?" Then goes to Alyona, while Valentin steps up to put himself between Alyona and the man. The man starts to step around Valentin, who just steps in his way. "You better get the fuck out of my face, you little piece of shit." Followed by him shoving Valentin hard enough to force him back, causing him to stumble a bit.'
 		act 'Go to Alyona':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A143', 'like'
@@ -269,7 +269,7 @@ if $ARGS[0] = 'alyona_dad':
 				grupvalue[4] += 3
 				gs 'stat'
 				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/zoykov.jpg"></center>'
-				'The man gets Valentin on the ground and starts really pounding on him, Valentin does his best to cover up. Alyona finally seems to snap out of it a bit as she screams. "Dad! Leave him alone!" Yet she doesn''t get off the ground even as Anushka jumps on Alyona''s dad back in a effort to get him to stop beating on Valentin. He only pauses hitting on Valentin long enough to grab Anushka and fling her off him, causing her to crash into the door of one of the garages, before he goes back to beating on Valentin. You step in to try and help as well, but suffer the same fate, the man is very strong as he easily tosses you aside. You get up to lunch back in and maybe do more than just try and pull him off this time. But before you can, you see someone running up from down the alleyway.'
+				'The man gets Valentin on the ground and starts really pounding on him, Valentin does his best to cover up. Alyona finally seems to snap out of it a bit as she screams. "Dad! Leave him alone!" Yet she doesn''t get off the ground even as Anushka jumps on Alyona''s dad back in a effort to get him to stop beating on Valentin. He only pauses hitting on Valentin long enough to grab Anushka and fling her off him, causing her to crash into the door of one of the garages, before he goes back to beating on Valentin. You step in to try and help as well, but suffer the same fate, the man is very strong as he easily tosses you aside. You get up to launch back in and maybe do more than just try and pull him off this time. But before you can, you see someone running up from down the alleyway.'
 				act 'Ed arrives': gt 'praiders_garage_events', 'edward_arrives'
 			end
 		end
@@ -302,7 +302,7 @@ if $ARGS[0] = 'edward_garage':
 	'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/ed/ed2.jpg"></center>'
 	'You rush down to Edward''s garage, as you do you hear Alyona screaming "Dad! Leave him alone!" So apparently the man is her father, as you reach the garage, you jerk open the door and sure enough Edward is inside working on his bike, he looks up at you in surprise at the way you burst in, he opens his mouth to say something, but you beat him to it and in a rush tell him. "Alyona''s dad hit her and when Val tried to stop him he starting beating the shit out of Val."'
 	'Edwards eyes darken. "Mother fucker, you ok?" When you nod and he gives you a quick look he rushes out, as he does he says. "Stay here." Then he is out of the garage at a flat out run.'
-	act 'Wait like you was told.'
+	act 'Wait like you was told.':
 		*clr & cla
 		'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/ed/ed6.jpg"></center>'
 		'You take a seat and just wait, it takes awhile but finally the door opens and it is Edward standing there. His hands are bloodied you notice and he has a grim look on his face like he wants to beat someone, behind him is Valentin who''s face is all bloodied and bruised and next to him Anushka has her arm wrapped around Alyona protectively. "Alright lets go." His tone is hard and angry but you can tell he isn''t angry at you, after a moment he forces a smile to his face and his tone lightens a bit, he is obviously trying to not come off as scary to you, but really that ship has sailed. "Come on." As you walk out he turns off the lights and locks the garage.'
@@ -317,20 +317,20 @@ if $ARGS[0] = 'edward_garage':
 		act 'Watch them fight':
 			*clr & cla
 			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov2.jpg"></center>'
-			'Now you know the man''s name is Zoykov, he lunges at Edward tackling him and they both go down. You just stand there and watch them fight. They trade a few blows but it doesn''t take long for Zoykov to end up pinned to the ground with Edward hitting him over and over, until Zoykov gives up fighting back and just start trying to defend himself. Once Edward is sure the fight is over he gets off Zoykov and looks around at the as he put it you kids and glares again at Zoykov. "You touch one of these kids again and I will beat you within a inch of your life."'
+			'Now you know the man''s name is Zoykov, he lunges at Edward tackling him and they both go down. You just stand there and watch them fight. They trade a few blows but it doesn''t take long for Zoykov to end up pinned to the ground with Edward hitting him over and over, until Zoykov gives up fighting back and just start trying to defend himself. Once Edward is sure the fight is over he gets off Zoykov and looks around at all of you before glaring again at Zoykov. "You touch one of these kids again and I will beat you within a inch of your life."'
 			*nl
-			'He glances over at Anushka who is next to Valentin checking his injuries before looking back at Zoykov again who is still on the ground. "You ever so much as look at my daughter again and I swear to you, they will never find your body, we clear?" When Zoykov doesn''t respond at once Edward repeats. "I said are we clear?"'
+			'He glances over at Anushka who is next to Valentin checking his injuries before looking back at Zoykov again who is still on the ground. "and if you ever so much as look at my daughter again, I swear to you, they will never find your body, we clear?" When Zoykov doesn''t respond at once Edward repeats. "I said are we clear?"'
 			'Zoykov sits up. "Yeah... yeah..."'
 			act 'Aftermath':
 				*clr & cla
 				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov3.jpg"></center>'
 				'While Zoykov stays laying on the ground, Edwards looks back over at Anushka and Alyona as he says. "Alyona''s going to have a sleep over with Nush tonight." Then looks back to Zoykov. "Got it?"'
-				'Zoykov clenches his jaws but nods. "Yeah, what ever." He gets up and gives a glare at Alyona, apparently blaming her for all this, then walks off muttering to himself and rubbing his jaw.'
+				'Zoykov clenches his jaws but nods. "Yeah, whatever." He gets up and gives a glare at Alyona, apparently blaming her for all this, then walks off muttering to himself and rubbing his jaw.'
 				*nl
 				'Edward first checks on Anushka, then Alyona and yourself before he finally checks on Valentin who he spends the most time with, once he seems to be sure Valentin isn''t injured badly he helps Valentin up. Edward has bloodied knuckles and a few bruises but Zoykov came off far worse.'
 				'"Alright lets go." His tone is hard and angry but you can tell he isn''t angry at any of you, after a moment he forces a smile to his face and his tone lightens a bit, he is obviously trying to not come off as scary to you, but really that ship has sailed. "Come on." As you all start to walk off together Anushka has her arm wrapped around Alyona protectively. You all walk back to his garage where he turns off the lights and locks the garage.'
 				*nl
-				'Next the five of you walk towards the apartments. The only one talking is Edward who is talking to Valentin, telling him what a good job he did and stuff like that. You can see Valentin react to this and straighten his shoulders and even smile at the compliments. First he walks you to his building, stopping at the door. "Ok you girls go on up to your room, I''ll be back shortly." He says to Anushka, who gives him a grateful smile. "Ok dad." Edward, Valentin, and you walk to your building next. "Ok it''s getting late, you should get home." Edward says to you, he won''t take no for a answer, so you go inside giving him a friendly smile. Once inside your building you give it a moment and then open the door to peek out, you see Edward walking with Valentin with his arm over the younger man''s shoulder. You let the door close after a moment, Edward is likely right, you probably should go home.'
+				'Next the five of you walk towards the apartments. The only one talking is Edward who is talking to Valentin, telling him what a good job he did. You can see Valentin straighten his shoulders and even smile at the compliments. First he walks you to his building, stopping at the door. "Ok you girls go on up to your room, I''ll be back shortly." He says to Anushka, who gives him a grateful smile. "Ok dad." Edward, Valentin, and you walk to your building next. "Ok it''s getting late, you should get home." Edward says to you, he won''t take no for a answer, so you go inside giving him a friendly smile. Once inside your building you give it a moment and then open the door to peek out, you see Edward walking with Valentin with his arm over the younger man''s shoulder. You let the door close after a moment, Edward is likely right, you probably should go home.'
 				act 'Let the door close': gt 'pod_ezd', 'etaj_1'
 			end
 		end
@@ -435,7 +435,7 @@ if $ARGS[0] = 'lav_baddrugs':
 		'Lavrenti quickly gets off Anushka as he says. "Shit, Nush, are you--" before he can finish Radomir cuts him off.'
 		'"Get out!" he barks as he rushes over to Anushka''s side. "Both of you get the fuck out!"'
 		'Valentin ushers everyone out including you, he won''t take no for a answer. "Come on lets go parties over." Once outside he takes Lavrenti and Arkadi off, you presume to work things out, having no choice you leave.' 
-		act 'Leave': gt 'pavComplex', 'garages'
+		act 'Leave': gt 'pav_complex', 'garages'
 	end
 	act 'Defend Lavrenti':
 		*clr & cla
@@ -454,9 +454,9 @@ if $ARGS[0] = 'lav_baddrugs':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile2.jpg"></center>'
 				'You begin lowering your head, as you feel an arm wrapped around your shoulders. You turn to see Niko with a smile on his face, as he says to Arkadi, "Hey man, chill. You''re not about to attack a girl right? You have thicker skin than that." Arkadi continues his deathly stare, as he says, "I''m not letting this little bitch talk shit to me." Niko chuckles, as he says, "Nah, she is pulling your leg man. Chill out, and have a beer. We''re here to party aren''t we?" Arkadi looks to you, then back at Niko, before saying, "Keep your little bitch on a leash Niko, or she will find out what happens when you poke a bear."'
 				*nl
-				'Niko nods then guides you out of the garage. When you reach the outside, Niko gives you a kiss on your cheek, before saying, "Careful with that one. He may be all brawn and no brains, but a bull is always dangerous." So grateful for Niko standing up for you, you wrap your arms around his waist, and say, "Thank you Niko. I always feel so safe with you." Niko gently rubs the side of his head against yours, as he responds, "And you always will be, because you''re my girl, and I''ll always look out for you. Now get yourself something to drink. I need to head back home. Yurik, needs a hand with something, and I promised to help out."'
+				'Niko nods then guides you out of the garage. When you reach the outside, Niko gives you a kiss on your cheek, before saying, "Careful with that one. He may be all brawn and no brains, but a bull is always dangerous." So grateful for Niko standing up for you, you wrap your arms around his waist, and say, "Thank you Niko. I always feel so safe with you." Niko gently rubs the side of his head against yours, as he responds, "And you always will be, because you''re my girl, and I''ll always look out for you. Now get yourself something to drink. I need to head back home. Yurik needs a hand with something, and I promised to help out."'
 				'Niko hands you 200 ruble, then gently rubs on your back, before releasing you, and walking away.'
-				act 'Leave': money += 200 & gt 'pavComplex', 'garages'
+				act 'Leave': money += 200 & gt 'pav_complex', 'garages'
 			end
 			gs 'willpower', 'action', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
@@ -468,9 +468,9 @@ if $ARGS[0] = 'lav_baddrugs':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile2.jpg"></center>'
 					'You return his deathly stare with a stare of your own, when you suddenly feel an arm wrapped around your shoulders. You turn to see Niko with a smile on his face, as he says to Arkadi, "Hey man, chill. You''re not about to attack a girl right? You have thicker skin than that." Arkadi continues his deathly stare, as he says, "I''m not letting this little bitch talk shit to me." Niko chuckles, as he says, "Nah, she is pulling your leg man. Chill out, and have a beer. We''re here to party aren''t we?" Arkadi looks to you, then back at Niko, before saying, "Keep your little bitch on a leash Niko, or she will find out what happens when you poke a bear."'
 					*nl
-					'Niko nods then guides you out of the garage. When you reach the outside, Niko gives you a kiss on your cheek, before saying, "Careful with that one. He may be all brawn and no brains, but a bull is always dangerous." So grateful for Niko standing up for you, you wrap your arms around his waist, and say, "Thank you Niko. I always feel so safe with you." Niko gently rubs the side of his head against yours, as he responds, "And you always will be, because you''re my girl, and I''ll always look out for you. Now get yourself something to drink. I need to head back home. Yurik, needs a hand with something, and I promised to help out."'
+					'Niko nods then guides you out of the garage. When you reach the outside, Niko gives you a kiss on your cheek, before saying, "Careful with that one. He may be all brawn and no brains, but a bull is always dangerous." So grateful for Niko standing up for you, you wrap your arms around his waist, and say, "Thank you Niko. I always feel so safe with you." Niko gently rubs the side of his head against yours, as he responds, "And you always will be, because you''re my girl, and I''ll always look out for you. Now get yourself something to drink. I need to head back home. Yurik needs a hand with something, and I promised to help out."'
 					'Niko hands you 200 ruble, then gently rubs on your back, before releasing you, and walking away.'
-					act 'Leave': money += 200 & gt 'pavComplex', 'garages'
+					act 'Leave': money += 200 & gt 'pav_complex', 'garages'
 				end
 			else
 				act 'Stand your ground (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -482,7 +482,7 @@ if $ARGS[0] = 'lav_baddrugs':
 				'<center><img src="images/pc/reactions/frightened.jpg"></center>'
 				'"No... nevermind," You quietly reply. Arkadi''s lips curl into a scowl. He looks disappointed that you didn''t stand your ground.'
 				'"That''s what I thought." He shoulders you out of his way as he heads towards Lavrenti. The conversation isn''t as heated now that Radomir and Valentin are there to talk them down. In the end, Lavrenti pulls out another baggy of pills and hands it over to a smiling Arkadi. You guess things have been settled between them. Not long after the hangout is over and everyone heads out, going their own ways.'
-				act 'Leave': gt 'pavComplex', 'garages'
+				act 'Leave': gt 'pav_complex', 'garages'
 			end
 			gs 'willpower', 'action', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
@@ -496,7 +496,7 @@ if $ARGS[0] = 'lav_baddrugs':
 					'"You got a smart mouth on you bitch. Best keep it in check before someone smacks the shit out of you." Arkadi says as he crowds you a little more, you think for a moment he might actually hit you.'
 					*nl
 					'Before you can respond, you hear Anushka bark out. "Arkadi!" He looks past you a moment then glares at you and walks past you, bumping his shoulder into you, causing you to stumble a step as he heads towards Lavrenti. The conversation isn''t as heated now that Radomir and Valentin are there to talk them down. In the end, Lavrenti pulls out another baggy of pills and hands it over to a smiling Arkadi. You guess things have been settled between them. Not long after the hangout is over and everyone heads out, going their own ways.'
-					act 'Leave': gt 'pavComplex', 'garages'
+					act 'Leave': gt 'pav_complex', 'garages'
 				end
 			else
 				act 'Stand your ground (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -515,7 +515,7 @@ if $ARGS[0] = 'lav_baddrugs':
 		'Anushka shakes her head. "It''s not worth pissing him off, dude."'
 		'Suddenly being put on the spot, Lavrenti reluctantly gives in. "Fine, fuck it." He reaches into his pocket and pulls out a new bag. "I hope you overdose on it!"'
 		'With a smirk and a wave, Arkadi watches Lavrenti storm off. "Thanks, <<$pcs_nickname>>," he says as he lets you go but not before giving your ass a light squeeze as you walk away.'
-		act 'Leave': gt 'pavComplex', 'garages'
+		act 'Leave': gt 'pav_complex', 'garages'
 	end
 	gs 'willpower', 'action', 'self', 'medium'
 	if will_cost <= pcs_willpwr:
@@ -538,16 +538,16 @@ if $ARGS[0] = 'lav_baddrugs':
 				'After what seems like, an eternity; they both become too fatigued to continue fighting, leaning against the wall. As they do Anushka chirps up, "So you girls done wrestling together? I think I seen you both coping a feel." Both the boys in perfect unison; "Fuck you Nush.", along with other obscenities, but with the sounds of the others laughing, you can barely make out what they are saying, though the middle fingers that both boys are flipping at Anushka, leaves no doubt to their feelings on her comment. They both sit back down for a few seconds, until Niko helps up Lavrenti, as the others help up Arkadi. Before too long, everyone seems relaxed, and begin hanging out, as if nothing happened.' 
 				*nl
 				'You can''t help notice by the end of the gathering, that Arkadi and Lavrenti seem to be chatting, and joking, as if they never fought in the first place...'
-				act: 'Reflect on what just happened':
+				act 'Reflect on what just happened':
 					*clr & cla
 					'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 					*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 					'So weirded out by what just happened, you can''t help but ponder to yourself, "'+$OpenInnerThought+'What the hell just happened? They were just at each other''s throats, fighting, and now they are hanging out like nothing happened... I will never understand these boys.'+$CloseInnerThought+'" After a few more minutes, of hanging out, everyone begins to wrap things up and leave, as you are ushered out, as well while the band begins locking up the garage. Once outside, everyone seems to go off in small groups or alone, as you leave alone.'
-					act 'Leave': gt 'pavComplex', 'garages'
+					act 'Leave': gt 'pav_complex', 'garages'
 				end
 			else
 				'Finally what seems like forever they both get tired and stop. As they do Anushka chirps up, "So you girls done wrestling together? I think I seen you both coping a feel." Both the boys respond at once with fuck you Nush and the like, so much so you can''t really makeout what they are saying over everyone else laughing, though the middle fingers flipped at her from both of them leaves no doubt their feelings on the comment. They both sit back down and a bit more time passes and before long everyone is relaxed and just hanging out. You can''t help notice by the end Arkadi and Lavrenti seems to be talking and acting like nothing happened... boys, you will never fully understand them. Eventually everyone starts to leave and you are ushered out so they can lock the garage up, once outside everyone goes off in small groups or alone.'
-				act 'Leave': gt 'pavComplex', 'garages'
+				act 'Leave': gt 'pav_complex', 'garages'
 			end
 		end
 	else