hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Arial font instead of Roboto

Browse Source
This commit is contained in:
Vortrex
2022-01-21 20:30:23 -06:00
parent a4a3f37583
commit 5f4ca19004
12 changed files with 73 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/client/gui.js
View File

@@ -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";

8
scripts/client/gui/2fa.js
View File

@@ -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: {

12
scripts/client/gui/changepass.js
View File

@@ -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: {

42
scripts/client/gui/charselect.js
View File

@@ -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`;
}
}
// ===========================================================================

4
scripts/client/gui/error.js
View File

@@ -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: {

4
scripts/client/gui/info.js
View File

@@ -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: {

2
scripts/client/gui/list.js
View File

@@ -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),

12
scripts/client/gui/login.js
View File

@@ -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),

14
scripts/client/gui/newchar.js
View File

@@ -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: {

16
scripts/client/gui/register.js
View File

@@ -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: {

12
scripts/client/gui/resetpass.js
View File

@@ -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),

6
scripts/client/gui/yesno.js
View File

@@ -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: {