Explorar o código

Merge remote-tracking branch 'rachels/master'

KevinSmarts %!s(int64=4) %!d(string=hai) anos
pai
achega
d30c4a4fcd
Modificáronse 4 ficheiros con 476 adicións e 392 borrados
  1. 50 2
      locations/KatjaHomeTalk.qsrc
  2. 84 25
      locations/ender.qsrc
  3. 2 2
      locations/fight_npcdata.qsrc
  4. 340 363
      locations/katjaEv.qsrc

+ 50 - 2
locations/KatjaHomeTalk.qsrc

@@ -191,8 +191,8 @@ if $ARGS[0] = '':
 				act 'Further':gt 'KatjaHomeTalk'
 			end
 
-			if npc_sex['A14'] > 0:
-				act 'Offer to take a walk in the Park':
+			if npc_sex['A14'] > 0 and KatjaSlut > 100:
+				act 'Look for boys in the park':
 					minut += 15
 					KatjaHorny += 5
 					$ev_name = 'Katja'
@@ -209,7 +209,55 @@ if $ARGS[0] = '':
 					gt 'placer'
 				end
 			end
+			
+			act '"Let''s hang out"': 
+				cla
+				gs 'stat'
+				if meynoldQW > 1 and pcs_makeup <= 1:
+					'"Hey! Wait a moment <<$pcs_nickname>>! I bet you would look great with a little make-up on you! What do you say?"'
+					act 'Let her put makeup on you':
+						*clr & cla
+						pcs_hairbsh = 1
+						minut += 10
+						gs 'stat'
+						'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
+						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
+						'Katja happily grins as she quickly straightens your hair: "What do you want? A light touch-up, some normal make-up or shall I just shovel it on?"'
+
+						act 'Light touch-up':
+							cla
+							pcs_makeup = 2
+							'Katja subtly applies some neutral tones, with a light application of makeup to bring out your natural beauty.'
+							if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
+
+							act '"Let''s hang out"':gt 'katjaEv','kathan'
+						end
+
+						act 'Normal make-up':
+							cla
+							pcs_makeup = 3
+							'Katja applies some mildly vibrate tones and colors of makeup to cover your minor imperfections and enhance your best features.'
+							if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 
+							act '"Let''s hang out"':gt 'katjaEv','kathan'
+						end
+
+						act 'Heavy make-up':
+							cla
+							pcs_makeup = 4
+							'Katja applies some deeper, richer shades of makeup that are thick enough to cover most imperfections while drawing attention to your eyes and lips.'
+							if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
+
+							act '"Let''s hang out"':gt 'katjaEv','kathan'
+						end
+					end
+					
+					act 'You really don''t need it.':gt 'katjaEv','kathan'
+				else
+					gt 'katjaEv','kathan'
+				end 
+			end
+			
 			if KatjaLust > 10 and rand(0,5) = 0:
 				cls
 				gs 'stat'

+ 84 - 25
locations/ender.qsrc

@@ -247,25 +247,46 @@ if $ARGS[0] = 'loss':
 			*nl
 			'You croak out. "I am a little cunt that will do anything you say, anytime you say it." With that Christina laughs with a fairly evil laugh, she seems to be enjoying bullying you a lot, then she and Lina walk off leaving you laying on the beach naked and in pain. Once the walk off you dry your tears as best you can and get up.'
 			gs 'pain', 1, 'labia', 'kick'
+
 			act 'Walk off': gt 'gLake'
 		end
-    elseif fightEnding = 17:
+	elseif fightEnding = 16:
+		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
+		killvar 'autocombat_surrender'
+		fightEnding = 0
+		Loss += 1
+		grupvalue[1] -= 5
+		grupvalue[2] += 5
+		grupvalue[4] += 5
+		pcs_mood -= 10
+		'<center><img <<$set_imgh>> src="images/locations/shared/street/lostfight.jpg"></center>'
+		'You groan on pain as the frozen ground reaches for you. Damm. That wasn''t your best idea now that you see it, especially because the police have just arrived to break up the brawl turned riot.'    
+		'"<<$pcs_nickname>>! Oh my god! What happened to you?!"'    
+		'Katja and Vicky appear over you and help Vanya take away your beaten body. It hurts a lot but somehow, after a while, you manage to stand without seeing stars. The trio looks at you in askance.'    
+		'"<<$pcs_nickname>>! I don''t know what to do with you! What were you thinking?!"'
+		'Demure Katja is really, really pissed and for a long while, she chastizes your actions. The fact that you are hurting doesn''t seem to make her stop, but finally, after a long-winded tirade, the redhead seems to deflate and gives you a tired hug.' 
+		'"Please! Don''t do that again!"'
+		'It feels nice and makes Vanya & Vicky spell and sonorous "Kawai!" before quickly turning back and running away from an embarrassed/angry Katja. It was "fun", but it is time to look for something else to do.'		
+
+		act 'Continue': gt 'katjaEV', 'kathan'
+	elseif fightEnding = 17:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
 		fightEnding = 0
 		Loss += 1
-        AlexandriaQW = 5
-        pcs_mood -= 40
+		AlexandriaQW = 5
+		pcs_mood -= 40
 		'<center><b><font color="maroon">????</font></b></center>'
-	    '<center><img <<$set_imgh>> src="images/characters/city/alexandria/alexandria.jpg"></center>'
-        'As a mighty cramp paralyzes your body, you find yourself sitting back in the prop''s room, your bitch nowhere to be found. In her place is a tall blonde in a suit, who is giving you the once-over.'
+		'<center><img <<$set_imgh>> src="images/characters/city/alexandria/alexandria.jpg"></center>'
+		'As a mighty cramp paralyzes your body, you find yourself sitting back in the prop''s room, your bitch nowhere to be found. In her place is a tall blonde in a suit, who is giving you the once-over.'
 		'"I admit that I was expecting another of Rikudo''s victims. For a moment, even I was tricked into thinking that you were... better."'
 		'Groaning, you try to make sense of the situation, and look for Tatiana''s film. It is now in the woman''s hand. She glances at it nonchalantly, before pocketing the trinket and looking at you with a frustrated sigh.'
-        '"It''s evident that you can''t handle her, so it would be better for a more experienced magician to take care of this anomaly."'
-        'You finally manage to stand on shaky legs, and give her a good look. She isn''t a Succubus, but she is old and powerful. That means two things. First, you will be hard-pressed to take the film from her grasp, and second, she must be an incredible tasty lay!'
-        '"Who... Who are you?"'
-        'She sneers and says, "I suppose this is time for a presentation. You can call me Aleksei, and you are?"'
-        act '"I am..."':intel_lvlst -= 20 & gt'tatiana_missions','mission2D'
+		'"It''s evident that you can''t handle her, so it would be better for a more experienced magician to take care of this anomaly."'
+		'You finally manage to stand on shaky legs, and give her a good look. She isn''t a Succubus, but she is old and powerful. That means two things. First, you will be hard-pressed to take the film from her grasp, and second, she must be an incredible tasty lay!'
+		'"Who... Who are you?"'
+		'She sneers and says, "I suppose this is time for a presentation. You can call me Aleksei, and you are?"'
+
+		act '"I am..."':intel_lvlst -= 20 & gt'tatiana_missions','mission2D'
 	end
 end
 
@@ -389,7 +410,6 @@ if $ARGS[0] = 'win':
 		Win += 1
 		money += rand(500,2000)
 		gs 'stat'
-
 		'You''ve managed to batter one of your attackers face while you broke the others nose. As he spits you can see that his spit is mixed with blood as he can barely hold his hand up to surrender. You quickly run over to them and empty the cash from their pockets and mock them that this should cover you expenses. The attacker quickly rise up and run away in fear.'
 
 		act 'Go home':	gt 'din_npc', 'go_home'
@@ -400,19 +420,16 @@ if $ARGS[0] = 'win':
 		Win += 1
 		fightEnding = 0
 		'<center><img src="images/characters/pavlovsk/school/girl/christina/school/win.jpg"></center>'
-
 		$npc_notes['A13'] = 'Lariska, who is very dependent on other people''s opinions. After you managed to win the fight against Christina Lariska looks more cheerful. She''s a good volleyball player, and could go pro if she keeps it up even though she doesn''t believe it herself. But with the help of Mikhail Nikolayevich, the volleyball coach, she might make it.'
-
 		$npc_notes['A18'] = 'After you beat Christina in front of the whole school started gossiping about how you managed to break her. Once known as the Christina the terrified she was a former shell of herself.'
 		grupTipe[18] = 5
-
 		'Christina fell to the ground, and you grabbed her by the hair. "Well bitch, tell the whole school, have you ever sucked a cock or not?" Christine squealed as she admitted to the whole school that she loved sucking cock.'
-
 		act 'Leave':gs 'gschool_grounds', 'main'
 	elseif fightEnding = 13:
 		fightEnding = 0
 		Win += 1
 		'The naked man staggers back, all bloody. You''ve beaten him, and it is pretty clear he is finished. You look down and see something odd...'
+
 		act 'What is that?':gt 'stallion', 'end'
 	elseif fightEnding = 14:
 		fightEnding = 0
@@ -420,6 +437,7 @@ if $ARGS[0] = 'win':
 		'<<$streetev_title>>'
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'
 		'Even though it was four against one, you beat their asses triumphantly. They got in some hits of their own, but in the end you are the only one standing while the four of them lay around your feet curled up, bloody and crying. You straighten your clothes the best you can and proudly continue on your way to the claps of several onlookers that watched the fight.'
+
 		act 'Leave':streetrand=-1 & gt $loc
 	elseif fightEnding = 15:
 		fightEnding = 0
@@ -427,7 +445,26 @@ if $ARGS[0] = 'win':
 		pcs_mood += 10
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/beach/losefight.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 a signal of no more, you smirk as she lays beaten at your feet. You reach down and pull her phone out of her pocket and then heave 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. "Now neither you you seen me here naked right? And since I wasn''t here, that means I didn''t beat you ass, but from now on we both know who''s the bitch don''t we?" You say to both of them. Lina nods quickly Christina a little slower but she nods as well. With that you walk away from the two of them as Lina helps Christina back to her feet.'
+
 		act 'Walk off': gt 'gLake'
+	elseif fightEnding = 16:
+		fightEnding = 0
+		Win += 1
+		grupvalue[1] -= 5
+		grupvalue[2] += 100
+		grupvalue[4] += 50
+		npc_rel['A165'] += 5
+		npc_rel['A14'] -= 5
+		pcs_mood += 10
+		'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'
+		'"Take that bitches!"'
+		'With one last kick, the bitch squad lies fallen before you, whimpering in pain thanks to the sound beating they''ve received at your hand, but as you look around for your next victim, a redheaded girl grabs you and pulls you away from the brawl turned riot, towards the waiting Vanya & Vicky.'
+		'"<<$pcs_nickname>>! I don''t know what to do with you! What were you thinking?!"'
+		'You...aren''t too sure why the hell you incited the massive brawl that now is being broken apart by the police, and as you try to look for a good answer, Vanya chooses that moment to express his opinion.'
+		'"Well...Katja, I want to say, well...That is hockey! Give me those five <<$pcs_nickname>>!"' 
+		'Katja looks dumbfounded as he raises his hand, more even when you clap it, followed by a shrugging Vicky, who jumps and does the same. As you turn smiling towards Katja, waiting for her to join, she facepalms, turns and begins to walk away, musing about your idiocy. Well, it is probably better if you follow her, so after saying goodbye to Vanya & Vicky, you go with her. It was "fun" but it is time to look for something else to do.'
+
+		act 'Continue': gt 'katjaEV', 'kathan'
 	elseif fightEnding = 17:
 		fightEnding = 0
 		Win += 1
@@ -727,6 +764,7 @@ if $ARGS[0] = 'surrender':
 		'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 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
@@ -739,25 +777,46 @@ if $ARGS[0] = 'surrender':
 			*nl
 			'You croak out. "I am a little cunt that will do anything you say, anytime you say it." With that Christina laughs with a fairly evil laugh, she seems to be enjoying bullying you a lot, then she and Lina walk off leaving you laying on the beach naked and in pain. Once the walk off you dry your tears as best you can and get up.'
 			gs 'pain', 1, 'labia', 'kick'
+
 			act 'Walk off': gt 'gLake'
 		end
-    elseif fightEnding = 17:
+	elseif fightEnding = 16:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
 		fightEnding = 0
 		Loss += 1
-        AlexandriaQW = 5
-        pcs_mood -= 40
+		grupvalue[1] -= 10
+		grupvalue[2] -= 5
+		grupvalue[4] -= 5
+		pcs_mood -= 10
+		'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'
+		'Oh shit! This had obviuslly been a bad idea, and the girls sorrouding you with murder in their eyes are more than willing to show you your error, so... you retreat and lift your hands in defeet waiting for some mercy...'
+		'"You will piss blood bitch!"'
+		'...or not taking into consideration those words "Banzai!" Suddenlly, a screaming Vanya run towards the bitch squad and sweep their legs with his hockey stick, making them fall, and letting the twins grab your hands and take you away from the brawl turned riot."'
+		'"<<$pcs_nickname>>! I don''t know what to do with you! What were you thinking?!"'
+		'Demure Katja is really, really pissed and for a long while, she chastizes your actions, but finally, after a long-winded tirade, the redhead seems to deflate and gives you a tired hug.'
+		'"Please! Don''t do that again!"'
+		'It feels nice and makes Vanya & Vicky spell and sonorous "Kawai!" before quickly turning back and running away from an embarrassed/angry Katja. It was "fun", but it is time to look for something else to do.'
+
+		act 'Continue': gt 'katjaEV', 'kathan'
+	elseif fightEnding = 17:
+		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
+		killvar 'autocombat_surrender'
+		fightEnding = 0
+		Loss += 1
+		AlexandriaQW = 5
+		pcs_mood -= 40
 		'<center><b><font color="maroon">????</font></b></center>'
-	    '<center><img <<$set_imgh>> src="images/characters/city/alexandria/alexandria.jpg"></center>'
-        'As a mighty cramp paralyzes your body, you find yourself sitting back in the prop''s room, your bitch nowhere to be found. In her place is a tall blonde in a suit, who is giving you the once-over.'
+		'<center><img <<$set_imgh>> src="images/characters/city/alexandria/alexandria.jpg"></center>'
+		'As a mighty cramp paralyzes your body, you find yourself sitting back in the prop''s room, your bitch nowhere to be found. In her place is a tall blonde in a suit, who is giving you the once-over.'
 		'"I admit that I was expecting another of Rikudo''s victims. For a moment, even I was tricked into thinking that you were... better."'
 		'Groaning, you try to make sense of the situation, and look for Tatiana''s film. It is now in the woman''s hand. She glances at it nonchalantly, before pocketing the trinket and looking at you with a frustrated sigh.'
-        '"It''s evident that you can''t handle her, so it would be better for a more experienced magician to take care of this anomaly."'
-        'You finally manage to stand on shaky legs, and give her a good look. She isn''t a Succubus, but she is old and powerful. That means two things. First, you will be hard-pressed to take the film from her grasp, and second, she must be an incredible tasty lay!'
-        '"Who... Who are you?"'
-        'She sneers and says, "I suppose this is time for a presentation. You can call me Aleksei, and you are?"'
-        act '"I am..."':intel_lvlst -= 20 & gt'tatiana_missions','mission2D'
+		'"It''s evident that you can''t handle her, so it would be better for a more experienced magician to take care of this anomaly."'
+		'You finally manage to stand on shaky legs, and give her a good look. She isn''t a Succubus, but she is old and powerful. That means two things. First, you will be hard-pressed to take the film from her grasp, and second, she must be an incredible tasty lay!'
+		'"Who... Who are you?"'
+		'She sneers and says, "I suppose this is time for a presentation. You can call me Aleksei, and you are?"'
+
+		act '"I am..."':intel_lvlst -= 20 & gt'tatiana_missions','mission2D'
 	end
 end
 

+ 2 - 2
locations/fight_npcdata.qsrc

@@ -364,7 +364,7 @@ end
 
 if $args[0] = 'bitch squad':
 	dynamic $setNPCFightStats, 'name', 'The bitch squad'
-	dynamic $setNPCFightStats, 'image', 'images/characters/pavlovsk/school/girl/katja/KS14.jpg'
+	dynamic $setNPCFightStats, 'image', 'images/characters/pavlovsk/school/girl/katja/KWT14.jpg'
 	dynamic $setNPCFightStats, 'def', 50
 	dynamic $setNPCFightStats, 'run', 50
 	dynamic $setNPCFightStats, 'wrstlng', 10
@@ -379,7 +379,7 @@ if $args[0] = 'bitch squad':
 	dynamic $setNPCFightStats, 'shoot', 100
 	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 16
-end
+end	
 
 if $args[0] = 'btatiana':
 	dynamic $setNPCFightStats, 'name', 'BTatiana'

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 340 - 363
locations/katjaEv.qsrc


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio