From d2b575a232ea04e27a95c9975ce3769896b56321 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Mon, 23 Oct 2023 12:01:18 -0400 Subject: [PATCH 1/4] Added event button and updated IPs --- addons/optionsmenu/gui/mainMenu.hpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/optionsmenu/gui/mainMenu.hpp b/addons/optionsmenu/gui/mainMenu.hpp index 254bdcc7..387272a9 100644 --- a/addons/optionsmenu/gui/mainMenu.hpp +++ b/addons/optionsmenu/gui/mainMenu.hpp @@ -17,24 +17,29 @@ class RscDisplayMain : RscStandardDisplay { tooltip = CSTRING(joinTac2_tooltip); y = "(3 * 1.5) * (pixelH * pixelGrid * 2) + (pixelH)"; action = ""; - onbuttonclick = "connectToServer ['75.6.53.62', 2302, ''];"; + onbuttonclick = "connectToServer ['75.6.53.50', 2302, ''];"; Onload = ""; }; class joinTS1 : joinTac2 { text = CSTRING(joinTS1_text); tooltip = CSTRING(joinTS1_tooltip); y = "(4 * 1.5) * (pixelH * pixelGrid * 2) + (pixelH)"; - onbuttonclick = "connectToServer ['75.6.53.62', 2402, ''];"; + onbuttonclick = "connectToServer ['75.6.53.50', 2402, ''];"; }; class joinTS2 : joinTS1 { text = CSTRING(joinTS2_text); y = "(5 * 1.5) * (pixelH * pixelGrid * 2) + (pixelH)"; - onbuttonclick = "connectToServer ['75.6.53.62', 2502, ''];"; + onbuttonclick = "connectToServer ['75.6.53.50', 2502, ''];"; }; class joinTS3 : joinTS1 { text = CSTRING(joinTS3_text); y = "(6 * 1.5) * (pixelH * pixelGrid * 2) + (pixelH)"; - onbuttonclick = "connectToServer ['75.6.53.62', 2602, ''];"; + onbuttonclick = "connectToServer ['75.6.53.50', 2602, ''];"; + }; + class joinTSE : joinTS1 { + text = CSTRING(joinTSE_text); + y = "(7 * 1.5) * (pixelH * pixelGrid * 2) + (pixelH)"; + onbuttonclick = "connectToServer ['75.6.53.50', 2902, ''];"; }; }; }; From c60f786615699b0880f2ad266591d49a18432ef6 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Mon, 23 Oct 2023 12:02:24 -0400 Subject: [PATCH 2/4] String table fixed --- addons/optionsmenu/stringtable.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml index 55e894ff..566e2740 100644 --- a/addons/optionsmenu/stringtable.xml +++ b/addons/optionsmenu/stringtable.xml @@ -14,10 +14,13 @@ Join the member only training server! - Join Training Server 1 + Join Training Server 2 - Join Training Server 1 + Join Training Server 3 + + + Join Event Server From 94d869a99497e8fd3842b8d22df6bddb5e03ba8d Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Mon, 23 Oct 2023 12:49:23 -0400 Subject: [PATCH 3/4] Increment menu height by one --- addons/optionsmenu/gui/mainMenu.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/optionsmenu/gui/mainMenu.hpp b/addons/optionsmenu/gui/mainMenu.hpp index 387272a9..03f52c99 100644 --- a/addons/optionsmenu/gui/mainMenu.hpp +++ b/addons/optionsmenu/gui/mainMenu.hpp @@ -8,7 +8,7 @@ class RscDisplayMain : RscStandardDisplay { class Controls; }; class GroupMultiplayer: GroupSingleplayer { - h = "(8 * 1.5) * (pixelH * pixelGrid * 2)"; + h = "(9 * 1.5) * (pixelH * pixelGrid * 2)"; class Controls : Controls { class Campaigns; class joinTac2 : Campaigns { From 6fd1f6aa0ee9319a8b7d7a84b72b1c88d043db51 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Mon, 23 Oct 2023 13:02:21 -0400 Subject: [PATCH 4/4] Add tooltip for event server and fix ts tooltip --- addons/optionsmenu/gui/mainMenu.hpp | 3 ++- addons/optionsmenu/stringtable.xml | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/optionsmenu/gui/mainMenu.hpp b/addons/optionsmenu/gui/mainMenu.hpp index 03f52c99..f5c5cf73 100644 --- a/addons/optionsmenu/gui/mainMenu.hpp +++ b/addons/optionsmenu/gui/mainMenu.hpp @@ -22,7 +22,7 @@ class RscDisplayMain : RscStandardDisplay { }; class joinTS1 : joinTac2 { text = CSTRING(joinTS1_text); - tooltip = CSTRING(joinTS1_tooltip); + tooltip = CSTRING(joinTS_tooltip); y = "(4 * 1.5) * (pixelH * pixelGrid * 2) + (pixelH)"; onbuttonclick = "connectToServer ['75.6.53.50', 2402, ''];"; }; @@ -38,6 +38,7 @@ class RscDisplayMain : RscStandardDisplay { }; class joinTSE : joinTS1 { text = CSTRING(joinTSE_text); + tooltip = CSTRING(joinTSE_tooltip); y = "(7 * 1.5) * (pixelH * pixelGrid * 2) + (pixelH)"; onbuttonclick = "connectToServer ['75.6.53.50', 2902, ''];"; }; diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml index 566e2740..e6d47939 100644 --- a/addons/optionsmenu/stringtable.xml +++ b/addons/optionsmenu/stringtable.xml @@ -10,7 +10,7 @@ Join Training Server 1 - + Join the member only training server! @@ -22,6 +22,9 @@ Join Event Server + + Join the 7Cav Event Server! + Enlist Today!