Stop unit deletion prompt text overlapping the window border

This was SVN commit r8832.
Disable compression for more UI textures with noticeable artifacts
2010-12-09 22:15:23 +00:00 · 2010-12-09 22:06:11 +00:00 · 2010-12-09 18:46:56 +00:00 · 2010-12-09 11:16:21 +00:00 · 2010-12-09 01:30:51 +00:00 · 2010-12-09 00:03:19 +00:00
3166 changed files with 52136 additions and 37154 deletions
@@ -32,10 +32,14 @@ shadows = true
 vsync = false

 nos3tc = false
-noautomipmap = false
+noautomipmap = true
 novbo = false
 noframebufferobject = false

+; Linux only: Set the driconf force_s3tc_enable option at startup,
+; for compressed texture support
+force_s3tc_enable = true
+
 ; Specify the render path. This can be one of:
 ;   default       Automatically select one of the below, depending on system capabilities
 ;   fixed         Only use OpenGL fixed function pipeline
@@ -47,26 +51,20 @@ renderpath = default
 ; Adjusts how OpenGL calculates mipmap level of detail. 0.0f is the default (blurry) value.
 ; Lower values sharpen/extend, and higher values blur/decrease. Clamped at -3.0 to 3.0.
 ; -1.0 to -1.5 recommended for good results.
-lodbias = -0.5
+lodbias = 0

 ; Profile selection

 profile = default

-; Language selection: (currently "english" or "pseudogreek")
-language = english
-
 ; Font mappings:

 font.console = console
 font.default = palatino12
 font.misc = verdana16

-; Colour of the sky (in "r g b" format). (Will be removed once there's proper sky support).
-;skycolor = "255 0 0"
-
-; Maximum number of players in a session (default 6).
-max_players = 8
+; Colour of the sky (in "r g b" format)
+skycolor = "0 0 0"

 ; GENERAL PREFERENCES:

@@ -79,8 +77,8 @@ view.rotate.x.min = 20
 view.rotate.x.max = 60
 view.rotate.x.default = 30
 view.rotate.y.speed = 2.0
-view.rotate.y.speed.wheel = 0.1
-view.rotate.y.default  0.0
+view.rotate.y.speed.wheel = 0.45
+view.rotate.y.default = 0.0
 view.drag.speed = 0.5
 view.zoom.speed = 256.0
 view.zoom.speed.wheel = 32.0
@@ -100,52 +98,42 @@ view.rotate.y.smoothness = 0.3
 ; See keys.txt for the list of key names.

 ; > SYSTEM SETTINGS
-hotkey.exit = "Alt+F4", "Ctrl+Break"		; Exit to desktop.
-hotkey.leave = Escape                       ;End current game or Exit.
-hotkey.pause = Pause								; Pause/unpause game.
-hotkey.screenshot = F2								; Take PNG screenshot.
-hotkey.bigscreenshot = "Ctrl+Alt+F2"				; Take large BMP screenshot.
-hotkey.togglefullscreen = "Alt+Return"				; Toggle fullscreen/windowed mode
-hotkey.screenshot.watermark = "K"					; Toggle product/company watermark for official 
-hotkey.wireframe = "Alt+W"							; Toggle wireframe mode.
-
-hotkey.archive.abort = "Alt+F4"						; Prematurely terminate the archive builder process.
+hotkey.exit = "Alt+F4", "Ctrl+Break"        ; Exit to desktop
+hotkey.leave = Escape                       ; End current game or Exit
+hotkey.pause = Pause                        ; Pause/unpause game
+hotkey.screenshot = F2                      ; Take PNG screenshot
+hotkey.bigscreenshot = "Shift+F2"           ; Take large BMP screenshot
+hotkey.togglefullscreen = "Alt+Return"      ; Toggle fullscreen/windowed mode
+hotkey.screenshot.watermark = "K"           ; Toggle product/company watermark for official screenshots
+hotkey.wireframe = "Alt+W"                  ; Toggle wireframe mode

 ; > CAMERA SETTINGS
-hotkey.camera.reset = "H"					; Reset camera rotation to default.
-hotkey.camera.reset.origin = "Ctrl+H"				; Reset camera to origin.
-hotkey.camera.zoom.in = Plus, Equals, NumPlus			; Zoom camera in.
-hotkey.camera.zoom.out = Minus, NumMinus			; Zoom camera out.
-hotkey.camera.zoom.wheel.in = WheelUp				; Zoom camera in (wheel speed).
-hotkey.camera.zoom.wheel.out = WheelDown			; Zoom camera out (wheel speed).
-hotkey.camera.rotate.wheel.cw = "Shift+WheelUp"
-hotkey.camera.rotate.wheel.ccw = "Shift+WheelDown"
-hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q
-hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E
-hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W"
-hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S"
-
-hotkey.camera.pan = MouseMiddle, ForwardSlash			; Scroll by moving mouse.
-hotkey.camera.pan.keyboard = "~Shift+~Ctrl"			; = holding neither Ctrl nor Shift
-hotkey.camera.left = A, LeftArrow					; Scroll or rotate left.
-hotkey.camera.right = D, RightArrow				; Scroll or rotate right.
-hotkey.camera.up = W, UpArrow					; Scroll or rotate up/forwards.
-hotkey.camera.down = S, DownArrow					; Scroll or rotate down/backwards.
-
-;camera.cinema.add = "L"
-;camera.cinema.delete = "U"
-;camera.cinema.delete.all = "R"
-;camera.cinema.write = "O"
-camera.cinema.queue = "I"
+hotkey.camera.reset = "H"                                 ; Reset camera rotation to default.
+hotkey.camera.follow = "F"                                ; Follow the first unit in the selection
+hotkey.camera.zoom.in = Plus, Equals, NumPlus             ; Zoom camera in (continuous control)
+hotkey.camera.zoom.out = Minus, NumMinus                  ; Zoom camera out (continuous control)
+hotkey.camera.zoom.wheel.in = WheelUp                     ; Zoom camera in (stepped control)
+hotkey.camera.zoom.wheel.out = WheelDown                  ; Zoom camera out (stepped control)
+hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W"        ; Rotate camera to look upwards
+hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S"    ; Rotate camera to look downwards
+hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q   ; Rotate camera clockwise around terrain
+hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E ; Rotate camera anticlockwise around terrain
+hotkey.camera.rotate.wheel.cw = "Shift+WheelUp", MouseX1    ; Rotate camera clockwise around terrain (stepped control)
+hotkey.camera.rotate.wheel.ccw = "Shift+WheelDown", MouseX2 ; Rotate camera clockwise around terrain (stepped control)
+hotkey.camera.pan = MouseMiddle, ForwardSlash             ; Enable scrolling by moving mouse
+hotkey.camera.left = A, LeftArrow                         ; Scroll or rotate left
+hotkey.camera.right = D, RightArrow                       ; Scroll or rotate right
+hotkey.camera.up = W, UpArrow                             ; Scroll or rotate up/forwards
+hotkey.camera.down = S, DownArrow                         ; Scroll or rotate down/backwards

 ; > CONSOLE SETTINGS
-hotkey.console.toggle = BackQuote, F9				; Open/close console.
-hotkey.console.copy = "Ctrl+C"					; Copy from console to clipboard.
-hotkey.console.paste = Insert, "Ctrl+V"				; Paste clipboard to console.
+hotkey.console.toggle = BackQuote, F9       ; Open/close console
+hotkey.console.copy = "Ctrl+C"              ; Copy from console to clipboard
+hotkey.console.paste = "Ctrl+V"             ; Paste clipboard to console

 ; > ENTITY SELECTION
-hotkey.selection.add = Shift					; Add units to selection.
-hotkey.selection.remove = Ctrl					; Remove units from selection.
+hotkey.selection.add = Shift                ; Add units to selection
+hotkey.selection.remove = Ctrl              ; Remove units from selection
 hotkey.selection.group.0 = 0
 hotkey.selection.group.1 = 1
 hotkey.selection.group.2 = 2
@@ -156,70 +144,32 @@ hotkey.selection.group.6 = 6
 hotkey.selection.group.7 = 7
 hotkey.selection.group.8 = 8
 hotkey.selection.group.9 = 9
-hotkey.selection.group.add = Shift				; +group: Add units to group.				
-hotkey.selection.group.save = Ctrl				; +group: Save units to group.
-hotkey.selection.group.snap = Alt				; +group: Check up on group.
-hotkey.selection.snap = Home					; Centre view on selection.
-hotkey.highlightall = O						; Show selection circle for all units on screen.
-hotkey.killUnit = Delete
+hotkey.selection.group.add = Shift          ; +group: Add units to group
+hotkey.selection.group.save = Ctrl          ; +group: Save units to group
+hotkey.selection.group.snap = Alt           ; +group: Check up on group
+hotkey.selection.snap = Home                ; Centre view on selection

-; > CONTEXT CURSOR
-hotkey.contextorder.next = LeftBracket				; Cycle right through orders (context cursors).
-hotkey.contextorder.previous = RightBracket			; Cycle left through orders (context cursors).
-
-; > TESTING KEYS
-hotkey.orbital.toggle = V					; Enable/disable ball arena.
-hotkey.orbital.cheat = "LeftCtrl+Backslash"			; Freeze ball.
-hotkey.dudemachine.random = "Ctrl+ForwardSlash"			; Create random Dude.
+; > SESSION CONTROLS
+hotkey.session.kill = Delete                ; Destroy selected units
+hotkey.session.garrison = Ctrl              ; Modifier to garrison when clicking on building
+hotkey.session.queue = Shift                ; Modifier to queue unit orders instead of replacing
+hotkey.session.batchtrain = Shift           ; Modifier to train units in batches
+hotkey.session.deselectgroup = Ctrl         ; Modifier to deselect units when clicking group icon, instead of selecting
+hotkey.session.rotate.cw = RightBracket     ; Rotate building placement preview clockwise
+hotkey.session.rotate.ccw = LeftBracket     ; Rotate building placement preview anticlockwise
+hotkey.timewarp.fastforward = Space
+hotkey.timewarp.rewind = Backspace

 ; > OVERLAY KEYS
-hotkey.fps.toggle = "Shift+F"					; Toggle frame counter.
-hotkey.session.statuspane.toggle = "Shift+S"			; Toggle Status Orb.
-hotkey.session.minimap.toggle = "Shift+M"			; Toggle Map Orb.
-hotkey.resourcepool.toggle = "Shift+R"				; Toggle Resource Pool.
-hotkey.grouppane.toggle = "Shift+G"				; Toggle Group Pane.
-hotkey.teamtray.toggle = "Shift+T"				; Toggle Team Tray.
-hotkey.session.ShowPlayersList = "Shift+P"      ; Toggle Players List
-hotkey.session.devcommands.toggle = "Shift+D"
-
-; > SESSION ORIENTATION KEYS
-hotkey.session.gui.flip = "Alt+G"				; Toggle GUI to top/bottom/left/right of screen.
-hotkey.session.gui.toggle = "G"					; Toggle visibility of session GUI.
-
-; (TEMPORARY)
-hotkey.alwayson.toggle = "Shift+X"				; Toggle always ons (Exit Button, End Game Button).
-
-; > SUBMENU KEYS
-hotkey.menu.toggle = "F10"					; Toggle in-game menu.
-hotkey.menu.resign = "Alt+X"					; End current game session and return to main menu.
+hotkey.fps.toggle = "Shift+F"                  ; Toggle frame counter
+hotkey.session.devcommands.toggle = "Shift+D"  ; Toggle developer commands panel
+hotkey.session.gui.toggle = "G"                ; Toggle visibility of session GUI
+hotkey.menu.toggle = "F10"                     ; Toggle in-game menu

 ; > HOTKEYS ONLY
-
-
-
-hotkey.chat = Return						; Toggles chat window
-
-
-
-hotkey.onlinehelp = "F1"					; Enable/disable online manual entry for current selection.
-hotkey.music.toggle = "M"						; Enable/disable music.
-hotkey.audio.toggle = "Ctrl+A"					; Enable/disable sound.
+hotkey.chat = Return                        ; Toggle chat window

 ; > PROFILER
-hotkey.profile.toggle = "F11"					; Enable/disable real-time profiler
-hotkey.profile.save = "Shift+F11"				; Save current profiler data to "logs/profile.txt"
+hotkey.profile.toggle = "F11"               ; Enable/disable real-time profiler
+hotkey.profile.save = "Shift+F11"           ; Save current profiler data to logs/profile.txt

-; UNMAPPED KEY/MOUSE REFERENCE:
-
-; LMB								; select unit
-; RMB								; issue order to selected units
-; LMB-drag							; bandbox units
-; LMB-doubleclick						; select all units of this type on screen
-; LMB-tripleclick						; select all units of this type on map
-; shift+mouse select						; add to selection
-; ctrl+mouse select						; remove from selection
-; #=(1...0)							; select group #, pressing again centres view
-; shift+#							; add group # to selection
-; ctrl+#							; save selection as group #
-; alt+# (hold down)						; snap view to group # (while alt is held down)
-; mouse on map edge						; scroll in this direction
@@ -126,8 +126,8 @@ Right Alt, RightAlt
 Left Alt, LeftAlt
 Right Meta
 Left Meta
-Left Super, LeftWin  
-Right Super, RightWin        
+Left Super, LeftWin
+Right Super, RightWin
 Alt Gr, AltGr
 Compose 

@@ -1,4 +0,0 @@
-@echo off
-cd ..\system
-set PATH=.
-archbuild.exe --bindir=..
@@ -2,8 +2,14 @@ function TestScript1A() {}

 TestScript1A.prototype.GetX = function() {
 	// Test that .entity is readonly
-	delete this.entity;
-	this.entity = -1;
+	try {
+		delete this.entity;
+		Engine.TS_FAIL("Missed exception");
+	} catch (e) { }
+	try {
+		this.entity = -1;
+		Engine.TS_FAIL("Missed exception");
+	} catch (e) { }
 	
 	// and return the value
 	return this.entity;
@@ -19,8 +19,14 @@ function TestScript1_entity() {}

 TestScript1_entity.prototype.GetX = function() {
 	// Test that .entity is readonly
-	delete this.entity;
-	this.entity = -1;
+	try {
+		delete this.entity;
+		Engine.TS_FAIL("Missed exception");
+	} catch (e) { }
+	try {
+		this.entity = -1;
+		Engine.TS_FAIL("Missed exception");
+	} catch (e) { }

 	// and return the value
 	return this.entity;
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="quarry temperate">
-      <mesh>gaia/quarry_a.dae</mesh>
-      <props>
-        <prop actor="geology/quarry_temperate_a_base.xml" attachpoint="root"/>
-      </props>
-      <texture>gaia/quarry_temperate.dds</texture>
-    </variant>
-  </group>
-</actor>
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <group>
-    <variant frequency="1" name="quarry base [A]">
-      <mesh>gaia/quarry_a_base.dae</mesh>
-      <texture>gaia/decal_quarry_temperate.dds</texture>
-    </variant>
-  </group>
-</actor>
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="quarry temperate">
-      <mesh>gaia/quarry_b.dae</mesh>
-      <props>
-        <prop actor="geology/quarry_temperate_b_base.xml" attachpoint="root"/>
-      </props>
-      <texture>gaia/quarry_temperate.dds</texture>
-    </variant>
-  </group>
-</actor>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="quarry base [B]">
-      <mesh>gaia/quarry_b_base.dae</mesh>
-      <texture>gaia/decal_quarry_temperate.dds</texture>
-    </variant>
-  </group>
-</actor>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="chinese merchant sail">
+      <mesh>props/chin_merch_sail.dae</mesh>
+      <texture>props/chin_sail_dragon.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="chinese trireme sail">
+      <mesh>props/chin_tri_sail.dae</mesh>
+      <texture>props/chin_sail_dragon.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/iber_dock_boat.dae</mesh>
+      <texture>structural/iber_ship.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
@@ -1,18 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="1" name="props-1">
-      <mesh>props/iber_gate_door_1.dae</mesh>
+      <mesh>props/iber_gate_door.dae</mesh>
+      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
-
-  <group>
-    <variant>
-      <texture>props/iber_prop_a.dds</texture>
-    </variant>
-  </group>
-
 </actor>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/iber_wallgate_shields.dae</mesh>
+      <texture>props/iber_prop_shields.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
@@ -1,23 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="1" name="shields-a">
      <mesh>props/iber_scout_tower.dae</mesh>
    </variant>
-    <variant frequency="1" name="shields-b">
-      <mesh>props/iber_scout_tower_b.dae</mesh>
-    </variant>
  </group>
-
  <group>
    <variant>
      <texture>props/iber_prop_shields.dds</texture>
    </variant>
  </group>
-
  <material>player_trans.xml</material>
-
 </actor>
@@ -14,7 +14,6 @@
    <variant frequency="1" name="oars-down">
      <mesh>props/rome_qui_oars2.dae</mesh>
    </variant>
-    <variant frequency="1" name="oars-drawn"/>
  </group>
  <material>player_trans.xml</material>
 </actor>
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="Mesh">
      <mesh>props/shield/spara_a_f.pmd</mesh>
@@ -11,11 +9,7 @@
      </props>
    </variant>
  </group>
-
  <group>
-    <variant name="spara-texture-a">
-      <texture>props/shield/pers_rect_a.dds</texture>
-    </variant>
    <variant name="spara-texture-b">
      <texture>props/shield/pers_rect_b.dds</texture>
    </variant>
@@ -26,7 +20,5 @@
      <texture>props/shield/pers_rect_e.dds</texture>
    </variant>
  </group>
-
  <material>player_trans.xml</material>
-
 </actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Mesh">
+      <mesh>props/shield/spara_a_f.pmd</mesh>
+      <props>
+        <prop actor="props/units/shields/pers_tower_back.xml" attachpoint="back"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="spara-texture-a">
+      <texture>props/shield/pers_rect_a.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
@@ -8,10 +8,10 @@
  <group>
    <variant frequency="100" name="Base">
      <mesh>structural/kart_tri.dae</mesh>
-      <!--<props>
-        <prop actor="props/structures/persians/trireme_oars.xml" attachpoint="root"/>
-        <prop actor="props/structures/persians/trireme_mast.xml" attachpoint="root"/>
-      </props>-->
+      <props>
+        <prop actor="props/structures/carthaginians/trireme_oars.xml" attachpoint="root"/>
+        <!--<prop actor="props/structures/persians/trireme_mast.xml" attachpoint="root"/>-->
+      </props>
      <texture>structural/plac_kart.dds</texture>
    </variant>
  </group>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant name="Chinese Merchant Ship">
+      <mesh>structural/chin_merch.dae</mesh>
+      <props>
+        <prop actor="props/structures/chinese/merchant_sail.xml" attachpoint="root"/>
+      </props>
+      <texture>structural/chin_ship.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant name="Chinese Trireme">
+      <mesh>structural/chin_tri.dae</mesh>
+      <props>
+        <prop actor="props/structures/chinese/trireme_sail.xml" attachpoint="root"/>
+        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+      </props>
+      <texture>structural/chin_ship.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
@@ -1,16 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="Base">
      <mesh>structural/iber_barracks.dae</mesh>
      <props>
        <prop actor="props/structures/iberians/barracks.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
      </props>
      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
-
 </actor>
@@ -1,18 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="Base">
      <mesh>structural/iber_civic_centre.dae</mesh>
      <props>
        <prop actor="props/structures/iberians/civil_centre.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
      </props>
      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
-
  <material>player_trans.xml</material>
-
 </actor>
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
  <castshadow/>
+  <float/>
  <group>
    <variant frequency="1" name="Iberian Dock">
      <mesh>structural/iber_dock.dae</mesh>
+      <props>
+        <prop actor="props/structures/iberians/dock_boat.xml" attachpoint="root"/>
+      </props>
      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
@@ -1,16 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="Base">
      <mesh>structural/iber_farmstead.dae</mesh>
      <props>
        <prop actor="props/structures/iberians/farmstead_hay.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/farmstead_mud.xml" attachpoint="root"/>
      </props>
      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
-
 </actor>
@@ -4,6 +4,9 @@
  <group>
    <variant frequency="100" name="base">
      <mesh>structural/iber_fortress.dae</mesh>
+      <props>
+        <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
+      </props>
      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
@@ -1,31 +1,32 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
+  <castshadow/>
  <group>
    <variant frequency="10" name="House A">
      <mesh>structural/iber_house_a.dae</mesh>
      <props>
        <prop actor="props/structures/iberians/house_a.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
      </props>
    </variant>
    <variant frequency="10" name="House B">
      <mesh>structural/iber_house_b.dae</mesh>
      <props>
        <prop actor="props/structures/iberians/house_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
      </props>
    </variant>
    <variant frequency="10" name="House C">
      <mesh>structural/iber_house_c.dae</mesh>
      <props>
        <prop actor="props/structures/iberians/house_c.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
      </props>
    </variant>
  </group>
-
  <group>
    <variant>
      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
-
 </actor>
@@ -1,18 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="Base">
      <mesh>structural/iber_market.dae</mesh>
      <props>
        <prop actor="props/structures/iberians/market_01.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
      </props>
      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
-
  <material>player_trans.xml</material>
-
 </actor>
@@ -1,16 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="Base">
      <mesh>structural/iber_mill.dae</mesh>
      <props>
        <prop actor="props/structures/iberians/mill.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
      </props>
      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
-
 </actor>
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="base">
      <mesh>structural/iber_sb_mon_1.dae</mesh>
      <props>
        <prop actor="props/structures/iberians/sb_1_a.xml" attachpoint="root"/>
        <prop actor="props/structures/iberians/sb_1_b.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
      </props>
      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
-
 </actor>
@@ -1,16 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="Base">
      <mesh>structural/iber_scout_tower.dae</mesh>
      <props>
        <prop actor="props/structures/iberians/scout_tower.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
      </props>
      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
-
 </actor>
@@ -1,16 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="Base">
      <mesh>structural/iber_temple.dae</mesh>
      <props>
        <prop actor="props/structures/iberians/temple.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
      </props>
      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
-
 </actor>
@@ -1,15 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
-    <variant frequency="100" name="base">
-      <mesh>structural/iber_wall.dae</mesh>
-      <texture>structural/iber_struct_a.dds</texture>
+    <variant frequency="1" name="wall long">
+      <mesh>structural/iber_wall_long.dae</mesh>
+    </variant>
+    <variant frequency="1" name="wall med">
+      <mesh>structural/iber_wall_med.dae</mesh>
+    </variant>
+    <variant frequency="1" name="wall short">
+      <mesh>structural/iber_wall_short.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant>
+      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
-
-  <material>player_trans.xml</material>
-
 </actor>
@@ -1,18 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="base">
-      <mesh>structural/iber_wall_gate.dae</mesh>
+      <mesh>structural/iber_wall_gate_new.dae</mesh>
      <props>
        <prop actor="props/structures/iberians/gate_door_1.xml" attachpoint="root"/>
+        <prop actor="props/structures/iberians/gate_shields.xml" attachpoint="root"/>
      </props>
-      <texture>structural/iber_struct_a.dds</texture>
+      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
-
-  <material>player_trans.xml</material>
-
 </actor>
@@ -1,15 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="base">
-      <mesh>structural/iber_wall_tower.dae</mesh>
-      <texture>structural/iber_struct_a.dds</texture>
+      <mesh>structural/iber_wall_turret.dae</mesh>
+      <texture>structural/iber_struct.dds</texture>
    </variant>
  </group>
-
  <material>player_trans.xml</material>
-
 </actor>
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="Base">
      <mesh>structural/pers_farmstead.dae</mesh>
+      <props>
+        <prop actor="props/structures/decals/farmstead_mud.xml" attachpoint="root"/>
+      </props>
      <texture>structural/pers_struct.dds</texture>
    </variant>
  </group>
-
  <material>player_trans.xml</material>
-
 </actor>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>temp/pers_tower_test.dae</mesh>
+      <texture>structural/pers_tower_01.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="Base">
      <mesh>structural/rome_mill.dae</mesh>
+      <props>
+        <prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
+      </props>
      <texture>structural/rome_struct.dds</texture>
    </variant>
  </group>
-
  <material>player_trans.xml</material>
-
 </actor>
@@ -1,33 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <float/>
-
  <group>
    <variant frequency="100" name="Base">
      <mesh>structural/rome_qui.dae</mesh>
      <texture>structural/rome_qui.dds</texture>
    </variant>
  </group>
-
  <group>
    <variant frequency="1" name="sail">
      <props>
-        <prop actor="props/structures/romans/quinquereme_oars.xml" attachpoint="root" />
-        <prop actor="props/structures/romans/quinquereme_props.xml" attachpoint="root" />
-        <prop actor="props/structures/romans/quinquereme_mast.xml" attachpoint="root" />
+        <prop actor="props/structures/romans/quinquereme_oars.xml" attachpoint="root"/>
+        <prop actor="props/structures/romans/quinquereme_props.xml" attachpoint="root"/>
+        <prop actor="props/structures/romans/quinquereme_mast.xml" attachpoint="root"/>
+        <prop actor="props/units/weapons/rock.xml" attachpoint="projectile"/>
      </props>
    </variant>
    <variant frequency="1" name="no-sail">
      <props>
-        <prop actor="props/structures/romans/quinquereme_oars.xml" attachpoint="root" />
-        <prop actor="props/structures/romans/quinquereme_props.xml" attachpoint="root" />
+        <prop actor="props/structures/romans/quinquereme_oars.xml" attachpoint="root"/>
+        <prop actor="props/structures/romans/quinquereme_props.xml" attachpoint="root"/>
+        <prop actor="props/units/weapons/rock.xml" attachpoint="projectile"/>
      </props>
    </variant>
  </group>
-
  <material>basic_trans.xml</material>
-
 </actor>
@@ -1,18 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="1" name="Base">
      <mesh>structural/rome_scout_tower.dae</mesh>
      <props>
        <prop actor="props/structures/romans/scout_tower.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
      </props>
      <texture>structural/rome_struct.dds</texture>
    </variant>
  </group>
-
  <material>player_trans.xml</material>
-
 </actor>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <float/>
-
-  <group>
-    <variant>
-      <mesh>test/monitor.dae</mesh>
-      <texture>temp/256unionmonitor-1.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="infantry/sword/attack/isw_s_off_05.psa" name="Idle" speed="1"/>
+        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="8"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_em_04.psa" name="Attack" speed="120"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="Attack" speed="150"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Attack" speed="145"/>
+        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_02.psa" name="death" speed="420"/>
+        <animation file="infantry/general/death/inf_06.psa" name="death" speed="200"/>
+        <animation file="infantry/general/death/inf_07.psa" name="death" speed="200"/>
+      </animations>
+      <mesh>skeletal/m_tunic_a.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/hele_hoplite_e.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_hele_h.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/xiphos.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/shields/hele_round_e.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="spartan">
+      <texture>skeletal/hele_spartitiate.dds</texture>
+    </variant>
+    <variant frequency="1" name="hoplite-f">
+      <texture>skeletal/hele_isp_e_f.dds</texture>
+    </variant>
+    <variant frequency="1" name="hoplite-g">
+      <texture>skeletal/hele_isp_e_g.dds</texture>
+    </variant>
+    <variant frequency="1" name="isp_a">
+      <texture>skeletal/hele_isp_a.dds</texture>
+    </variant>
+    <variant frequency="1" name="xenophon">
+      <texture>skeletal/hele_xenophon.dds</texture>
+    </variant>
+    <variant frequency="1" name="pez-1">
+      <texture>skeletal/hele_pezhetairoi.dds</texture>
+    </variant>
+    <variant frequency="1" name="pez-2">
+      <texture>skeletal/hele_pezhetairoi_2.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation file="female/f_idle_01.dae" name="Idle" speed="200"/>
+        <animation file="female/f_walk_01.dae" name="Walk" speed="30"/>
+        <animation file="female/f_walk_01.dae" name="Run" speed="45"/>
+        <animation file="female/f_death_01.dae" name="Death" speed="100"/>
+      </animations>
+      <props>
+        <prop actor="props/units/heads/head_kart_priestess.xml" attachpoint="head"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Peplos-DarkBrown">
+      <mesh>skeletal/f_dress.dae</mesh>
+      <texture>skeletal/kart_fem_01.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
@@ -1,16 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="1" name="Base">
      <animations>
        <animation file="biped/not used/inf_phalanx_b.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_phalanx_walk_a.psa" name="Walk" speed="17"/>
-        <animation file="biped/inf_phalanx_walk_a.psa" name="run" speed="18"/>
+        <animation file="biped/inf_phalanx_walk_a.psa" name="Walk" speed="140"/>
+        <animation file="biped/inf_phalanx_walk_a.psa" name="run" speed="200"/>
        <animation event="0.5" file="biped/inf_phalanx_atk_a.psa" name="melee" speed="350"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="death" speed="165"/>
        <animation file="infantry/general/death/inf_06.psa" name="death" speed="200"/>
      </animations>
      <props>
@@ -21,7 +18,6 @@
      </props>
    </variant>
  </group>
-
  <group>
    <variant frequency="1" name="Carth-Sacred Band-ShortSleeve">
      <mesh>skeletal/m_tunic_short.dae</mesh>
@@ -44,7 +40,5 @@
      <texture>skeletal/kart_su1_sacredband_5.dds</texture>
    </variant>
  </group>
-
  <material>player_trans.xml</material>
-
 </actor>
@@ -4,15 +4,16 @@
  <group>
    <variant frequency="1" name="Base">
      <animations>
-        <animation file="infantry/sword/attack/isw_s_def_06.psa" name="idle" speed="1"/>
-        <animation file="biped/dudewalk_swordshield.psa" name="walk" speed="18"/>
-        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="run" speed="8"/>
-        <animation file="infantry/general/death/inf_01.psa" name="death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="death" speed="200"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="melee" speed="160"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="110"/>
+        <animation file="biped/inf_sword_ready_e.dae" name="idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_e.dae" name="idle" speed="90"/>
+        <animation file="biped/walk_spearshield.psa" name="walk" speed="120"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="run" speed="40"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="100"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="melee" speed="100"/>
+        <animation file="infantry/general/death/inf_01.psa" name="death" speed="400"/>
+        <animation file="infantry/general/death/inf_02.psa" name="death" speed="700"/>
+        <animation file="infantry/general/death/inf_06.psa" name="death" speed="500"/>
+        <animation file="infantry/general/death/inf_07.psa" name="death" speed="400"/>
      </animations>
      <props>
        <prop actor="props/units/heads/head_iber_hero_1.xml" attachpoint="head"/>
@@ -1,24 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations>
-        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-      </animations>
-      <mesh>skeletal/m_pants_celt.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/head_iber_adv.xml" attachpoint="head"/>
-      </props>
-      <texture>skeletal/iber_trader_1.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>skeletal/celt_trader.pmd</mesh>
+      <props>
+        <prop actor="units/iberians/trader_r.xml" attachpoint="trader"/>
+        <prop actor="units/celts/trader_h.xml" attachpoint="donkey"/>
+      </props>
+      <texture>null_white.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/inf_pack_idle.dae" name="Idle" speed="200"/>
+        <animation file="biped/inf_pack_walk.dae" name="Walk" speed="20"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
+      </animations>
+      <mesh>skeletal/m_pants_celt.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_iber_adv.xml" attachpoint="head"/>
+        <prop actor="props/units/backpack_celt.xml" attachpoint="back"/>
+      </props>
+      <texture>skeletal/iber_trader_1.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
@@ -27,7 +27,6 @@
      </animations>
      <mesh>skeletal/m_pants_celt.dae</mesh>
      <props>
-        <prop actor="props/units/heads/head_pers_tiara_y.xml" attachpoint="head"/>
        <prop actor="props/units/shields/pers_tower.xml" attachpoint="shield"/>
        <prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
      </props>
@@ -35,14 +34,35 @@
  </group>
  <group>
    <variant frequency="1" name="Clothing-red-stripes">
+      <props>
+        <prop actor="props/units/heads/head_pers_tiara_y.xml" attachpoint="head"/>
+      </props>
      <texture>skeletal/pers_isp_a_1.dds</texture>
    </variant>
    <variant frequency="1" name="Clothing-blue-stripes">
+      <props>
+        <prop actor="props/units/heads/head_pers_tiara_y.xml" attachpoint="head"/>
+      </props>
      <texture>skeletal/pers_isp_a_2.dds</texture>
    </variant>
    <variant frequency="1" name="Clothing-gold-stripes">
+      <props>
+        <prop actor="props/units/heads/head_pers_tiara_y.xml" attachpoint="head"/>
+      </props>
      <texture>skeletal/pers_isp_a_3.dds</texture>
    </variant>
+    <variant frequency="1" name="Clothing-emerald">
+      <props>
+        <prop actor="props/units/heads/head_pers_tiara.xml" attachpoint="head"/>
+      </props>
+      <texture>skeletal/pers_isp_e_1.dds</texture>
+    </variant>
+    <variant frequency="1" name="Clothing-gold">
+      <props>
+        <prop actor="props/units/heads/head_pers_tiara.xml" attachpoint="head"/>
+      </props>
+      <texture>skeletal/pers_isp_e_2.dds</texture>
+    </variant>
  </group>
  <group>
    <variant frequency="100" name="Idle"/>
@@ -4,8 +4,8 @@
  <group>
    <variant frequency="100" name="Base">
      <animations>
-        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="100"/>
-        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="101"/>
+        <animation file="biped/inf_sword_ready_e.dae" name="Idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_e.dae" name="Idle" speed="95"/>
        <animation file="biped/walk_spearshield.psa" name="Walk" speed="18"/>
        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Melee" speed="100"/>
        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="100"/>
@@ -27,18 +27,16 @@
      </animations>
      <mesh>skeletal/m_pants_celt.dae</mesh>
      <props>
-        <prop actor="props/units/heads/head_pers_tiara.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/pers_tower.xml" attachpoint="shield"/>
+        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/pers_tower_e.xml" attachpoint="shield"/>
        <prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/heads/thracian_cap_01.xml" attachpoint="helmet"/>
      </props>
    </variant>
  </group>
  <group>
-    <variant frequency="1" name="Clothing-emerald">
-      <texture>skeletal/pers_isp_e_1.dds</texture>
-    </variant>
-    <variant frequency="1" name="Clothing-gold">
-      <texture>skeletal/pers_isp_e_2.dds</texture>
+    <variant frequency="1" name="scale mail">
+      <texture>skeletal/pers_iar_e_2.dds</texture>
    </variant>
  </group>
  <group>
@@ -55,6 +53,7 @@
        <prop actor="" attachpoint="shield"/>
        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
        <prop actor="" attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
      </props>
    </variant>
    <variant name="gather_grain">
@@ -62,6 +61,7 @@
        <prop actor="" attachpoint="shield"/>
        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
        <prop actor="" attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
      </props>
    </variant>
    <variant name="gather_fruit">
@@ -70,6 +70,7 @@
        <prop actor="" attachpoint="l_hand"/>
        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
        <prop actor="" attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
      </props>
    </variant>
    <variant name="gather_stone">
@@ -77,6 +78,7 @@
        <prop actor="" attachpoint="shield"/>
        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
        <prop actor="" attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
      </props>
    </variant>
    <variant name="gather_metal">
@@ -84,6 +86,7 @@
        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
        <prop attachpoint="r_hand"/>
        <prop attachpoint="shield"/>
+        <prop attachpoint="helmet"/>
      </props>
    </variant>
    <variant name="Build">
@@ -91,6 +94,7 @@
        <prop actor="" attachpoint="shield"/>
        <prop actor="" attachpoint="l_hand"/>
        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+        <prop attachpoint="helmet"/>
      </props>
    </variant>
  </group>
@@ -6,33 +6,29 @@
      <animations>
        <animation file="biped/inf_sword_ready_e.dae" name="Idle" speed="100"/>
        <animation file="biped/inf_sword_ready_e.dae" name="Idle" speed="95"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="17"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="110"/>
        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="120"/>
-        <animation event="0.5" file="infantry/sword/attack/isw_s_def_01.psa" name="Melee" speed="100"/>
-        <animation file="infantry/sword/attack/isw_s_def_06.psa" name="Melee" speed="100"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_01.psa" name="Melee" speed="80"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Melee" speed="80"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="Melee" speed="80"/>
        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="6"/>
        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="8"/>
        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="8"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
      </animations>
      <mesh>skeletal/m_pants_celt.dae</mesh>
      <props>
        <prop actor="props/units/heads/head_pers_tiara.xml" attachpoint="head"/>
        <prop actor="props/units/shields/gerron_b.xml" attachpoint="shield"/>
        <prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
-        <prop actor="props/temp/quiver.xml" attachpoint="back"/>
+        <prop actor="props/units/pers_quiver_back.xml" attachpoint="back"/>
      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="ChainMail-Bronze">
-      <texture>skeletal/pers_su1_anusiya.dds</texture>
+      <texture>skeletal/pers_su1_anusiya_iron.dds</texture>
    </variant>
  </group>
  <material>player_trans.xml</material>
@@ -1,52 +1,45 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
-    <variant frequency="100" name="Mesh">
+    <variant frequency="1" name="Base">
      <animations>
-        <animation file="quadraped/elephant_idle_01.dae" name="Idle" speed="100"/>
-        <animation file="quadraped/elephant_idle_02.dae" name="Idle" speed="100"/>
-        <animation file="quadraped/elephant_walk_01.dae" name="walk" speed="20"/>
-        <animation file="quadraped/elephant_run_01.dae" name="run " speed="30"/>
-        <animation file="quadraped/elephant_attack_03.dae" name="melee" speed="100"/>
-        <animation file="quadraped/elephant_attack_02.dae" name="melee" speed="100"/>
-        <animation file="quadraped/elephant_attack_01.dae" name="melee" speed="100"/>
-        <animation file="quadraped/elephant_death_01.dae" name="death" speed="300"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="70"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="48"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="45"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="60"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
      </animations>
-      <mesh>skeletal/elephant_asian.dae</mesh>
+      <mesh>skeletal/horse.pmd</mesh>
      <props>
-        <prop actor="units/persians/super_unit_2_mahout.xml" attachpoint="rider1"/>
-        <prop actor="units/persians/super_unit_2_raja.xml" attachpoint="rider2"/>
+        <prop actor="units/persians/super_unit_2_r.xml" attachpoint="rider"/>
      </props>
    </variant>
  </group>
-
  <group>
-    <variant frequency="1" name="elephant-hide-gray-1">
-      <texture>skeletal/pers_su2_ele_01.dds</texture>
+    <variant frequency="1" name="horse-texture-1">
+      <texture>skeletal/horse_pers_csp_e_3.dds</texture>
    </variant>
-    <variant frequency="1" name="elephant-hide-brown-1">
-      <texture>skeletal/pers_su2_ele_02.dds</texture>
-    </variant>
-    <variant frequency="1" name="elephant-hide-gray-2">
-      <texture>skeletal/pers_su2_ele_03.dds</texture>
-    </variant>
-    <variant frequency="1" name="elephant-hide-brown-2">
-      <texture>skeletal/pers_su2_ele_04.dds</texture>
-    </variant>
-    <variant frequency="1" name="elephant-hide-gray-3">
-      <texture>skeletal/pers_su2_ele_05.dds</texture>
-    </variant>
-    <variant frequency="1" name="elephant-hide-gray-4">
-      <texture>skeletal/pers_su2_ele_06.dds</texture>
-    </variant>
-    <variant frequency="1" name="elephant-hide-brown-4">
-      <texture>skeletal/pers_su2_ele_07.dds</texture>
+    <variant frequency="1" name="horse-texture-2">
+      <texture>skeletal/horse_pers_csp_e_4.dds</texture>
    </variant>
  </group>
-
-  <material>player_trans.xml</material>
-
+  <group>
+    <variant frequency="1" name="horse-color-black">
+      <colour>41 41 41</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-biege">
+      <colour>247 213 111</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-gray">
+      <colour>253 253 253</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-brown">
+      <colour>211 123 44</colour>
+    </variant>
+  </group>
+  <material>objectcolor.xml</material>
 </actor>
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
+        <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
+        <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
+        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="100"/>
+        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="100"/>
+        <animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
+      </animations>
+      <mesh>skeletal/m_pants_armor.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/hele_hoplite_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/cape_olivegreen.xml" attachpoint="shoulders"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Elite-Rider-Texture-01">
+      <texture>skeletal/pers_csp_e_1.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Mesh">
+      <animations>
+        <animation file="quadraped/elephant_idle_01.dae" name="Idle" speed="100"/>
+        <animation file="quadraped/elephant_idle_02.dae" name="Idle" speed="100"/>
+        <animation file="quadraped/elephant_walk_01.dae" name="walk" speed="20"/>
+        <animation file="quadraped/elephant_run_01.dae" name="run " speed="30"/>
+        <animation file="quadraped/elephant_attack_03.dae" name="melee" speed="100"/>
+        <animation file="quadraped/elephant_attack_02.dae" name="melee" speed="100"/>
+        <animation file="quadraped/elephant_attack_01.dae" name="melee" speed="100"/>
+        <animation file="quadraped/elephant_death_01.dae" name="death" speed="300"/>
+      </animations>
+      <mesh>skeletal/elephant_asian.dae</mesh>
+      <props>
+        <prop actor="units/persians/super_unit_3_mahout.xml" attachpoint="rider1"/>
+        <prop actor="units/persians/super_unit_3_raja.xml" attachpoint="rider2"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="elephant-hide-gray-1">
+      <texture>skeletal/pers_su2_ele_01.dds</texture>
+    </variant>
+    <variant frequency="1" name="elephant-hide-brown-1">
+      <texture>skeletal/pers_su2_ele_02.dds</texture>
+    </variant>
+    <variant frequency="1" name="elephant-hide-gray-2">
+      <texture>skeletal/pers_su2_ele_03.dds</texture>
+    </variant>
+    <variant frequency="1" name="elephant-hide-brown-2">
+      <texture>skeletal/pers_su2_ele_04.dds</texture>
+    </variant>
+    <variant frequency="1" name="elephant-hide-gray-3">
+      <texture>skeletal/pers_su2_ele_05.dds</texture>
+    </variant>
+    <variant frequency="1" name="elephant-hide-gray-4">
+      <texture>skeletal/pers_su2_ele_06.dds</texture>
+    </variant>
+    <variant frequency="1" name="elephant-hide-brown-4">
+      <texture>skeletal/pers_su2_ele_07.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
--- a/Show More
+++ b/Show More