diff --git a/data/game.cfg b/data/game.cfg
index 3c44013a193..7cd79bc6f77 100644
--- a/data/game.cfg
+++ b/data/game.cfg
@@ -480,1231 +480,7 @@ default=yes
 	[/hotkey]
 #endif
 
-# a special macro to define slightly less nimble elves such
-# as fighters, who don't do quite so well in forest
-#define LESS_NIMBLE_ELF
-		[defense]
-		forest=40
-		[/defense]
-#enddef
-
-[+units]
-	{units}
-	{~units}
-
-	#traits that are common to all races and units
-	{TRAIT_STRONG}
-	{TRAIT_QUICK}
-	{TRAIT_INTELLIGENT}
-	{TRAIT_RESILIENT}
-
-	[race]
-	name=elf
-	num_traits=2
-	markov_chain_size=2
-	{ELVISH_NAMES}
-
-	{TRAIT_DEXTROUS}
-	[/race]
-	[race]
-	name=wose
-	num_traits=0
-	markov_chain_size=3
-	{WOSE_NAMES}
-	[/race]
-	[race]
-	name=human
-	num_traits=2
-	{HUMAN_NAMES}
-	[/race]
-	[race]
-	name=dwarf
-	num_traits=2
-	{DWARVISH_NAMES}
-	[/race]
-	[race]
-	name=orc
-	num_traits=2
-	{ORCISH_NAMES}
-	[/race]
-	[race]
-	name=goblin
-	num_traits=2
-	{ORCISH_NAMES}
-	[/race]
-	[race]
-	name=undead
-	not_living=yes
-	num_traits=1
-	ignore_global_traits=yes
-	{TRAIT_UNDEAD}
-	[/race]
-	[race]
-	name=ogre
-	num_traits=2
-	{OGRE_NAMES}
-	[/race]
-	[race]
-	name=merman
-	num_traits=2
-	{MERMAN_NAMES}
-	[/race]
-	[race]
-	name=naga
-	num_traits=2
-	{NAGA_NAMES}
-	[/race]
-	[race]
-	name=monster
-	num_traits=0
-	[/race]
-	[race]
-	name=troll
-	num_traits=2
-	ignore_global_traits=yes
-	{TRAIT_STRONG}
-	{TRAIT_QUICK}
-	{TRAIT_RESILIENT}
-	{TROLL_NAMES}
-	[/race]
-	[race]
-	name=drake
-	num_traits=2
-	{DRAKE_NAMES}
-	[/race]
-	[race]
-	name=lizard
-	num_traits=2
-	#Tentative list of fricative heavy lizard names
-	{LIZARD_NAMES}
-	[/race]
-
-	[movetype]
-	name=smallfoot
-		[movement_costs]
-		deep_water=100
-		shallow_water=3
-		swamp_water=3
-		grassland=1
-		sand=2
-		forest=2
-		hills=2
-		mountains=3
-		village=1
-		castle=1
-		cave=2
-		tundra=3
-		canyon=100
-		cavewall=100
-		[/movement_costs]
-
-		[defense]
-		deep_water=80
-		shallow_water=80
-		swamp_water=80
-		grassland=60
-		sand=70
-		forest=50
-		hills=50
-		mountains=40
-		village=40
-		castle=40
-		cave=60
-		tundra=80
-		cavewall=10
-		[/defense]
-
-		[resistance]
-		blade=100
-		pierce=100
-		impact=100
-		fire=100
-		cold=100
-		holy=80
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=orcishfoot
-		[movement_costs]
-		deep_water=100
-		shallow_water=3
-		swamp_water=3
-		grassland=1
-		sand=2
-		forest=2
-		hills=1
-		mountains=2
-		village=1
-		castle=1
-		cave=2
-		tundra=3
-		canyon=100
-		cavewall=100
-		[/movement_costs]
-
-		[defense]
-		deep_water=80
-		shallow_water=80
-		swamp_water=70
-		grassland=60
-		sand=70
-		forest=50
-		hills=50
-		mountains=40
-		village=40
-		castle=40
-		cave=60
-		tundra=80
-		cavewall=10
-		[/defense]
-
-		[resistance]
-		blade=100
-		pierce=100
-		impact=100
-		fire=100
-		cold=100
-		holy=80
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=largefoot
-		[movement_costs]
-		deep_water=100
-		shallow_water=2
-		swamp_water=2
-		grassland=1
-		sand=2
-		forest=2
-		hills=1
-		mountains=2
-		village=1
-		castle=1
-		cave=1
-		canyon=100
-		cavewall=100
-		tundra=2
-		[/movement_costs]
-
-		[defense]
-		deep_water=80
-		shallow_water=80
-		swamp_water=80
-		grassland=70
-		sand=70
-		forest=60
-		hills=50
-		mountains=40
-		village=60
-		castle=60
-		cave=60
-		tundra=80
-		[/defense]
-
-		[resistance]
-		blade=80
-		pierce=80
-		impact=100
-		fire=100
-		cold=100
-		holy=80
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=armoredfoot
-		[movement_costs]
-		deep_water=100
-		shallow_water=4
-		swamp_water=4
-		grassland=1
-		sand=2
-		forest=2
-		hills=3
-		mountains=100
-		village=1
-		castle=1
-		cave=2
-		canyon=100
-		cavewall=100
-		tundra=4
-		[/movement_costs]
-
-		[defense]
-		deep_water=80
-		shallow_water=90
-		swamp_water=90
-		grassland=70
-		sand=80
-		forest=60
-		hills=60
-		mountains=80
-		village=60
-		castle=50
-		cave=60
-		tundra=80
-		[/defense]
-
-		[resistance]
-		blade=50
-		pierce=60
-		impact=70
-		fire=110
-		cold=120
-		holy=80
-		[/resistance]
-	[/movetype]
-	
-	[movetype]
-	name=elusivefoot
-		[movement_costs]
-		deep_water=100
-		shallow_water=2
-		swamp_water=2
-		grassland=1
-		sand=2
-		forest=2
-		hills=2
-		mountains=3
-		village=1
-		castle=1
-		cave=2
-		canyon=100
-		cavewall=100
-		tundra=2
-		[/movement_costs]
-
-		[defense]
-		deep_water=70
-		shallow_water=60
-		swamp_water=60
-		grassland=40
-		sand=60
-		forest=30
-		hills=30
-		mountains=30
-		village=30
-		castle=30
-		cave=50
-		tundra=60
-		[/defense]
-
-		[resistance]
-		blade=130
-		pierce=120
-		impact=120
-		fire=100
-		cold=100
-		holy=80
-		[/resistance]
-
-	[/movetype]
-
-	[movetype]
-	name=mounted
-		[movement_costs]
-		deep_water=100
-		shallow_water=4
-		swamp_water=4
-		grassland=1
-		sand=2
-		forest=3
-		hills=2
-		mountains=100
-		village=1
-		castle=1
-		cave=4
-		canyon=100
-		cavewall=100
-		tundra=2
-		[/movement_costs]
-
-		[defense]
-		deep_water=80
-		shallow_water=80
-		swamp_water=80
-		grassland=60
-		sand=70
-		forest=70
-		hills=60
-		mountains=80
-		village=60
-		castle=60
-		cave=80
-		tundra=70
-		[/defense]
-
-		[resistance]
-		blade=80
-		pierce=120
-		impact=70
-		fire=100
-		cold=100
-		holy=80
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=woodland
-		[movement_costs]
-		deep_water=100
-		shallow_water=3
-		swamp_water=2
-		grassland=1
-		sand=2
-		forest=1
-		hills=2
-		mountains=3
-		village=1
-		castle=1
-		cave=3
-		canyon=100
-		cavewall=100
-		tundra=2
-		[/movement_costs]
-
-		[defense]
-		deep_water=80
-		shallow_water=80
-		swamp_water=60
-		grassland=60
-		sand=70
-		forest=30
-		hills=50
-		mountains=40
-		village=40
-		castle=40
-		cave=70
-		tundra=70
-		[/defense]
-
-		[resistance]
-		blade=100
-		pierce=100
-		impact=100
-		fire=100
-		cold=100
-		holy=80
-		[/resistance]
-	[/movetype]
-	
-	[movetype]
-	name=woodlandfloat
-	flies=true
-		[movement_costs]
-		deep_water=2
-		shallow_water=1
-		swamp_water=1
-		grassland=1
-		sand=1
-		forest=1
-		hills=1
-		mountains=2
-		village=1
-		castle=1
-		tundra=2
-		cave=2
-		canyon=100
-		cavewall=100
-		[/movement_costs]
-
-		[defense]
-		deep_water=70
-		shallow_water=60
-		swamp_water=60
-		grassland=50
-		sand=60
-		forest=30
-		hills=50
-		mountains=40
-		village=40
-		castle=40
-		tundra=60
-		cave=70
-		[/defense]
-
-		[resistance]
-		blade=100
-		pierce=100
-		impact=110
-		fire=100
-		cold=100
-		holy=80
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=treefolk
-		[movement_costs]
-		deep_water=100
-		shallow_water=2
-		swamp_water=2
-		grassland=1
-		sand=2
-		forest=1
-		hills=2
-		mountains=3
-		village=1
-		castle=1
-		cave=3
-		canyon=100
-		cavewall=100
-		tundra=2
-		[/movement_costs]
-
-		[defense]
-		deep_water=90
-		shallow_water=80
-		swamp_water=70
-		grassland=80
-		sand=80
-		forest=60
-		hills=70
-		mountains=70
-		village=80
-		castle=80
-		cave=80
-		tundra=80
-		[/defense]
-
-		[resistance]
-		blade=100
-		pierce=40
-		impact=60
-		fire=150
-		cold=80
-		holy=80
-		[/resistance]
-	[/movetype] 
-
-	[movetype]
-	name=fly
-	flies=true
-		[movement_costs]
-		deep_water=1
-		shallow_water=1
-		swamp_water=1
-		grassland=1
-		sand=1
-		forest=1
-		hills=1
-		mountains=1
-		village=1
-		castle=1
-		cave=2
-		canyon=1
-		cavewall=100
-		tundra=1
-		[/movement_costs]
-
-		[defense]
-		deep_water=50
-		shallow_water=50
-		swamp_water=50
-		grassland=50
-		sand=50
-		forest=50
-		hills=50
-		mountains=50
-		village=50
-		castle=50
-		tundra=50
-		canyon=50
-		cave=80
-		[/defense]
-
-		[resistance]
-		blade=100
-		pierce=100
-		impact=120
-		fire=100
-		cold=100
-		holy=80
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=deepsea
-		[movement_costs]
-		deep_water=1
-		shallow_water=2
-		swamp_water=2
-		grassland=4
-		sand=4
-		forest=5
-		hills=5
-		mountains=100
-		village=2
-		castle=1
-		cave=3
-		tundra=2
-		canyon=100
-		cavewall=100
-		[/movement_costs]
-
-		[defense]
-		deep_water=40
-		shallow_water=50
-		swamp_water=40
-		grassland=70
-		sand=70
-		forest=70
-		hills=70
-		mountains=80
-		village=70
-		castle=70
-		tundra=70
-		cave=80
-		[/defense]
-
-		[resistance]
-		blade=80
-		pierce=100
-		impact=70
-		fire=100
-		cold=40
-		holy=80
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=swimmer
-		[movement_costs]
-		deep_water=1
-		shallow_water=1
-		swamp_water=1
-		grassland=2
-		sand=2
-		forest=5
-		hills=5
-		mountains=100
-		village=1
-		castle=1
-		cave=3
-		tundra=2
-		canyon=100
-		cavewall=100
-		[/movement_costs]
-
-		[defense]
-		deep_water=50
-		shallow_water=40
-		swamp_water=40
-		grassland=70
-		sand=70
-		forest=70
-		hills=70
-		mountains=80
-		village=60
-		castle=60
-		tundra=70
-		cave=80
-		[/defense]
-
-		[resistance]
-		blade=100
-		pierce=100
-		impact=100
-		fire=100
-		cold=40
-		holy=80
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=naga
-		[movement_costs]
-		deep_water=1
-		shallow_water=1
-		swamp_water=1
-		grassland=2
-		sand=1
-		forest=3
-		hills=3
-		mountains=5
-		village=1
-		castle=2
-		cave=1
-		tundra=2
-		canyon=100
-		cavewall=100
-		[/movement_costs]
-
-		[defense]
-		deep_water=50
-		shallow_water=40
-		swamp_water=40
-		grassland=70
-		sand=60
-		forest=70
-		hills=60
-		mountains=70
-		village=60
-		castle=50
-		tundra=70
-		cave=80
-		[/defense]
-
-		[resistance]
-		blade=100
-		pierce=100
-		impact=100
-		fire=100
-		cold=120
-		holy=80
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=float
-	flies=true
-		[movement_costs]
-		deep_water=1
-		shallow_water=1
-		swamp_water=2
-		grassland=200
-		sand=200
-		forest=200
-		hills=200
-		mountains=200
-		village=200
-		castle=200
-		tundra=200
-		cave=200
-		canyon=200
-		cavewall=200
-		[/movement_costs]
-
-		[defense]
-		deep_water=50
-		shallow_water=50
-		swamp_water=60
-		grassland=0
-		sand=0
-		forest=0
-		hills=0
-		mountains=0
-		village=0
-		castle=0
-		tundra=0
-		cave=0
-		[/defense]
-
-		[resistance]
-		blade=100
-		pierce=100
-		impact=110
-		fire=100
-		cold=100
-		holy=80
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=mountainfoot
-		[movement_costs]
-		deep_water=100
-		shallow_water=3
-		swamp_water=3
-		grassland=1
-		sand=1
-		forest=1
-		hills=1
-		mountains=1
-		village=1
-		castle=1
-		tundra=2
-		cave=1
-		canyon=100
-		cavewall=100
-		[/movement_costs]
-
-		[defense]
-		deep_water=80
-		shallow_water=80
-		swamp_water=80
-		grassland=70
-		sand=70
-		forest=70
-		hills=40
-		mountains=30
-		village=50
-		tundra=60
-		castle=40
-		cave=50
-		[/defense]
-
-		[resistance]
-		blade=100
-		pierce=100
-		impact=100
-		fire=100
-		cold=100
-		holy=80
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=dwarvishfoot
-		[movement_costs]
-		deep_water=100
-		shallow_water=3
-		swamp_water=3
-		grassland=1
-		sand=1
-		forest=1
-		hills=1
-		mountains=1
-		village=1
-		castle=1
-		tundra=2
-		cave=1
-		canyon=100
-		cavewall=100
-		[/movement_costs]
-
-		[defense]
-		deep_water=80
-		shallow_water=80
-		swamp_water=80
-		grassland=70
-		sand=70
-		forest=70
-		hills=40
-		mountains=30
-		village=50
-		tundra=60
-		castle=40
-		cave=50
-		[/defense]
-
-		[resistance]
-		blade=70
-		pierce=80
-		impact=80
-		fire=90
-		cold=80
-		holy=80
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=undeadfoot
-		[movement_costs]
-		deep_water=4
-		shallow_water=3
-		swamp_water=2
-		grassland=1
-		sand=2
-		forest=2
-		hills=3
-		mountains=4
-		village=1
-		castle=1
-		cave=2
-		canyon=100
-		cavewall=100
-		tundra=2
-		[/movement_costs]
-
-		[defense]
-		deep_water=90
-		shallow_water=80
-		swamp_water=70
-		grassland=60
-		sand=70
-		forest=50
-		hills=50
-		mountains=40
-		village=40
-		castle=40
-		cave=60
-		canyon=80
-		tundra=60
-		[/defense]
-
-		[resistance]
-		blade=90
-		pierce=70
-		impact=110
-		fire=120
-		cold=40
-		holy=200
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=undeadfly
-	flies=true
-		[movement_costs]
-		deep_water=1
-		shallow_water=1
-		swamp_water=1
-		grassland=1
-		sand=1
-		forest=1
-		hills=1
-		mountains=1
-		village=1
-		castle=1
-		cave=1
-		canyon=1
-		cavewall=100
-		tundra=1
-		[/movement_costs]
-
-		[defense]
-		deep_water=50
-		shallow_water=50
-		swamp_water=50
-		grassland=50
-		sand=50
-		forest=50
-		hills=50
-		mountains=50
-		village=50
-		castle=50
-		cave=60
-		canyon=50
-		tundra=50
-		[/defense]
-
-		[resistance]
-		blade=100
-		pierce=100
-		impact=100
-		fire=120
-		cold=40
-		holy=200
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=undeadspirit
-	flies=true
-		[movement_costs]
-		deep_water=4
-		shallow_water=3
-		swamp_water=1
-		grassland=1
-		sand=1
-		forest=1
-		hills=1
-		mountains=1
-		village=1
-		castle=1
-		cave=1
-		canyon=1
-		cavewall=100
-		tundra=1
-		[/movement_costs]
-
-		[defense]
-		deep_water=50
-		shallow_water=50
-		swamp_water=50
-		grassland=50
-		sand=50
-		forest=50
-		hills=50
-		mountains=50
-		village=50
-		castle=50
-		cave=60
-		canyon=50
-		tundra=50
-		[/defense]
-
-		[resistance]
-		blade=40
-		pierce=40
-		impact=40
-		fire=100
-		cold=30
-		holy=150
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=spirit
-	flies=true
-		[movement_costs]
-		deep_water=4
-		shallow_water=3
-		swamp_water=1
-		grassland=1
-		sand=1
-		forest=1
-		hills=1
-		mountains=1
-		village=1
-		castle=1
-		cave=1
-		canyon=1
-		cavewall=100
-		tundra=1
-		[/movement_costs]
-
-		[defense]
-		deep_water=50
-		shallow_water=50
-		swamp_water=50
-		grassland=50
-		sand=50
-		forest=50
-		hills=50
-		mountains=50
-		village=50
-		castle=50
-		cave=60
-		canyon=50
-		tundra=50
-		[/defense]
-
-		[resistance]
-		blade=40
-		pierce=40
-		impact=40
-		fire=100
-		cold=30
-		holy=100
-		[/resistance]
-	[/movetype]
-
-	[movetype] 
-		name=lizard
-		flies=false
-		[movement_costs] 
-		deep_water=100 
-		shallow_water=3 
-		swamp_water=1 
-		grassland=1 
-		sand=1 
-		forest=2 
-		hills=1 
-		mountains=2 
-		village=1 
-		castle=1 
-		cave=1 
-		canyon=100
-		cavewall=100 
-		tundra=4 
-		[/movement_costs] 
-		
-		[defense] 
-		deep_water=100 
-		shallow_water=60 
-		swamp_water=40 
-		grassland=60 
-		sand=40 
-		forest=40 
-		hills=40 
-		mountains=40 
-		village=50 
-		castle=40 
-		cave=40 
-		tundra=70 
-		[/defense] 
- 
-		[resistance] 
-		blade=100 
-		pierce=90 
-		impact=100 
-		fire=110 
-		cold=120 
-		holy=80 
-		[/resistance] 
-	[/movetype] 
-
-	[movetype]
-		name=none
-		flies=false
-		[movement_costs]
-		deep_water=200
-		shallow_water=200
-		swamp_water=200
-		grassland=200
-		sand=200
-		forest=200
-		hills=200
-		mountains=200
-		village=200
-		castle=200
-		tundra=200
-		cave=200
-		canyon=200
-		cavewall=200
-		[/movement_costs]
-	
-		[defense]
-		deep_water=200
-		shallow_water=200
-		swamp_water=200
-		grassland=50
-		sand=50
-		forest=50
-		hills=50
-		mountains=50
-		village=50
-		castle=50
-		tundra=50
-		cave=50
-		[/defense]
-	
-		[resistance]
-		blade=80
-		pierce=80
-		impact=120
-		fire=120
-		cold=100
-		holy=100
-		[/resistance]
-	
-	[/movetype]
-
-	[movetype]
-		name=scuttlefoot
-		flies=false
-		[movement_costs]
-		deep_water=100
-		shallow_water=3
-		swamp_water=2
-		grassland=1
-		sand=2
-		forest=2
-		hills=3
-		mountains=4
-		village=1
-		castle=1
-		cave=2
-		canyon=100
-		cavewall=100
-		tundra=2
-		[/movement_costs]
-
-		[defense]
-		deep_water=80
-		shallow_water=70
-		swamp_water=60
-		grassland=60
-		sand=60
-		forest=50
-		hills=50
-		mountains=40
-		village=40
-		castle=40
-		cave=60
-		tundra=60
-		[/defense]
-
-	  	[resistance]
-		blade=90
-		pierce=90
-		impact=30
-		fire=200
-		cold=120
-		holy=100
-	 	[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=drakefly
-	flies=true
-	# Drakes are huge (easy targets) flying beasts, but are different
-	# from the classical flying unit: to fight they have to land
-	# They love caves and mountains, and above all: warmth
-		[movement_costs]
-		deep_water=1
-		shallow_water=1
-		swamp_water=1
-		grassland=1
-		sand=1
-		forest=1
-		hills=1
-		mountains=1
-		village=1
-		castle=1
-		cave=1
-		canyon=1
-		cavewall=100
-		tundra=1
-		[/movement_costs]
-
-		[defense]
-		deep_water=80
-		shallow_water=80
-		swamp_water=70
-		grassland=70
-		sand=60
-		forest=60
-		hills=60
-		mountains=60
-		village=60
-		castle=60
-		cave=60
-		canyon=60
-		tundra=70
-		[/defense]
-
-		[resistance]
-		blade=90
-		pierce=110
-		impact=80
-		fire=50
-		cold=150
-		holy=80
-		[/resistance]
-	[/movetype]
-
-	[movetype]
-	name=drakefoot
-	# These Drakes wear heavy armor - they don't fly
-	# But the armor makes them a good bit tougher
-	# Do a bit worse in Swamps as they can't hop to dry spots
-		[movement_costs]
-		deep_water=100
-		shallow_water=3
-		swamp_water=3
-		grassland=1
-		sand=1
-		forest=2
-		hills=1
-		mountains=1
-		village=1
-		castle=1
-		cave=1
-		canyon=100
-		cavewall=100
-		tundra=3
-		[/movement_costs]
-
-		[defense]
-		deep_water=90
-		shallow_water=80
-		swamp_water=80
-		grassland=70
-		sand=60
-		forest=60
-		hills=60
-		mountains=60
-		village=60
-		castle=60
-		cave=60
-		tundra=80
-		[/defense]
-
-		[resistance]
-		blade=80
-		pierce=100
-		impact=70
-		fire=50
-		cold=150
-		holy=80
-		[/resistance]
-	[/movetype]
-[/units]
+{units.cfg}
 
 #ifdef TUTORIAL
 {scenarios/tutorial}
diff --git a/data/units.cfg b/data/units.cfg
new file mode 100644
index 00000000000..8b9acb2e29c
--- /dev/null
+++ b/data/units.cfg
@@ -0,0 +1,1225 @@
+# a special macro to define slightly less nimble elves such
+# as fighters, who don't do quite so well in forest
+#define LESS_NIMBLE_ELF
+		[defense]
+		forest=40
+		[/defense]
+#enddef
+
+[+units]
+	{units}
+	{~units}
+
+	#traits that are common to all races and units
+	{TRAIT_STRONG}
+	{TRAIT_QUICK}
+	{TRAIT_INTELLIGENT}
+	{TRAIT_RESILIENT}
+
+	[race]
+	name=elf
+	num_traits=2
+	markov_chain_size=2
+	{ELVISH_NAMES}
+
+	{TRAIT_DEXTROUS}
+	[/race]
+	[race]
+	name=wose
+	num_traits=0
+	markov_chain_size=3
+	{WOSE_NAMES}
+	[/race]
+	[race]
+	name=human
+	num_traits=2
+	{HUMAN_NAMES}
+	[/race]
+	[race]
+	name=dwarf
+	num_traits=2
+	{DWARVISH_NAMES}
+	[/race]
+	[race]
+	name=orc
+	num_traits=2
+	{ORCISH_NAMES}
+	[/race]
+	[race]
+	name=goblin
+	num_traits=2
+	{ORCISH_NAMES}
+	[/race]
+	[race]
+	name=undead
+	not_living=yes
+	num_traits=1
+	ignore_global_traits=yes
+	{TRAIT_UNDEAD}
+	[/race]
+	[race]
+	name=ogre
+	num_traits=2
+	{OGRE_NAMES}
+	[/race]
+	[race]
+	name=merman
+	num_traits=2
+	{MERMAN_NAMES}
+	[/race]
+	[race]
+	name=naga
+	num_traits=2
+	{NAGA_NAMES}
+	[/race]
+	[race]
+	name=monster
+	num_traits=0
+	[/race]
+	[race]
+	name=troll
+	num_traits=2
+	ignore_global_traits=yes
+	{TRAIT_STRONG}
+	{TRAIT_QUICK}
+	{TRAIT_RESILIENT}
+	{TROLL_NAMES}
+	[/race]
+	[race]
+	name=drake
+	num_traits=2
+	{DRAKE_NAMES}
+	[/race]
+	[race]
+	name=lizard
+	num_traits=2
+	#Tentative list of fricative heavy lizard names
+	{LIZARD_NAMES}
+	[/race]
+
+	[movetype]
+	name=smallfoot
+		[movement_costs]
+		deep_water=100
+		shallow_water=3
+		swamp_water=3
+		grassland=1
+		sand=2
+		forest=2
+		hills=2
+		mountains=3
+		village=1
+		castle=1
+		cave=2
+		tundra=3
+		canyon=100
+		cavewall=100
+		[/movement_costs]
+
+		[defense]
+		deep_water=80
+		shallow_water=80
+		swamp_water=80
+		grassland=60
+		sand=70
+		forest=50
+		hills=50
+		mountains=40
+		village=40
+		castle=40
+		cave=60
+		tundra=80
+		cavewall=10
+		[/defense]
+
+		[resistance]
+		blade=100
+		pierce=100
+		impact=100
+		fire=100
+		cold=100
+		holy=80
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=orcishfoot
+		[movement_costs]
+		deep_water=100
+		shallow_water=3
+		swamp_water=3
+		grassland=1
+		sand=2
+		forest=2
+		hills=1
+		mountains=2
+		village=1
+		castle=1
+		cave=2
+		tundra=3
+		canyon=100
+		cavewall=100
+		[/movement_costs]
+
+		[defense]
+		deep_water=80
+		shallow_water=80
+		swamp_water=70
+		grassland=60
+		sand=70
+		forest=50
+		hills=50
+		mountains=40
+		village=40
+		castle=40
+		cave=60
+		tundra=80
+		cavewall=10
+		[/defense]
+
+		[resistance]
+		blade=100
+		pierce=100
+		impact=100
+		fire=100
+		cold=100
+		holy=80
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=largefoot
+		[movement_costs]
+		deep_water=100
+		shallow_water=2
+		swamp_water=2
+		grassland=1
+		sand=2
+		forest=2
+		hills=1
+		mountains=2
+		village=1
+		castle=1
+		cave=1
+		canyon=100
+		cavewall=100
+		tundra=2
+		[/movement_costs]
+
+		[defense]
+		deep_water=80
+		shallow_water=80
+		swamp_water=80
+		grassland=70
+		sand=70
+		forest=60
+		hills=50
+		mountains=40
+		village=60
+		castle=60
+		cave=60
+		tundra=80
+		[/defense]
+
+		[resistance]
+		blade=80
+		pierce=80
+		impact=100
+		fire=100
+		cold=100
+		holy=80
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=armoredfoot
+		[movement_costs]
+		deep_water=100
+		shallow_water=4
+		swamp_water=4
+		grassland=1
+		sand=2
+		forest=2
+		hills=3
+		mountains=100
+		village=1
+		castle=1
+		cave=2
+		canyon=100
+		cavewall=100
+		tundra=4
+		[/movement_costs]
+
+		[defense]
+		deep_water=80
+		shallow_water=90
+		swamp_water=90
+		grassland=70
+		sand=80
+		forest=60
+		hills=60
+		mountains=80
+		village=60
+		castle=50
+		cave=60
+		tundra=80
+		[/defense]
+
+		[resistance]
+		blade=50
+		pierce=60
+		impact=70
+		fire=110
+		cold=120
+		holy=80
+		[/resistance]
+	[/movetype]
+	
+	[movetype]
+	name=elusivefoot
+		[movement_costs]
+		deep_water=100
+		shallow_water=2
+		swamp_water=2
+		grassland=1
+		sand=2
+		forest=2
+		hills=2
+		mountains=3
+		village=1
+		castle=1
+		cave=2
+		canyon=100
+		cavewall=100
+		tundra=2
+		[/movement_costs]
+
+		[defense]
+		deep_water=70
+		shallow_water=60
+		swamp_water=60
+		grassland=40
+		sand=60
+		forest=30
+		hills=30
+		mountains=30
+		village=30
+		castle=30
+		cave=50
+		tundra=60
+		[/defense]
+
+		[resistance]
+		blade=130
+		pierce=120
+		impact=120
+		fire=100
+		cold=100
+		holy=80
+		[/resistance]
+
+	[/movetype]
+
+	[movetype]
+	name=mounted
+		[movement_costs]
+		deep_water=100
+		shallow_water=4
+		swamp_water=4
+		grassland=1
+		sand=2
+		forest=3
+		hills=2
+		mountains=100
+		village=1
+		castle=1
+		cave=4
+		canyon=100
+		cavewall=100
+		tundra=2
+		[/movement_costs]
+
+		[defense]
+		deep_water=80
+		shallow_water=80
+		swamp_water=80
+		grassland=60
+		sand=70
+		forest=70
+		hills=60
+		mountains=80
+		village=60
+		castle=60
+		cave=80
+		tundra=70
+		[/defense]
+
+		[resistance]
+		blade=80
+		pierce=120
+		impact=70
+		fire=100
+		cold=100
+		holy=80
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=woodland
+		[movement_costs]
+		deep_water=100
+		shallow_water=3
+		swamp_water=2
+		grassland=1
+		sand=2
+		forest=1
+		hills=2
+		mountains=3
+		village=1
+		castle=1
+		cave=3
+		canyon=100
+		cavewall=100
+		tundra=2
+		[/movement_costs]
+
+		[defense]
+		deep_water=80
+		shallow_water=80
+		swamp_water=60
+		grassland=60
+		sand=70
+		forest=30
+		hills=50
+		mountains=40
+		village=40
+		castle=40
+		cave=70
+		tundra=70
+		[/defense]
+
+		[resistance]
+		blade=100
+		pierce=100
+		impact=100
+		fire=100
+		cold=100
+		holy=80
+		[/resistance]
+	[/movetype]
+	
+	[movetype]
+	name=woodlandfloat
+	flies=true
+		[movement_costs]
+		deep_water=2
+		shallow_water=1
+		swamp_water=1
+		grassland=1
+		sand=1
+		forest=1
+		hills=1
+		mountains=2
+		village=1
+		castle=1
+		tundra=2
+		cave=2
+		canyon=100
+		cavewall=100
+		[/movement_costs]
+
+		[defense]
+		deep_water=70
+		shallow_water=60
+		swamp_water=60
+		grassland=50
+		sand=60
+		forest=30
+		hills=50
+		mountains=40
+		village=40
+		castle=40
+		tundra=60
+		cave=70
+		[/defense]
+
+		[resistance]
+		blade=100
+		pierce=100
+		impact=110
+		fire=100
+		cold=100
+		holy=80
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=treefolk
+		[movement_costs]
+		deep_water=100
+		shallow_water=2
+		swamp_water=2
+		grassland=1
+		sand=2
+		forest=1
+		hills=2
+		mountains=3
+		village=1
+		castle=1
+		cave=3
+		canyon=100
+		cavewall=100
+		tundra=2
+		[/movement_costs]
+
+		[defense]
+		deep_water=90
+		shallow_water=80
+		swamp_water=70
+		grassland=80
+		sand=80
+		forest=60
+		hills=70
+		mountains=70
+		village=80
+		castle=80
+		cave=80
+		tundra=80
+		[/defense]
+
+		[resistance]
+		blade=100
+		pierce=40
+		impact=60
+		fire=150
+		cold=80
+		holy=80
+		[/resistance]
+	[/movetype] 
+
+	[movetype]
+	name=fly
+	flies=true
+		[movement_costs]
+		deep_water=1
+		shallow_water=1
+		swamp_water=1
+		grassland=1
+		sand=1
+		forest=1
+		hills=1
+		mountains=1
+		village=1
+		castle=1
+		cave=2
+		canyon=1
+		cavewall=100
+		tundra=1
+		[/movement_costs]
+
+		[defense]
+		deep_water=50
+		shallow_water=50
+		swamp_water=50
+		grassland=50
+		sand=50
+		forest=50
+		hills=50
+		mountains=50
+		village=50
+		castle=50
+		tundra=50
+		canyon=50
+		cave=80
+		[/defense]
+
+		[resistance]
+		blade=100
+		pierce=100
+		impact=120
+		fire=100
+		cold=100
+		holy=80
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=deepsea
+		[movement_costs]
+		deep_water=1
+		shallow_water=2
+		swamp_water=2
+		grassland=4
+		sand=4
+		forest=5
+		hills=5
+		mountains=100
+		village=2
+		castle=1
+		cave=3
+		tundra=2
+		canyon=100
+		cavewall=100
+		[/movement_costs]
+
+		[defense]
+		deep_water=40
+		shallow_water=50
+		swamp_water=40
+		grassland=70
+		sand=70
+		forest=70
+		hills=70
+		mountains=80
+		village=70
+		castle=70
+		tundra=70
+		cave=80
+		[/defense]
+
+		[resistance]
+		blade=80
+		pierce=100
+		impact=70
+		fire=100
+		cold=40
+		holy=80
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=swimmer
+		[movement_costs]
+		deep_water=1
+		shallow_water=1
+		swamp_water=1
+		grassland=2
+		sand=2
+		forest=5
+		hills=5
+		mountains=100
+		village=1
+		castle=1
+		cave=3
+		tundra=2
+		canyon=100
+		cavewall=100
+		[/movement_costs]
+
+		[defense]
+		deep_water=50
+		shallow_water=40
+		swamp_water=40
+		grassland=70
+		sand=70
+		forest=70
+		hills=70
+		mountains=80
+		village=60
+		castle=60
+		tundra=70
+		cave=80
+		[/defense]
+
+		[resistance]
+		blade=100
+		pierce=100
+		impact=100
+		fire=100
+		cold=40
+		holy=80
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=naga
+		[movement_costs]
+		deep_water=1
+		shallow_water=1
+		swamp_water=1
+		grassland=2
+		sand=1
+		forest=3
+		hills=3
+		mountains=5
+		village=1
+		castle=2
+		cave=1
+		tundra=2
+		canyon=100
+		cavewall=100
+		[/movement_costs]
+
+		[defense]
+		deep_water=50
+		shallow_water=40
+		swamp_water=40
+		grassland=70
+		sand=60
+		forest=70
+		hills=60
+		mountains=70
+		village=60
+		castle=50
+		tundra=70
+		cave=80
+		[/defense]
+
+		[resistance]
+		blade=100
+		pierce=100
+		impact=100
+		fire=100
+		cold=120
+		holy=80
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=float
+	flies=true
+		[movement_costs]
+		deep_water=1
+		shallow_water=1
+		swamp_water=2
+		grassland=200
+		sand=200
+		forest=200
+		hills=200
+		mountains=200
+		village=200
+		castle=200
+		tundra=200
+		cave=200
+		canyon=200
+		cavewall=200
+		[/movement_costs]
+
+		[defense]
+		deep_water=50
+		shallow_water=50
+		swamp_water=60
+		grassland=0
+		sand=0
+		forest=0
+		hills=0
+		mountains=0
+		village=0
+		castle=0
+		tundra=0
+		cave=0
+		[/defense]
+
+		[resistance]
+		blade=100
+		pierce=100
+		impact=110
+		fire=100
+		cold=100
+		holy=80
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=mountainfoot
+		[movement_costs]
+		deep_water=100
+		shallow_water=3
+		swamp_water=3
+		grassland=1
+		sand=1
+		forest=1
+		hills=1
+		mountains=1
+		village=1
+		castle=1
+		tundra=2
+		cave=1
+		canyon=100
+		cavewall=100
+		[/movement_costs]
+
+		[defense]
+		deep_water=80
+		shallow_water=80
+		swamp_water=80
+		grassland=70
+		sand=70
+		forest=70
+		hills=40
+		mountains=30
+		village=50
+		tundra=60
+		castle=40
+		cave=50
+		[/defense]
+
+		[resistance]
+		blade=100
+		pierce=100
+		impact=100
+		fire=100
+		cold=100
+		holy=80
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=dwarvishfoot
+		[movement_costs]
+		deep_water=100
+		shallow_water=3
+		swamp_water=3
+		grassland=1
+		sand=1
+		forest=1
+		hills=1
+		mountains=1
+		village=1
+		castle=1
+		tundra=2
+		cave=1
+		canyon=100
+		cavewall=100
+		[/movement_costs]
+
+		[defense]
+		deep_water=80
+		shallow_water=80
+		swamp_water=80
+		grassland=70
+		sand=70
+		forest=70
+		hills=40
+		mountains=30
+		village=50
+		tundra=60
+		castle=40
+		cave=50
+		[/defense]
+
+		[resistance]
+		blade=70
+		pierce=80
+		impact=80
+		fire=90
+		cold=80
+		holy=80
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=undeadfoot
+		[movement_costs]
+		deep_water=4
+		shallow_water=3
+		swamp_water=2
+		grassland=1
+		sand=2
+		forest=2
+		hills=3
+		mountains=4
+		village=1
+		castle=1
+		cave=2
+		canyon=100
+		cavewall=100
+		tundra=2
+		[/movement_costs]
+
+		[defense]
+		deep_water=90
+		shallow_water=80
+		swamp_water=70
+		grassland=60
+		sand=70
+		forest=50
+		hills=50
+		mountains=40
+		village=40
+		castle=40
+		cave=60
+		canyon=80
+		tundra=60
+		[/defense]
+
+		[resistance]
+		blade=90
+		pierce=70
+		impact=110
+		fire=120
+		cold=40
+		holy=200
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=undeadfly
+	flies=true
+		[movement_costs]
+		deep_water=1
+		shallow_water=1
+		swamp_water=1
+		grassland=1
+		sand=1
+		forest=1
+		hills=1
+		mountains=1
+		village=1
+		castle=1
+		cave=1
+		canyon=1
+		cavewall=100
+		tundra=1
+		[/movement_costs]
+
+		[defense]
+		deep_water=50
+		shallow_water=50
+		swamp_water=50
+		grassland=50
+		sand=50
+		forest=50
+		hills=50
+		mountains=50
+		village=50
+		castle=50
+		cave=60
+		canyon=50
+		tundra=50
+		[/defense]
+
+		[resistance]
+		blade=100
+		pierce=100
+		impact=100
+		fire=120
+		cold=40
+		holy=200
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=undeadspirit
+	flies=true
+		[movement_costs]
+		deep_water=4
+		shallow_water=3
+		swamp_water=1
+		grassland=1
+		sand=1
+		forest=1
+		hills=1
+		mountains=1
+		village=1
+		castle=1
+		cave=1
+		canyon=1
+		cavewall=100
+		tundra=1
+		[/movement_costs]
+
+		[defense]
+		deep_water=50
+		shallow_water=50
+		swamp_water=50
+		grassland=50
+		sand=50
+		forest=50
+		hills=50
+		mountains=50
+		village=50
+		castle=50
+		cave=60
+		canyon=50
+		tundra=50
+		[/defense]
+
+		[resistance]
+		blade=40
+		pierce=40
+		impact=40
+		fire=100
+		cold=30
+		holy=150
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=spirit
+	flies=true
+		[movement_costs]
+		deep_water=4
+		shallow_water=3
+		swamp_water=1
+		grassland=1
+		sand=1
+		forest=1
+		hills=1
+		mountains=1
+		village=1
+		castle=1
+		cave=1
+		canyon=1
+		cavewall=100
+		tundra=1
+		[/movement_costs]
+
+		[defense]
+		deep_water=50
+		shallow_water=50
+		swamp_water=50
+		grassland=50
+		sand=50
+		forest=50
+		hills=50
+		mountains=50
+		village=50
+		castle=50
+		cave=60
+		canyon=50
+		tundra=50
+		[/defense]
+
+		[resistance]
+		blade=40
+		pierce=40
+		impact=40
+		fire=100
+		cold=30
+		holy=100
+		[/resistance]
+	[/movetype]
+
+	[movetype] 
+		name=lizard
+		flies=false
+		[movement_costs] 
+		deep_water=100 
+		shallow_water=3 
+		swamp_water=1 
+		grassland=1 
+		sand=1 
+		forest=2 
+		hills=1 
+		mountains=2 
+		village=1 
+		castle=1 
+		cave=1 
+		canyon=100
+		cavewall=100 
+		tundra=4 
+		[/movement_costs] 
+		
+		[defense] 
+		deep_water=100 
+		shallow_water=60 
+		swamp_water=40 
+		grassland=60 
+		sand=40 
+		forest=40 
+		hills=40 
+		mountains=40 
+		village=50 
+		castle=40 
+		cave=40 
+		tundra=70 
+		[/defense] 
+ 
+		[resistance] 
+		blade=100 
+		pierce=90 
+		impact=100 
+		fire=110 
+		cold=120 
+		holy=80 
+		[/resistance] 
+	[/movetype] 
+
+	[movetype]
+		name=none
+		flies=false
+		[movement_costs]
+		deep_water=200
+		shallow_water=200
+		swamp_water=200
+		grassland=200
+		sand=200
+		forest=200
+		hills=200
+		mountains=200
+		village=200
+		castle=200
+		tundra=200
+		cave=200
+		canyon=200
+		cavewall=200
+		[/movement_costs]
+	
+		[defense]
+		deep_water=200
+		shallow_water=200
+		swamp_water=200
+		grassland=50
+		sand=50
+		forest=50
+		hills=50
+		mountains=50
+		village=50
+		castle=50
+		tundra=50
+		cave=50
+		[/defense]
+	
+		[resistance]
+		blade=80
+		pierce=80
+		impact=120
+		fire=120
+		cold=100
+		holy=100
+		[/resistance]
+	
+	[/movetype]
+
+	[movetype]
+		name=scuttlefoot
+		flies=false
+		[movement_costs]
+		deep_water=100
+		shallow_water=3
+		swamp_water=2
+		grassland=1
+		sand=2
+		forest=2
+		hills=3
+		mountains=4
+		village=1
+		castle=1
+		cave=2
+		canyon=100
+		cavewall=100
+		tundra=2
+		[/movement_costs]
+
+		[defense]
+		deep_water=80
+		shallow_water=70
+		swamp_water=60
+		grassland=60
+		sand=60
+		forest=50
+		hills=50
+		mountains=40
+		village=40
+		castle=40
+		cave=60
+		tundra=60
+		[/defense]
+
+	  	[resistance]
+		blade=90
+		pierce=90
+		impact=30
+		fire=200
+		cold=120
+		holy=100
+	 	[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=drakefly
+	flies=true
+	# Drakes are huge (easy targets) flying beasts, but are different
+	# from the classical flying unit: to fight they have to land
+	# They love caves and mountains, and above all: warmth
+		[movement_costs]
+		deep_water=1
+		shallow_water=1
+		swamp_water=1
+		grassland=1
+		sand=1
+		forest=1
+		hills=1
+		mountains=1
+		village=1
+		castle=1
+		cave=1
+		canyon=1
+		cavewall=100
+		tundra=1
+		[/movement_costs]
+
+		[defense]
+		deep_water=80
+		shallow_water=80
+		swamp_water=70
+		grassland=70
+		sand=60
+		forest=60
+		hills=60
+		mountains=60
+		village=60
+		castle=60
+		cave=60
+		canyon=60
+		tundra=70
+		[/defense]
+
+		[resistance]
+		blade=90
+		pierce=110
+		impact=80
+		fire=50
+		cold=150
+		holy=80
+		[/resistance]
+	[/movetype]
+
+	[movetype]
+	name=drakefoot
+	# These Drakes wear heavy armor - they don't fly
+	# But the armor makes them a good bit tougher
+	# Do a bit worse in Swamps as they can't hop to dry spots
+		[movement_costs]
+		deep_water=100
+		shallow_water=3
+		swamp_water=3
+		grassland=1
+		sand=1
+		forest=2
+		hills=1
+		mountains=1
+		village=1
+		castle=1
+		cave=1
+		canyon=100
+		cavewall=100
+		tundra=3
+		[/movement_costs]
+
+		[defense]
+		deep_water=90
+		shallow_water=80
+		swamp_water=80
+		grassland=70
+		sand=60
+		forest=60
+		hills=60
+		mountains=60
+		village=60
+		castle=60
+		cave=60
+		tundra=80
+		[/defense]
+
+		[resistance]
+		blade=80
+		pierce=100
+		impact=70
+		fire=50
+		cold=150
+		holy=80
+		[/resistance]
+	[/movetype]
+[/units]