New mods menu

3 files changed, 60 insertions, 250 deletions

diff --git a/ui/ingame_vote.menu b/ui/ingame_vote.menu
index bceb2c5d..f89509fb 100644
--- a/ui/ingame_vote.menu
+++ b/ui/ingame_vote.menu
@@ -196,7 +196,7 @@
       name kick
       group grpCallVote
       rect 80 70 150 85
-      style WINDOW_STYLE_FILLED
+      style WINDOW_STYLE_EMPTY
       type ITEM_TYPE_LISTBOX
       elementwidth 120
       elementheight 15
@@ -253,7 +253,7 @@
       group grpCallVote
       rect 80 70 150 85
       type ITEM_TYPE_LISTBOX
-      style WINDOW_STYLE_FILLED
+      style WINDOW_STYLE_EMPTY
       elementwidth 120
       elementheight 15
       textscale .25
diff --git a/ui/main.menu b/ui/main.menu
index 3e569b45..5adc89f0 100644
--- a/ui/main.menu
+++ b/ui/main.menu
@@ -99,28 +99,6 @@
         open createserver
       }
     }
-    itemDef
-    {
-      name mainmenu
-      text "Setup"
-      type ITEM_TYPE_BUTTON
-      style WINDOW_STYLE_EMPTY
-      textstyle ITEM_TEXTSTYLE_NORMAL 
-      rect 472 80 128 20 
-      textalignx 128 
-      textaligny 20 
-      textscale .416
-      textalign ITEM_ALIGN_RIGHT   
-      forecolor 1 1 1 1
-      visible 1 
-      action
-      {
-        play "sound/misc/kcaction.wav"; 
-        close main; 
-        open setup_menu; 
-        open control_menu
-      }
-    }
 
     itemDef
     {
@@ -130,7 +108,7 @@
       textstyle ITEM_TEXTSTYLE_NORMAL
       textscale .416
       style WINDOW_STYLE_EMPTY 
-      rect 472 100 128 20
+      rect 472 80 128 20
       textalignx 128 
       textaligny 20 
       textalign ITEM_ALIGN_RIGHT   
@@ -153,7 +131,7 @@
       style WINDOW_STYLE_EMPTY 
       textstyle ITEM_TEXTSTYLE_NORMAL
       textscale .416
-      rect 472 120 128 20 
+      rect 472 100 128 20 
       textalignx 128 
       textaligny 20 
       textalign ITEM_ALIGN_RIGHT   
@@ -163,7 +141,6 @@
       action
       {
         play "sound/misc/kcaction.wav"; 
-        close main; 
         open mod
       }
     }
@@ -174,7 +151,7 @@
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
       textstyle ITEM_TEXTSTYLE_NORMAL
-      rect 472 160 128 20
+      rect 472 140 128 20
       textalignx 128 
       textaligny 20 
       textscale .416
@@ -191,7 +168,7 @@
     itemDef
     {
       name copyright
-      text "Q3A (C) 2000 Id Software Inc. Tremulous by Timbo and Veda."
+      text "Q3A (C) 2000 Id Software Inc. Tremulous (C) 2002 Us."
       style WINDOW_STYLE_EMPTY
       textstyle ITEM_TEXTSTYLE_NORMAL
       textscale .15
diff --git a/ui/mod.menu b/ui/mod.menu
index 3a1ed8e8..eee53be5 100644
--- a/ui/mod.menu
+++ b/ui/mod.menu
@@ -7,81 +7,42 @@
   {
     name "mod"
     visible 0
-    fullscreen 1
-    rect 0 0 640 480
-    focusColor 1 .67 0 1
-    backcolor 0 0 0 1
+    fullscreen 0
+    rect 160 120 320 240
+    focusColor 1 .75 0 1
     style 1
     border 1
-    onEsc { close mod ; open main }
-    onOpen
-    {
-      setitemcolor fadebox backcolor 0 0 0 1;
-      fadeout fadebox;
-      uiScript loadMods;
-      hide lightning;
-      hide accept_alt;
-      show accept;
-      hide back_alt;
-      show back;
-      hide grpmessage
-    }
-
-
-
-    // LEVEL SELECTION BAR  //
-
-    itemDef
+    popup
+    onEsc
     {
-      name levelbar
-      text "TEAM ARENA MODS"
-      textstyle 6
-      style 2
-      rect 0 16 640 40 
-      textscale 0.416
-      textalign 1           // center
-      textalignx 320        // x alignment point for text
-                            // use it to offset left/right text from the edge 
-                            // or to center the text on a different point
-      textaligny 27        
-      style 2
-      border 4
-      bordercolor 0.5 0.5 0.5 0.5
-      bordersize 2
-      backcolor 0 0 .75 0.5
-      visible 1 
-      decoration 
+      close mod;
+      open main
     }
-
-    itemDef
+    onOpen
     {
-      name teamarenaimage
-      style 3
-      background "ui/assets/teamarenaimage.tga"
-      rect 0 80 220 115 
-      visible 1 
+      uiScript loadMods
     }
 
     itemDef
     {
-      name mappreview
-      style 5
-      cinematic "mpintro.roq"
-      rect 20 195 200 150
-      backcolor 1 1 1 .25
-      border 1
-      bordersize 1
-      bordercolor .5 .5 .5 1
-      decoration
+      name window
+      rect 0 0 320 240
+      style WINDOW_STYLE_FILLED
+      backcolor 0 0 0 1
       visible 1
-    }
+      decoration
 
+      border WINDOW_BORDER_FULL
+      borderSize 1.0
+      borderColor 0.5 0.5 0.5 1
+    }
+    
     itemDef
     {
       name modlist
-      rect 240 100 360 300
+      rect 10 10 300 200
       type ITEM_TYPE_LISTBOX
-      style WINDOW_STYLE_FILLED
+      style WINDOW_STYLE_EMPTY
       elementwidth 120
       elementheight 20
       textscale .25
@@ -90,180 +51,52 @@
       textalign 3
       textaligny 14
       border 1
-      bordercolor .5 .5 .5 .5
-      forecolor 1 1 1 1
-      backcolor 0 0 .5 .25
-      outlinecolor .1 .1 .7 .5
+      bordercolor   0.5 0.5 0.5 0.5
+      forecolor     1   1   1   1
+      backcolor     0.2 0.2 0.2 1
+      outlinecolor  0.1 0.1 0.1 0.5
       visible 1
-      doubleClick { uiScript RunMod }
-      mouseEnter { fadein message_mod ; setitemcolor modlist bordercolor .7 0 0 1 } 
-      mouseExit { fadeout message_mod ; setitemcolor modlist bordercolor .5 .5 .5 .5 } 
-    }
-
-
-// BACK BAR //
-
-
-    itemDef
-    {
-      name gotobar
-      style 2
-      rect 0 430 640 30 
-      textscale 0.4
-      textalign 0           // center
-      textalignx 60        // x alignment point for text
-                            // use it to offset left/right text from the edge 
-                            // or to center the text on a different point
-      textaligny 21        
-      style 2
-      border 4
-      bordercolor 0.5 0.5 0.5 0.5
-      bordersize 2
-      backcolor 0 0 .75 0.5
-      visible 1 
-      mouseEnter { setcolor backcolor .75 0 0 .5 }
-      mouseExit { setcolor backcolor 0 0 .75 .5 }
-      decoration 
-    }
-
-    itemDef
-    {
-      name back
-      style 3
-      background "ui/assets/backarrow.tga"
-      rect 16 424 50 50 
-      visible 1 
-      action { close mod ; open main }
-      mouseEnter { hide back ; show back_alt ; fadein message_back }
-    }
-
-    itemDef
-    {
-      name back_alt
-      style WINDOW_STYLE_SHADER
-      background "ui/assets/backarrow_alt.tga"
-      rect 14 422 54 54 
-      backcolor 0 0 0 0
-      forecolor 1 1 1 1
-      visible 0
-      type ITEM_TYPE_BUTTON
-      mouseExit { hide back_alt ; show back ; fadeout message_back }      
-      action { close mod ; open main }    
-    }
-
-    itemDef
-    {
-      name accept
-      style 3 
-      rect 574 424 50 50 
-      background "ui/assets/forwardarrow.tga"
-      backcolor 0 0 0 0
-      forecolor 1 1 1 1
-      visible 1 
-      mouseEnter { show lightning ; hide accept ; show accept_alt ; show message_accept ; playlooped "sound/misc/loop_electricity_05.wav" }
-      action { close mod ; uiScript RunMod }
-    }
-
-    itemDef
-    {
-      name accept_alt
-      style 3 
-      rect 572 422 54 54 
-      background "ui/assets/forwardarrow_alt.tga"
-      backcolor 0 0 0 0
-      forecolor 1 1 1 1
-      visible 0
-      type ITEM_TYPE_BUTTON   
-      action { close mod ; uiScript RunMod }
-      mouseExit { hide lightning ; hide accept_alt ; show accept ; hide message_accept ; playlooped "music/fla_mp03.wav" }   
-    }
-
-    itemDef
-    {
-      name lightning
-      style 3
-      background lightningkc
-      rect 46 385 250 128     
-      visible 0 
-      decoration 
-    }
-    
-    itemDef
-    {
-      name lightning
-      style 3
-      background lightningkc
-      rect 341 385 250 128     
-      visible 0 
-      decoration 
-    }
-
-
-
-    //  MESSAGES  //
-
-    itemDef
-    {
-      name message_back
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
-      textstyle 1
-      textalign 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Exit to Main Menu"
-      forecolor 1 1 1 1
-      decoration 
-      visible 0
+      doubleClick
+      {
+        uiScript RunMod
+      }
     }
 
     itemDef
     {
-      name message_accept
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
+      name ok
+      text "OK"
+      type 1
+      textscale .25
+      rect 250 210 30 26
       textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Play Mod"
+      textalignx 15
+      textaligny 20
       forecolor 1 1 1 1
-      decoration 
-      visible 0
+      visible 1
+      action
+      { 
+        close mod;
+        uiScript RunMod
+      }
     }
     
     itemDef
     {
-      name message_mod
-      group grpmessage
-      style 0 
-      rect 320 430 128 30
+      name cancel
+      text "Cancel"
+      type 1
+      textscale .25
+      rect 280 210 30 26
       textalign 1
-      textstyle 1
-      textalignx 0
-      textaligny 25
-      textscale .416
-      text "Select Mod Name to Play"
+      textalignx 15
+      textaligny 20
       forecolor 1 1 1 1
-      decoration 
-      visible 0
-    }
-
-
-    itemDef
-    {
-      name fadebox
-      style WINDOW_STYLE_FILLED
-      background "ui/assets/fadebox.tga"
-      forecolor 0 0 0 1
-      backcolor 0 0 0 1
-      rect 0 0 640 480
-      visible 1 
-      decoration
+      visible 1
+      action
+      { 
+        close mod
+      }
     }
   }
 }