diff --git a/scripts/client/gui.js b/scripts/client/gui.js index f73404f4..38a0ef14 100644 --- a/scripts/client/gui.js +++ b/scripts/client/gui.js @@ -9,7 +9,7 @@ var app = {}; -let robotoFont = "Roboto"; +let mainFont = "Arial"; // "Roboto" let mainLogoPath = (typeof gta == "undefined") ? "files/images/mafiac-logo.png" : "files/images/gtac-logo.png"; diff --git a/scripts/client/gui/2fa.js b/scripts/client/gui/2fa.js index 729facbc..8bdebc81 100644 --- a/scripts/client/gui/2fa.js +++ b/scripts/client/gui/2fa.js @@ -52,7 +52,7 @@ function initTwoFactorAuthenticationGUI() { textSize: 10.0, textAlign: 0.5, textColour: toColour(200, 200, 200, 255), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), @@ -65,7 +65,7 @@ function initTwoFactorAuthenticationGUI() { borderColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], textInputAlpha), textColour: toColour(200, 200, 200, 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, }, caret: { lineColour: toColour(255, 255, 255, 255), @@ -73,7 +73,7 @@ function initTwoFactorAuthenticationGUI() { placeholder: { textColour: toColour(200, 200, 200, 150), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], 255), @@ -86,7 +86,7 @@ function initTwoFactorAuthenticationGUI() { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(0, 0, 0, 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, textAlign: 0.5, }, focused: { diff --git a/scripts/client/gui/changepass.js b/scripts/client/gui/changepass.js index c6329e5c..b95a4b22 100644 --- a/scripts/client/gui/changepass.js +++ b/scripts/client/gui/changepass.js @@ -50,7 +50,7 @@ function initChangePasswordGUI() { textSize: 10.0, textAlign: 0.5, textColour: toColour(200, 200, 200, 255), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), @@ -62,7 +62,7 @@ function initChangePasswordGUI() { backgroundColour: toColour(0, 0, 0, 120), textColour: toColour(200, 200, 200, 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, }, caret: { lineColour: toColour(255, 255, 255, 255), @@ -71,7 +71,7 @@ function initChangePasswordGUI() { backgroundColour: toColour(0, 0, 0, 120), textColour: toColour(200, 200, 200, 200), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, } }); passwordChange.passwordInput.masked = true; @@ -82,7 +82,7 @@ function initChangePasswordGUI() { backgroundColour: toColour(0, 0, 0, 120), textColour: toColour(200, 200, 200, 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, }, caret: { lineColour: toColour(255, 255, 255, 255), @@ -91,7 +91,7 @@ function initChangePasswordGUI() { backgroundColour: toColour(0, 0, 0, 120), textColour: toColour(200, 200, 200, 200), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, } }); passwordChange.confirmPasswordInput.masked = true; @@ -102,7 +102,7 @@ function initChangePasswordGUI() { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(255, 255, 255, 255), textSize: 12.0, - textFont: robotoFont, + textFont: mainFont, textAlign: 0.5, }, focused: { diff --git a/scripts/client/gui/charselect.js b/scripts/client/gui/charselect.js index aff0ad72..33ff9d7b 100644 --- a/scripts/client/gui/charselect.js +++ b/scripts/client/gui/charselect.js @@ -47,7 +47,7 @@ function initCharacterSelectGUI() { textSize: 14.0, textAlign: 0.0, textColour: toColour(255, 255, 255, 220), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), @@ -59,7 +59,7 @@ function initCharacterSelectGUI() { textSize: 9.0, textAlign: 0.0, textColour: toColour(255, 255, 255, 220), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), @@ -71,7 +71,7 @@ function initCharacterSelectGUI() { textSize: 9.0, textAlign: 0.0, textColour: toColour(255, 255, 255, 220), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), @@ -83,7 +83,7 @@ function initCharacterSelectGUI() { textSize: 9.0, textAlign: 0.0, textColour: toColour(255, 255, 255, 220), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), @@ -94,8 +94,8 @@ function initCharacterSelectGUI() { main: { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(primaryTextColour[0], primaryTextColour[1], primaryTextColour[2], 255), - textSize: 12.0, - textFont: robotoFont, + textSize: 10.0, + textFont: mainFont, textAlign: 0.5, }, focused: { @@ -107,8 +107,8 @@ function initCharacterSelectGUI() { main: { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(primaryTextColour[0], primaryTextColour[1], primaryTextColour[2], 255), - textSize: 12.0, - textFont: robotoFont, + textSize: 10.0, + textFont: mainFont, textAlign: 0.5, }, focused: { @@ -116,12 +116,12 @@ function initCharacterSelectGUI() { } }, showNewCharacter); - characterSelect.previousCharacterButton = characterSelect.window.button(5, 130, 75, 25, '< PREV', { + characterSelect.previousCharacterButton = characterSelect.window.button(5, 130, 75, 25, '←', { main: { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(primaryTextColour[0], primaryTextColour[1], primaryTextColour[2], 255), - textSize: 10.0, - textFont: robotoFont, + textSize: 13.0, + textFont: mainFont, textAlign: 0.5, }, focused: { @@ -129,12 +129,12 @@ function initCharacterSelectGUI() { } }, selectPreviousCharacter); - characterSelect.nextCharacterButton = characterSelect.window.button(350, 130, 75, 25, 'NEXT >', { + characterSelect.nextCharacterButton = characterSelect.window.button(350, 130, 75, 25, '→', { main: { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(primaryTextColour[0], primaryTextColour[1], primaryTextColour[2], 255), - textSize: 10.0, - textFont: robotoFont, + textSize: 13.0, + textFont: mainFont, textAlign: 0.5, }, focused: { @@ -204,7 +204,7 @@ function switchCharacterSelectGUI(firstName, lastName, cash, clan, lastPlayed, s characterSelect.cashText.text = `Money: $${cash}`; characterSelect.clanText.text = `Clan: ${clan}`; characterSelect.lastPlayedText.text = `Last Played: ${lastPlayed}`; - characterSelect.skinImage = characterSelect.window.image(310, 32, 100, 90, "files/images/skins/none.png"); + characterSelect.skinImage = (getGame() == GAME_GTA_III) ? characterSelect.window.image(310, 32, 100, 90, `files/images/skins/gta3/${getSkinImage(skinId)}.png`) : characterSelect.window.image(310, 32, 100, 90, "files/images/skins/none.png"); characterSelect.window.shown = true; guiSubmitKey = selectThisCharacter; guiLeftKey = selectPreviousCharacter; @@ -218,4 +218,16 @@ function characterSelectSuccess() { closeAllWindows(); } +// =========================================================================== + +function getSkinImage(skinId, gameId = getGame()) { + if(skinId < 10) { + return `Skin_00${skinId}.png`; + } else if(skinId > 10 && skinId < 100) { + return `Skin_0${skinId}.png`; + } else if(skinId > 100) { + return `Skin_${skinId}.png`; + } +} + // =========================================================================== \ No newline at end of file diff --git a/scripts/client/gui/error.js b/scripts/client/gui/error.js index 529701bc..2c6826bb 100644 --- a/scripts/client/gui/error.js +++ b/scripts/client/gui/error.js @@ -39,7 +39,7 @@ function initErrorDialogGUI() { textSize: 10.0, textAlign: 0.5, textColour: toColour(255, 255, 255, 255), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), @@ -51,7 +51,7 @@ function initErrorDialogGUI() { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(primaryTextColour[0], primaryTextColour[1], primaryTextColour[2], 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, textAlign: 0.5, }, focused: { diff --git a/scripts/client/gui/info.js b/scripts/client/gui/info.js index 611de94a..bbbb3766 100644 --- a/scripts/client/gui/info.js +++ b/scripts/client/gui/info.js @@ -38,7 +38,7 @@ function initInfoDialogGUI() { textSize: 10.0, textAlign: 0.5, textColour: toColour(255, 255, 255, 220), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), @@ -50,7 +50,7 @@ function initInfoDialogGUI() { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(primaryTextColour[0], primaryTextColour[1], primaryTextColour[2], 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, textAlign: 0.5, }, focused: { diff --git a/scripts/client/gui/list.js b/scripts/client/gui/list.js index 6aaec8a9..00d94be9 100644 --- a/scripts/client/gui/list.js +++ b/scripts/client/gui/list.js @@ -41,7 +41,7 @@ function initListGUI() { textSize: 10.0, textAlign: 0.5, textColour: toColour(255, 255, 255, 220), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), diff --git a/scripts/client/gui/login.js b/scripts/client/gui/login.js index 60aa1ea9..c484687c 100644 --- a/scripts/client/gui/login.js +++ b/scripts/client/gui/login.js @@ -53,7 +53,7 @@ function initLoginGUI() { textSize: 10.0, textAlign: 0.5, textColour: toColour(200, 200, 200, 255), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), @@ -66,7 +66,7 @@ function initLoginGUI() { borderColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], textInputAlpha), textColour: toColour(200, 200, 200, 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, }, caret: { lineColour: toColour(255, 255, 255, 255), @@ -74,7 +74,7 @@ function initLoginGUI() { placeholder: { textColour: toColour(200, 200, 200, 150), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], 255), @@ -88,7 +88,7 @@ function initLoginGUI() { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(0, 0, 0, 255), textSize: 12.0, - textFont: robotoFont, + textFont: mainFont, textAlign: 0.5, }, focused: { @@ -101,7 +101,7 @@ function initLoginGUI() { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(0, 0, 0, 255), textSize: 8.0, - textFont: robotoFont, + textFont: mainFont, textAlign: 0.5, }, focused: { @@ -114,7 +114,7 @@ function initLoginGUI() { textSize: 8.0, textAlign: 1.0, textColour: toColour(180, 180, 180, 255), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), diff --git a/scripts/client/gui/newchar.js b/scripts/client/gui/newchar.js index bff3359d..76ce1474 100644 --- a/scripts/client/gui/newchar.js +++ b/scripts/client/gui/newchar.js @@ -51,7 +51,7 @@ function initNewCharacterGUI() { textSize: 10.0, textAlign: 0.5, textColour: toColour(200, 200, 200, 255), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), @@ -63,7 +63,7 @@ function initNewCharacterGUI() { backgroundColour: toColour(0, 0, 0, 120), textColour: toColour(200, 200, 200, 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, }, caret: { lineColour: toColour(255, 255, 255, 255), @@ -72,7 +72,7 @@ function initNewCharacterGUI() { backgroundColour: toColour(0, 0, 0, 120), textColour: toColour(200, 200, 200, 200), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, } }); newCharacter.firstNameInput.placeholder = "First Name"; @@ -82,7 +82,7 @@ function initNewCharacterGUI() { backgroundColour: toColour(0, 0, 0, 120), textColour: toColour(200, 200, 200, 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, }, caret: { lineColour: toColour(255, 255, 255, 255), @@ -91,7 +91,7 @@ function initNewCharacterGUI() { backgroundColour: toColour(0, 0, 0, 120), textColour: toColour(150, 150, 150, 200), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, } }); newCharacter.lastNameInput.placeholder = "Last Name"; @@ -100,8 +100,8 @@ function initNewCharacterGUI() { main: { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(255, 255, 255, 255), - textSize: 12.0, - textFont: robotoFont, + textSize: 10.0, + textFont: mainFont, textAlign: 0.5, }, focused: { diff --git a/scripts/client/gui/register.js b/scripts/client/gui/register.js index 620e1ab6..1edac69c 100644 --- a/scripts/client/gui/register.js +++ b/scripts/client/gui/register.js @@ -51,7 +51,7 @@ function initRegisterGUI() { textSize: 10.0, textAlign: 0.5, textColour: toColour(200, 200, 200, 255), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), @@ -63,7 +63,7 @@ function initRegisterGUI() { backgroundColour: toColour(0, 0, 0, 120), textColour: toColour(200, 200, 200, 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, }, caret: { lineColour: toColour(255, 255, 255, 255), @@ -72,7 +72,7 @@ function initRegisterGUI() { backgroundColour: toColour(0, 0, 0, 120), textColour: toColour(200, 200, 200, 200), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, } }); register.passwordInput.masked = true; @@ -83,7 +83,7 @@ function initRegisterGUI() { backgroundColour: toColour(0, 0, 0, 120), textColour: toColour(200, 200, 200, 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, }, caret: { lineColour: toColour(255, 255, 255, 255), @@ -92,7 +92,7 @@ function initRegisterGUI() { backgroundColour: toColour(0, 0, 0, 120), textColour: toColour(200, 200, 200, 200), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, } }); register.confirmPasswordInput.masked = true; @@ -103,7 +103,7 @@ function initRegisterGUI() { backgroundColour: toColour(0, 0, 0, 120), textColour: toColour(200, 200, 200, 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, }, caret: { lineColour: toColour(255, 255, 255, 255), @@ -112,7 +112,7 @@ function initRegisterGUI() { backgroundColour: toColour(0, 0, 0, 120), textColour: toColour(200, 200, 200, 200), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, } }); register.emailInput.placeholder = "Email"; @@ -122,7 +122,7 @@ function initRegisterGUI() { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(255, 255, 255, 255), textSize: 12.0, - textFont: robotoFont, + textFont: mainFont, textAlign: 0.5, }, focused: { diff --git a/scripts/client/gui/resetpass.js b/scripts/client/gui/resetpass.js index cdde2148..2b8c3abe 100644 --- a/scripts/client/gui/resetpass.js +++ b/scripts/client/gui/resetpass.js @@ -53,7 +53,7 @@ function initResetPasswordGUI() { textSize: 10.0, textAlign: 0.5, textColour: toColour(200, 200, 200, 255), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), @@ -66,7 +66,7 @@ function initResetPasswordGUI() { borderColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], textInputAlpha), textColour: toColour(200, 200, 200, 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, }, caret: { lineColour: toColour(255, 255, 255, 255), @@ -74,7 +74,7 @@ function initResetPasswordGUI() { placeholder: { textColour: toColour(200, 200, 200, 150), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], 255), @@ -87,7 +87,7 @@ function initResetPasswordGUI() { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(primaryTextColour[0], primaryTextColour[1], primaryTextColour[2], 255), textSize: 12.0, - textFont: robotoFont, + textFont: mainFont, textAlign: 0.5, }, focused: { @@ -100,7 +100,7 @@ function initResetPasswordGUI() { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(primaryTextColour[0], primaryTextColour[1], primaryTextColour[2], 255), textSize: 8.0, - textFont: robotoFont, + textFont: mainFont, textAlign: 0.5, }, focused: { @@ -113,7 +113,7 @@ function initResetPasswordGUI() { textSize: 8.0, textAlign: 1.0, textColour: toColour(200, 200, 200, 255), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), diff --git a/scripts/client/gui/yesno.js b/scripts/client/gui/yesno.js index 161c910f..a7ee4f32 100644 --- a/scripts/client/gui/yesno.js +++ b/scripts/client/gui/yesno.js @@ -41,7 +41,7 @@ function initYesNoDialogGUI() { textSize: 10.0, textAlign: 0.5, textColour: toColour(255, 255, 255, 255), - textFont: robotoFont, + textFont: mainFont, }, focused: { borderColour: toColour(0, 0, 0, 0), @@ -53,7 +53,7 @@ function initYesNoDialogGUI() { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(primaryTextColour[0], primaryTextColour[1], primaryTextColour[2], 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, textAlign: 0.5, }, focused: { @@ -66,7 +66,7 @@ function initYesNoDialogGUI() { backgroundColour: toColour(primaryColour[0], primaryColour[1], primaryColour[2], buttonAlpha), textColour: toColour(primaryTextColour[0], primaryTextColour[1], primaryTextColour[2], 255), textSize: 10.0, - textFont: robotoFont, + textFont: mainFont, textAlign: 0.5, }, focused: {