Merge remote-tracking branch 'Anya/master'

locations/albina_mother_events.qsrc

@@ -311,7 +311,7 @@ if $ARGS[0] = 'peep1':
 		minut +=6
 		gs 'stat'
 		
-		act 'Leave'
+		act 'Leave':
 		 *clr & cla
 		 'You don''t feel comfortable invading Zoya''s privacy and so quickly and quietly leave the room.'
          act 'Leave': gt 'albinahome', 'hallway'

locations/ender.qsrc

@@ -358,24 +358,13 @@ if $ARGS[0] = 'loss':
 		killvar 'autocombat_surrender'
 		fightEnding = 0
 		Loss += 1
+		slyQW['fight'] = -1
 		pcs_mood -= 20
-		'<center><img <<$set_imgh>> src="images/shared/fight/nakedlose.jpg"></center>'
-		'You do your best, you really thought you could beat Christina, but she is just so fast. She hits harder than most guys and worse, someone has trained her how to fight. In the end you find you are no match for her, a blow finally knocks you down and you land on your back. You know you can''t win at this point so you just lay there. Christina smirks at you as you lay there and she pulls her phone back out and takes more pictures of you. "That''s right bitch, I own your ass now. Now roll over and get on your hands and knees." You reluctantly do as she says.'
-		act 'Do as she says':
-			cla & *clr
-			pcs_mood -= 10
-			christinaphotos = 3
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/beach/onall4s.jpg"></center>'
-			'Now spread those legs so we can get a nice shot of that disgusting pussy and dirty ass of yours." You blush with shame but do as she says. She takes several more pictures, laughing the whole time. "You are going to do anything I want any time I say it from now on or everyone in school will see these and I will kick your ass again, right?" You meekly nod on the verge of tears.'
-			*nl
-			'Then you feel a swift kick from behind, between your open legs, as Christina kicks you in the twat hard. You cry out and tears start running down your cheeks as you grab your crotch and roll over onto your side with your legs squeezed closed. "Then say it! Say you are a little cunt and will do anything I say anytime I say it." Christina demands as she towers over you.'
-			*nl
-			'You croak out. "I am a little cunt that will do anything you say, anytime you say it." Christina laughs in an evil, satisifed tone - she seems to be enjoying bullying you a lot. She and Lina then walk off, leaving you laying on the beach naked and in pain. Once they walk off, you dry your tears as best you can and get up.'
-			gs 'pain', 1, 'labia', 'kick'
-
-			act 'Walk off': gt 'pav_lake'
-		end
+		gs 'pain', 5, 'cheeks', 'hit'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big248.jpg"></center>'
+		'You know he isn''t that tough, but somehow he just keeps getting lucky blows in. After a solid punch knocks you off your feet, you just lay there, dazed and completely done resisting.'
+		act 'Give up': gt 'Zvereva_Sly', 'loss'
 	elseif fightEnding = 16:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
@@ -659,12 +648,13 @@ if $ARGS[0] = 'win':
 	elseif fightEnding = 15:
 		fightEnding = 0
 		Win += 1
+		slyQW['fight'] = 1
 		pcs_mood += 10
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/beach/losefight.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big248.jpg"></center>'
 		'Christina is a hell of a fighter. She is fast, hits harder than most boys and knows what she is doing. Yet despite all that she just isn''t a match for you. You finally land a few hard blows and she goes down gasping for breath, holding up her hand in surrender. You smirk as she lies beaten at your feet. You reach down and pull her phone out of her pocket and then toss it as far as you can out into the lake where it plops into the water.' 
 		'Lina seems to be stunned that you beat Christina and she looks a little afraid of you. "Neither you seen me here naked, right? And since I wasn''t here, that means I didn''t beat your ass, but from now on we both know who''s the bitch don''t we?" you say to both of them. Lina nods quickly while Christina is reluctant to agree, but soon nods herself. You confidently walk away as Lina helps Christina back to her feet.'
 
-		act 'Walk off': gt 'pav_lake'
+		act 'Continue': gt 'Zvereva_Sly', 'win'
 	elseif fightEnding = 16:
 		fightEnding = 0
 		Win += 1
@@ -1054,27 +1044,13 @@ if $ARGS[0] = 'surrender':
 		killvar 'autocombat_surrender'
 		fightEnding = 0
 		Loss += 1
+		slyQW['fight'] = -1
 		pcs_mood -= 20
-		'<center><img <<$set_imgh>> src="images/shared/fight/nakedlose.jpg"></center>'
-		'You do your best, you really thought you could beat Christina, but she is just so fast. She hits harder than most guys and worse, someone has trained her how to fight.'
-		'In the end you find you are no match for her. You fall onto your back and hold you hands up to signal your surrender. You know you can''t win at this point, so you just lie there.'
-		'Christina smirks at you as you lay there and she pulls her phone back out and takes more pictures of you. "That''s right bitch, I own your ass now, Now roll over and get on your hands and knees." You reluctantly do as she says.'
-
-		act 'Do as she says':
-			cla & *clr
-			pcs_mood -= 10
-			christinaphotos = 3
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/beach/onall4s.jpg"></center>'
-			'Now spread those legs so we can get a nice shot of that disgusting pussy and dirty ass of yours." You blush with shame but do as she says, she takes several more pictures laughing the whole time. "You are going to do anything I want any time I say it from now on or everyone in school will see these and I will kick your ass again, right?" You meekly nod, on the verge of tears.'
-			*nl
-			'Then you feel a swift kick from behind, between your open legs, as Christina kicks you in the twat hard. You cry out and tears start running down your cheeks as you grab your crotch and roll over onto your side with your legs squeezed closed. "Then say it! Say you are a little cunt and will do anything I say anytime I say it." Christina demands as she towers over you.'
-			*nl
-			'You croak out. "I am a little cunt that will do anything you say, anytime you say it." Christina laughs in an evil and satisfied tone - she seems to be enjoying bullying you a lot. She and Lina then walk off, leaving you laying on the beach naked and in pain. Once they walk off, you dry your tears as best you can and get up.'
-			gs 'pain', 1, 'labia', 'kick'
-
-			act 'Walk off': gt 'pav_lake'
-		end
+		gs 'pain', 5, 'cheeks', 'hit'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big248.jpg"></center>'
+		'You know he isn''t that tough, but somehow he just keeps getting lucky blows in. After a solid punch knocks you off your feet, you just lay there, dazed and completely done resisting.'
+		act 'Give up': gt 'Zvereva_Sly', 'loss'
 	elseif fightEnding = 16:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'

locations/fight_npcdata.qsrc

@@ -364,6 +364,24 @@ if $args[0] = 'girls':
 	fightEnding = 14
 end
 
+if $args[0] = 'silvestr':
+	dynamic $setNPCFightStats, 'name', 'Silvestr'
+	dynamic $setNPCFightStats, 'image', 'images/characters/shared/headshots_main/248.jpg'
+	dynamic $setNPCFightStats, 'def', 30
+	dynamic $setNPCFightStats, 'run', 50
+	dynamic $setNPCFightStats, 'wrstlng', 10
+	dynamic $setNPCFightStats, 'kick', 10
+	dynamic $setNPCFightStats, 'punch', 40
+	dynamic $setNPCFightStats, 'jab', 30
+	dynamic $setNPCFightStats, 'stren', 50
+	dynamic $setNPCFightStats, 'agil', 45
+	dynamic $setNPCFightStats, 'vital', 60
+	dynamic $setNPCFightStats, 'react', 50
+	dynamic $setNPCFightStats, 'willpwr', 25
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
+	fightEnding = 15
+end
+
 if $args[0] = 'bitch squad':
 	dynamic $setNPCFightStats, 'name', 'The bitch squad'
 	dynamic $setNPCFightStats, 'image', 'images/characters/pavlovsk/school/girl/katja/KWT14.jpg'

locations/fit.qsrc

@@ -27,6 +27,7 @@ if $ARGS[0] = 'start':
 	'Weights'
 	'Cross Trainer'
 	'Tennis'
+	'Dancing'
 	'Kickboxing'
 	'Swimming pool.'
 	*nl

locations/foto_models.qsrc

@@ -614,7 +614,7 @@ if $ARGS[0] = 'mari_chat':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading5.jpg"></center>'
 						'Your mouth is agape as she wriggles in embarrassment. She doesn''t seem upset by any means, she''s still clearly smiling. It kind of reminds you of when you were younger and when girls asked each other if they had ever kissed a boy.'
-						'"You''re a virgin?! You''re a nude model who''s <<sisterage>> and living in St. Petersburg and you''re a virgin?!"'
+						'"You''re a virgin?! You''re a nude model who''s <<sisterAge>> and living in St. Petersburg and you''re a virgin?!"'
 						'Your exclamations are met with hushes, "Shh! Shh! Shh shh shh! Not so loud!" as Mari tries to quiet you down while holding back her own nervous laughter.'
 						act'"But... how?!"':
 							*clr & cla

locations/journal.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'records':
 	end
 
 	'<center><h2>Housing</h2></center>'
-	
+	*nl
 	if pavSharedAptEnabled = 1:'You share an apartment with three others in Pavlovsk. Your bills are paid by the other tenants in exchange for your house services'
 	if home_owned[1] = 1:'You rent a two room apartment in the city residential area. Your rent for the apartment is subtracted automatically in sum of <<home_rent[1]>> <b>₽</b> us electric bill on 25th of each month. You are currently paid up for <b><<ArendHouseSL>></b> days'
 	if home_owned[1] = 2:'You own a two room apartment in the city residential area. Your utility bills are due on the 25th of each month.'
@@ -35,9 +35,39 @@ if $ARGS[0] = 'records':
 	if home_owned[5] = 1:'You own a vacant block in the city suburbs. Your utility bills are due on the 25th of each month.'
 	if home_owned[5] = 2:'You own a plot of land in the city suburbs upon which you are building a house. Your utility bills are due on the 25th of each month.'
 	if home_owned[5] = 3:'You own an impressive mansion in the city suburbs. Your utility bills are due on the 25th of each month.'
-	
+	*nl
+	if car > 0:
+		'<center><h2>Car</h2></center>'
+		*nl
+		if cardrive = 1: 'Your car is parked in St. Petersburg''s residential area.'
+		if cardrive = 2: 'Your car is parked in St. Petersburg''s city center.'
+		if cardrive = 3: 'Your car is parked in St. Petersburg''s industrial region.'
+		if cardrive = 4: 'Your car is parked at St. Petersburg''s Lake.'
+		if cardrive = 5: 'Your car is parked at St. Petersburg''s Park.'
+		if cardrive = 6: 'Your car is parked at the gas station in St. Petersburg''s industrial region.'
+		if cardrive = 7: 'Your car is parked at the Car Repair Shop in St. Petersburg.'
+		if cardrive = 8: 'Your car is parked at your house in St. Petersburg''s residential area.'
+		if cardrive = 9: 'Your car is parked at the Car Dealership in St. Petersburg.'
+		if cardrive = 10: 'Your car is parked at St. Petersburg''s Park.'
+		if cardrive = 11: 'Your car is parked at St. Petersburg''s Sauna.'
+		if cardrive = 12: 'Your car is parked at the construction site.'
+		if cardrive = 13: 'Your car is parked in the Suburban Cooperative.'	
+		if cardrive = 14: 'Your car is parked in Old Town district of Pavlovsk.'
+		if cardrive = 18: 'Your car is parked at Matryona Mansion.'
+		if cardrive = 19: 'Your car is parked at St. Petersburg''s industrial train station.'
+		if cardrive = 20: 'Your car is parked in Pavlovsk''s residential area.'
+		if cardrive = 21: 'Your car is parked at the gas station near Pavlovsk.'
+		if cardrive = 22: 'Your car is parked on the highway.'
+		if cardrive = 23: 'Your car is parked in Gadukino.'
+		if cardrive = 24: 'Your car is parked in Pavlovsk''s commercial region.'
+		if cardrive = 25: 'Your car is parked in Vasilyevsky Island'
+		if cardrive = 26: 'Your car is parked in Pavlovsk''s industrial region.'
+		if cardrive = 27: 'Your car is parked in St. Petersburg''s red light district.'
+		if cardrive = 28: 'Your car is parked in St. Petersburg''s suburbs.'
+	end
+	*nl
 	'<center><h2>Work</h2></center>'
-	
+	*nl
 	if workPTU > 2:'You work as a teacher at the Lycée and your schedule is Monday to Saturday, teaching between 14:00 and 16:00. Your salary is 300 <b>₽</b> per day.'
 	if (work = 1 or cheatWork = 1) and workKafe > 0:'You are working as a waitress at The Roadhouse cafe. You need to come to work between 11:00-12:00 while your working days are: Tuesday, Wednesday, and Thursday. At work, you can receive tips from customers and your wages are received on 25th of each month.'
 	if (work = 1 or cheatWork = 1) and workhosp > 0:'You work as a nurse in the city residential area clinic. You need to come to work between 08:00-09:00 during the week. Salary is automatically transferred on the 25th of each month.'
@@ -56,9 +86,9 @@ if $ARGS[0] = 'records':
 	if film > 0:'You are working as a pornographic actress under the name <<$pfname>>.'
 	if bumtolik = 4:'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.'
 	if bumtolik >= 5:'You volunteer at the Mercy Clinic in the city industrial region and work with the homeless. Working hours are from 09:00 to 17:00 on Saturday and Sunday.'
-	
+
 	*nl
-	
+
 	if audition['day'] = daystart:
 		'Your audition for the role of <<$role>> is today!'
 	elseif audition['day'] - daystart = 1:
@@ -66,7 +96,7 @@ if $ARGS[0] = 'records':
 	elseif audition['day'] - daystart > 1:
 		'You are auditioning for the role of <<$role>> in <<audition[''day''] - daystart>> days.'
 	end
-	
+
 	if actress_cast = 1:
 		if acting['shoot_day'] = daystart: 
 			'You are '
@@ -76,8 +106,8 @@ if $ARGS[0] = 'records':
 			'You are scheduled to play the part of <<$role>> <<acting[''shoot_day''] - daystart>> days from now.'
 		end
 	end
-	
-	
+
+
 	if modelfoto['shoots'] > 0:	
 		*nl
 		if modelfoto['erotic'] > modelfoto['nude'] and modelfoto['erotic'] > modelfoto['fashion'] and modelfoto['erotic'] > modelfoto['fitness'] and modelfoto['erotic'] > modelfoto['glamour'] and modelfoto['erotic'] > modelfoto['lingerie'] and modelfoto['erotic'] > modelfoto['catalog']:

locations/npcstatic5.qsrc

@@ -735,6 +735,22 @@ npc_intel['A<<npctemp>>'] = 77
 !!hair = long red hair reaching just past her shoulders.
 !!pubic hair = shaved
 
+npctemp = 248
+$npc_dna['A<<npctemp>>'] = '0'
+$npc_firstname['A<<npctemp>>'] = 'Silvestr'
+$npc_nickname['A<<npctemp>>'] = 'Sly'
+$npc_lastname['A<<npctemp>>'] = 'Zvereva'
+$npc_usedname['A<<npctemp>>'] = 'Silvestr'
+$npc_notes['A<<npctemp>>'] = 'Silvestr is one of Christina''s older brothers. The black sheep of the family, he was often a disappointment to his hard-working parents. He taught his little sister to fight at a young age, but they aren''t that close these days.'
+npc_dob['A<<npctemp>>'] = 19971231
+npc_gender['A<<npctemp>>'] = 0
+gs 'npcstaticdefaults', 'defaults'
+$npc_thdick['A<<npctemp>>'] = 'thick'
+npc_dick['A<<npctemp>>'] = 15
+npc_sexskill['A<<npctemp>>'] = 2
+npc_intel['A<<npctemp>>'] = 47
+
+
 !! {Keep this at the end of file of the npcstatics.}
 aarraynumber = npctemp