Fix test failures on Windows

This was SVN commit r10802.
Fix tests, and warnings, and non-PCH build
2011-12-23 13:37:11 +00:00 · 2011-12-23 13:01:29 +00:00 · 2011-12-23 10:22:07 +00:00 · 2011-12-23 03:54:36 +00:00 · 2011-12-22 22:47:47 +00:00 · 2011-12-22 22:44:57 +00:00
8258 changed files with 221989 additions and 181494 deletions
@@ -16,6 +16,9 @@
 ; Enable/disable windowed mode by default. (Use Alt+Enter to toggle in the game.)
 windowed = false

+; Pause the game on window focus loss (Only applicable to single player mode)
+pauseonfocusloss = true
+
 ; Force a particular resolution. (If these are 0, the default is
 ; to keep the current desktop resolution in fullscreen mode or to
 ; use 1024x768 in windowed mode.)
@@ -29,6 +32,7 @@ bpp = 0

 fancywater = true
 shadows = true
+shadowpcf = true
 vsync = false

 nos3tc = false
@@ -43,9 +47,9 @@ 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
-;   vertexshader  Use vertex shaders for transform and lighting where possible
+;   shader        Use vertex/fragment shaders for transform and lighting where possible
 ; Using 'fixed' instead of 'default' may work around some graphics-related problems,
-; but will reduce performance when a modern graphics card is available.
+; but will reduce performance and features when a modern graphics card is available.
 renderpath = default

 ; Adjusts how OpenGL calculates mipmap level of detail. 0.0f is the default (blurry) value.
@@ -53,12 +57,8 @@ renderpath = default
 ; -1.0 to -1.5 recommended for good results.
 lodbias = 0

-; Profile selection
-
-profile = default
-
-; Language selection: (currently "english" or "pseudogreek")
-language = english
+; Opt-in online user reporting system
+userreport.url = "http://feedback.wildfiregames.com/report/upload/v1/"

 ; Font mappings:

@@ -69,9 +69,6 @@ font.misc = verdana16
 ; Colour of the sky (in "r g b" format)
 skycolor = "0 0 0"

-; Maximum number of players in a session (default 6).
-max_players = 8
-
 ; GENERAL PREFERENCES:

 sound.mastergain = 0.5
@@ -79,22 +76,25 @@ sound.mastergain = 0.5
 ; Camera control settings
 view.scroll.speed = 120.0
 view.rotate.x.speed = 1.2
-view.rotate.x.min = 20
-view.rotate.x.max = 60
-view.rotate.x.default = 30
+view.rotate.x.min = 28.0
+view.rotate.x.max = 60.0
+view.rotate.x.default = 35.0
 view.rotate.y.speed = 2.0
-view.rotate.y.speed.wheel = 0.1
+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
-view.zoom.min = 96.0
-view.zoom.max = 256.0
-view.zoom.default = 192.0
+view.zoom.min = 50.0
+view.zoom.max = 200.0
+view.zoom.default = 100.0
 view.pos.smoothness = 0.1
 view.zoom.smoothness = 0.4
 view.rotate.x.smoothness = 0.5
 view.rotate.y.smoothness = 0.3
+view.near = 2.0                             ; Near plane distance
+view.far = 4096.0                           ; Far plane distance
+view.fov = 45.0                             ; Field of view (degrees), lower is narrow, higher is wide

 ; HOTKEY MAPPINGS:

@@ -104,127 +104,128 @@ 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.follow = "F"							; Follow the first unit in the selection
-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 anticlockwise 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
+
+; > CLIPBOARD CONTROLS
+hotkey.copy = "Ctrl+C"              ; Copy to clipboard
+hotkey.paste = "Ctrl+V"             ; Paste from clipboard
+hotkey.cut = "Ctrl+X"               ; Cut selected text and copy to the clipboard

 ; > ENTITY 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
-hotkey.selection.group.3 = 3
-hotkey.selection.group.4 = 4
-hotkey.selection.group.5 = 5
-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.add = Shift                ; Add units to selection
+hotkey.selection.remove = Ctrl              ; Remove units from selection
+hotkey.selection.idleworker = Period        ; Select next idle worker
+hotkey.selection.idlewarrior = Comma        ; Select next idle warrior
+hotkey.selection.offscreen = Alt			; Include offscreen units in selection
+hotkey.selection.group.select.0 = 0
+hotkey.selection.group.save.0 = "Ctrl+0"
+hotkey.selection.group.add.0 = "Shift+0"
+hotkey.selection.group.select.1 = 1
+hotkey.selection.group.save.1 = "Ctrl+1"
+hotkey.selection.group.add.1 = "Shift+1"
+hotkey.selection.group.select.2 = 2
+hotkey.selection.group.save.2 = "Ctrl+2"
+hotkey.selection.group.add.2 = "Shift+2"
+hotkey.selection.group.select.3 = 3
+hotkey.selection.group.save.3 = "Ctrl+3"
+hotkey.selection.group.add.3 = "Shift+3"
+hotkey.selection.group.select.4 = 4
+hotkey.selection.group.save.4 = "Ctrl+4"
+hotkey.selection.group.add.4 = "Shift+4"
+hotkey.selection.group.select.5 = 5
+hotkey.selection.group.save.5 = "Ctrl+5"
+hotkey.selection.group.add.5 = "Shift+5"
+hotkey.selection.group.select.6 = 6
+hotkey.selection.group.save.6 = "Ctrl+6"
+hotkey.selection.group.add.6 = "Shift+6"
+hotkey.selection.group.select.7 = 7
+hotkey.selection.group.save.7 = "Ctrl+7"
+hotkey.selection.group.add.7 = "Shift+7"
+hotkey.selection.group.select.8 = 8
+hotkey.selection.group.save.8 = "Ctrl+8"
+hotkey.selection.group.add.8 = "Shift+8"
+hotkey.selection.group.select.9 = 9
+hotkey.selection.group.save.9 = "Ctrl+9"
+hotkey.selection.group.add.9 = "Shift+9"

-; > 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.massbarter = Shift           ; Modifier to barter bunch of resources
+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			; If timewarp mode enabled, speed up the game
+hotkey.timewarp.rewind = Backspace			; If timewarp mode enabled, go back to earlier point in the game

 ; > 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
+hotkey.timeelapsedcounter.toggle = "F12"       ; Toggle time elapsed counter

 ; > HOTKEYS ONLY
+hotkey.chat = Return                        ; Toggle chat window

-
-
-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.
+; > GUI TEXTBOX HOTKEYS
+hotkey.text.delete.left = "Ctrl+Backspace"    ; Delete word to the left of cursor
+hotkey.text.delete.right = "Ctrl+Del"         ; Delete word to the right of cursor
+hotkey.text.move.left = "Ctrl+LeftArrow"      ; Move cursor to start of word to the left of cursor
+hotkey.text.move.right = "Ctrl+RightArrow"    ; Move cursor to start of word to the right of cursor

 ; > 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
+hotkey.profile2.enable = "F11"              ; Enable HTTP/GPU modes for new profiler

-; UNMAPPED KEY/MOUSE REFERENCE:
+profiler2.http.autoenable = false           ; Enable HTTP server output at startup (default off for security/performance)
+profiler2.gpu.autoenable = false            ; Enable GPU timing at startup (default off for performance/compatibility)
+profiler2.gpu.arb.enable = true             ; Allow GL_ARB_timer_query timing mode when available
+profiler2.gpu.ext.enable = true             ; Allow GL_EXT_timer_query timing mode when available
+profiler2.gpu.intel.enable = true           ; Allow GL_INTEL_performance_queries timing mode when available

-; 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
+; > QUICKSAVE
+hotkey.quicksave = "Shift+F5"
+hotkey.quickload = "Shift+F8"
+
+; EXPERIMENTAL: joystick/gamepad settings
+joystick.enable = false
+joystick.deadzone = 8192
+joystick.camera.pan.x = 0
+joystick.camera.pan.y = 1
+joystick.camera.rotate.x = 3
+joystick.camera.rotate.y = 2
+joystick.camera.zoom.in = 5
+joystick.camera.zoom.out = 4
@@ -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 

@@ -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;
@@ -20,9 +20,9 @@ Engine.RegisterComponentType(IID_Test1, "TestScript1_Init", TestScript1_Init);
 function TestScript1_readonly() {}

 TestScript1_readonly.prototype.GetX = function() {
-	this.template = null;
-	delete this.template;
-	try { this.template.x += 1000; } catch(e) { }	
+	try { this.template = null; } catch(e) { }
+	try { delete this.template; } catch(e) { }
+	try { this.template.x += 1000; } catch(e) { }
 	try { delete this.template.x; } catch(e) { }
 	try { this.template.y = 2000; } catch(e) { }
 	return +(this.template.x || 1) + +(this.template.y || 2);
@@ -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;
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TerritoryManager>
+  <ImpassableCost>4</ImpassableCost>
+  <BorderThickness>0.5</BorderThickness>
+  <BorderSeparation>0.55</BorderSeparation>
+</TerritoryManager>
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity>
+  <VisualActor>
+    <SilhouetteDisplay>false</SilhouetteDisplay>
+    <SilhouetteOccluder>false</SilhouetteOccluder>
+  </VisualActor>
+</Entity>
@@ -2,12 +2,15 @@
 <Entity>
    <VisualActor>
        <Actor>example</Actor>
+        <SilhouetteDisplay>false</SilhouetteDisplay>
+        <SilhouetteOccluder>false</SilhouetteOccluder>
    </VisualActor>
    <Selectable/>
    <Position>
        <Altitude>0</Altitude>
        <Anchor>upright</Anchor>
        <Floating>false</Floating>
+        <TurnRate>6.0</TurnRate>
    </Position>
    <UnitAI/>
 </Entity>
@@ -2,12 +2,15 @@
 <Entity>
    <VisualActor>
        <Actor>example</Actor>
+        <SilhouetteDisplay>false</SilhouetteDisplay>
+        <SilhouetteOccluder>false</SilhouetteOccluder>
    </VisualActor>
    <Selectable/>
    <Position>
        <Altitude>0</Altitude>
        <Anchor>upright</Anchor>
        <Floating>false</Floating>
+        <TurnRate>6.0</TurnRate>
    </Position>
    <UnitAI/>
    <Footprint>
@@ -16,5 +19,12 @@
    </Footprint>
    <Obstruction>
        <Unit radius="4"/>
+        <Active>true</Active>
+        <BlockMovement>true</BlockMovement>
+        <BlockPathfinding>false</BlockPathfinding>
+        <BlockFoundation>false</BlockFoundation>
+        <BlockConstruction>true</BlockConstruction>
+        <DisableBlockMovement>false</DisableBlockMovement>
+        <DisableBlockPathfinding>false</DisableBlockPathfinding>
    </Obstruction>
 </Entity>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="civic_centre_props_a">
-      <mesh>props/kart_civiccentre_a.dae</mesh>
-    </variant>
-    <variant frequency="1" name="civic_centre_props_b">
-      <mesh>props/kart_civiccentre_b.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <texture>structural/kart_struct.dds</texture>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <group>
-    <variant frequency="1" name="palms">
-      <mesh>props/kart_civiccentre_1.dae</mesh>
-      <texture>structural/kart_struct.dds</texture>
-    </variant>
-  </group>
-  <material>basic_trans.xml</material>
-</actor>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base">
-      <mesh>props/kart_dock_a.dae</mesh>
-      <texture>structural/kart_struct.dds</texture>
-    </variant>
-  </group>
-</actor>
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="wall_tower_prop_1">
-      <mesh>props/kart_wall_tower_1.dae</mesh>
-    </variant>
-    <variant frequency="1" name="wall_tower_prop_2">
-      <mesh>props/kart_wall_tower_2.dae</mesh>
-    </variant>
-    <variant frequency="1" name="wall_tower_prop_3">
-      <mesh>props/kart_wall_tower_3.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <texture>structural/kart_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 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>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="mesh">
+      <mesh>props/iber_fishship_sail.dae</mesh>
+      <texture>props/iber_sail_b.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>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="mesh">
+      <mesh>props/iber_merch_sail.dae</mesh>
+      <texture>props/iber_sail_a.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>
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="props-a">
-      <mesh>props/pers_barracks_props_a.dae</mesh>
-    </variant>
-    <variant frequency="1" name="props-b">
-      <mesh>props/pers_barracks_props_b.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>structural/pers_struct.dds</texture>
-    </variant>
-  </group>
-
-  <material>basic_trans.xml</material>
-
-</actor>
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="props_a">
-      <mesh>props/pers_cc_props_a.dae</mesh>
-    </variant>
-    <variant frequency="1" name="props_b">
-      <mesh>props/pers_cc_props_b.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="1" name="texture">
-      <texture>structural/pers_struct.dds</texture>
-    </variant>
-  </group>
-
-  <material>basic_trans.xml</material>
-
-</actor>
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="props_1">
-      <mesh>props/pers_dock_1.dae</mesh>
-    </variant>
-    <variant frequency="1" name="props_2">
-      <mesh>props/pers_dock_2.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>structural/pers_struct.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="Base">
-      <mesh>props/pers_fortress_eagles.dae</mesh>
-      <texture>structural/pers_struct.dds</texture>
-    </variant>
-  </group>
-
-  <material>basic_trans.xml</material>
-
-</actor>
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="house_a_props_1">
-      <mesh>props/pers_house_a_1.dae</mesh>
-    </variant>
-    <variant frequency="1" name="house_a_props_2">
-      <mesh>props/pers_house_a_2.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>structural/pers_struct.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="house_b_props_1">
-      <mesh>props/pers_house_b_1.dae</mesh>
-    </variant>
-    <variant frequency="1" name="house_b_props_2">
-      <mesh>props/pers_house_b_2.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>structural/pers_struct.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="house_c_props_1">
-      <mesh>props/pers_house_c_1.dae</mesh>
-    </variant>
-    <variant frequency="1" name="house_c_props_2">
-      <mesh>props/pers_house_c_2.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>structural/pers_struct.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="house_d_props_1">
-      <mesh>props/pers_house_d_1.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>structural/pers_struct.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <group>
-    <variant frequency="1" name="persian kahk props">
-      <mesh>props/pers_sb1_props.dae</mesh>
-      <texture>structural/pers_struct.dds</texture>
-    </variant>
-  </group>
-  <material>basic_trans.xml</material>
-</actor>
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="base">
-      <mesh>structural/pers_sb_kahk_bulls.dae</mesh>
-      <texture>props/pers_bull_a.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <float/>
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>props/pers_tri_mast.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="trireme-sail-stripes">
-      <texture>props/pers_trireme_sail.dds</texture>
-    </variant>
-    <variant frequency="1" name="trireme-sail-eagle">
-      <texture>props/pers_trireme_sail_b.dds</texture>
-    </variant>
-    <variant frequency="1" name="trireme-sail-drako">
-      <texture>props/pers_trireme_sail_c.dds</texture>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <group>
-    <variant frequency="1">
-      <mesh>props/pers_wall_tower.dae</mesh>
-      <texture>structural/pers_struct.dds</texture>
-    </variant>
-  </group>
-
-  <material>basic_trans.xml</material>
-
-</actor>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <float/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>props/rome_qui_mast.dae</mesh>
-      <texture>props/rome_qui_sail.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>test/balrog.pmd</mesh>
-      <props>
-        <prop actor="props/temp/balrogwings.xml" attachpoint="props_main"/>
-      </props>
-      <texture>temp/balrog.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>test/balrogwings.pmd</mesh>
-      <texture>temp/balrogwings.dds</texture>
-    </variant>
-  </group>
-
-  <material>basic_trans.xml</material>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/breastplate.pmd</mesh>
-      <props/>
-      <texture>props/wrld_anvil.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/cape.pmd</mesh>
-      <props/>
-      <texture>props/prop_weap_axe.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/car_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/car_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/car_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/cjv_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/cjv_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/cjv_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/csp_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/csp_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/csp_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/csw_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/csw_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/csw_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/fem.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/med.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/hr1.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/hr2.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/hr3.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/iar_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/iar_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/iar_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/ijv_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/ijv_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/ijv_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/isl_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/isl_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/isl_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/isp_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/isp_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/isp_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/isw_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/isw_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/isw_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/su1.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/su2.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/su3.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/trd.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_celt.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/car_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/car_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/car_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/cjv_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/cjv_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/cjv_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/csp_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/csp_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/csp_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/csw_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/csw_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/csw_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/fem.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/med.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/hr1.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/hr2.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/hr3.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/iar_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/iar_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/iar_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/ijv_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/ijv_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/ijv_e.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/isl_a.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>temp/isl_b.pmd</mesh>
-      <props/>
-      <texture>temp/ui_portrait_sheet_civ_hele.dds</texture>
-    </variant>
-  </group>
-
-</actor>
--- a/Show More
+++ b/Show More