Merge remote-tracking branch 'KeyMasterOfGozer/master'

locations/fight_npcdata.qsrc

@@ -58,6 +58,12 @@ $setNPCFightStats = {
 	end
 }
 
+$calcNPCFightHealth = {
+	NPCFightStatStr = dyneval("result=<<$NPCFS_Team>>_stren[<<NPCFS_TeamSlot>>]")
+	NPCFightStatVit = dyneval("result=<<$NPCFS_Team>>_vital[<<NPCFS_TeamSlot>>]")
+	result = NPCFightStatStr*5 + NPCFightStatVit*5
+}
+
 if $args[0] = 'gustav':
 	dynamic $setNPCFightStats, 'name', 'Gustav'
 	dynamic $setNPCFightStats, 'image', 'images/characters/city/jugo/jugopre.jpg'
@@ -71,10 +77,9 @@ if $args[0] = 'gustav':
 	dynamic $setNPCFightStats, 'agil', 60
 	dynamic $setNPCFightStats, 'vital', 200
 	dynamic $setNPCFightStats, 'react', 50
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 3250
 	dynamic $setNPCFightStats, 'willpwr', 50
 	dynamic $setNPCFightStats, 'shoot', 100
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 2
 end
 
@@ -91,13 +96,12 @@ if $args[0] = 'tatiana':
 	dynamic $setNPCFightStats, 'agil', 75
 	dynamic $setNPCFightStats, 'vital', 100
 	dynamic $setNPCFightStats, 'react', 60
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 1150
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
 	dynamic $setNPCFightStats, 'magik', 1
 	dynamic $setNPCFightStats, 'mana', 200
 	dynamic $setNPCFightStats, 'spells', 'fog,clone,stun,energo'
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 3
 end
 
@@ -114,10 +118,9 @@ if $args[0] = 'prostitute':
 	dynamic $setNPCFightStats, 'agil', rand(25,35)
 	dynamic $setNPCFightStats, 'vital', rand(45,55)
 	dynamic $setNPCFightStats, 'react', rand(25,35)
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', rand(550,650)
 	dynamic $setNPCFightStats, 'willpwr', 50
 	dynamic $setNPCFightStats, 'shoot', 10
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 4
 end
 
@@ -134,10 +137,9 @@ if $args[0] = 'bandit':
 	dynamic $setNPCFightStats, 'agil', rand(15,25)
 	dynamic $setNPCFightStats, 'vital', rand(65,75)
 	dynamic $setNPCFightStats, 'react', rand(15,25)
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', rand(1000,1350)
 	dynamic $setNPCFightStats, 'willpwr', 50
 	dynamic $setNPCFightStats, 'shoot', 10
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 5
 end
 
@@ -154,10 +156,9 @@ if $args[0] = 'prostitute2':
 	dynamic $setNPCFightStats, 'agil', 40
 	dynamic $setNPCFightStats, 'vital', 60
 	dynamic $setNPCFightStats, 'react', 30
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 950
 	dynamic $setNPCFightStats, 'willpwr', 50
 	dynamic $setNPCFightStats, 'shoot', 10
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 6
 end
 
@@ -174,13 +175,12 @@ if $args[0] = 'kisame':
 	dynamic $setNPCFightStats, 'agil', 100
 	dynamic $setNPCFightStats, 'vital', 150
 	dynamic $setNPCFightStats, 'react', 100
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 2250
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
 	dynamic $setNPCFightStats, 'magik', 1
 	dynamic $setNPCFightStats, 'mana', 500
 	dynamic $setNPCFightStats, 'spells', 'leechmana,flood,blister,sharkrockets'
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 7
 end
 
@@ -197,10 +197,9 @@ if $args[0] = 'rapist':
 	dynamic $setNPCFightStats, 'agil', rand(30,50)
 	dynamic $setNPCFightStats, 'vital', rand(40,60)
 	dynamic $setNPCFightStats, 'react', rand(30,50)
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', rand(400,600)+rand(350,450)
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 8
 end
 
@@ -217,10 +216,9 @@ if $args[0] = 'robber':
 	dynamic $setNPCFightStats, 'agil', rand(30,50)
 	dynamic $setNPCFightStats, 'vital', rand(40,60)
 	dynamic $setNPCFightStats, 'react', rand(30,50)
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', rand(800,900)
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	if rand(0,10) < 5:
 		fightEnding = 8
 	else
@@ -241,10 +239,9 @@ if $args[0] = 'snatcher':
 	dynamic $setNPCFightStats, 'agil', rand(30,50)
 	dynamic $setNPCFightStats, 'vital', rand(40,60)
 	dynamic $setNPCFightStats, 'react', rand(30,50)
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', rand(800,900)
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 9
 end
 
@@ -261,10 +258,9 @@ if $args[0] = 'dimka':
 	dynamic $setNPCFightStats, 'agil', 40
 	dynamic $setNPCFightStats, 'vital', 50
 	dynamic $setNPCFightStats, 'react', 40
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 900
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 10
 end
 
@@ -281,10 +277,9 @@ if $args[0] = 'stranger':
 	dynamic $setNPCFightStats, 'agil', 10
 	dynamic $setNPCFightStats, 'vital', 50
 	dynamic $setNPCFightStats, 'react', 10
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 900
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 11
 end
 
@@ -301,9 +296,8 @@ if $args[0] = 'christina':
 	dynamic $setNPCFightStats, 'agil', 75
 	dynamic $setNPCFightStats, 'vital', 95
 	dynamic $setNPCFightStats, 'react', 75
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 1325
 	dynamic $setNPCFightStats, 'willpwr', 45
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 12
 end
 
@@ -320,13 +314,12 @@ if $args[0] = 'stallion':
 	dynamic $setNPCFightStats, 'agil', 300
 	dynamic $setNPCFightStats, 'vital', 200
 	dynamic $setNPCFightStats, 'react', 100
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 2500
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 10
 	dynamic $setNPCFightStats, 'magik', 1
 	dynamic $setNPCFightStats, 'mana', 200
 	dynamic $setNPCFightStats, 'spells', 'clone,energo'
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 13
 end
 
@@ -343,10 +336,9 @@ if $args[0] = 'ganggirl':
 	dynamic $setNPCFightStats, 'agil', rand(25,35)
 	dynamic $setNPCFightStats, 'vital', rand(45,55)
 	dynamic $setNPCFightStats, 'react', rand(25,35)
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', rand(250,350)
 	dynamic $setNPCFightStats, 'willpwr', 50
 	dynamic $setNPCFightStats, 'shoot', rand(25,35)
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 14
 end
 
@@ -363,10 +355,9 @@ if $args[0] = 'girls':
 	dynamic $setNPCFightStats, 'agil', 60
 	dynamic $setNPCFightStats, 'vital', 60
 	dynamic $setNPCFightStats, 'react', 60
-	!! Health is generally :: vital * 10 + stren * 5
-	dynamic $setNPCFightStats, 'health', 1100
 	dynamic $setNPCFightStats, 'willpwr', 100
 	dynamic $setNPCFightStats, 'shoot', 100
+	dynamic $setNPCFightStats, 'health', dyneval($calcNPCFightHealth)
 	fightEnding = 14
 end