Change discord server invite link

modUtils.js

@@ -24,6 +24,13 @@ class ModUtils {
     script = "";
     /** @type {{[key: string]: string}} */
     dictionary = {};
+    safeDictionary = new Proxy(this.dictionary, {
+        get(target, prop) {
+            if (typeof prop === 'symbol') prop = prop.toString();
+            if (prop in target) return target[prop];
+            throw new Error(`Property ${prop} is not defined in dictionary`);
+        }
+    });
     /** @type {Function[]} */
     postMinifyHandlers = [];
 

patches/customLobby.js

@@ -1,7 +1,7 @@
 import ModUtils from '../modUtils.js';
 
 // Custom lobby patches
-export default (/** @type {ModUtils} */ { insertCode, replaceCode, replaceRawCode, dictionary: dict, waitForMinification }) => {
+export default (/** @type {ModUtils} */ { insertCode, replaceCode, replaceRawCode, safeDictionary: dict, waitForMinification }) => {
     
     // set player id correctly
     insertCode(`function aBG(aBE) {

patches/patches.js

@@ -6,10 +6,10 @@ export default (/** @type {ModUtils} */ modUtils) => {
 }
 //export const requiredVariables = ["game", "playerId", "playerData", "rawPlayerNames", "gIsSingleplayer", "playerTerritories"];
 
-function applyPatches(/** @type {ModUtils} */ { replace, replaceOne, replaceRawCode, dictionary, matchOne, matchRawCode, escapeRegExp }) {
+function applyPatches(/** @type {ModUtils} */ { replace, replaceOne, replaceRawCode, safeDictionary, matchOne, matchRawCode, escapeRegExp }) {
 
     // Constants for easy usage of otherwise long variable access expressions
-    const dict = dictionary;
+    const dict = safeDictionary;
     const playerId = `${dict.game}.${dict.playerId}`;
     const rawPlayerNames = `${dict.playerData}.${dict.rawPlayerNames}`;
     const gIsSingleplayer = `${dict.game}.${dict.gIsSingleplayer}`;
@@ -153,7 +153,7 @@ canvas.font=aY.g0.g1(1,fontSize),canvas.fillStyle="rgba("+gR+","+tD+","+hj+",0.6
 
     { // Player list and leaderboard filter tabs
         // Draw player list button
-        const uiOffset = dictionary.uiSizes + "." + dictionary.gap;
+        const uiOffset = dict.uiSizes + "." + dict.gap;
         const { groups: { drawFunction, topBarHeight } } = replaceOne(/(="";function (?<drawFunction>\w+)\(\){[^}]+?(?<canvas>\w+)\.fillRect\(0,(?<topBarHeight>\w+),\w+,1\),(?:\3\.fillRect\([^()]+\),)+\3\.font=\w+,(\w+\.\w+)\.textBaseline\(\3,1\),\5\.textAlign\(\3,1\),\3\.fillText\(\w+,Math\.floor\()(\w+)\/2\),(Math\.floor\(\w+\+\w+\/2\)\));/g,
             "$1($6 + $<topBarHeight> - 22) / 2), $7; __fx.playerList.drawButton($<canvas>, 12, 12, $<topBarHeight> - 22);");
         const buttonBoundsCheck = `__fx.utils.isPointInRectangle($<x>, $<y>, ${uiOffset} + 12, ${uiOffset} + 12, ${topBarHeight} - 22, ${topBarHeight} - 22)`

src/settings.js

@@ -120,7 +120,7 @@ const settingsManager = new (function () {
       const versionInfo = document.createElement("p");
       versionInfo.innerText = `FX Client v${versionData.version}`;
       const links = document.createElement("p");
-      links.innerHTML = `<a href="https://discord.gg/mtWFTQhTT9" target="_blank">Discord server</a> |
+      links.innerHTML = `<a href="https://discord.gg/dyxcwdNKwK" target="_blank">Discord server</a> |
         <a href="https://github.com/fxclient/FXclient#readme">Github repository</a>`;
       const changelogButton = document.createElement("button");
       changelogButton.innerText = "Changelog";

static/main.css

@@ -16,7 +16,7 @@
 	width           : 90%;
 	top             : 0;
 	color           : white;
-	font-family     : 'Franklin Gothic Medium', 'Trebuchet MS', Arial, sans-serif;
+	font-family     : 'Trebuchet MS', 'Franklin Gothic Medium', Arial, sans-serif;
 	margin          : auto;
 	margin-top      : 20px;
 	right           : 0;

version.json

@@ -6,6 +6,7 @@
         "Added custom lobby join links - to get one, click on the new \"Copy link\" button while in a lobby.",
         "Added version information at the bottom of the setting page along with a link to the FX Client Discord server and GitHub repository. Previously this was shown only in the vanilla version menu.",
         "Added a settings option to toggle displaying a player's donation history when clicking on their name in the leaderboard (applies to team games only)",
+        "Changed the font for the FX Client UI elements",
         "The custom lobby server no longer tries to verify the compatibility of the client's protocol version. This will make custom lobbies usable immediately after an update, provided that the communication protocol has not changed significantly."
     ]
 }