Merge remote-tracking branch 'KeyMasterOfGozer/master'

locations/Prostitute.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'start':
 				minut += 15
 				gs 'npcgeneratec', 1, 'stoned prostitute', rand(18,28)
 				gs 'boyStat', $npclastgenerated
-				!!stats
+				!!stats{
 				strenV = 20
 				speedV = 30
 				agilV = 30
@@ -60,7 +60,25 @@ if $ARGS[0] = 'start':
 				prostitutFight = 1
 
 				if spellavtoklon = 1:klon = 3
-				if spellbefshild = 1:defence = 500
+				if spellbefshild = 1:defence = 500}
+
+				gs 'fight','initFight'
+
+				$opp_name[0] = 'Prostitute'
+				$opp_image[0] = 'images/locations/city/shared/streetwalker/working1.jpg'
+				opp_def[0] = 30
+				opp_run[0] = 30
+				opp_wrstlng[0] = 20
+				opp_kick[0] = 0
+				opp_punch[0] = 10
+				opp_jab[0] = 10
+				opp_stren[0] = 20
+				opp_agil[0] = 30
+				opp_vital[0] = 50
+				opp_react[0] = 30
+				opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+				opp_willpwr[0] = 50
+				opp_shoot[0] = 10
 
 				gt 'fight', 'start'
 			end
@@ -129,7 +147,7 @@ if $ARGS[0] = 'start':
 								minut += 15
 								gs 'npcgeneratec', 0, 'Bandit', rand(18,45)
 								gs 'boyStat', $npclastgenerated
-								!!stats
+								!!stats{
 								strenV = 200
 								speedV = 30
 								agilV = 20
@@ -152,7 +170,25 @@ if $ARGS[0] = 'start':
 								prostitutFight = 2
 
 								if spellavtoklon = 1:klon = 3
-								if spellbefshild = 1:defence = 500
+								if spellbefshild = 1:defence = 500}
+
+								gs 'fight','initFight'
+
+								$opp_name[0] = 'Bandit'
+								$opp_image[0] = 'images/locations/shared/street/mugger.jpg'
+								opp_def[0] = 10
+								opp_run[0] = 30
+								opp_wrstlng[0] = 10
+								opp_kick[0] = 0
+								opp_punch[0] = 10
+								opp_jab[0] = 10
+								opp_stren[0] = 200
+								opp_agil[0] = 20
+								opp_vital[0] = 150
+								opp_react[0] = 20
+								opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+								opp_willpwr[0] = 100
+								opp_shoot[0] = 10
 
 								gt 'fight', 'start'
 							end
@@ -184,7 +220,7 @@ if $ARGS[0] = 'start':
 								minut += 15
 								gs 'npcgeneratec', 1, 'prostitute', rand(18,28)
 								gs 'boyStat', $npclastgenerated
-								!!stats
+								!!stats{
 								strenV = 50
 								speedV = 50
 								agilV = 40
@@ -207,7 +243,26 @@ if $ARGS[0] = 'start':
 								prostitutFight = 3
 
 								if spellavtoklon = 1:klon = 3
-								if spellbefshild = 1:defence = 500
+								if spellbefshild = 1:defence = 500}
+
+
+								gs 'fight','initFight'
+
+								$opp_name[0] = 'Prostitute'
+								$opp_image[0] = 'images/locations/city/shared/streetwalker/working1.jpg'
+								opp_def[0] = 10
+								opp_run[0] = 50
+								opp_wrstlng[0] = 10
+								opp_kick[0] = 0
+								opp_punch[0] = 10
+								opp_jab[0] = 10
+								opp_stren[0] = 50
+								opp_agil[0] = 40
+								opp_vital[0] = 60
+								opp_react[0] = 30
+								opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+								opp_willpwr[0] = 50
+								opp_shoot[0] = 10
 
 								gt 'fight', 'start'
 							end

locations/bass.qsrc

@@ -78,7 +78,7 @@ if $ARGS[0] = 'a':
 			cla
 			pcs_horny += 10
 			gs 'boyStat', 'A40'
-			!!stats
+			!!stats {
 			strenV = 300
 			speedV = 100
 			agilV = 100
@@ -102,7 +102,25 @@ if $ARGS[0] = 'a':
 			klonV = 5
 			defenceV = 800
 
-			if spellavtoklon = 1:klon = 3
+			if spellavtoklon = 1:klon = 3}
+
+			gs 'fight','initFight'
+
+			$opp_name[0] = 'Kisame'
+			$opp_image[0] = 'images/characters/city/kisame/kisamev.jpg'
+			opp_def[0] = 100
+			opp_run[0] = 100
+			opp_wrstlng[0] = 75
+			opp_kick[0] = 0
+			opp_punch[0] = 100
+			opp_jab[0] = 100
+			opp_stren[0] = 200
+			opp_agil[0] = 100
+			opp_vital[0] = 200
+			opp_react[0] = 100
+			opp_health[0] = (opp_vital * 10 + opp_stren * 5)
+			opp_willpwr[0] = 100
+			opp_shoot[0] = 100
 
 			gt 'fight', 'start'
 		end

locations/dimaRevenge.qsrc

@@ -280,7 +280,7 @@ if ARGS[0] = 3:
 								'He hears you walking up and turns to meet you. Before he can say anything you punch him as hard as you can in the face.'
 								'"Ow! My fucking nose!" He says while holding his nose, then he looks at you with anger in his eyes. "I''m going to beat your ass bitch."'
 								act 'Fight':
-									!!stats
+									!!stats{
 									gs 'boyStat', 'A1'
 									strenV = 100
 									speedV = 50
@@ -303,7 +303,25 @@ if ARGS[0] = 3:
 									program = 0
 									DimaFight = 1
 									if spellavtoklon = 1:klon = 3
-									if spellbefshild = 1:defence = 500
+									if spellbefshild = 1:defence = 500}
+									gs 'fight','initFight'
+
+									$opp_name[0] = 'Dimka'
+									$opp_image[0] = 'images/characters/pavlovsk/school/head/1.jpg'
+									opp_def[0] = 50
+									opp_run[0] = 50
+									opp_wrstlng[0] = 10
+									opp_kick[0] = 0
+									opp_punch[0] = 50
+									opp_jab[0] = 50
+									opp_stren[0] = 100
+									opp_agil[0] = 40
+									opp_vital[0] = 50
+									opp_react[0] = 40
+									opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+									opp_willpwr[0] = 100
+									opp_shoot[0] = 100
+
 									gt 'fight', 'start'
 								end
 							end

locations/fight.qsrc

@@ -12,28 +12,135 @@ opp_punch[0] = Power punch
 opp_jab[0] = Ligth punch
 opp_stren[0] = Strengh
 opp_agil[0] = Agility
-opp_vital[0] = Opponent health
-opp_react = Reactions
+opp_vital[0] = vitality
+opp_react[0] = Reactions
+opp_health[0] = Health
+opp_willpwr[0] = willpower
 opp_shoot[0] = opponent marksmanship (only required if they are armed)
 opp_magik[0] = only if they have magic
 opp_mana[0] = only if they have magic
+opp_fog[0] = (tuman): Obscures vision, makes hitting harder.
+opp_clone[0] = (klon): Copies of the char that absorb 1 hit and disappear.  A char may have some number of them.
+opp_shield[0] = (defence): Shielding that absorbs damage before hitpoints.
+opp_dambonus[0] = (magweapbonus): damage added to melee attacks
+opp_init[0] = (initBonus): attack faster/first
+opp_stun[0] = (stunner): make target unable to act for some amount of time
 }
 
+if $ARGS[0] = 'initFight':
+	!! Clear Opponents from previous battle
+	killvar '$opp_name'
+	killvar '$opp_image'
+	killvar 'opp_def'
+	killvar 'opp_run'
+	killvar 'opp_wrstlng'
+	killvar 'opp_kick'
+	killvar 'opp_punch'
+	killvar 'opp_jab'
+	killvar 'opp_stren'
+	killvar 'opp_agil'
+	killvar 'opp_vital'
+	killvar 'opp_react'
+	killvar 'opp_health'
+	killvar 'opp_willpwr'
+	killvar 'opp_shoot'
+	killvar 'opp_magik'
+	killvar 'opp_mana'
+	killvar 'opp_fog'
+	killvar 'opp_clone'
+	killvar 'opp_shield'
+	killvar 'opp_dambonus'
+	killvar 'opp_init'
+	killvar 'opp_stun'
+
+	!! Clear any allies from previous battle{
+	i = arrsize('pcs_def')
+	:ClearAllyLoop
+	if i > 0:
+		gs 'fight', 'clearPCSArray', i-1
+		i -= 1
+		jump 'ClearAllyLoop'
+	end
+	killvar 'i'}
+
+	!! Initialize $pcs_name for Sveta
+	$pcs_name[0] = 'You'
+end
+
+if $ARGS[0] = 'clearPCSArray':
+!{ Delete an Ally from the pcs data arrays
+	ARGS[1] = Which ally slot tot delete
+}
+	i = ARGS[1]
+
+	killvar '$pcs_name', i
+	killvar '$pcs_image', i
+	killvar 'pcs_def', i
+	killvar 'pcs_run', i
+	killvar 'pcs_wrstlng', i
+	killvar 'pcs_kick', i
+	killvar 'pcs_punch', i
+	killvar 'pcs_jab', i
+	killvar 'pcs_stren', i
+	killvar 'pcs_agil', i
+	killvar 'pcs_vital', i
+	killvar 'pcs_react', i
+	killvar 'pcs_health', i
+	killvar 'pcs_willpwr', i
+	killvar 'pcs_shoot', i
+	killvar 'pcs_magik', i
+	killvar 'pcs_mana', i
+	killvar 'pcs_fog', i
+	killvar 'pcs_clone', i
+	killvar 'pcs_shield', i
+	killvar 'pcs_dambonus', i
+	killvar 'pcs_init', i
+	killvar 'pcs_stun', i
+
+	killvar 'i'
+end
+
+if $ARGS[0] = 'randomOpp':
+!{ Generate a random Opponent
+	ARGS[1] = Optional, raise difficulty of the attacker, 0 - 50
+}
+	OppDiffBonus = ARGS[1]
+	i = arrsize('opp_def')
+	$opp_name[i] = 'Opponent 1'
+	$opp_image[i] = 'images/locations/shared/street/mugger.jpg'
+	opp_def[i] = rand(1,50) + OppDiffBonus
+	opp_run[i] = rand(1,50) + OppDiffBonus
+	opp_wrstlng[i] = rand(1,50) + OppDiffBonus
+	opp_kick[i] = rand(1,50) + OppDiffBonus
+	opp_punch[i] = rand(1,50) + OppDiffBonus
+	opp_jab[i] = rand(1,50) + OppDiffBonus
+	opp_stren[i] = rand(1,50) + OppDiffBonus
+	opp_agil[i] = rand(1,50) + OppDiffBonus
+	opp_vital[i] = rand(1,50) + OppDiffBonus
+	opp_health[i] = (opp_vital * 10 + opp_stren * 5)
+	opp_react[i] = rand(1,50) + OppDiffBonus
+	opp_willpwr[i] = rand(1,50) + OppDiffBonus
+	opp_shoot[i] = rand(1,50) + OppDiffBonus
+	killvar 'OppDiffBonus'
+	killvar 'i'
+end
+
+
 if $ARGS[0] = 'start':
 	menu_off = 1
 	inFight = 1
 	gs 'themes', 'indoors'
 	cla
-	
+
 	'<center><b><font color="maroon">Fight!</font></b></center>'
 	*nl
-	'<left><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></left><right><<$opp_image[0]>></right>'
+	'<left><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></left><right><img <<$set_imgh>> src="<<$opp_image[0]>>"></right>'
 	*nl
 	'<left><<$pcs_firstname>></left><center>vs.</center><right><<$opp_name[0]>></right>'
-	
+
 	pcs_timer = 100 - pcs_react
 	opp_timer = 100 - opp_react[0]
-	
+
 	act 'Engage': gt 'fight', 'main'
 end
 
@@ -50,15 +157,70 @@ if $ARGS[0] = 'main':
 	end
 end
 
+if $ARGS[0] = 'printStats':
+!{ Print the stats for a character
+	$ARGS[1] = The Type of char ('opp','pcs')
+	 ARGS[2] = The member of the party
+}
+	$fightPStats['CharType'] = $ARGS[1]
+	i = ARGS[2]
+
+	if $fightPStats['CharType'] = 'opp':
+		$fightPStats['Name'] = $opp_name[i]
+		fightPStats['Health'] = opp_health[i]
+		fightPStats['Mana'] = opp_mana[i]
+		fightPStats['Willpower'] = opp_willpwr[i]
+		fightPStats['Shield'] = opp_shield[i]
+		fightPStats['Fog'] = opp_fog[i]
+		fightPStats['Clone'] = opp_clone[i]
+	else
+		$fightPStats['Name'] = $pcs_name[i]
+		fightPStats['Health'] = pcs_health[i]
+		fightPStats['Mana'] = pcs_mana[i]
+		fightPStats['Willpower'] = pcs_willpwr[i]
+		fightPStats['Shield'] = pcs_shield[i]
+		fightPStats['Fog'] = pcs_fog[i]
+		fightPStats['Clone'] = pcs_clone[i]
+	end
+
+	'<b><<$fightPStats["Name"]>></b> life <b><font color = red><<fightPStats["Health"]>></font></b>, mana <b><font color = blue><<fightPStats["Mana"]>></font></b>, willpower <b><font color = green><<fightPStats["Willpower"]>></font></b>'
+	if fightPStats['Shield'] > 0:'<b><font color = red>Protection <<fightPStats["Shield"]>> units</font></b>'
+	if fightPStats['Clone'] > 0:'<b><font color = red>Clones active <<fightPStats["Clone"]>> </font></b>'
+	if fightPStats['Fog'] > 0:'<b><font color = red>Obscuring Fog <<fightPStats["Fog"]>> units</font></b>'
+	'<b>= = = = = = = = = = = = = = = = = = = = = = = = = = = = =</b>'
+
+	killvar 'i'
+	killvar 'fightPStats'
+	killvar '$fightPStats'
+end
+
+if $ARGS[0] = 'statDisplay':
+	'<b>= = = = = = = = = = = O p p o n e n t s = = = = = = = = = = =</b>'
+	i = 0
+	:OppLoopRC1
+	if i < arrsize('opp_health'):
+		gs 'fight', 'printStats', 'opp', i
+		i += 1
+		jump 'OppLoopRC1'
+	end
+	*nl
+	'<b>= = = = = = = = = = = = A l l i e s = = = = = = = = = = = = =</b>'
+	i = 0
+	:PCSLoopRC1
+	if i < arrsize('pcs_health'):
+		gs 'fight', 'printStats', 'pcs', i
+		i += 1
+		jump 'PCSLoopRC1'
+	end
+end
+
 if $ARGS[0] = 'result_check':
 !!cheat to auto-win fights check
 	if fight_cheat = 1:
 		xgt 'ender', 'win'
 		exit
 	end
-	
-!!	gs'defence'
-!!	gs'statBat'
+
 
 !!win/lose conditions
 	if pcs_health <= 0:
@@ -66,7 +228,7 @@ if $ARGS[0] = 'result_check':
 
 		xgt'ender','loss'
 		exit
-	elseif opp_vital[0] <= 0:
+	elseif opp_health[0] <= 0:
 		'<b><font color = green><<$boydesc>> You won!</font></b>'
 
 		xgt'ender','win'
@@ -77,7 +239,8 @@ if $ARGS[0] = 'result_check':
 		xgt'ender','loss'
 		exit
 	end
-	gt 'fight', 'main'
+	!gt 'fight', 'main'
+	killvar 'i'
 end
 
 !! Kick
@@ -128,13 +291,13 @@ $fight['Attack'] = {
 	fightAtk['MinDamage'] = AttackMin[fightAtk['Type']]
 	fightAtk['MaxDamage'] = AttackMax[fightAtk['Type']]
 
-	'<<$fightAtk["AttackerPronoun"]>> attempts a <<$fightAtk["Type"]>>!'
+	'<<$fightAtk["AttackerPronoun"]>> attempt a <<$fightAtk["Type"]>>!'
 	*nl
 	if fightAtk['AttackerSkillValue'] + rand(0,30) > fightAtk['TargetReactValue'] / 4 + 3 * fightAtk['TargetAgilValue'] / 4:
 		!!Calculate Damage
 		dynamic "fightAtk['Damage'] = <<$fightAtk['AttackerType']>>_stren[<<fightAtk['AttackerNumber']>>] * rand(<<fightAtk['MinDamage']>>,<<fightAtk['MaxDamage']>>) / 15"
 		!!Apply Damage
-		dynamic "<<$fightAtk['TargetType']>>_health -= fightAtk['Damage']"
+		dynamic "<<$fightAtk['TargetType']>>_health[<<fightAtk['TargetNumber']>>] -= fightAtk['Damage']"
 		if fightAtk['Damage'] > 10:
 			'The hit is hard and <<$fightAtk["TargetPronoun"]>> reel in pain.'
 		else
@@ -144,6 +307,7 @@ $fight['Attack'] = {
 		'<<$fightAtk["TargetPronoun"]>> avoid the blow.'
 	end
 	dynamic "<<$fightAtk['AttackerType']>>_timer += AttackTime[fightAtk['Type']]"
+	cla
 	act 'Next': gt 'fight', 'main'
 
 	killvar 'fightAtk'
@@ -151,6 +315,7 @@ $fight['Attack'] = {
 }
 
 if $ARGS[0] = 'opponent':
+	gs 'fight', 'statDisplay'
 	if opp_magik[0] > 0: gs 'fight', 'opp_spellcast'
 	if rand(0,opp_kick[0]) > 40:
 		dynamic $fight['Attack'], 'Kick', 'pcs', 0, 0
@@ -159,10 +324,13 @@ if $ARGS[0] = 'opponent':
 	else
 		dynamic $fight['Attack'], 'Jab', 'pcs', 0, 0
 	end
-end	
+end
 
 if $ARGS[0] = 'player':
-	if pcs_magik > 0: gs 'fight', 'spellcast'
+	gs 'fight', 'statDisplay'
+	if pcs_magik > 0:
+		act 'Cast a Spell': gs 'fight', 'spellcast'
+	end
 
 	act 'Kick them':
 		dynamic $fight['Attack'], 'Kick', 'opp', 0, 0
@@ -175,7 +343,7 @@ if $ARGS[0] = 'player':
 	act 'Jab them':
 		dynamic $fight['Attack'], 'Jab', 'opp', 0, 0
 	end
-end	
+end
 
 
 if $ARGS[0] = 'opp_spellcast':
@@ -470,14 +638,14 @@ end
 			act 'Surrender to your opponent': autocombat_surrender = 1 & gt 'ender', 'loss'
 		elseif autocombat_cheat = 1 and pcs_magick = 0:
 			xgt'boxing'
-		end		
+		end
 	elseif hod = 1:
 		!enemy attacks
 		'<font color = red><<$boydesc>> attacks</font>'
-		if autocombat_cheat = 0: 
+		if autocombat_cheat = 0:
 			act 'Continue': xgt'enemy','start'
 			act 'Surrender to your opponent': autocombat_surrender = 1 & gt 'ender', 'loss'
-		elseif autocombat_cheat = 1: 
+		elseif autocombat_cheat = 1:
 			xgt'enemy','start'
 		end
 	end

locations/kisameQW.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/characters/city/kisame/kisamev.jpg"></center>'
 			pcs_horny += 60
 			gs 'boyStat', 'A40'
-			!!stats
+			!!stats{
 			strenV = 300
 			speedV = 100
 			agilV = 100
@@ -78,7 +78,24 @@ if $ARGS[0] = 'start':
 			klonV = 5
 			!!defenceV = 10000
 			if spellavtoklon = 1:klon = 3
-			if spellbefshild = 1:defence = 500
+			if spellbefshild = 1:defence = 500}
+			gs 'fight','initFight'
+
+			$opp_name[0] = 'Kisame'
+			$opp_image[0] = 'images/characters/city/kisame/kisamev.jpg'
+			opp_def[0] = 100
+			opp_run[0] = 100
+			opp_wrstlng[0] = 75
+			opp_kick[0] = 0
+			opp_punch[0] = 100
+			opp_jab[0] = 100
+			opp_stren[0] = 200
+			opp_agil[0] = 100
+			opp_vital[0] = 200
+			opp_react[0] = 100
+			opp_health[0] = (opp_vital * 10 + opp_stren * 5)
+			opp_willpwr[0] = 100
+			opp_shoot[0] = 100
 
 			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

@@ -47,6 +47,7 @@ if $ARGS[0] = 'start':
 			cla
 			judosparday = daystart
 			gs 'boyStat', 'A175'
+			!{
 			!!stats
 			strenV = 600
 			speedV = 60
@@ -68,6 +69,25 @@ if $ARGS[0] = 'start':
 			!!Programme of Action
 			program = 0
 			jugoFight = 2
+			}
+			gs 'fight','initFight'
+
+			$opp_name[0] = 'Gustav'
+			$opp_image[0] = 'images/characters/city/jugo/jugopre.jpg'
+			opp_def[0] = 100
+			opp_run[0] = 75
+			opp_wrstlng[0] = 75
+			opp_kick[0] = 75
+			opp_punch[0] = 85
+			opp_jab[0] = 75
+			opp_stren[0] = 250
+			opp_agil[0] = 60
+			opp_vital[0] = 200
+			opp_react[0] = 50
+			opp_health[0] = (opp_vital * 10 + opp_stren * 5)
+			opp_willpwr[0] = 50
+			opp_shoot[0] = 100
+
 			gt 'fight', 'start'
 		end
 	end
@@ -77,7 +97,7 @@ if $ARGS[0] = 'start':
 			cla
 			tatianasparday = daystart
 			gs 'boyStat', 'A176'
-			!!stats
+			!!stats{
 			strenV = 60
 			speedV = 100
 			agilV = 100
@@ -97,7 +117,24 @@ if $ARGS[0] = 'start':
 			BonusDefV = 0
 			!!Programme of Action
 			program = 4
-			tatianaFight = 1
+			tatianaFight = 1}
+			gs 'fight','initFight'
+
+			$opp_name[0] = 'Tatiana'
+			$opp_image[0] = 'images/characters/city/tatiana/magiclook.jpg'
+			opp_def[0] = 100
+			opp_run[0] = 75
+			opp_wrstlng[0] = 50
+			opp_kick[0] = 75
+			opp_punch[0] = 100
+			opp_jab[0] = 100
+			opp_stren[0] = 60
+			opp_agil[0] = 100
+			opp_vital[0] = 100
+			opp_react[0] = 60
+			opp_health[0] = (opp_vital * 10 + opp_stren * 5)
+			opp_willpwr[0] = 100
+			opp_shoot[0] = 100
 			gt 'fight', 'start'
 		end
 	end

locations/park.qsrc

@@ -142,7 +142,7 @@ if $ARGS[0] = 'start':
 					gs 'boyStat', $npclastgenerated
 					act 'Fight':
 						cla
-						!!stats
+						!!stats{
 						strenV = 100
 						speedV = 50
 						agilV = 40
@@ -165,7 +165,24 @@ if $ARGS[0] = 'start':
 						RapistFight = 1
 
 						if spellavtoklon = 1:klon = 3
-						if spellbefshild = 1:defence = 500
+						if spellbefshild = 1:defence = 500}
+						gs 'fight','initFight'
+
+						$opp_name[0] = 'Rapist'
+						$opp_image[0] = 'images/locations/shared/street/rapist.jpg'
+						opp_def[0] = 50
+						opp_run[0] = 50
+						opp_wrstlng[0] = 10
+						opp_kick[0] = 0
+						opp_punch[0] = 50
+						opp_jab[0] = 50
+						opp_stren[0] = 100
+						opp_agil[0] = 40
+						opp_vital[0] = 50
+						opp_react[0] = 40
+						opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+						opp_willpwr[0] = 100
+						opp_shoot[0] = 100
 
 						gt 'fight', 'start'
 					end
@@ -549,7 +566,7 @@ if $ARGS[0] = 'prost':
 		act 'Fuck you!':
 			cla
 			minut += 15
-			!!stats
+			!!stats {
 			strenV = 20
 			speedV = 30
 			agilV = 30
@@ -572,7 +589,25 @@ if $ARGS[0] = 'prost':
 			prostitutFight = 1
 
 			if spellavtoklon = 1:klon = 3
-			if spellbefshild = 1:defence = 500
+			if spellbefshild = 1:defence = 500}
+
+			gs 'fight','initFight'
+
+			$opp_name[0] = 'Prostitute'
+			$opp_image[0] = 'images/locations/city/shared/streetwalker/working1.jpg'
+			opp_def[0] = 30
+			opp_run[0] = 30
+			opp_wrstlng[0] = 20
+			opp_kick[0] = 0
+			opp_punch[0] = 10
+			opp_jab[0] = 10
+			opp_stren[0] = 20
+			opp_agil[0] = 30
+			opp_vital[0] = 50
+			opp_react[0] = 30
+			opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+			opp_willpwr[0] = 50
+			opp_shoot[0] = 10
 
 			gt 'fight', 'start'
 		end
@@ -601,7 +636,7 @@ if $ARGS[0] = 'prost':
 					minut += 15
 					gs 'npcgeneratec', 0, 'Bandit', rand(18,40)
 					gs 'boyStat', $npclastgenerated
-					!!stats
+					!!stats{
 					strenV = 200
 					speedV = 30
 					agilV = 20
@@ -624,7 +659,25 @@ if $ARGS[0] = 'prost':
 					prostitutFight = 2
 
 					if spellavtoklon = 1:klon = 3
-					if spellbefshild = 1:defence = 500
+					if spellbefshild = 1:defence = 500}
+
+					gs 'fight','initFight'
+
+					$opp_name[0] = 'Bandit'
+					$opp_image[0] = 'images/locations/shared/street/mugger.jpg'
+					opp_def[0] = 10
+					opp_run[0] = 30
+					opp_wrstlng[0] = 10
+					opp_kick[0] = 0
+					opp_punch[0] = 10
+					opp_jab[0] = 10
+					opp_stren[0] = 200
+					opp_agil[0] = 20
+					opp_vital[0] = 150
+					opp_react[0] = 20
+					opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+					opp_willpwr[0] = 100
+					opp_shoot[0] = 10
 
 					gt 'fight', 'start'
 				end
@@ -678,7 +731,7 @@ if $ARGS[0] = 'prost':
 					minut += 15
 					gs 'npcgeneratec', 0, 'Prostitute', rand(15,30)
 					gs 'boyStat', $npclastgenerated
-					!!stats
+					!!stats{
 					strenV = 50
 					speedV = 50
 					agilV = 40
@@ -701,7 +754,24 @@ if $ARGS[0] = 'prost':
 					prostitutFight = 3
 
 					if spellavtoklon = 1:klon = 3
-					if spellbefshild = 1:defence = 500
+					if spellbefshild = 1:defence = 500}
+					gs 'fight','initFight'
+
+					$opp_name[0] = 'Prostitute'
+					$opp_image[0] = 'images/locations/city/shared/streetwalker/working1.jpg'
+					opp_def[0] = 10
+					opp_run[0] = 50
+					opp_wrstlng[0] = 10
+					opp_kick[0] = 0
+					opp_punch[0] = 10
+					opp_jab[0] = 10
+					opp_stren[0] = 50
+					opp_agil[0] = 40
+					opp_vital[0] = 60
+					opp_react[0] = 30
+					opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+					opp_willpwr[0] = 50
+					opp_shoot[0] = 10
 
 					gt 'fight', 'start'
 				end

locations/parkivent.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = '1':
 		gs 'boyStat', $npclastgenerated
 		act 'Fight him':
 			*clr & cla
-			!!stats
+			!!stats{
 			strenV = 100
 			speedV = 50
 			agilV = 40
@@ -70,7 +70,25 @@ if $ARGS[0] = '1':
 			RapistFight = 1
 
 			if spellavtoklon = 1:klon = 3
-			if spellbefshild = 1:defence = 500
+			if spellbefshild = 1:defence = 500}
+
+			gs 'fight','initFight'
+
+			$opp_name[0] = 'Rapist'
+			$opp_image[0] = 'images/locations/shared/street/rapist.jpg'
+			opp_def[0] = 50
+			opp_run[0] = 50
+			opp_wrstlng[0] = 10
+			opp_kick[0] = 0
+			opp_punch[0] = 50
+			opp_jab[0] = 50
+			opp_stren[0] = 100
+			opp_agil[0] = 40
+			opp_vital[0] = 50
+			opp_react[0] = 40
+			opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+			opp_willpwr[0] = 100
+			opp_shoot[0] = 100
 
 			gt 'fight', 'start'
 		end

locations/preTG.qsrc

@@ -280,7 +280,7 @@ if $ARGS[0] = 'otelPRE':
 											'<center><img <<$set_imgh>> src="images/characters/city/jugo/jugopre.jpg"></center>'
 											'The man has a large tattoo across the left side of his face. He too has red hair'
 											$boy = 'Gustav'
-											!!stats
+											!!stats{
 											strenV = 600
 											speedV = 60
 											agilV = 60
@@ -300,7 +300,25 @@ if $ARGS[0] = 'otelPRE':
 											BonusDefV = 0
 											!!Programme of Action
 											program = 0
-											jugoFight = 1
+											jugoFight = 1}
+											gs 'fight','initFight'
+
+											$opp_name[0] = 'Gustav'
+											$opp_image[0] = 'images/characters/city/jugo/jugopre.jpg'
+											opp_def[0] = 100
+											opp_run[0] = 75
+											opp_wrstlng[0] = 75
+											opp_kick[0] = 75
+											opp_punch[0] = 85
+											opp_jab[0] = 75
+											opp_stren[0] = 250
+											opp_agil[0] = 60
+											opp_vital[0] = 200
+											opp_react[0] = 50
+											opp_health[0] = (opp_vital * 10 + opp_stren * 5)
+											opp_willpwr[0] = 50
+											opp_shoot[0] = 100
+
 											act 'Fight': gt 'fight', 'start'
 										end
 									end

locations/sexm.qsrc

@@ -826,7 +826,7 @@ if $ARGS[0] = 'gangrape':
 
 	act 'Start a fight':
 		cla
-		!!stats
+		!!stats{
 		strenV = 100
 		speedV = 20
 		agilV = 10
@@ -849,7 +849,24 @@ if $ARGS[0] = 'gangrape':
 		gangrapeFight = 1
 
 		if spellavtoklon = 1:klon = 3
-		if spellbefshild = 1:defence = 500
+		if spellbefshild = 1:defence = 500}
+		gs 'fight','initFight'
+
+		$opp_name[0] = 'Stranger'
+		$opp_image[0] = 'images/locations/shared/street/rapist.jpg'
+		opp_def[0] = 10
+		opp_run[0] = 20
+		opp_wrstlng[0] = 10
+		opp_kick[0] = 0
+		opp_punch[0] = 10
+		opp_jab[0] = 10
+		opp_stren[0] = 100
+		opp_agil[0] = 10
+		opp_vital[0] = 50
+		opp_react[0] = 10
+		opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+		opp_willpwr[0] = 100
+		opp_shoot[0] = 100
 
 		gt 'fight', 'start'
 	end

locations/stallion.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'fight':
 	act 'Fight':
 		cla
 		$nameV = 'Naked Man'
-		!!stats
+		!!stats{
 		strenV = 100
 		speedV = 300
 		agilV = 300
@@ -59,7 +59,25 @@ if $ARGS[0] = 'fight':
 		program = 0
 		if spellavtoklon = 1:klon = 3
 		if spellbefshild = 1:defence = 500
-		stallionfight = 1
+		stallionfight = 1}
+		gs 'fight','initFight'
+
+		$opp_name[0] = 'Naked Man'
+		$opp_image[0] = 'images/locations/shared/street/rapist.jpg'
+		opp_def[0] = 100
+		opp_run[0] = 100
+		opp_wrstlng[0] = 100
+		opp_kick[0] = 100
+		opp_punch[0] = 100
+		opp_jab[0] = 100
+		opp_stren[0] = 100
+		opp_agil[0] = 300
+		opp_vital[0] = 200
+		opp_react[0] = 100
+		opp_health[0] = (opp_vital * 10 + opp_stren * 5)
+		opp_willpwr[0] = 100
+		opp_shoot[0] = 10
+
 		gt 'fight', 'start'
 	end
 end

locations/street_event.qsrc

@@ -464,7 +464,7 @@ if $ARGS[1] = 'main':
 
 		act 'Fight':
 			cla
-			!!stats
+			!!stats{
 			strenV = 100
 			speedV = 50
 			agilV = 40
@@ -486,7 +486,25 @@ if $ARGS[1] = 'main':
 			program = 0
 			RapistFight = 1
 			if spellavtoklon = 1:klon = 3
-			if spellbefshild = 1:defence = 500
+			if spellbefshild = 1:defence = 500}
+			gs 'fight','initFight'
+
+			$opp_name[0] = 'Rapist'
+			$opp_image[0] = 'images/locations/shared/street/rapist.jpg'
+			opp_def[0] = 50
+			opp_run[0] = 50
+			opp_wrstlng[0] = 10
+			opp_kick[0] = 0
+			opp_punch[0] = 50
+			opp_jab[0] = 50
+			opp_stren[0] = 100
+			opp_agil[0] = 40
+			opp_vital[0] = 50
+			opp_react[0] = 40
+			opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+			opp_willpwr[0] = 100
+			opp_shoot[0] = 100
+
 			gt 'fight', 'start'
 		end
 
@@ -561,7 +579,7 @@ if $ARGS[1] = 'main':
 				cla
 				gs 'npcgeneratec', 0, 'Robber', rand(18,45)
 				gs 'boyStat', $npclastgenerated
-				!!stats
+				!!stats{
 				strenV = 100
 				speedV = 50
 				agilV = 40
@@ -588,7 +606,25 @@ if $ARGS[1] = 'main':
 				end
 
 				if spellavtoklon = 1:klon = 3
-				if spellbefshild = 1:defence = 500
+				if spellbefshild = 1:defence = 500}
+				gs 'fight','initFight'
+
+				$opp_name[0] = 'Robber'
+				$opp_image[0] = 'images/locations/shared/street/mugger.jpg'
+				opp_def[0] = 50
+				opp_run[0] = 50
+				opp_wrstlng[0] = 10
+				opp_kick[0] = 0
+				opp_punch[0] = 50
+				opp_jab[0] = 50
+				opp_stren[0] = 100
+				opp_agil[0] = 40
+				opp_vital[0] = 50
+				opp_react[0] = 40
+				opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+				opp_willpwr[0] = 100
+				opp_shoot[0] = 100
+
 				gt 'fight', 'start'
 			end
 		end
@@ -620,7 +656,7 @@ if $ARGS[1] = 'main':
 			else
 				gs 'npcgeneratec', 0, 'Purse Snatcher', rand(18,45)
 				gs 'boyStat', $npclastgenerated
-				!!stats
+				!!stats{
 				strenV = 100
 				speedV = 50
 				agilV = 40
@@ -642,10 +678,28 @@ if $ARGS[1] = 'main':
 				program = 0
 				ThiefFight = 1
 				if spellavtoklon = 1:klon = 3
-				if spellbefshild = 1:defence = 500
+				if spellbefshild = 1:defence = 500}
 				'<<$streetev_title>>'
 				'<center><img src="images/locations/shared/street/pursechase.jpg"></center>'
 				'You chase after him, screaming at him to stop or anyone to stop him. All that working out is paying off, you are gaining on him. He keeps glancing back as you get closer, he turns and ducks down an alley when you are nearly on top of him. He leaps over an overturned trash can, obviously still hoping to get away from you. You easily leap over it as well and a few steps later you tackle him, sending both of you rolling on the ground. You both get back to your feet at the same time, realising he can''t escape he lunges at you.'
+				gs 'fight','initFight'
+
+				$opp_name[0] = 'Purse Snatcher'
+				$opp_image[0] = 'images/locations/shared/street/pursesnatch.jpg'
+				opp_def[0] = 50
+				opp_run[0] = 50
+				opp_wrstlng[0] = 10
+				opp_kick[0] = 0
+				opp_punch[0] = 50
+				opp_jab[0] = 50
+				opp_stren[0] = 100
+				opp_agil[0] = 40
+				opp_vital[0] = 50
+				opp_react[0] = 40
+				opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+				opp_willpwr[0] = 100
+				opp_shoot[0] = 100
+
 				act 'Fight':gt 'fight', 'start'
 			end
 		end
@@ -1249,7 +1303,7 @@ if $ARGS[1] = 'main':
 							$boydesc = 'The group of girls'
 							'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'
 							'You give her a small shove, to force her to step back. "Bring it on then, bitch." The words barely leave your mouth before she jumps you, soon all of her friends join in, leaving you to fight them all.'
-							!!stats
+							!!stats{
 							strenV = 100
 							speedV = 50
 							agilV = 60
@@ -1272,7 +1326,25 @@ if $ARGS[1] = 'main':
 							BitchFight = 1
 
 							if spellavtoklon = 1:klon = 3
-							if spellbefshild = 1:defence = 500
+							if spellbefshild = 1:defence = 500}
+							gs 'fight','initFight'
+
+							$opp_name[0] = 'The group of girls'
+							$opp_image[0] = 'images/locations/shared/street/girlgang.jpg'
+							opp_def[0] = 50
+							opp_run[0] = 50
+							opp_wrstlng[0] = 10
+							opp_kick[0] = 0
+							opp_punch[0] = 50
+							opp_jab[0] = 50
+							opp_stren[0] = 100
+							opp_agil[0] = 60
+							opp_vital[0] = 60
+							opp_react[0] = 60
+							opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+							opp_willpwr[0] = 100
+							opp_shoot[0] = 100
+
 							gt 'fight', 'start'
 						end
 					end