From 0f90f80f16568d502d247b9976095ff5e243adf2 Mon Sep 17 00:00:00 2001 From: D1GQ Date: Mon, 16 Sep 2024 20:17:08 -0500 Subject: [PATCH 1/6] New announcement types --- Patches/AnnouncementPatch.cs | 40 +++++++++++++++++++-- Resources/Images/TENCreditsButton.png | Bin 0 -> 14527 bytes Resources/ModNews/BAU.v.1.0.0-Template.txt | 1 + Resources/ModNews/BAU.v.1.0.0.txt | 3 +- Resources/ModNews/BAU.v1.1.0.txt | 3 +- Resources/ModNews/BAU.v1.1.3-TEN.txt | 17 +++++++++ 6 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 Resources/Images/TENCreditsButton.png create mode 100644 Resources/ModNews/BAU.v1.1.3-TEN.txt diff --git a/Patches/AnnouncementPatch.cs b/Patches/AnnouncementPatch.cs index 58ab3d2..b747ff7 100644 --- a/Patches/AnnouncementPatch.cs +++ b/Patches/AnnouncementPatch.cs @@ -12,9 +12,17 @@ namespace BetterAmongUs.Patches; // Thanks: https://github.com/0xDrMoe/TownofHost-Enhanced +public enum NewsTypes +{ + None, + BAU, + TEN +} + [HarmonyPatch] public class ModNews { + public NewsTypes NewsType; public int Number; public string Title; public string SubTitle; @@ -41,8 +49,9 @@ public class ModNews public static List AllModNews = new List(); - public ModNews(int number, string title, string subTitle, string shortTitle, string text, string date) + public ModNews(NewsTypes type, int number, string title, string subTitle, string shortTitle, string text, string date) { + NewsType = type; Number = number; Title = title; SubTitle = subTitle; @@ -69,6 +78,8 @@ public class ModNews private static void ProcessModNewsFiles() { + AllModNews.Clear(); + var assembly = Assembly.GetExecutingAssembly(); var resourceNames = assembly.GetManifestResourceNames() .Where(name => name.StartsWith("BetterAmongUs.Resources.ModNews") && name.EndsWith(".txt")); @@ -85,10 +96,23 @@ public class ModNews var lines = content.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); int number = 0; string title = "", subTitle = "", shortTitle = "", text = "", date = ""; + NewsTypes type = NewsTypes.None; foreach (var line in lines) { if (line.StartsWith("#Skip")) return; + else if (line.StartsWith("#Type:")) + { + switch (line[6..]) + { + case "BAU": + type = NewsTypes.BAU; + break; + case "TEN": + type = NewsTypes.TEN; + break; + } + } else if (line.StartsWith("#Number:")) number = int.Parse(line[8..]); else if (line.StartsWith("#Title:")) title = line[7..]; else if (line.StartsWith("#SubTitle:")) subTitle = line[10..]; @@ -101,7 +125,7 @@ public class ModNews if (number != 0) { - new ModNews(number, title, subTitle, shortTitle, text, date); + new ModNews(type, number, title, subTitle, shortTitle, text, date); } } @@ -146,7 +170,17 @@ public class ModNews obj.transform.localPosition = new Vector3(-0.8f, 0.13f, 0.5f); obj.transform.localScale = new Vector3(0.9f, 0.9f, 0.9f); var renderer = obj.AddComponent(); - renderer.sprite = Utils.LoadSprite($"BetterAmongUs.Resources.Images.BetterAmongUs-Icon.png", 650f); + switch (AllModNews.Find(a => a.Number == announcement.Number).NewsType) + { + case NewsTypes.BAU: + renderer.sprite = Utils.LoadSprite($"BetterAmongUs.Resources.Images.BetterAmongUs-Icon.png", 650f); + break; + case NewsTypes.TEN: + renderer.sprite = Utils.LoadSprite($"BetterAmongUs.Resources.Images.TENCreditsButton.png", 365f); + break; + default: + break; + } renderer.maskInteraction = SpriteMaskInteraction.VisibleInsideMask; } } diff --git a/Resources/Images/TENCreditsButton.png b/Resources/Images/TENCreditsButton.png new file mode 100644 index 0000000000000000000000000000000000000000..9518ccbbf8569211f512b772693923700b45071b GIT binary patch literal 14527 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 ds~qZJ{QrIs it truly better though? #ShortTitle:BAU v1.0.0 diff --git a/Resources/ModNews/BAU.v1.1.0.txt b/Resources/ModNews/BAU.v1.1.0.txt index feb0777..e7b4bd7 100644 --- a/Resources/ModNews/BAU.v1.1.0.txt +++ b/Resources/ModNews/BAU.v1.1.0.txt @@ -1,4 +1,5 @@ -#Number:110002 +#Type:BAU +#Number:110002 #Title:Better Among Us v1.1.0 #SubTitle:Settings Galore! #ShortTitle:BAU v1.1.0 diff --git a/Resources/ModNews/BAU.v1.1.3-TEN.txt b/Resources/ModNews/BAU.v1.1.3-TEN.txt new file mode 100644 index 0000000..99c876d --- /dev/null +++ b/Resources/ModNews/BAU.v1.1.3-TEN.txt @@ -0,0 +1,17 @@ +#Type:TEN +#Number:110003 +#Title:Better Among Us X The Enhanced Network +#SubTitle:Things are getting more enhanced! +#ShortTitle:TEN +#Date:2024-9-16T00:00:00Z +#----------------------------- +We are excited to announce that BetterAmongUs is now collaborating with The Enhanced Network (TEN)! +# +This collaboration brings a lot of exciting changes to BetterAmongUs, including: +- Improved Online Safety: With TEN’s focus on cybersecurity, we aim to make your gaming experience safer and more enjoyable. +- Larger Community: By merging with TEN, we’re expanding our player base and community support, opening up more opportunities for community-driven content and events. +- Cross-Mod Compatibility: We’re working with TEN to ensure BetterAmongUs remains compatible with other mods, including their host-only Among Us mod. +# +Stay tuned for a detailed change log and updates coming soon! +# +Discord Github From 2850cb49d9e655bfca3a4984485f7bd240738d13 Mon Sep 17 00:00:00 2001 From: D1GQ Date: Tue, 17 Sep 2024 17:15:07 -0500 Subject: [PATCH 2/6] fix anti level 0 --- Modules/AntiCheat.cs | 4 ++-- Patches/ClientPatch.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/AntiCheat.cs b/Modules/AntiCheat.cs index 5808df8..3cbf5ff 100644 --- a/Modules/AntiCheat.cs +++ b/Modules/AntiCheat.cs @@ -264,10 +264,10 @@ class AntiCheat Logger.LogCheat($"{player.BetterData().RealName} {Enum.GetName((RpcCalls)callId)}: {level > BetterGameSettings.DetectedLevelAbove.GetInt()}"); } - if (level + 1 <= 0) + if (level > 1000000) { var betterData = player.BetterData(); - player.Kick(false, "{0}" + $" due to {level + 1} being invalid level", bypassDataCheck: true); + player.Kick(false, "{0}" + $" due to {level} being invalid level", bypassDataCheck: true); betterData.AntiCheatInfo.BannedByAntiCheat = true; } } diff --git a/Patches/ClientPatch.cs b/Patches/ClientPatch.cs index 0de4165..4dd2684 100644 --- a/Patches/ClientPatch.cs +++ b/Patches/ClientPatch.cs @@ -93,7 +93,7 @@ public class ClientPatch { if (!GameStates.IsHost) { - if (__instance.PlayerLevel == unchecked((uint)0 - 1)) + if (__instance.PlayerLevel > 1000000) { __instance.PlayerLevel = 0; } From 476d5c1e1fc8073b7675acc54c0113c25ed8bf37 Mon Sep 17 00:00:00 2001 From: D1GQ Date: Tue, 17 Sep 2024 17:15:33 -0500 Subject: [PATCH 3/6] fix kick and ban msg --- Modules/ExtendedPlayerControl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/ExtendedPlayerControl.cs b/Modules/ExtendedPlayerControl.cs index 6007e7a..c4891af 100644 --- a/Modules/ExtendedPlayerControl.cs +++ b/Modules/ExtendedPlayerControl.cs @@ -120,7 +120,7 @@ static class ExtendedPlayerControl if (setReasonInfo != "") { - GameDataShowNotificationPatch.BetterShowNotification(player.Data, forceReasonText: string.Format(setReasonInfo, ban ? "banned" : "kicked")); + GameDataShowNotificationPatch.BetterShowNotification(player.Data, forceReasonText: string.Format(setReasonInfo, Ban ? "banned" : "kicked")); } AmongUsClient.Instance.KickPlayer(player.GetClientId(), Ban); From 20f8af3cc7ded1f32d7a251aacbd7b2014fc3c53 Mon Sep 17 00:00:00 2001 From: D1GQ Date: Tue, 17 Sep 2024 17:16:33 -0500 Subject: [PATCH 4/6] Fix modded lobbys --- Modules/RPC.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/RPC.cs b/Modules/RPC.cs index 671a722..12dfe26 100644 --- a/Modules/RPC.cs +++ b/Modules/RPC.cs @@ -153,7 +153,7 @@ internal static class RPC { if (player == null || player.IsLocalPlayer() || player.Data == null) return; - var flag = Enum.IsDefined(typeof(CustomRPC), (int)unchecked(callId)) || Enum.IsDefined(typeof(RpcCalls), callId); + var flag = Enum.IsDefined(typeof(CustomRPC), unchecked(callId)) || Enum.IsDefined(typeof(RpcCalls), callId); if (!flag && player.IsHost()) { From a3d7d62d429a25960284a7bfccae2d14a76a51d3 Mon Sep 17 00:00:00 2001 From: D1GQ Date: Tue, 17 Sep 2024 17:17:51 -0500 Subject: [PATCH 5/6] hotfix 1 --- main.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.cs b/main.cs index f8b8a98..4770425 100644 --- a/main.cs +++ b/main.cs @@ -24,8 +24,8 @@ public class Main : BasePlugin { public const ReleaseTypes ReleaseBuildType = ReleaseTypes.Release; public const string BetaNum = "0"; - public const string HotfixNum = "0"; - public const bool IsHotFix = false; + public const string HotfixNum = "1"; + public const bool IsHotFix = true; public const string PluginGuid = "com.ten.betteramongus"; public const string PluginVersion = "1.1.3"; public const string ReleaseDate = "09.16.2024"; // mm/dd/yyyy From d458ae977ecb4e6ce81e1ea849bb1ac0148ff7ce Mon Sep 17 00:00:00 2001 From: D1GQ Date: Tue, 17 Sep 2024 17:54:07 -0500 Subject: [PATCH 6/6] v1.1.3 hotfix 1 --- main.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cs b/main.cs index 4770425..96ba00c 100644 --- a/main.cs +++ b/main.cs @@ -28,7 +28,7 @@ public class Main : BasePlugin public const bool IsHotFix = true; public const string PluginGuid = "com.ten.betteramongus"; public const string PluginVersion = "1.1.3"; - public const string ReleaseDate = "09.16.2024"; // mm/dd/yyyy + public const string ReleaseDate = "09.17.2024"; // mm/dd/yyyy public const string Github = "https://github.com/EnhancedNetwork/BetterAmongUs-Public"; public const string Discord = "https://discord.gg/ten";