diff --git a/iw4x/iw4x_00/localizedstrings/iw4x_english.str b/iw4x/iw4x_00/localizedstrings/iw4x_english.str index a6b9cb8..c997135 100644 --- a/iw4x/iw4x_00/localizedstrings/iw4x_english.str +++ b/iw4x/iw4x_00/localizedstrings/iw4x_english.str @@ -4,7 +4,13 @@ FILENOTES "Official IW4x localized strings" REFERENCE MPUI_VIP_CAPS LANG_ENGLISH "VIP" -REFERENCE MENU_GTNW_DESC +REFERENCE MPUI_GTNW +LANG_ENGLISH "Global Thermal Nuclear War" + +REFERENCE MPUI_GTNW_CAPS +LANG_ENGLISH "GLOBAL THERMAL NUCLEAR WAR" + +REFERENCE MENU_GTNW LANG_ENGLISH "Teams fight for capturing the nuclear payload to activate the nuclear strike." REFERENCE MPUI_GUNGAME diff --git a/iw4x/iw4x_00/mp/gameTypesTable.csv b/iw4x/iw4x_00/mp/gameTypesTable.csv index 8d3df15..2e287df 100644 --- a/iw4x/iw4x_00/mp/gameTypesTable.csv +++ b/iw4x/iw4x_00/mp/gameTypesTable.csv @@ -1,5 +1,5 @@ a0,b1,c2,d3,e4,f5 -dm,MPUI_DEATHMATCH,MENU_KILL_EVERYONE_FIRST_PLAYER,weapon_missing_image,1,1 +dm,MPUI_DEATHMATCH,MENU_KILL_EVERYONE_FIRST_PLAYER,weapon_missing_image,0,1 war,MPUI_TEAM_DEATHMATCH,MENU_KILL_PLAYERS_ON_THE_OPPOSING,weapon_missing_image,1,1 sd,MPUI_SEARCH_AND_DESTROY,MENU_TEAMS_TAKE_TURNS_DEFENDING,weapon_missing_image,1,1 sab,MPUI_SABOTAGE,MENU_1_BOMB_IN_THE_CENTER,weapon_missing_image,1,1 @@ -10,10 +10,10 @@ arena,MPUI_ARENA,MENU_ARENA,weapon_missing_image,1,1 dd,MPUI_DD,MENU_DD,weapon_missing_image,1,1 vip,MPUI_VIP,MENU_VIP,weapon_missing_image,1,1 ctf,MPUI_CTF,MENU_CTF_DESC,weapon_missing_image,1,1 -gtnw,MPUI_GTNW,MENU_GTNW_DESC,weapon_missing_image,1,1 +gtnw,MPUI_GTNW,MENU_GTNW,weapon_missing_image,1,1 gun,MPUI_GUNGAME,MENU_GUNGAME,weapon_missing_image,0,0 oic,MPUI_OITC,MENU_OITC,weapon_missing_image,0,0 conf,MPUI_CONF,MENU_CONF,weapon_missing_image,1,1 infect,MPUI_INF,MENU_INF,weapon_missing_image,0,0 -cranked,MPUI_CRANKED,MENU_CRANKED,weapon_missing_image,1,1 +cranked,MPUI_CRANKED,MENU_CRANKED,weapon_missing_image,0,1 tdef,MPUI_TDEF,MENU_TDEF,weapon_missing_image,1,1 diff --git a/iw4x/iw4x_00/ui_mp/scriptmenus/class.menu b/iw4x/iw4x_00/ui_mp/scriptmenus/class.menu index 69bbbd1..419704b 100644 --- a/iw4x/iw4x_00/ui_mp/scriptmenus/class.menu +++ b/iw4x/iw4x_00/ui_mp/scriptmenus/class.menu @@ -425,7 +425,7 @@ textalignx -60 textscale 0.375 text "@MPUI_CHANGE_TEAM" - disabled when ( !( dvarbool( "ui_allow_teamchange" ) && ( !dvarbool( "onlinegame" ) || dvarbool( "xblive_privatematch" ) ) ) ) + disabled when ( !( dvarbool( "ui_allow_teamchange" ) && ( dvarbool( "xblive_privatematch" ) ) ) ) action { play "mouse_click"; @@ -596,7 +596,7 @@ textalign 6 textalignx -60 textscale 0.375 - disabled when(!dvarBool("g_allowvote")) + disabled when(!dvarBool("g_allowvote") || dvarbool("xblive_privatematch")) text "@MPUI_CALL_VOTE" action { diff --git a/iw4x/iw4x_00/ui_mp/settings_gametype.menu b/iw4x/iw4x_00/ui_mp/settings_gametype.menu index b23667e..2d0e5e3 100644 --- a/iw4x/iw4x_00/ui_mp/settings_gametype.menu +++ b/iw4x/iw4x_00/ui_mp/settings_gametype.menu @@ -505,78 +505,34 @@ setLocalVarBool "ui_more_gametypes" ( scrollArg ); \ } \ } - - /*GAMETYPE_BUTTON(1, when( localVarBool("ui_more_gametypes") == 0), arena) - GAMETYPE_BUTTON(2, when( localVarBool("ui_more_gametypes") == 0), ctf) - GAMETYPE_BUTTON(3, when( localVarBool("ui_more_gametypes") == 0), cranked) - GAMETYPE_BUTTON(4, when( localVarBool("ui_more_gametypes") == 0), dd) - GAMETYPE_BUTTON(1, when( localVarBool("ui_more_gametypes") == 1), dd) - GAMETYPE_BUTTON(5, when( localVarBool("ui_more_gametypes") == 0), dom) - GAMETYPE_BUTTON(2, when( localVarBool("ui_more_gametypes") == 1), dom) - GAMETYPE_BUTTON(6, when( localVarBool("ui_more_gametypes") == 0), dm) - GAMETYPE_BUTTON(3, when( localVarBool("ui_more_gametypes") == 1), dm) - GAMETYPE_BUTTON(7, when( localVarBool("ui_more_gametypes") == 0), gtnw) - GAMETYPE_BUTTON(4, when( localVarBool("ui_more_gametypes") == 1), gtnw) - GAMETYPE_BUTTON(8, when( localVarBool("ui_more_gametypes") == 0), gg) - GAMETYPE_BUTTON(5, when( localVarBool("ui_more_gametypes") == 1), gg) - GAMETYPE_BUTTON(9, when( localVarBool("ui_more_gametypes") == 0), infected) - GAMETYPE_BUTTON(6, when( localVarBool("ui_more_gametypes") == 1), infected) - GAMETYPE_BUTTON(10, when( localVarBool("ui_more_gametypes") == 0), koth) - GAMETYPE_BUTTON(7, when( localVarBool("ui_more_gametypes") == 1), koth) - GAMETYPE_BUTTON(11, when( localVarBool("ui_more_gametypes") == 0), conf) - GAMETYPE_BUTTON(8, when( localVarBool("ui_more_gametypes") == 1), conf) - GAMETYPE_BUTTON(12, when( localVarBool("ui_more_gametypes") == 0), oneflag) - GAMETYPE_BUTTON(9, when( localVarBool("ui_more_gametypes") == 1), oneflag) - GAMETYPE_BUTTON(13, when( localVarBool("ui_more_gametypes") == 0), oitc) - GAMETYPE_BUTTON(10, when( localVarBool("ui_more_gametypes") == 1), oitc) - GAMETYPE_BUTTON(14, when( localVarBool("ui_more_gametypes") == 0), sab) - GAMETYPE_BUTTON(11, when( localVarBool("ui_more_gametypes") == 1), sab) - GAMETYPE_BUTTON(15, when( localVarBool("ui_more_gametypes") == 0), sd) - GAMETYPE_BUTTON(12, when( localVarBool("ui_more_gametypes") == 1), sd) - GAMETYPE_BUTTON(16, when( localVarBool("ui_more_gametypes") == 0), ss) - GAMETYPE_BUTTON(13, when( localVarBool("ui_more_gametypes") == 1), ss) - GAMETYPE_BUTTON(14, when( localVarBool("ui_more_gametypes") == 1), war) - GAMETYPE_BUTTON(15, when( localVarBool("ui_more_gametypes") == 1), tdef) - GAMETYPE_BUTTON(16, when( localVarBool("ui_more_gametypes") == 1), vip) - GAMETYPE_BUTTON_SCROLLER(17, when( localVarBool("ui_more_gametypes") == 1), "@MENU_SCROLL_UP", 0) - GAMETYPE_BUTTON_SCROLLER(17, when( localVarBool("ui_more_gametypes") == 0), "@MENU_SCROLL_DOWN", 1)*/ GAMETYPE_BUTTON(1, 1, dm) GAMETYPE_BUTTON(2, 1, war) GAMETYPE_BUTTON(3, 1, sd) GAMETYPE_BUTTON(4, 1, sab) GAMETYPE_BUTTON(5, 1, dom) - GAMETYPE_BUTTON(6, 1, koth) - GAMETYPE_BUTTON(7, 1, ctf) - GAMETYPE_BUTTON(8, 1, dd) - GAMETYPE_BUTTON(9, 1, vip) - GAMETYPE_BUTTON(10, 1, gtnw) - GAMETYPE_BUTTON(11, 1, oneflag) - GAMETYPE_BUTTON(12, 1, arena) - GAMETYPE_BUTTON(13, 1, conf) + GAMETYPE_BUTTON(6, 1, ctf) + GAMETYPE_BUTTON(7, 1, dd) + GAMETYPE_BUTTON(8, 1, gtnw) + GAMETYPE_BUTTON(9, 1, oneflag) + GAMETYPE_BUTTON(10, 1, koth) + GAMETYPE_BUTTON(11, 1, arena) + GAMETYPE_BUTTON(12, 1, conf) + GAMETYPE_BUTTON(13, 1, infect) GAMETYPE_BUTTON(14, 1, gun) - GAMETYPE_BUTTON(15, 1, infect) /* - GAMETYPE_BUTTON(1, dm) - GAMETYPE_BUTTON(2, war) - GAMETYPE_BUTTON(3, sd) - GAMETYPE_BUTTON(4, sab) - GAMETYPE_BUTTON(5, dom) - GAMETYPE_BUTTON(6, koth) - GAMETYPE_BUTTON(7, ctf) - GAMETYPE_BUTTON(8, dd) - GAMETYPE_BUTTON(9, vip) - GAMETYPE_BUTTON(10, gtnw) - GAMETYPE_BUTTON(11, oneflag) - GAMETYPE_BUTTON(12, arena) - GAMETYPE_BUTTON(13, ss) - GAMETYPE_BUTTON(14, gg) - GAMETYPE_BUTTON(15, oitc) - GAMETYPE_BUTTON(16, conf) - GAMETYPE_BUTTON(17, dzone) + GAMETYPE_BUTTON(15, 1, vip) + GAMETYPE_BUTTON(16, 1, cranked) + GAMETYPE_BUTTON(17, 1, ss) + GAMETYPE_BUTTON(19, 1, oitc) + GAMETYPE_BUTTON(20, 1, dzone) */ + //GAMETYPE_BUTTON_SCROLLER(21, when( localVarBool("ui_more_gametypes") == 1), "@MENU_SCROLL_UP", 0) + //GAMETYPE_BUTTON_SCROLLER(22, when( localVarBool("ui_more_gametypes") == 0), "@MENU_SCROLL_DOWN", 1) + + itemDef { rect -64 -20 336 20 1 3