Pārlūkot izejas kodu

[Fixes] Added new fight win/lose/surrender conditions for Christina on the beach fight to 'ender' and set the fightending variable in the fight setup

KevinSmarts 4 gadi atpakaļ
vecāks
revīzija
f1801a4596
2 mainītis faili ar 54 papildinājumiem un 25 dzēšanām
  1. 53 0
      locations/ender.qsrc
  2. 1 25
      locations/gschool_socialchg1.qsrc

+ 53 - 0
locations/ender.qsrc

@@ -223,6 +223,28 @@ if $ARGS[0] = 'loss':
 		*nl
 		'With tears rolling down your face you slowly get up and do your best to pull your clothes into place to cover up. They are just ruined, you gingerly walk away.'
 		act 'Leave':streetrand=-1 & gt $loc
+	elseif fightEnding = 15:
+		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
+		killvar 'autocombat_surrender'
+		fightEnding = 0
+		Loss += 1
+		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
+			mood -= 10
+			christinaphotos = 3
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/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 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." 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
 	end
 end
 
@@ -379,6 +401,13 @@ if $ARGS[0] = 'win':
 		'<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
+		Win += 1
+		mood += 10
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/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'
 	end
 end
 
@@ -659,6 +688,30 @@ if $ARGS[0] = 'surrender':
 
 		if pcs_health < 100: pcs_health = 100
 		act 'Leave':streetrand=-1 & gt $loc
+	elseif fightEnding = 15:
+		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
+		killvar 'autocombat_surrender'
+		fightEnding = 0
+		Loss += 1
+		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 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
+			mood -= 10
+			christinaphotos = 3
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/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 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." 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
 	end
 end
 

+ 1 - 25
locations/gschool_socialchg1.qsrc

@@ -703,36 +703,12 @@ if $ARGS[0] = 'christina_fight':
 	gs 'stat'
 	'You step closer to Christina and say. "Give me the fucking phone before I kick you ass."'
 	'She smirks to you and puts her phone in her pocket and gets in fighting stance obviously more than willing to fight you. "Take if you think you can cunt!" Lina moves out of the way to watch, just as you take your first swing. Which Christina was waiting for and easily side steps your first blow, but now the fight is on.'
-!! Fightcheck
 	act 'fight':
 		gs 'fight','initFight'
 		gs 'fight_npcdata', 'christina'
+		fightEnding = 15
 		gt 'fight', 'start'
 	end
-	if win:
-		mood += 10
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/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'
-	else
-		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
-			mood -= 10
-			christinaphotos = 3
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/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 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." 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
-	end
 end
 
 if $ARGS[0] = 'tBella':