Browse Source

[changed] Move npc fight data to new file for easier usage and maintainance

KevinSmarts 4 years ago
parent
commit
6ae174fb19

+ 1 - 0
glife.qproj

@@ -194,6 +194,7 @@
 		<Location name="npcstatic3"/>
 		<Location name="npcstatic4"/>
 		<Location name="npcstatic5"/>
+		<Location name="fight_npcdata"/>
 		<Location name="npc_intro"/>
 		<Location name="npc_age"/>
 		<Location name="saveupdater"/>

+ 7 - 122
locations/Prostitute.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'start':
 	cls
 	minut += 5
 	gs 'stat'
-	
+
 	'<center><b><font color="maroon">Road near the park, among prostitutes</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/park2.jpg"></center>'
 
@@ -37,48 +37,10 @@ if $ARGS[0] = 'start':
 				minut += 15
 				gs 'npcgeneratec', 1, 'stoned prostitute', rand(18,28)
 				gs 'boyStat', $npclastgenerated
-				!!stats{
-				strenV = 20
-				speedV = 30
-				agilV = 30
-				reactV = 30
-				vitalV = 50
-				intelV = 10
-				willV = 10
-				!!skills
-				magikV = 10
-				boxingV = 10
-				shootV = 10
-				!!parameters
-				healthV = vitalV * 10 + strenV * 5
-				manaV = intelV * 10 + magikV * 10
-				willpowerV = willV * 10
-				BonusAtakV = 0
-				BonusDefV = 0
-				!!Programme of Action
-				program = 0
-
-				if spellavtoklon = 1:klon = 3
-				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
-				fightEnding = 4
+				gs 'fight_npcdata', 'prostitute'
 
 				gt 'fight', 'start'
 			end
@@ -147,48 +109,10 @@ if $ARGS[0] = 'start':
 								minut += 15
 								gs 'npcgeneratec', 0, 'Bandit', rand(18,45)
 								gs 'boyStat', $npclastgenerated
-								!!stats{
-								strenV = 200
-								speedV = 30
-								agilV = 20
-								reactV = 20
-								vitalV = 150
-								intelV = 10
-								willV = 10
-								!!skills
-								magikV = 10
-								boxingV = 10
-								shootV = 10
-								!!parameters
-								healthV = vitalV * 10 + strenV * 5
-								manaV = intelV * 10 + magikV * 10
-								willpowerV = willV * 10
-								BonusAtakV = 0
-								BonusDefV = 0
-								!!Programme of Action
-								program = 0
-
-								if spellavtoklon = 1:klon = 3
-								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
-								fightEnding = 5
+								gs 'fight_npcdata', 'bandit'
 
 								gt 'fight', 'start'
 							end
@@ -220,49 +144,10 @@ if $ARGS[0] = 'start':
 								minut += 15
 								gs 'npcgeneratec', 1, 'prostitute', rand(18,28)
 								gs 'boyStat', $npclastgenerated
-								!!stats{
-								strenV = 50
-								speedV = 50
-								agilV = 40
-								reactV = 30
-								vitalV = 60
-								intelV = 10
-								willV = 10
-								!!skills
-								magikV = 10
-								boxingV = 10
-								shootV = 10
-								!!parameters
-								healthV = vitalV * 10 + strenV * 5
-								manaV = intelV * 10 + magikV * 10
-								willpowerV = willV * 10
-								BonusAtakV = 0
-								BonusDefV = 0
-								!!Programme of Action
-								program = 0
-
-								if spellavtoklon = 1:klon = 3
-								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
-								fightEnding = 6
+								gs 'fight_npcdata', 'prostitue2'
 
 								gt 'fight', 'start'
 							end
@@ -413,7 +298,7 @@ if $ARGS[0] = 'work2':
 		guy += 1
 		if pcs_throat < dick: pcs_throat += 1
 
-		
+
 
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/bj.jpg"></center>'
@@ -474,7 +359,7 @@ if $ARGS[0] = 'work2':
 							gs 'arousal', 'vaginal', 15, 'prostitution', 'unknown', 'rough'
 							gs 'stat'
 						end
-						
+
 						'After a few minutes of fucking you, the man groans and you feel his hips spasming against yours. He pulls out of you and takes the filled condom off his slowly shrinking cock.'
 						'He ties a knot in the condom and tosses it out of the window carelessly, and gives you the money he owes you.'
 						gs 'dinSex', 'std_trigger'
@@ -629,7 +514,7 @@ if $ARGS[0] = 'work2':
 							prostRand = rand(1, 100)
 							gs 'dinSex', 'std_trigger'
 
-							
+
 							if prostRand <= 50:
 								pose = 1
 								picpRand = rand(1, 7)

+ 1 - 43
locations/bass.qsrc

@@ -91,52 +91,10 @@ if $ARGS[0] = 'a':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				gs 'boyStat', 'A40'
-				!!stats {
-				strenV = 300
-				speedV = 100
-				agilV = 100
-				reactV = 100
-				vitalV = 200
-				intelV = 100
-				willV = 50
-				!!skills
-				magikV = 10
-				boxingV = 100
-				shootV = 100
-				!!parameters
-				healthV = vitalV * 10 + strenV * 5
-				manaV = intelV * magikV + magikV * 100 + vitalV * 10
-				willpowerV = willV * 10
-				BonusAtakV = 0
-				BonusDefV = 0
-				!!Programme of Action
-				program = 5
-				klonV = 5
-				defenceV = 800
-
-				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
-				opp_magik[0] = 1
-				opp_mana[0] = 500
-				$opp_spells[0] = 'leechmana,flood,blister,sharkrockets'
-				fightEnding = 7
+				gs 'fight_npcdata', 'kisame'
 
 				gt 'fight', 'start'
 			end

+ 1 - 42
locations/dimaRevenge.qsrc

@@ -280,50 +280,9 @@ 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{
-									gs 'boyStat', 'A1'
-									strenV = 100
-									speedV = 50
-									agilV = 40
-									reactV = 40
-									vitalV = 50
-									intelV = 10
-									willV = 10
-									!!skills
-									magikV = 100
-									boxingV = 50
-									shootV = 100
-									!!parameters
-									healthV = vitalV * 10 + strenV * 5
-									manaV = intelV * 10 + magikV * 10
-									willpowerV = willV * 10
-									BonusAtakV = 0
-									BonusDefV = 0
-									!!Programme of Action
-									program = 0
-									if spellavtoklon = 1:klon = 3
-									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
-									opp_magik[0] = 1
-									opp_mana[0] = 500
-									$opp_spells[0] = 'clone,energo'
-									fightEnding = 10
+									gs 'fight_npcdata', 'dimka'
 
 									gt 'fight', 'start'
 								end

+ 312 - 0
locations/fight_npcdata.qsrc

@@ -0,0 +1,312 @@
+# fight_npcdata
+
+!!{Template
+if $args[0] = '':
+	$opp_name[0] = <<name of opponent>>
+	$opp_image[0] = opponent image ie. '<img <<$set_imgh>> src="images/characters/city/tobi/tobi.jpg">'
+	opp_def[0] = opponent defence
+	opp_run[0] = Opponent running skill used for player escape
+	opp_wrstlng[0] = Wrestling skill
+	opp_kick[0] = Kicking
+	opp_punch[0] = Power punch
+	opp_jab[0] = Ligth punch
+	opp_stren[0] = Strengh
+	opp_agil[0] = Agility
+	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
+	opp_spells[0] = comma delimited list of spell names
+	fightEnding = number used for selecting the win/loss scene
+end
+}
+
+if $args[0] = 'gustav':
+	$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
+	fightEnding = 2
+end
+
+if $args[0] = 'tatiana':
+	$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
+	opp_magik[0] = 1
+	opp_mana[0] = 200
+	$opp_spells[0] = 'fog,clone,stun,energo'
+	fightEnding = 3
+end
+
+if $args[0] = 'prostitute':
+	$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
+	fightEnding = 4
+end
+
+if $args[0] = 'bandit':
+	$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
+	fightEnding = 5
+end
+
+if $args[0] = 'prostitute2':
+	$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
+	fightEnding = 6
+end
+
+if $args[0] = 'kisame':
+	$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
+	opp_magik[0] = 1
+	opp_mana[0] = 500
+	$opp_spells[0] = 'leechmana,flood,blister,sharkrockets'
+	fightEnding = 7
+end
+
+if $args[0] = 'rapist':
+	$opp_name[0] = 'Rapist'
+	$opp_image[0] = 'images/locations/shared/street/rapist.jpg'
+	opp_def[0] = rand(40,60)
+	opp_run[0] = rand(40,60)
+	opp_wrstlng[0] = rand(5,15)
+	opp_kick[0] = 0
+	opp_punch[0] = rand(40,60)
+	opp_jab[0] = rand(40,60)
+	opp_stren[0] = rand(70,90)
+	opp_agil[0] = rand(30,50)
+	opp_vital[0] = rand(40,60)
+	opp_react[0] = rand(30,50)
+	opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+	opp_willpwr[0] = 100
+	opp_shoot[0] = 100
+	fightEnding = 8
+end
+
+if $args[0] = 'robber':
+	$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] = 70
+	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
+	if rand(0,10) < 5:
+		fightEnding = 8
+	else
+		fightEnding = 9
+	end
+end
+
+if $args[0] = 'snatcher':
+	$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] = 70
+	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
+	fightEnding = 9
+end
+
+if $args[0] = 'dimka':
+	$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
+	fightEnding = 10
+end
+
+if $args[0] = 'stranger':
+	$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
+	fightEnding = 11
+end
+
+if $args[0] = 'christina':
+	$opp_name[0] = 'Christina'
+	$opp_image[0] = 'images/characters/pavlovsk/school/head/18.jpg'
+	opp_def[0] = 45
+	opp_run[0] = 80
+	opp_wrstlng[0] = 10
+	opp_kick[0] = 10
+	opp_punch[0] = 35
+	opp_jab[0] = 35
+	opp_stren[0] = 85
+	opp_agil[0] = 75
+	opp_vital[0] = 95
+	opp_react[0] = 75
+	opp_health[0] = (opp_vital[0] * 10 + opp_stren[0] * 5)
+	opp_willpwr[0] = 45
+	fightEnding = 12
+end
+
+if $args[0] = 'stallion':
+	$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
+	opp_magik[0] = 1
+	opp_mana[0] = 200
+	$opp_spells[0] = 'clone,energo'
+	fightEnding = 13
+end
+
+if $args[0] = 'girls':
+	$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
+	fightEnding = 14
+end
+
+--- fight_npcdata ---------------------------------
+

+ 2 - 26
locations/gschool_grounds.qsrc

@@ -463,32 +463,8 @@ if $ARGS[0] = 'KristinaFight':
 
 	gs 'fight','initFight'
 	gs 'boyStat', 'A18'
-	!!stats
-	strenV = 85
-	speedV = 75
-	agilV = 75
-	reactV = 75
-	vitalV = 95
-	intelV = 45
-	willV = 45
-	!Skills
-	magikV = 95
-	boxingV = 35
-	shootV = 95
-	!Parameters
-	healthV = vitalV*10 + strenV*5
-	manaV = intelV*10 + magikV*10
-	willpowerV = willV*10
-	BonusAtakV = 0
-	BonusDefV = 0
-	!Action Programme
-	program = 0
-	fightEnding = 12
-
-	if spellavtoklon = 1:klon = 3
-	if spellbefshild = 1:defence = 500
-
-	round = 0
+
+	gs 'fight_npcdata', 'christina'
 
 	act 'fight': gt 'fight','start'
 end

+ 2 - 44
locations/kisameQW.qsrc

@@ -51,52 +51,10 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/characters/city/kisame/kisamev.jpg"></center>'
 			pcs_horny += 60
 			gs 'boyStat', 'A40'
-			!!stats{
-			strenV = 300
-			speedV = 100
-			agilV = 100
-			reactV = 100
-			vitalV = 200
-			intelV = 100
-			willV = 50
-			!!skills
-			magikV = 10
-			boxingV = 100
-			shootV = 100
-			!!parameters
-			healthV = vitalV * 10 + strenV * 5
-			manaV = intelV * magikV + magikV * 100 + vitalV * 10
-			willpowerV = willV * 10
-			BonusAtakV = 0
-			BonusDefV = 0
-			!!Programme of Action
-			program = 5
-			kisamePic = 1
-			klonV = 5
-			!!defenceV = 10000
-			if spellavtoklon = 1:klon = 3
-			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
-			opp_magik[0] = 1
-			opp_mana[0] = 500
-			$opp_spells[0] = 'leechmana,flood,blister,sharkrockets'
-			fightEnding = 7
+			gs 'fight_npcdata', 'kisame'
 
 			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!"'

+ 5 - 77
locations/lab.qsrc

@@ -46,46 +46,10 @@ if $ARGS[0] = 'start':
 			cla
 			judosparday = daystart
 			gs 'boyStat', 'A175'
-			!{
-			!!stats
-			strenV = 600
-			speedV = 60
-			agilV = 60
-			reactV = 50
-			vitalV = 200
-			intelV = 50
-			willV = 50
-			!!skills
-			magikV = 100
-			boxingV = 100
-			shootV = 100
-			!!parameters
-			healthV = vitalV * 10 + strenV * 5
-			manaV = intelV * 10 + magikV * 10
-			willpowerV = willV * 10
-			BonusAtakV = 0
-			BonusDefV = 0
-			!!Programme of Action
-			program = 0
-			}
+
 			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
-			fightEnding = 2
+			gs 'fight_npcdata', 'gustav'
 
 			gt 'fight', 'start'
 		end
@@ -96,47 +60,11 @@ if $ARGS[0] = 'start':
 			cla
 			tatianasparday = daystart
 			gs 'boyStat', 'A176'
-			!!stats{
-			strenV = 60
-			speedV = 100
-			agilV = 100
-			reactV = 60
-			vitalV = 100
-			intelV = 100
-			willV = 100
-			!!skills
-			magikV = 100
-			boxingV = 100
-			shootV = 100
-			!!parameters
-			healthV = vitalV * 10 + strenV * 5
-			manaV = intelV * 6 + magikV * 10
-			willpowerV = willV * 10
-			BonusAtakV = 0
-			BonusDefV = 0
-			!!Programme of Action
-			program = 4}
+
 			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
-			opp_magik[0] = 1
-			opp_mana[0] = 200
-			$opp_spells[0] = 'fog,clone,stun,energo'
-			fightEnding = 3
+			gs 'fight_npcdata', 'tatiana'
+
 			gt 'fight', 'start'
 		end
 	end

+ 4 - 156
locations/park.qsrc

@@ -142,47 +142,9 @@ if $ARGS[0] = 'start':
 					gs 'boyStat', $npclastgenerated
 					act 'Fight':
 						cla
-						!!stats{
-						strenV = 100
-						speedV = 50
-						agilV = 40
-						reactV = 40
-						vitalV = 50
-						intelV = 10
-						willV = 10
-						!!skills
-						magikV = 100
-						boxingV = 50
-						shootV = 100
-						!!parameters
-						healthV = vitalV * 10 + strenV * 5
-						manaV = intelV * 10 + magikV * 10
-						willpowerV = willV * 10
-						BonusAtakV = 0
-						BonusDefV = 0
-						!!Programme of Action
-						program = 1
-
-						if spellavtoklon = 1:klon = 3
-						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
-						fightEnding = 8
+						gs 'fight_npcdata', 'rapist'
 
 						gt 'fight', 'start'
 					end
@@ -563,48 +525,10 @@ if $ARGS[0] = 'prost':
 		act 'Fuck you!':
 			cla
 			minut += 15
-			!!stats {
-			strenV = 20
-			speedV = 30
-			agilV = 30
-			reactV = 30
-			vitalV = 50
-			intelV = 10
-			willV = 10
-			!!skills
-			magikV = 10
-			boxingV = 10
-			shootV = 10
-			!!parameters
-			healthV = vitalV * 10 + strenV * 5
-			manaV = intelV * 10 + magikV * 10
-			willpowerV = willV * 10
-			BonusAtakV = 0
-			BonusDefV = 0
-			!!Programme of Action
-			program = 0
-
-			if spellavtoklon = 1:klon = 3
-			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
-			fightEnding = 4
+			gs 'fight_npcdata', 'prostitute'
 
 			gt 'fight', 'start'
 		end
@@ -633,48 +557,10 @@ if $ARGS[0] = 'prost':
 					minut += 15
 					gs 'npcgeneratec', 0, 'Bandit', rand(18,40)
 					gs 'boyStat', $npclastgenerated
-					!!stats{
-					strenV = 200
-					speedV = 30
-					agilV = 20
-					reactV = 20
-					vitalV = 150
-					intelV = 10
-					willV = 10
-					!!skills
-					magikV = 10
-					boxingV = 10
-					shootV = 10
-					!!parameters
-					healthV = vitalV * 10 + strenV * 5
-					manaV = intelV * 10 + magikV * 10
-					willpowerV = willV * 10
-					BonusAtakV = 0
-					BonusDefV = 0
-					!!Programme of Action
-					program = 0
-
-					if spellavtoklon = 1:klon = 3
-					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
-					fightEnding = 5
+					gs 'fight_npcdata', 'bandit'
 
 					gt 'fight', 'start'
 				end
@@ -728,47 +614,9 @@ if $ARGS[0] = 'prost':
 					minut += 15
 					gs 'npcgeneratec', 0, 'Prostitute', rand(15,30)
 					gs 'boyStat', $npclastgenerated
-					!!stats{
-					strenV = 50
-					speedV = 50
-					agilV = 40
-					reactV = 30
-					vitalV = 60
-					intelV = 10
-					willV = 10
-					!!skills
-					magikV = 10
-					boxingV = 10
-					shootV = 10
-					!!parameters
-					healthV = vitalV * 10 + strenV * 5
-					manaV = intelV * 10 + magikV * 10
-					willpowerV = willV * 10
-					BonusAtakV = 0
-					BonusDefV = 0
-					!!Programme of Action
-					program = 0
-
-					if spellavtoklon = 1:klon = 3
-					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
-					fightEnding = 6
+					gs 'fight_npcdata', 'prostitute'
 
 					gt 'fight', 'start'
 				end

+ 1 - 39
locations/parkivent.qsrc

@@ -45,48 +45,10 @@ if $ARGS[0] = '1':
 		gs 'boyStat', $npclastgenerated
 		act 'Fight him':
 			*clr & cla
-			!!stats{
-			strenV = 100
-			speedV = 50
-			agilV = 40
-			reactV = 40
-			vitalV = 50
-			intelV = 10
-			willV = 10
-			!!skills
-			magikV = 100
-			boxingV = 50
-			shootV = 100
-			!!parameters
-			healthV = vitalV * 10 + strenV * 5
-			manaV = intelV * 10 + magikV * 10
-			willpowerV = willV * 10
-			BonusAtakV = 0
-			BonusDefV = 0
-			!!Programme of Action
-			program = 0
-
-			if spellavtoklon = 1:klon = 3
-			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
-			fightEnding = 8
+			gs 'fight_npcdata', 'rapist'
 
 			gt 'fight', 'start'
 		end

+ 1 - 37
locations/preTG.qsrc

@@ -283,45 +283,9 @@ 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{
-											strenV = 600
-											speedV = 60
-											agilV = 60
-											reactV = 50
-											vitalV = 200
-											intelV = 50
-											willV = 50
-											!!skills
-											magikV = 100
-											boxingV = 100
-											shootV = 100
-											!!parameters
-											healthV = vitalV * 10 + strenV * 5
-											manaV = intelV * 10 + magikV * 10
-											willpowerV = willV * 10
-											BonusAtakV = 0
-											BonusDefV = 0
-											!!Programme of Action
-											program = 0}
 											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
-											!!To set the ending text/code
-											fightEnding = 1
+											gs 'fight_npcdata', 'gustav'
 
 											act 'Fight': gt 'fight', 'start'
 										end

+ 2 - 39
locations/sexm.qsrc

@@ -854,47 +854,10 @@ if $ARGS[0] = 'gangrape':
 
 	act 'Start a fight':
 		cla
-		!!stats{
-		strenV = 100
-		speedV = 20
-		agilV = 10
-		reactV = 10
-		vitalV = 50
-		intelV = 10
-		willV = 10
-		!!skills
-		magikV = 100
-		boxingV = 10
-		shootV = 100
-		!!parameters
-		healthV = vitalV * 10 + strenV * 5
-		manaV = intelV * 10 + magikV * 10
-		willpowerV = willV * 10
-		BonusAtakV = 0
-		BonusDefV = 0
-		!!Programme of Action
-		program = 0
-
-		if spellavtoklon = 1:klon = 3
-		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
-		fightEnding = 11
+		gs 'fight_npcdata', 'stranger'
 
 		gt 'fight', 'start'
 	end

+ 2 - 41
locations/stallion.qsrc

@@ -43,49 +43,10 @@ if $ARGS[0] = 'fight':
 	act 'Fight':
 		cla
 		$nameV = 'Naked Man'
-		!!stats{
-		strenV = 100
-		speedV = 300
-		agilV = 300
-		reactV = 100
-		vitalV = 100
-		intelV = 100
-		willV = 50
-		!!skills
-		magikV = 10
-		boxingV = 100
-		shootV = 10
-		!!parameters
-		healthV = vitalV * 10 + strenV * 5
-		manaV = intelV * magikV + magikV * 100 + vitalV * 10
-		willpowerV = willV * 10
-		BonusAtakV = 0
-		BonusDefV = 0
-		!!Programme of Action
-		program = 0
-		if spellavtoklon = 1:klon = 3
-		if spellbefshild = 1:defence = 500}
+
 		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
-		opp_magik[0] = 1
-		opp_mana[0] = 200
-		$opp_spells[0] = 'clone,energo'
-		fightEnding = 13
+		gs 'fight_npcdata', 'stallion'
 
 		gt 'fight', 'start'
 	end

+ 7 - 158
locations/street_event.qsrc

@@ -333,46 +333,10 @@ if $ARGS[1] = 'main':
 
 		act 'Fight':
 			cla
-			!!stats{
-			strenV = 100
-			speedV = 50
-			agilV = 40
-			reactV = 40
-			vitalV = 50
-			intelV = 10
-			willV = 10
-			!!skills
-			magikV = 100
-			boxingV = 50
-			shootV = 100
-			!!parameters
-			healthV = vitalV * 10 + strenV * 5
-			manaV = intelV * 10 + magikV * 10
-			willpowerV = willV * 10
-			BonusAtakV = 0
-			BonusDefV = 0
-			!!Programme of Action
-			program = 0
-			if spellavtoklon = 1:klon = 3
-			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] = 70
-			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
-			fightEnding = 8
+			gs 'fight_npcdata', 'rapist'
 
 			gt 'fight', 'start'
 		end
@@ -448,51 +412,10 @@ if $ARGS[1] = 'main':
 				cla
 				gs 'npcgeneratec', 0, 'Robber', rand(18,45)
 				gs 'boyStat', $npclastgenerated
-				!!stats{
-				strenV = 100
-				speedV = 50
-				agilV = 40
-				reactV = 40
-				vitalV = 50
-				intelV = 10
-				willV = 10
-				!!skills
-				magikV = 100
-				boxingV = 50
-				shootV = 100
-				!!parameters
-				healthV = vitalV * 10 + strenV * 5
-				manaV = intelV * 10 + magikV * 10
-				willpowerV = willV * 10
-				BonusAtakV = 0
-				BonusDefV = 0
-				!!Programme of Action
-				program = 0
-
-				if spellavtoklon = 1:klon = 3
-				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] = 70
-				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
-				if rand(0,10) < 5:
-					fightEnding = 8
-				else
-					fightEnding = 9
-				end
+				gs 'fight_npcdata', 'robber'
 
 				gt 'fight', 'start'
 			end
@@ -529,49 +452,12 @@ if $ARGS[1] = 'main':
 				else
 					gs 'npcgeneratec', 0, 'Purse Snatcher', rand(18,45)
 					gs 'boyStat', $npclastgenerated
-					!!stats{
-					strenV = 100
-					speedV = 50
-					agilV = 40
-					reactV = 40
-					vitalV = 50
-					intelV = 10
-					willV = 10
-					!!skills
-					magikV = 100
-					boxingV = 50
-					shootV = 100
-					!!parameters
-					healthV = vitalV * 10 + strenV * 5
-					manaV = intelV * 10 + magikV * 10
-					willpowerV = willV * 10
-					BonusAtakV = 0
-					BonusDefV = 0
-					!!Programme of Action
-					program = 0
-					if spellavtoklon = 1:klon = 3
-					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] = 70
-					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
-					fightEnding = 9
+					gs 'fight_npcdata', 'snatcher'
 
 					act 'Fight':gt 'fight', 'start'
 				end
@@ -1177,47 +1063,10 @@ 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{
-							strenV = 100
-							speedV = 50
-							agilV = 60
-							reactV = 60
-							vitalV = 60
-							intelV = 10
-							willV = 10
-							!!skills
-							magikV = 100
-							boxingV = 50
-							shootV = 100
-							!!parameters
-							healthV = vitalV * 30 + strenV * 15
-							manaV = intelV * 10 + magikV * 10
-							willpowerV = willV * 10
-							BonusAtakV = 0
-							BonusDefV = 0
-							!!Programme of Action
-							program = 0
-
-							if spellavtoklon = 1:klon = 3
-							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
-							fightEnding = 14
+							gs 'fight_npcdata', 'girls'
 
 							gt 'fight', 'start'
 						end