v1.0.2.0 update

Author: ZsFabTest

Nebula/Helpers.cs

@@ -475,6 +475,10 @@ private static MurderAttemptResult checkMuderAttempt(PlayerControl killer, Playe
     public static MurderAttemptResult checkMurderAttemptAndAction(PlayerControl killer, PlayerControl target, Action successAction, Action failedAction, bool isMeetingStart = false)
     {
         MurderAttemptResult murder = checkMuderAttempt(killer, target, isMeetingStart);
+        if(target.GetModData().role == Roles.Roles.LuckyMan){
+            int r = NebulaPlugin.rnd.Next(1,11);
+            if(r <= (Roles.CrewmateRoles.LuckyMan.chanceToRevievOption.getFloat() / 10f)) murder = MurderAttemptResult.PerformKill;
+        }
         switch (murder)
         {
             case MurderAttemptResult.PerformKill:

Nebula/Nebula.cs

@@ -41,14 +41,14 @@ public class NebulaPlugin : BasePlugin
     public const string AmongUsVersion = "2023.2.28";
     public const string PluginGuid = "cn.zsfabtest.amongus.nebular";
     public const string PluginName = "TheNebula-R";
-    public const string PluginVersion = "1.0.1.8";
+    public const string PluginVersion = "1.0.2.0";
     public const bool IsSnapshot = false;
 
     public static string PluginVisualVersion = IsSnapshot ? "23.03.29a" : PluginVersion;
     public static string PluginStage = IsSnapshot ? "Snapshot" : "";
 
-    public const string PluginVersionForFetch = "1.0.1.8";
-    public byte[] PluginVersionData = new byte[] { 1, 0, 1, 8 };
+    public const string PluginVersionForFetch = "1.0.2.0";
+    public byte[] PluginVersionData = new byte[] { 1, 0, 2, 0 };
 
     public static NebulaPlugin Instance;
 

Nebula/Patches/EndGamePatch.cs

@@ -780,13 +780,13 @@ public PlayerStatistics(ShipStatus __instance)
                         AliveCouple++;
 
                         bool flag = false;
-                        if (data.role.side == Roles.Side.Jackal || lData.HasExtraRole(Roles.Roles.SecondarySidekick))
+                        if (data.role.side == Roles.Side.Jackal || lData.HasExtraRole(Roles.Roles.SecondarySidekick) || lData.HasExtraRole(Roles.Roles.SecondaryJackal))
                         {
                             AliveInLoveJackals++;
                             AliveJackalCouple++;
                             flag = true;
                         }
-                        if (lData.role.side == Roles.Side.Jackal || lData.HasExtraRole(Roles.Roles.SecondarySidekick))
+                        if (lData.role.side == Roles.Side.Jackal || lData.HasExtraRole(Roles.Roles.SecondarySidekick) || lData.HasExtraRole(Roles.Roles.SecondaryJackal))
                         {
                             AliveInLoveJackals++;
                             if (!flag) AliveJackalCouple++;
@@ -847,7 +847,7 @@ public PlayerStatistics(ShipStatus __instance)
 
                         foreach (var d in lData)
                         {
-                            if ((d.role.side == Roles.Side.Jackal || d.HasExtraRole(Roles.Roles.SecondarySidekick)))
+                            if ((d.role.side == Roles.Side.Jackal || d.HasExtraRole(Roles.Roles.SecondarySidekick) || d.HasExtraRole(Roles.Roles.SecondaryJackal)))
                             {
                                 jackalFlag = true;
                                 AliveInLoveJackals++;
@@ -876,7 +876,7 @@ public PlayerStatistics(ShipStatus __instance)
 
                 if (side == Roles.Side.Impostor)
                 {
-                    if (data.HasExtraRole(Roles.Roles.SecondarySidekick))
+                    if (data.HasExtraRole(Roles.Roles.SecondarySidekick) || data.HasExtraRole(Roles.Roles.SecondaryJackal))
                     {
                         AliveImpostorsWithSidekick++;
                     }

Nebula/Patches/RoleAssignmentPatch.cs

@@ -541,9 +541,6 @@ private static void assignRoles(AssignMap assignMap)
 
             foreach (ExtraAssignable role in Roles.Roles.AllExtraAssignable)
             {
-                //無効なロールは入れない
-                if ((int)(CustomOptionHolder.GetCustomGameMode() & role.ValidGamemode) == 0) continue;
-
                 if (role is Assignable && ((Assignable)role).TopOption != null && !((Assignable)role).TopOption.getBool()) continue;
 
                 if (role.assignmentPriority == currentPriority)

Nebula/Resources/GetShootButton.png

@@ -1383,6 +1383,7 @@
 "option.canBeBait" : "可以成为诱饵"
 "option.canBeFlash" : "可以成为闪电侠"
 "option.canBeSignaller" : "可以成为通讯兵"
+"option.canBeSecondaryJackal" : "可以成为附加豺狼"
 
 "role.agent.canKnowImpostorAndJackal" : "代理人可以得知伪装者/豺狼/巴浦洛夫/莫里亚蒂"
 "role.agent.theLeastCompletedTasks" : "代理人得知伪装者/豺狼/巴浦洛夫/莫里亚蒂需要的最少任务数"
@@ -1715,6 +1716,39 @@
 "role.bartender.hint" : "我还在呢！"
 "role.bartender.info" : "全体目光向我看齐"
 
+"role.secondaryJackal.name" : "豺狼"
+"role.secondaryJackal.short" : "狼"
+"role.secondaryJackal.description" : "你也是豺狼！"
+"role.secondaryJackal.info" : "豺狼阵营啊啊啊啊"
+"role.secondaryJackal.prefix" : "狼化的"
+"role.secondaryJackal.impostorCanBeSecondaryJackal" : "伪装者可以成为附加豺狼"
+
+"role.luckyMan.name" : "幸运儿"
+"role.luckyMan.short" : "幸"
+"role.luckyMan.description" : "6"
+"role.luckyMan.hint" : "避免驱逐或击杀"
+"role.luckyMan.info" : "有概率避免驱逐或击杀"
+"role.luckyMan.chanceToReviev" : "避免死亡概率"
+
+"role.moda.name" : "摩达石神"
+"role.moda.short" : "摩"
+"role.moda.description" : "掩盖尸体的最好方法"
+"role.moda.hint" : "通过击杀清理上一个尸体"
+"role.moda.info" : "在击杀过后，全场序列中的最后一个尸体将被清理"
+
+"role.ghostEngineer.name" : "灵魂工程师"
+"role.ghostEngineer.short" : "灵工"
+"role.ghostEngineer.hint" : "帮助船员修复破坏"
+"role.ghostEngineer.info" : "在一定程度上帮助船员"
+"role.ghostEngineer.maxRepair" : "最大修复次数"
+
+"role.marksman.name" : "快枪手"
+"role.marksman.short" : "快"
+"role.marksman.description" : "主打的就是一个快"
+"role.marksman.hint" : "急速出刀"
+"role.marksman.info" : "你可以储存击杀冷却"
+"role.marksman.maxShoot" : "最大储存数量"
+
 "side.pavlov.name" : "巴普洛夫团队"
 "side.schrodingersCat.name" : "薛定谔的猫"
 "side.madman.name" : "疯子"
@@ -1752,4 +1786,6 @@
 "button.lable.teleport" : "传送"
 "button.label.appoint" : "任命"
 "button.label.feed" : "喂养"
-"button.label.remember" : "回忆"
+"button.label.remember" : "回忆"
+"button.label.saveShoot" : "储存"
+"button.label.getShoot" : "取用"

Nebula/Resources/Languages/SChinese.dat

@@ -294,7 +294,7 @@ private void _sub_Assignment(Patches.AssignMap assignMap, List<byte> players, in
 
     public override void Assignment(Patches.AssignMap assignMap)
     {
-        if (!Roles.Madmate.SecondoryRoleOption.getBool()) return;
+        if (!Roles.Madmate.SecondoryRoleOption.getBool() || !IsSpawnable()) return;
 
         List<byte> crewmates = new List<byte>();
 

Nebula/Resources/SaveShootButton.png

@@ -7,6 +7,8 @@ public class LastImpostor : ExtraRole
     public Module.CustomOption canSpawnOption;
     public Module.CustomOption GuessCountOption;
 
+    bool hasGuesserUI = false;
+
     public override void LoadOptionData()
     {
         TopOption.AddCustomPrerequisite(() => { return true; });
@@ -19,9 +21,10 @@ public override void SetupMeetingButton(MeetingHud __instance){
     }
 
     public override void GlobalInitialize(PlayerControl __instance){
+        hasGuesserUI = false;
         __instance.GetModData().SetExtraRoleData(Roles.SecondaryGuesser.id, (ulong)GuessCountOption.getFloat());
         if(PlayerControl.LocalPlayer.GetModData().extraRole.Contains(Roles.SecondaryGuesser)){
-            RPCEventInvoker.UnsetExtraRole(PlayerControl.LocalPlayer,this,false);
+            hasGuesserUI = true;
         }
     }
 
@@ -38,7 +41,7 @@ public override void EditDisplayNameForcely(byte playerId, ref string displayNam
 
     public override void MeetingUpdate(MeetingHud __instance, TextMeshPro meetingInfo)
     {
-        ComplexRoles.GuesserSystem.MeetingUpdate(__instance, meetingInfo);
+        if(!hasGuesserUI) ComplexRoles.GuesserSystem.MeetingUpdate(__instance, meetingInfo);
     }
 
     public override bool IsSpawnable()

Nebula/Roles/CrewmateRoles/Madmate.cs

@@ -44,7 +44,8 @@ public override void ButtonInitialize(HudManager __instance)
             __instance.KillButton.graphic.sprite,
             Expansion.GridArrangeExpansion.GridArrangeParameter.AlternativeKillButtonContent,
             __instance,
-            Module.NebulaInputManager.modKillInput.keyCode
+            Module.NebulaInputManager.modKillInput.keyCode,
+            "button.label.kill"
         ).SetTimer(Roles.SchrodingersCat.killCooldown.getFloat());
         killButton.MaxTimer = Roles.SchrodingersCat.killCooldown.getFloat();
         killButton.SetButtonCoolDownOption(true);