1
0
Переглянути джерело

[fixes] you shouldn't lose health if you surrender to your enemy

julzor 5 роки тому
батько
коміт
9d46bb9fe8
2 змінених файлів з 29 додано та 16 видалено
  1. 27 14
      locations/ender.qsrc
  2. 2 2
      locations/fight.qsrc

+ 27 - 14
locations/ender.qsrc

@@ -10,7 +10,8 @@ if $ARGS[0] = 'loss':
 	end
 
 	if jugoFight = 1:
-		pcs_health = 100
+		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
+		killvar 'autocombat_surrender'
 		jugoFight = 0
 
 		'You fall down on the floor and feel your consciousness slipping away.'
@@ -18,7 +19,8 @@ if $ARGS[0] = 'loss':
 		act 'Further': gt 'preTG', 'tatianaPRE'
 		exit
 	elseif jugoFight = 2:
-		pcs_health = pcs_vital*10
+		if autocombat_surrender = 0 and pcs_health > 100: pcs_health = 100
+		killvar 'autocombat_surrender'
 		jugoFight = 0
 
 		'You fall down on the floor as you''re not longer able to fight Juugo.'
@@ -26,7 +28,8 @@ if $ARGS[0] = 'loss':
 		act 'Further':gt'lab','start'
 		exit
 	elseif tatianaFight = 1:
-		pcs_health = pcs_vital*10
+		if autocombat_surrender = 0 and pcs_health > 100: pcs_health = 100
+		killvar 'autocombat_surrender'
 		tatianaFight = 0
 
 		'You fall down on the floor as you''re not longer able to fight Tatiana.'
@@ -34,7 +37,8 @@ if $ARGS[0] = 'loss':
 		act 'Further':gt'lab','start'
 		exit
 	elseif prostitutFight = 1:
-		pcs_health = 100
+		if autocombat_surrender = 0 and pcs_health > 100: pcs_health = 100
+		killvar 'autocombat_surrender'
 		prostitutFight = 0
 		money = 0
 		SUB = SUB + 1
@@ -47,7 +51,8 @@ if $ARGS[0] = 'loss':
 		act 'Further':gt'park','start'
 		exit
 	elseif prostitutFight = 2:
-		pcs_health = 100
+		if autocombat_surrender = 0 and pcs_health > 100: pcs_health = 100
+		killvar 'autocombat_surrender'
 		prostitutFight = 0
 		money = 0
 		SUB = SUB + 1
@@ -62,7 +67,8 @@ if $ARGS[0] = 'loss':
 		act 'Further':gt'park','start'
 		exit
 	elseif prostitutFight = 3:
-		pcs_health = 100
+		if autocombat_surrender = 0 and pcs_health > 100: pcs_health = 100
+		killvar 'autocombat_surrender'
 		prostitutFight = 0
 		money = 0
 		Loss += 1
@@ -81,7 +87,8 @@ if $ARGS[0] = 'loss':
 		act 'Further':gt'park','start'
 		exit
 	elseif KisaFight = 1:
-		pcs_health = 100
+		if autocombat_surrender = 0 and pcs_health > 100: pcs_health = 100
+		killvar 'autocombat_surrender'
 		KisaFight = 0
 		SUB = SUB + 1
 		Loss += 1
@@ -106,7 +113,8 @@ if $ARGS[0] = 'loss':
 		act 'Crawl out of the pool':gt'street'
 		exit
 	elseif RapistFight = 1:
-		pcs_health = 100
+		if autocombat_surrender = 0 and pcs_health > 100: pcs_health = 100
+		killvar 'autocombat_surrender'
 		if succubusQW >= 4: gt 'succubus', 'RapistFight'
 		RapistFight = 0
 		SUB += 1
@@ -149,7 +157,8 @@ if $ARGS[0] = 'loss':
 		act 'Cry': gt $loc, $metka
 		exit
 	elseif DimaFight = 1:
-		pcs_health = 100
+		if autocombat_surrender = 0 and pcs_health > 100: pcs_health = 100
+		killvar 'autocombat_surrender'
 		DimaFight = 0
 		grupvalue[4] -= 2
 		Loss = 0
@@ -160,9 +169,10 @@ if $ARGS[0] = 'loss':
 
 		act 'Continue': gt 'gschool_lessons', 'short_break'
 	elseif gangrapeFight = 1:
+		if autocombat_surrender = 0 and pcs_health > 100: pcs_health = 100
+		killvar 'autocombat_surrender'
 		gangrapeFight = 0
-		pcs_health = 100
-		SUB += 1
+		sub += 1
 		Loss += 1
 		if rikudo > 10:rikudo = rikudo - 10
 
@@ -170,9 +180,10 @@ if $ARGS[0] = 'loss':
 
 		act 'Cry':gt'sexm','gangbang'
 	elseif ZverevaFight = 1:
+		if autocombat_surrender = 0 and pcs_health > 100: pcs_health = 100
+		killvar 'autocombat_surrender'
 		ZverevaFight = 0
 		zverRageQW = 10
-		pcs_health = 100
 		Loss += 1
 
 		'<center><img <<$set_imgh>> src="images/shared/sex/dom/spit.jpg"></center>'
@@ -182,14 +193,16 @@ if $ARGS[0] = 'loss':
 
 		act 'Leave':gs 'gschool_grounds', 'main'
 	elseif stallionfight = 1:
-		pcs_health = 100
+		if autocombat_surrender = 0 and pcs_health > 100: pcs_health = 100
+		killvar 'autocombat_surrender'
 		stallionfight = 0
 		Loss += 1
 		'You breath deeply, totally exhausted as the naked man advances upon you. You no longer have the strength to fight him off.'
 		
 		act 'Lose':gt 'stallion', 'rape'
 	elseif BitchFight = 1:
-		pcs_health = 100
+		if autocombat_surrender = 0 and pcs_health > 100: pcs_health = 100
+		killvar 'autocombat_surrender'
 		BitchFight = 0
 		Loss += 1
 		gs 'pain', 5, 'tummy', 'kick'

+ 2 - 2
locations/fight.qsrc

@@ -294,7 +294,7 @@ if $ARGS[0] = 'start':
 		if autocombat_cheat = 0 or pcs_magick > 0:
 			act 'Physical Attack':xgt'boxing'
 			if pcs_magik > 0: act 'Magical Attack':gt'magik'
-			act 'Surrender to your opponent': gt 'ender', 'loss'
+			act 'Surrender to your opponent': autocombat_surrender = 1 & gt 'ender', 'loss'
 		elseif autocombat_cheat = 1 and pcs_magick = 0:
 			xgt'boxing'
 		end		
@@ -303,7 +303,7 @@ if $ARGS[0] = 'start':
 		'<font color = red><<$boydesc>> attacks</font>'
 		if autocombat_cheat = 0: 
 			act 'Continue': xgt'enemy','start'
-			act 'Surrender to your opponent': gt 'ender', 'loss'
+			act 'Surrender to your opponent': autocombat_surrender = 1 & gt 'ender', 'loss'
 		elseif autocombat_cheat = 1: 
 			xgt'enemy','start'
 		end