merge:develop

ExtremeRoles.Test/Asset/FakerAssetLoadRunner.cs

@@ -0,0 +1,16 @@
+using ExtremeRoles.Resources;
+using ExtremeRoles.Roles;
+
+namespace ExtremeRoles.Test.Asset;
+
+internal sealed class FakerAssetLoadRunner
+	: AssetLoadRunner
+{
+	public override void Run()
+	{
+		Log.LogInfo($"----- Unit:FakerAsset Test -----");
+
+		LoadFromExR(ExtremeRoleId.Faker, ObjectPath.FakerDummyPlayer);
+		LoadFromExR(ExtremeRoleId.Faker, ObjectPath.FakerDummyDeadBody);
+	}
+}

ExtremeRoles.Test/Asset/GlitchAssetLoadRunner.cs

@@ -0,0 +1,14 @@
+using ExtremeRoles.Roles;
+
+namespace ExtremeRoles.Test.Asset;
+
+internal sealed class GlitchAssetLoadRunner
+	: AssetLoadRunner
+{
+	public override void Run()
+	{
+		Log.LogInfo($"----- Unit:GlitchAsset Test -----");
+
+		LoadFromExR(ExtremeRoleId.Glitch);
+	}
+}

ExtremeRoles.Test/Asset/HijackerAssetLoadRunner.cs

@@ -0,0 +1,14 @@
+using ExtremeRoles.Roles;
+
+namespace ExtremeRoles.Test.Asset;
+
+internal sealed class HijackerAssetLoadRunner
+	: AssetLoadRunner
+{
+	public override void Run()
+	{
+		Log.LogInfo($"----- Unit:HijackerAsset Test -----");
+
+		LoadFromExR(ExtremeRoleId.Hijacker);
+	}
+}

ExtremeRoles.Test/Asset/RaiderAssetLoadRunner.cs

@@ -0,0 +1,14 @@
+using ExtremeRoles.Roles;
+
+namespace ExtremeRoles.Test.Asset;
+
+internal sealed class RaiderAssetLoadRunner
+	: AssetLoadRunner
+{
+	public override void Run()
+	{
+		Log.LogInfo($"----- Unit:RaiderAsset Test -----");
+
+		LoadFromExR(ExtremeRoleId.Raider);
+	}
+}

ExtremeRoles.Test/Asset/TimeBreakerAssetLoadRunner.cs

@@ -0,0 +1,14 @@
+using ExtremeRoles.Roles;
+
+namespace ExtremeRoles.Test.Asset;
+
+internal sealed class TimeBreakerAssetLoadRunner
+	: AssetLoadRunner
+{
+	public override void Run()
+	{
+		Log.LogInfo($"----- Unit:TimeBreakerAsset Test -----");
+
+		LoadFromExR(ExtremeRoleId.TimeBreaker);
+	}
+}

ExtremeRoles.Test/AssetLoadRunner.cs

@@ -40,11 +40,16 @@ public override void Run()
 		Run<JailerAssetLoadRunner>();
 		Run<SummonerAssetLoadRunner>();
 
+		Run<FakerAssetLoadRunner>();
 		Run<MeryAssetLoadRunner>();
 		Run<HypnotistAssetLoadRunner>();
 		Run<ThiefAssetLoadRunner>();
 		Run<TeroAssetLoadRunner>();
 		Run<ZombieAssetLoadRunner>();
+		Run<GlitchAssetLoadRunner>();
+		Run<TimeBreakerAssetLoadRunner>();
+		Run<RaiderAssetLoadRunner>();
+		Run<HijackerAssetLoadRunner>();
 
 		Run<TuckerAssetLoadRunner>();
 		Run<YokoAssetLoadRunner>();

ExtremeRoles.Test/TranslationTestRunner.cs

@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace ExtremeRoles.Test;
 
@@ -13,9 +11,11 @@ public override void Run()
 		var allTrans = TranslationController.Instance.currentLanguage.AllStrings;
 		var valKeys = new Dictionary<string, HashSet<string>>(allTrans.Count);
 
-
-		foreach (var (key, val) in allTrans)
+		foreach (var item in allTrans)
 		{
+			string key = item.Key;
+			string val = item.Value;
+
 			if (valKeys.TryGetValue(val, out var set) &&
 				set is not null)
 			{

ExtremeRoles/Extension/LinqExtend.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 
 #nullable enable
 
@@ -12,6 +13,26 @@ public static T GetRandomItem<T>(this IReadOnlyList<T> self)
 		int index = RandomGenerator.Instance.Next(size);
 		return self[index];
 	}
+
+	public static IEnumerable<T> GetRandomItem<T>(this IReadOnlyList<T> self, int num)
+	{
+		if (self.Count >= num)
+		{
+			return self.OrderBy(x => RandomGenerator.Instance.Next()).Take(num);
+
+		}
+
+		return sizedRandom(self, num);
+	}
+
+	private static IEnumerable<T> sizedRandom<T>(IReadOnlyList<T> self, int num)
+	{
+		for (int i = 0; i < num; ++i)
+		{
+			yield return self.GetRandomItem();
+		}
+	}
+
 	public static T GetRandomItem<T>(this T[] self)
 	{
 		int size = self.Length;

ExtremeRoles/Extension/PlayerControlExtension.cs

@@ -6,4 +6,10 @@ public static void MurderPlayer(this PlayerControl source, PlayerControl target)
 	{
 		source.MurderPlayer(target, MurderResultFlags.Succeeded | MurderResultFlags.DecisionByHost);
 	}
+	public static bool IsValid(this PlayerControl @this)
+		=>
+			@this != null &&
+			@this.Data != null &&
+			!@this.Data.IsDead && !@this.Data.Disconnected;
+
 }

ExtremeRoles/ExtremeRoles.csproj

@@ -3,9 +3,9 @@
     <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <WarningLevel>7</WarningLevel>
-    <Version>12.0.2.4</Version>
-    <!--<VersionPrefix>12.0.2</VersionPrefix>-->
-    <VersionSuffix>Invitation-AmongUsV2024813</VersionSuffix>
+    <!--<Version>12.1.0.0</Version>-->
+    <VersionPrefix>12.1.0</VersionPrefix>
+    <VersionSuffix>3rdAnniversary</VersionSuffix>
     <Description>Extreme Roles for Advanced user</Description>
     <Authors>yukieiji</Authors>
     <Configurations>Debug;Release</Configurations>

ExtremeRoles/GameMode/RoleSelector/ClassicGameModeRoleSelector.cs

@@ -2,8 +2,6 @@
 
 using ExtremeRoles.GhostRoles;
 using ExtremeRoles.Roles;
-using ExtremeRoles.Roles.API;
-
 
 namespace ExtremeRoles.GameMode.RoleSelector;
 
@@ -126,6 +124,10 @@ private static ExtremeRoleId[] getUseNormalRoleId() =>
 			ExtremeRoleId.Thief,
 			ExtremeRoleId.Crewshroom,
 			ExtremeRoleId.Terorist,
+			ExtremeRoleId.Raider,
+			ExtremeRoleId.Glitch,
+			ExtremeRoleId.Hijacker,
+			ExtremeRoleId.TimeBreaker,
 
 			ExtremeRoleId.Alice,
             ExtremeRoleId.Jackal,
@@ -143,6 +145,7 @@ private static ExtremeRoleId[] getUseNormalRoleId() =>
 			ExtremeRoleId.Hatter,
 			ExtremeRoleId.Artist,
 			ExtremeRoleId.Tucker,
+			ExtremeRoleId.IronMate,
 		];
 
     private CombinationRoleType[] getUseCombRoleType() =>
@@ -175,8 +178,9 @@ private ExtremeGhostRoleId[] getUseGhostRoleId() =>
             ExtremeGhostRoleId.Ventgeist,
             ExtremeGhostRoleId.SaboEvil,
             ExtremeGhostRoleId.Igniter,
+			ExtremeGhostRoleId.Doppelganger,
 
-            ExtremeGhostRoleId.Foras,
+			ExtremeGhostRoleId.Foras,
         ];
 }
 

ExtremeRoles/GameMode/RoleSelector/HideNSeekGameModeRoleSelector.cs

@@ -71,7 +71,10 @@ private static ExtremeRoleId[] getUseNormalId() =>
             ExtremeRoleId.Hypnotist,
             ExtremeRoleId.Slime,
 			ExtremeRoleId.Terorist,
-        ];
+			ExtremeRoleId.Raider,
+			ExtremeRoleId.Hijacker,
+			ExtremeRoleId.TimeBreaker,
+		];
 	private CombinationRoleType[] getUseCombRoleType() =>
 		[
 			CombinationRoleType.Accelerator,

ExtremeRoles/GhostRoles/API/GhostRoleBase.cs

@@ -12,6 +12,7 @@
 using ExtremeRoles.Roles.API.Interface;
 
 using OptionFactory = ExtremeRoles.Module.CustomOption.Factory.AutoParentSetOptionCategoryFactory;
+using ExtremeRoles.Performance;
 
 namespace ExtremeRoles.GhostRoles.API;
 
@@ -222,7 +223,7 @@ protected void ButtonInit()
         this.Button.OnMeetingEnd();
     }
 
-    protected bool isReportAbility() => this.Loader.GetValue<GhostRoleOption, bool>(GhostRoleOption.IsReportAbility);
+    protected bool IsReportAbility() => this.Loader.GetValue<GhostRoleOption, bool>(GhostRoleOption.IsReportAbility);
 
     private OptionFactory createOptionFactory()
     {
@@ -259,11 +260,41 @@ private OptionFactory createOptionFactory()
 
     protected abstract void UseAbility(RPCOperator.RpcCaller caller);
 
-	protected static bool IsCommonUse() =>
-		PlayerControl.LocalPlayer != null &&
-		PlayerControl.LocalPlayer.Data != null &&
-		PlayerControl.LocalPlayer.Data.IsDead &&
-		PlayerControl.LocalPlayer.CanMove;
+	protected static bool IsCommonUse()
+	{
+		var localPlayer = PlayerControl.LocalPlayer;
+
+		return
+			localPlayer != null &&
+			localPlayer.Data != null &&
+			localPlayer.Data.IsDead &&
+			localPlayer.CanMove;
+	}
+	protected static bool IsCommonUseWithMinigame()
+	{
+		var localPlayer = PlayerControl.LocalPlayer;
+		var hud = FastDestroyableSingleton<HudManager>.Instance;
+		return
+			!(
+				localPlayer == null ||
+				localPlayer.Data == null ||
+				!localPlayer.Data.IsDead ||
+				localPlayer.inVent ||
+				localPlayer.MyPhysics.DoingCustomAnimation ||
+				localPlayer.shapeshifting ||
+				localPlayer.waitingForShapeshiftResponse ||
+				hud == null ||
+				hud.Chat.IsOpenOrOpening ||
+				hud.KillOverlay.IsOpen ||
+				hud.GameMenu.IsOpen ||
+				hud.IsIntroDisplayed ||
+				(MapBehaviour.Instance != null && MapBehaviour.Instance.IsOpenStopped) ||
+				MeetingHud.Instance != null ||
+				PlayerCustomizationMenu.Instance != null ||
+				ExileController.Instance != null ||
+				IntroCutscene.Instance != null
+			);
+	}
 
 	protected static void EnumCheck<T>(T isEnum) where T : struct, IConvertible
     {

ExtremeRoles/GhostRoles/Crewmate/Faunus.cs

@@ -53,7 +53,7 @@ public override void CreateAbility()
             AbilityType.FaunusOpenSaboConsole,
             Resources.UnityObjectLoader.LoadSpriteFromResources(
                 Resources.ObjectPath.MaintainerRepair),
-            this.isReportAbility(),
+            this.IsReportAbility(),
             this.isPreCheck,
             this.isAbilityUse,
             this.UseAbility,

ExtremeRoles/GhostRoles/Crewmate/Poltergeist.cs

@@ -95,7 +95,7 @@ public override void CreateAbility()
             AbilityType.PoltergeistMoveDeadbody,
             Resources.UnityObjectLoader.LoadSpriteFromResources(
                 Resources.ObjectPath.CarrierCarry),
-            this.isReportAbility(),
+            this.IsReportAbility(),
             this.isPreCheck,
             this.isAbilityUse,
             this.UseAbility,

ExtremeRoles/GhostRoles/Crewmate/Shutter.cs

@@ -189,7 +189,7 @@ public override void CreateAbility()
             AbilityType.ShutterTakePhoto,
             Resources.UnityObjectLoader.LoadSpriteFromResources(
                 Resources.ObjectPath.PhotographerPhotoCamera),
-            this.isReportAbility(),
+            this.IsReportAbility(),
             () => true,
             this.isAbilityUse,
             this.UseAbility,

ExtremeRoles/GhostRoles/ExtremeGhostRoleManager.cs

@@ -30,8 +30,9 @@ public enum ExtremeGhostRoleId : byte
     Ventgeist,
     SaboEvil,
     Igniter,
+	Doppelganger,
 
-    Foras,
+	Foras,
 }
 
 public enum AbilityType : byte
@@ -45,13 +46,13 @@ public enum AbilityType : byte
     VentgeistVentAnime,
     SaboEvilResetSabotageCool,
     IgniterSwitchLight,
+	DoppelgangerDoppel,
 
-    ForasShowArrow
+	ForasShowArrow
 }
 
 public static class ExtremeGhostRoleManager
 {
-    private const int ghostRoleOptionId = 25;
     public const int IdOffset = 512;
 
     public static Dictionary<byte, GhostRoleBase> GameRole = new Dictionary<byte, GhostRoleBase>();
@@ -63,11 +64,12 @@ public static readonly Dictionary<
             { ExtremeGhostRoleId.Faunus,      new Faunus()      },
             { ExtremeGhostRoleId.Shutter,     new Shutter()     },
 
-            { ExtremeGhostRoleId.Ventgeist, new Ventgeist() },
-            { ExtremeGhostRoleId.SaboEvil , new SaboEvil()  },
-            { ExtremeGhostRoleId.Igniter  , new Igniter()   },
+            { ExtremeGhostRoleId.Ventgeist   , new Ventgeist()    },
+            { ExtremeGhostRoleId.SaboEvil    , new SaboEvil()     },
+            { ExtremeGhostRoleId.Igniter     , new Igniter()      },
+			{ ExtremeGhostRoleId.Doppelganger, new Doppelganger() },
 
-            { ExtremeGhostRoleId.Foras    , new Foras()   },
+			{ ExtremeGhostRoleId.Foras    , new Foras()   },
         };
 
     private static readonly HashSet<RoleTypes> vanillaGhostRole = new HashSet<RoleTypes>()
@@ -270,10 +272,15 @@ public static void UseAbility(
             case AbilityType.IgniterSwitchLight:
                 Igniter.SetVison(reader.ReadBoolean());
                 break;
-            case AbilityType.ForasShowArrow:
+			case AbilityType.DoppelgangerDoppel:
+				byte doppelgangerPlayerId = reader.ReadByte();
+				byte doppelTargetPlayerId = reader.ReadByte();
+				Doppelganger.Doppl(doppelgangerPlayerId, doppelTargetPlayerId);
+				break;
+			case AbilityType.ForasShowArrow:
                 Foras.SwitchArrow(ref reader);
                 break;
-            default:
+			default:
                 break;
         }