[added] Fights now have a variable for endings and have updated them to use this. It is numerical and should be used in all fights for win and lose in the file "ender"

locations/Prostitute.qsrc

@@ -57,7 +57,6 @@ if $ARGS[0] = 'start':
 				BonusDefV = 0
 				!!Programme of Action
 				program = 0
-				prostitutFight = 1
 
 				if spellavtoklon = 1:klon = 3
 				if spellbefshild = 1:defence = 500}
@@ -79,6 +78,7 @@ if $ARGS[0] = 'start':
 				opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 				opp_willpwr[0] = 50
 				opp_shoot[0] = 10
+				fightEnding = 4
 
 				gt 'fight', 'start'
 			end
@@ -167,7 +167,6 @@ if $ARGS[0] = 'start':
 								BonusDefV = 0
 								!!Programme of Action
 								program = 0
-								prostitutFight = 2
 
 								if spellavtoklon = 1:klon = 3
 								if spellbefshild = 1:defence = 500}
@@ -189,6 +188,7 @@ if $ARGS[0] = 'start':
 								opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 								opp_willpwr[0] = 100
 								opp_shoot[0] = 10
+								fightEnding = 5
 
 								gt 'fight', 'start'
 							end
@@ -240,7 +240,6 @@ if $ARGS[0] = 'start':
 								BonusDefV = 0
 								!!Programme of Action
 								program = 0
-								prostitutFight = 3
 
 								if spellavtoklon = 1:klon = 3
 								if spellbefshild = 1:defence = 500}
@@ -263,6 +262,7 @@ if $ARGS[0] = 'start':
 								opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 								opp_willpwr[0] = 50
 								opp_shoot[0] = 10
+								fightEnding = 6
 
 								gt 'fight', 'start'
 							end

locations/bass.qsrc

@@ -98,7 +98,6 @@ if $ARGS[0] = 'a':
 			BonusDefV = 0
 			!!Programme of Action
 			program = 5
-			KisaFight = 1
 			klonV = 5
 			defenceV = 800
 
@@ -121,6 +120,7 @@ if $ARGS[0] = 'a':
 			opp_health[0] = (opp_vital * 10 + opp_stren * 5)
 			opp_willpwr[0] = 100
 			opp_shoot[0] = 100
+			fightEnding = 7
 
 			gt 'fight', 'start'
 		end

locations/dimaRevenge.qsrc

@@ -301,7 +301,6 @@ if ARGS[0] = 3:
 									BonusDefV = 0
 									!!Programme of Action
 									program = 0
-									DimaFight = 1
 									if spellavtoklon = 1:klon = 3
 									if spellbefshild = 1:defence = 500}
 									gs 'fight','initFight'
@@ -321,6 +320,7 @@ if ARGS[0] = 3:
 									opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 									opp_willpwr[0] = 100
 									opp_shoot[0] = 100
+									fightEnding = 10
 
 									gt 'fight', 'start'
 								end

locations/ender.qsrc

@@ -9,37 +9,37 @@ if $ARGS[0] = 'loss':
 		exit
 	end
 
-	if jugoFight = 1:
+	if fightEnding = 1:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		jugoFight = 0
+		fightEnding = 0
 
 		'You fall down on the floor and feel your consciousness slipping away.'
 
 		act 'Further': gt 'preTG', 'tatianaPRE'
 		exit
-	elseif jugoFight = 2:
+	elseif fightEnding = 2:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		jugoFight = 0
+		fightEnding = 0
 
 		'You fall down on the floor as you''re not longer able to fight Juugo.'
 
 		act 'Further':gt'lab','start'
 		exit
-	elseif tatianaFight = 1:
+	elseif fightEnding = 3:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		tatianaFight = 0
+		fightEnding = 0
 
 		'You fall down on the floor as you''re not longer able to fight Tatiana.'
 
 		act 'Further':gt'lab','start'
 		exit
-	elseif prostitutFight = 1:
+	elseif fightEnding = 4:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		prostitutFight = 0
+		fightEnding = 0
 		money = 0
 		SUB = SUB + 1
 		Loss += 1
@@ -50,10 +50,10 @@ if $ARGS[0] = 'loss':
 
 		act 'Further':gt'park','start'
 		exit
-	elseif prostitutFight = 2:
+	elseif fightEnding = 5:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		prostitutFight = 0
+		fightEnding = 0
 		money = 0
 		SUB = SUB + 1
 		Loss += 1
@@ -66,10 +66,10 @@ if $ARGS[0] = 'loss':
 
 		act 'Further':gt'park','start'
 		exit
-	elseif prostitutFight = 3:
+	elseif fightEnding = 6:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		prostitutFight = 0
+		fightEnding = 0
 		money = 0
 		Loss += 1
 		stellfight = stellfight - 1
@@ -86,10 +86,10 @@ if $ARGS[0] = 'loss':
 		
 		act 'Further':gt'park','start'
 		exit
-	elseif KisaFight = 1:
+	elseif fightEnding = 7:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		KisaFight = 0
+		fightEnding = 0
 		SUB = SUB + 1
 		Loss += 1
 		if rikudo > 10:rikudo = rikudo - 10
@@ -112,11 +112,11 @@ if $ARGS[0] = 'loss':
 
 		act 'Crawl out of the pool':gt'street'
 		exit
-	elseif RapistFight = 1:
+	elseif fightEnding = 8:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
 		if succubusQW >= 4: gt 'succubus', 'RapistFight'
-		RapistFight = 0
+		fightEnding = 0
 		sub += 1
 		Loss += 1
 		if rikudo > 10:rikudo -= 10
@@ -156,20 +156,20 @@ if $ARGS[0] = 'loss':
 
 		act 'Cry': gt $loc, $metka
 		
-	elseif ThiefFight = 1:
+	elseif fightEnding = 9:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		ThiefFight = 0
+		fightEnding = 0
 		sub += 1
 		Loss += 1
 		money = 0
 		'He knocks you down with one final hit. The moment he puts you out of commission he grabs the money and runs away.'
 		act 'Get back on your feet': gt $loc, $metka
 		exit
-	elseif DimaFight = 1:
+	elseif fightEnding = 10:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		DimaFight = 0
+		fightEnding = 0
 		grupvalue[4] -= 2
 		if Loss < 0: Loss = 0
 		'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/girlbeatsguy2.jpg"></center>'
@@ -178,10 +178,10 @@ if $ARGS[0] = 'loss':
 		'Lena turns to you and says tauntingly, "You either need to learn how to fight or get used to serving us, little bunny." Before you can say anything, the bell rings for class.'
 
 		act 'Continue': gt 'gschool_lessons', 'short_break'
-	elseif gangrapeFight = 1:
+	elseif fightEnding = 11:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		gangrapeFight = 0
+		fightEnding = 0
 		sub += 1
 		Loss += 1
 		if rikudo > 10:rikudo = rikudo - 10
@@ -189,10 +189,10 @@ if $ARGS[0] = 'loss':
 		'In their drunken state they throw you on the spit-covered porch and began tearing your clothes as you no longer have the strength to resist.'
 
 		act 'Cry':gt'sexm','gangbang'
-	elseif ZverevaFight = 1:
+	elseif fightEnding = 12:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		ZverevaFight = 0
+		fightEnding = 0
 		zverRageQW = 10
 		Loss += 1
 
@@ -202,18 +202,18 @@ if $ARGS[0] = 'loss':
 		'Christina then again spits on you this time on your face. While making fun of you, Christina kicks you a few times more in the ribs before turning around and walking away.'
 
 		act 'Leave':gs 'gschool_grounds', 'main'
-	elseif stallionfight = 1:
+	elseif fightEnding = 13:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		stallionfight = 0
+		fightEnding = 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:
+	elseif fightEnding = 14:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
-		BitchFight = 0
+		fightEnding = 0
 		Loss += 1
 		gs 'pain', 5, 'tummy', 'kick'
 		gs 'pain', 5, 'cheeks', 'hit'
@@ -240,19 +240,19 @@ if $ARGS[0] = 'win':
 		exit
 	end
 
-	if jugoFight = 2:
+	if fightEnding = 2:
 		pcs_health = pcs_vital*10
 		rikudo = rikudo + 10
-		jugoFight = 0
+		fightEnding = 0
 		if winJugo = 0:winJugo = 1
 
 		'Juugo fell to the floor and can no longer keep on fighting.'
 
 		act 'Further':gt'lab','start'
 		exit
-	elseif tatianaFight = 1:
+	elseif fightEnding = 3:
 		pcs_health = pcs_vital*10
-		tatianaFight = 0
+		fightEnding = 0
 		rikudo = rikudo + 10
 		if wintatiana = 0:wintatiana = 1
 
@@ -260,8 +260,8 @@ if $ARGS[0] = 'win':
 
 		act 'Further':gt'lab','start'
 		exit
-	elseif prostitutFight = 1:
-		prostitutFight = 0
+	elseif fightEnding = 4:
+		fightEnding = 0
 		whoreQW = 1
 		pcs_dom += 1
 		Win += 1
@@ -271,8 +271,8 @@ if $ARGS[0] = 'win':
 
 		act 'Further':gt'park','start'
 		exit
-	elseif prostitutFight = 2:
-		prostitutFight = 0
+	elseif fightEnding = 5:
+		fightEnding = 0
 		pcs_dom += 1
 		Win += 1
 		bandfight = bandfight + 1
@@ -283,8 +283,8 @@ if $ARGS[0] = 'win':
 
 		act 'Further':gt'park','start'
 		exit
-	elseif prostitutFight = 3:
-		prostitutFight = 0
+	elseif fightEnding = 6:
+		fightEnding = 0
 		pcs_dom += 1
 		Win += 1
 		stellfight = stellfight + 1
@@ -295,9 +295,9 @@ if $ARGS[0] = 'win':
 
 		act 'Further':gt'park','start'
 		exit
-	elseif KisaFight = 1:
+	elseif fightEnding = 7:
 		KisameDead = 1
-		KisaFight = 2
+		fightEnding = 2
 		pcs_dom += 1
 		Win += 1
 		if rikudo > 10:rikudo = rikudo + 3000
@@ -307,8 +307,7 @@ if $ARGS[0] = 'win':
 
 		act 'Further':gt'street'
 		exit
-	elseif RapistFight = 1 or ThiefFight = 1:
-		ThiefFight = 0
+	elseif fightEnding = 8 or fightEnding = 9:
 		if succubusQW >= 4 and scpopt < 2:
 			$sclocrt = 'ender'
 			$scargrt = 'win'
@@ -316,20 +315,22 @@ if $ARGS[0] = 'win':
 			scpopt = 1
 			gt 'succubus', 'RapistFight'
 		end
-		RapistFight = 0
+
+		'You fought back the '+iif(fightEnding = 8, 'rapist', 'thief')+' and took his wallet.'
+
+		fightEnding = 0
+		fightEnding = 0
 		scpopt = 0
 		if rikudo > 10:rikudo += 100
 		pcs_dom += 1
 		Win += 1
 		money += rand(500,2000)
 
-		'You fought back the '+iif(RapistFight = 1, 'rapist', 'thief')+' and took his wallet.'
-						
 		act 'Leave': gt $loc, $metka
 		exit
-	elseif DimaFight = 1:
+	elseif fightEnding = 10:
 		money += 10000
-		DimaFight = 0
+		fightEnding = 0
 		grupvalue[4] += 3
 		Win += 1
 		'<center><img src="images/characters/pavlovsk/school/boy/dimka/revenge/girlbeatsguy1.jpg"></center>'
@@ -340,8 +341,8 @@ if $ARGS[0] = 'win':
 		'You check his pockets and find 10000 rubles in his wallet. Fucking rich kid. This should teach him. "The teacher is coming," says Lera, "Let''s get out of here."'
 
 		act 'Continue': gt 'gschool_lessons', 'short_break'
-	elseif gangrapeFight = 1:
-		gangrapeFight = 0
+	elseif fightEnding = 11:
+		fightEnding = 0
 		if rikudo > 10:rikudo += 100
 		pcs_dom += 1
 		Win += 1
@@ -359,11 +360,11 @@ if $ARGS[0] = 'win':
 				gt 'street'
 			end
 		end
-	elseif ZverevaFight = 1:
+	elseif fightEnding = 12:
 		zverSlutQW = 1
 		lariskaQwestStart = daystart + 7
 		Win += 1
-		ZverevaFight = 0
+		fightEnding = 0
 
 		$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.'
 
@@ -373,13 +374,13 @@ if $ARGS[0] = 'win':
 		'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 stallionfight = 1:
-		stallionfight = 0
+	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 BitchFight = 1:
-		BitchFight = 0
+	elseif fightEnding = 14:
+		fightEnding = 0
 		Win += 1
 		'<<$streetev_title>>'
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'

locations/fight.qsrc

@@ -439,14 +439,6 @@ if $ARGS[0] = 'Attack':
 	dynamic "<<$fightAtk_AttackerType>>_timer += AttackTime[fightAtk_Type]"
 	cla
 	act 'Next': gt 'fight', 'main'
-
-	killvar 'fightAtk'
-	killvar '$fightAtk'
-	killvar '$fightAtk_Type'
-	killvar '$fightAtk_TargetType'
-	killvar 'fightAtk_TargetNumber'
-	killvar 'fightAtk_AttackerNumber'
-
 end
 
 if $ARGS[0] = 'opponent':

locations/gschool_grounds.qsrc

@@ -474,7 +474,7 @@ if $ARGS[0] = 'KristinaFight':
 	BonusDefV = 0
 	!Action Programme
 	program = 0
-	ZverevaFight = 1
+	fightEnding = 12
 
 	if spellavtoklon = 1:klon = 3
 	if spellbefshild = 1:defence = 500

locations/kisameQW.qsrc

@@ -74,7 +74,6 @@ if $ARGS[0] = 'start':
 			!!Programme of Action
 			program = 5
 			kisamePic = 1
-			KisaFight = 1
 			klonV = 5
 			!!defenceV = 10000
 			if spellavtoklon = 1:klon = 3
@@ -96,6 +95,7 @@ if $ARGS[0] = 'start':
 			opp_health[0] = (opp_vital * 10 + opp_stren * 5)
 			opp_willpwr[0] = 100
 			opp_shoot[0] = 100
+			fightEnding = 7
 
 			gt 'fight', 'start'
 			'You kick Kisame in the face. He shows his teeth, and his appearance begins to change. Instantaneously he has blue gills on his face and shark teeth. He whispers with a smile, "You wanna play baby? Let''s play!"'

locations/lab.qsrc

@@ -68,7 +68,6 @@ if $ARGS[0] = 'start':
 			BonusDefV = 0
 			!!Programme of Action
 			program = 0
-			jugoFight = 2
 			}
 			gs 'fight','initFight'
 
@@ -87,6 +86,7 @@ if $ARGS[0] = 'start':
 			opp_health[0] = (opp_vital * 10 + opp_stren * 5)
 			opp_willpwr[0] = 50
 			opp_shoot[0] = 100
+			fightEnding = 2
 
 			gt 'fight', 'start'
 		end
@@ -116,8 +116,7 @@ if $ARGS[0] = 'start':
 			BonusAtakV = 0
 			BonusDefV = 0
 			!!Programme of Action
-			program = 4
-			tatianaFight = 1}
+			program = 4}
 			gs 'fight','initFight'
 
 			$opp_name[0] = 'Tatiana'
@@ -135,6 +134,7 @@ if $ARGS[0] = 'start':
 			opp_health[0] = (opp_vital * 10 + opp_stren * 5)
 			opp_willpwr[0] = 100
 			opp_shoot[0] = 100
+			fightEnding = 3
 			gt 'fight', 'start'
 		end
 	end

locations/nill.qsrc

@@ -1,53 +1,12 @@
 # nill
-inFight = 0
-stun = 0
-stunV = 0
-tuman = 0
-tumanV = 0
-klon = 0
-klonV = 0
-blood = 0
-bloodV = 0
-defence = 0
-defenceV = 0
-izanagiV = 0
-round = 0
-heartV = 0
-hodtimeV = 0
-hodtime = 0
-damTip = 0
-damTipV = 0
-unmaterialV = 0
-unmaterial = 0
-defenceM = 0
-defenceW = 0
-defenceActPar = 0
-defenceActParM = 0
-defenceAct = 0
-defenceActM = 0
-defenceMV = 0
-defenceWV = 0
-defenceActParV = 0
-defenceActParMV = 0
-defenceActV = 0
-defenceActMV = 0
-defAtk = 0
-defAtkV = 0
-defAtkM = 0
-defAtkMV = 0
-damTipM = 0
-damTipMV = 0
-kisamePro = 0
-poisonAV = 0
-SasoriBody = 0
-tobiPic = 0
-kisamePic = 0
-sasoriPic = 0
-konanPic = 0
-hidanPic = 0
-barierV = 0
-hidanAtk = 0
-hidanPic = 0
+
+killvar 'fightAtk'
+killvar '$fightAtk'
+killvar '$fightAtk_Type'
+killvar '$fightAtk_TargetType'
+killvar 'fightAtk_TargetNumber'
+killvar 'fightAtk_AttackerNumber'
+
 
 --- nill ---------------------------------
 

locations/park.qsrc

@@ -162,7 +162,7 @@ if $ARGS[0] = 'start':
 						BonusDefV = 0
 						!!Programme of Action
 						program = 1
-						RapistFight = 1
+						fightEnding = 8
 
 						if spellavtoklon = 1:klon = 3
 						if spellbefshild = 1:defence = 500}
@@ -586,7 +586,6 @@ if $ARGS[0] = 'prost':
 			BonusDefV = 0
 			!!Programme of Action
 			program = 0
-			prostitutFight = 1
 
 			if spellavtoklon = 1:klon = 3
 			if spellbefshild = 1:defence = 500}
@@ -608,6 +607,7 @@ if $ARGS[0] = 'prost':
 			opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 			opp_willpwr[0] = 50
 			opp_shoot[0] = 10
+			fightEnding = 4
 
 			gt 'fight', 'start'
 		end
@@ -656,7 +656,6 @@ if $ARGS[0] = 'prost':
 					BonusDefV = 0
 					!!Programme of Action
 					program = 0
-					prostitutFight = 2
 
 					if spellavtoklon = 1:klon = 3
 					if spellbefshild = 1:defence = 500}
@@ -678,6 +677,7 @@ if $ARGS[0] = 'prost':
 					opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 					opp_willpwr[0] = 100
 					opp_shoot[0] = 10
+					fightEnding = 5
 
 					gt 'fight', 'start'
 				end
@@ -751,7 +751,6 @@ if $ARGS[0] = 'prost':
 					BonusDefV = 0
 					!!Programme of Action
 					program = 0
-					prostitutFight = 3
 
 					if spellavtoklon = 1:klon = 3
 					if spellbefshild = 1:defence = 500}
@@ -772,6 +771,7 @@ if $ARGS[0] = 'prost':
 					opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 					opp_willpwr[0] = 50
 					opp_shoot[0] = 10
+					fightEnding = 6
 
 					gt 'fight', 'start'
 				end

locations/parkivent.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = '1':
 			BonusDefV = 0
 			!!Programme of Action
 			program = 0
-			RapistFight = 1
+			fightEnding = 8
 
 			if spellavtoklon = 1:klon = 3
 			if spellbefshild = 1:defence = 500}

locations/preTG.qsrc

@@ -302,8 +302,7 @@ if $ARGS[0] = 'otelPRE':
 											BonusAtakV = 0
 											BonusDefV = 0
 											!!Programme of Action
-											program = 0
-											jugoFight = 1}
+											program = 0}
 											gs 'fight','initFight'
 
 											$opp_name[0] = 'Gustav'
@@ -321,6 +320,8 @@ if $ARGS[0] = 'otelPRE':
 											opp_health[0] = (opp_vital * 10 + opp_stren * 5)
 											opp_willpwr[0] = 50
 											opp_shoot[0] = 100
+											!!To set the ending text/code
+											fightEnding = 1
 
 											act 'Fight': gt 'fight', 'start'
 										end

locations/sexm.qsrc

@@ -846,7 +846,6 @@ if $ARGS[0] = 'gangrape':
 		BonusDefV = 0
 		!!Programme of Action
 		program = 0
-		gangrapeFight = 1
 
 		if spellavtoklon = 1:klon = 3
 		if spellbefshild = 1:defence = 500}
@@ -867,6 +866,7 @@ if $ARGS[0] = 'gangrape':
 		opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 		opp_willpwr[0] = 100
 		opp_shoot[0] = 100
+		fightEnding = 11
 
 		gt 'fight', 'start'
 	end

locations/stallion.qsrc

@@ -58,8 +58,7 @@ if $ARGS[0] = 'fight':
 		!!Programme of Action
 		program = 0
 		if spellavtoklon = 1:klon = 3
-		if spellbefshild = 1:defence = 500
-		stallionfight = 1}
+		if spellbefshild = 1:defence = 500}
 		gs 'fight','initFight'
 
 		$opp_name[0] = 'Naked Man'
@@ -77,6 +76,7 @@ if $ARGS[0] = 'fight':
 		opp_health[0] = (opp_vital * 10 + opp_stren * 5)
 		opp_willpwr[0] = 100
 		opp_shoot[0] = 10
+		fightEnding = 13
 
 		gt 'fight', 'start'
 	end

locations/street_event.qsrc

@@ -484,7 +484,6 @@ if $ARGS[1] = 'main':
 			BonusDefV = 0
 			!!Programme of Action
 			program = 0
-			RapistFight = 1
 			if spellavtoklon = 1:klon = 3
 			if spellbefshild = 1:defence = 500}
 			gs 'fight','initFight'
@@ -504,6 +503,7 @@ if $ARGS[1] = 'main':
 			opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 			opp_willpwr[0] = 100
 			opp_shoot[0] = 100
+			fightEnding = 8
 
 			gt 'fight', 'start'
 		end
@@ -599,11 +599,6 @@ if $ARGS[1] = 'main':
 				BonusDefV = 0
 				!!Programme of Action
 				program = 0
-				if rand(0,10) < 5:
-					RapistFight = 1
-				else
-					ThiefFight = 1
-				end
 
 				if spellavtoklon = 1:klon = 3
 				if spellbefshild = 1:defence = 500}
@@ -624,6 +619,11 @@ if $ARGS[1] = 'main':
 				opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 				opp_willpwr[0] = 100
 				opp_shoot[0] = 100
+				if rand(0,10) < 5:
+					fightEnding = 8
+				else
+					fightEnding = 9
+				end
 
 				gt 'fight', 'start'
 			end
@@ -676,7 +676,6 @@ if $ARGS[1] = 'main':
 				BonusDefV = 0
 				!!Programme of Action
 				program = 0
-				ThiefFight = 1
 				if spellavtoklon = 1:klon = 3
 				if spellbefshild = 1:defence = 500}
 				'<<$streetev_title>>'
@@ -699,6 +698,7 @@ if $ARGS[1] = 'main':
 				opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 				opp_willpwr[0] = 100
 				opp_shoot[0] = 100
+				fightEnding = 9
 
 				act 'Fight':gt 'fight', 'start'
 			end
@@ -1323,7 +1323,6 @@ if $ARGS[1] = 'main':
 							BonusDefV = 0
 							!!Programme of Action
 							program = 0
-							BitchFight = 1
 
 							if spellavtoklon = 1:klon = 3
 							if spellbefshild = 1:defence = 500}
@@ -1344,6 +1343,7 @@ if $ARGS[1] = 'main':
 							opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
 							opp_willpwr[0] = 100
 							opp_shoot[0] = 100
+							fightEnding = 14
 
 							gt 'fight', 'start'
 						end

locations/succubus.qsrc

@@ -106,23 +106,22 @@ if $ARGS[0] = 'RapistFight':
 	act 'Continue':
 		cla
 		scrand = rand(0,3)
-		if RapistFight = 1 and scfwon = 1:
+		if fightEnding = 8 and scfwon = 1:
 			scrand -= 1
 			scfwon = 0
-			RapistFight = 0
-			ThiefFight = 0
+			fightEnding = 0
 			if rikudo > 10:rikudo += 100
 			pcs_dom += 1
 			Win += 1
-		elseif RapistFight = 1:
-			RapistFight = 0
-			ThiefFight = 0
+		elseif fightEnding = 8:
+			fightEnding = 0
 			SUB += 1
 			Loss += 1
 			if rikudo > 10:rikudo -= 10
 		else
 			scrand -= 1
 			scfwon = 0
+			fightEnding = 0
 		end
 		if scrand < succublvl:
 			scfeed = succublvl + rand(1,4)