* Updated default and human huds

* Split alien hud into builder and general huds

1 files changed, 45 insertions, 129 deletions

diff --git a/ui/tremulous_human_hud.menu b/ui/tremulous_human_hud.menu
index ffb73491..be6f4098 100644
--- a/ui/tremulous_human_hud.menu
+++ b/ui/tremulous_human_hud.menu
@@ -29,6 +29,34 @@
     visible MENU_TRUE
     rect 0 0 640 480
 
+    //CONSOLE
+    itemDef
+    {
+      name "console"
+      rect 8 8 560 180
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1 1 1 1
+      align ITEM_ALIGN_LEFT
+      textalignx 0
+      textaligny 18
+      textscale 0.4
+      textstyle ITEM_TEXTSTYLE_NORMAL
+      ownerdraw CG_CONSOLE
+    }   
+
+    //LAGOMETER
+    itemDef
+    {
+      name "lagometer"
+      rect 576 68 56 28
+      visible 1
+      decoration
+      background "lagometer"
+      ownerdraw CG_LAGOMETER
+    }
+
     //////////////////
     //STATIC OBJECTS//
     //////////////////
@@ -57,23 +85,11 @@
       background "ui/assets/human/left-arm.tga"
     }   
 
-    //LEFT CAP
-    itemDef
-    {
-      name "left-cap"
-      rect 49 387.75 81 27.5
-      visible 1
-      decoration
-      forecolor 0.0 0.8 1.0 0.25
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/human/left-cap.tga"
-    }   
-
     //CREDITS LABEL
     itemDef
     {
       name "credits-label"
-      rect 70 392.75 7 7.5
+      rect 508 403 7 7.5
       visible 1
       decoration
       forecolor 0.0 0.8 1.0 0.5
@@ -109,7 +125,7 @@
     itemDef
     {
       name "right-cap"
-      rect 510 387.75 81 27.5
+      rect 500 400 80 15
       visible 1
       decoration
       forecolor 0.0 0.8 1.0 0.25
@@ -117,30 +133,6 @@
       background "ui/assets/human/right-cap.tga"
     }   
 
-    //TIMER COLON
-    itemDef
-    {
-      name "colon"
-      rect 538.5 406 1.5 4
-      visible 1
-      decoration
-      forecolor 0.0 0.8 1.0 0.5
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/neutral/colon.tga"
-    }   
-
-    //FPS LABEL
-    itemDef
-    {
-      name "fps-label"
-      rect 555 394 16 5
-      visible 1
-      decoration
-      forecolor 0.0 0.8 1.0 0.5
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/neutral/fps.tga"
-    }   
-
     ///////////////////
     //DYNAMIC OBJECTS//
     ///////////////////
@@ -234,24 +226,13 @@
     itemDef
     {
       name "credits"
-      rect 77 392 40 10
+      rect 515 402 45 11.25
       visible 1
       decoration
       forecolor 0.0 0.8 1.0 0.5
       ownerdraw CG_PLAYER_CREDITS_VALUE
     }   
 
-    //BANK
-    itemDef
-    {
-      name "bank"
-      rect 80 404 32 8
-      visible 1
-      decoration
-      forecolor 0.0 0.8 1.0 0.5
-      ownerdraw CG_PLAYER_BANK_VALUE
-    }
-
     //HEALTH
     itemDef
     {
@@ -274,17 +255,6 @@
       ownerdraw CG_PLAYER_SELECT
     }   
 
-    //WEAPON SELECT TEXT  
-    itemDef  
-    {  
-      name "selecttext"  
-      rect 200 25 240 300  
-      visible 1  
-      decoration  
-      textScale .5  
-      ownerdraw CG_PLAYER_SELECTTEXT  
-    }
-
     //AMMO
     itemDef
     {
@@ -311,87 +281,33 @@
     itemDef
     {
       name "fps"
-      rect 525 392 24 8
-      style WINDOW_STYLE_EMPTY
-      visible 1
-      decoration
-      forecolor 0.0 0.8 1.0 .5
-      ownerdraw CG_FPS_FIXED
-    }   
-
-    //TIMER SECONDS
-    itemDef
-    {
-      name "timer"
-      rect 540 404 16 8
+      rect 572 8 56 22
       style WINDOW_STYLE_EMPTY
       visible 1
       decoration
-      forecolor 0.0 0.8 1.0 .5
-      ownerdraw CG_TIMER_SECS
+      forecolor 0.0 0.8 1.0 1
+      align ITEM_ALIGN_RIGHT
+      textalignx 0
+      textaligny 18
+      textscale 0.3
+      textstyle ITEM_TEXTSTYLE_NORMAL
+      ownerdraw CG_FPS
     }   
-    
-    //TIMER MINUTES
+    //TIMER
     itemDef
     {
       name "timer"
-      rect 510 404 24 8
-      style WINDOW_STYLE_EMPTY
-      visible 1
-      decoration
-      forecolor 0.0 0.8 1.0 .5
-      ownerdraw CG_TIMER_MINS
-    }   
-
-    //CONSOLE
-    itemDef
-    {
-      name "console"
-      rect 8 8 560 180
+      rect 572 38 56 22
       style WINDOW_STYLE_EMPTY
       visible 1
       decoration
-      forecolor 1 1 1 1
-      align ITEM_ALIGN_LEFT
+      forecolor 0.0 0.8 1.0 1
+      align ITEM_ALIGN_RIGHT
       textalignx 0
       textaligny 18
-      textscale 0.4
+      textscale 0.3
       textstyle ITEM_TEXTSTYLE_NORMAL
-      ownerdraw CG_CONSOLE
+      ownerdraw CG_TIMER
     }   
-
-    //LAGOMETER  
-    itemDef  
-    {  
-      name "lagometer"  
-      rect 502 358 132 28  
-      visible 1  
-      decoration  
-      background "lagometer"  
-      ownerdraw CG_LAGOMETER  
-    }
-
-    //USABLE
-    itemDef  
-    {  
-      name "usable"
-      rect 304 420 32 32
-      visible 1
-      decoration
-      forecolor 0.0 0.8 1.0 .25
-      background "ui/assets/neutral/use.tga"
-      ownerdraw CG_PLAYER_USABLE_BUILDABLE
-    }
-
-    //SCANNER
-    itemDef
-    {
-      name "scanner"
-      rect 60 300 520 120
-      visible 1
-      decoration
-      background "textures/common/invisible" //FIXME: change to a bunch on concentric circles
-      ownerdraw CG_PLAYER_HUMAN_SCANNER
-    }
   }
 }