Snapshot 24w42c

Author: ZsFabTest

NebulaPluginNova/Nebula.cs

@@ -42,10 +42,10 @@ public class NebulaPlugin : BasePlugin
     public const string PluginVersion = "2.0.3";
 
     //public const string VisualVersion = "v2.0.3";
-    public const string VisualVersion = "Snapshot 24w42b";
+    public const string VisualVersion = "Snapshot 24w42c";
 
     public const string PluginEpochStr = "104";
-    public const string PluginBuildNumStr = "1136";
+    public const string PluginBuildNumStr = "1138";
     public static readonly int PluginEpoch = int.Parse(PluginEpochStr);
     public static readonly int PluginBuildNum = int.Parse(PluginBuildNumStr);
     public const bool GuardVanillaLangData = false;

NebulaPluginNova/Resources/Addons/NebulaRemakeLanguage.zip

@@ -221,7 +221,8 @@
 "role.spiritualist.blurb" : "你好啊 古老的亡魂"
 "options.role.spiritualist.detail" : "招魂师拥有和本轮被报告尸体对应玩家对话的能力。<br>被招魂玩家仅有一次回答机会。<br>根据设置限制回答。<br>若无可提取的回答内容，不算作回答。"
 "options.role.spiritualist.charCount" : "回答最大字符数"
-"options.role.spiritualist.onlyLetters" : "仅提取数字与拉丁字母"
+"options.role.spiritualist.onlyLetters" : "仅提取拉丁字母"
+"options.role.spiritualist.lettersEachMeeting" : "每轮会议获得的可用字符数"
 "role.spiritualist.seleted" : "招魂师在召唤你"
 
 "role.swapper.name" : "换票师"

NebulaPluginNova/Resources/Addons/NebulaRemakeLanguage/Language/SChinese.dat

@@ -53,6 +53,6 @@ void Update(GameUpdateEvent ev)
     internal void Reset(Virial.Game.Player player, UnityEngine.Color color)
     {
         target = player;
-        this.color = color;
+        arrow.SetSmallColor(color);
     }
 }

NebulaPluginNova/Roles/Abilities/TrackingArrowAbility.cs

@@ -2,31 +2,31 @@
 using Virial.Configuration;
 using Virial.Events.Game.Meeting;
 using Virial;
-using System.Text.RegularExpressions;
 using Virial.Events.Game;
-using Nebula.Compat;
 
 namespace Nebula.Roles.Crewmate;
 
 public class Spiritualist : DefinedRoleTemplate, DefinedRole
 {
-    private Spiritualist() : base("spiritualist", new(200, 191, 231), RoleCategory.CrewmateRole, Crewmate.MyTeam, [CharCountOption, OnlyLettersOption]) { }
+    private Spiritualist() : base("spiritualist", new(200, 191, 231), RoleCategory.CrewmateRole, Crewmate.MyTeam, [CharCountOption, LettersEachMeetingOption]) { }
 
     RuntimeRole RuntimeAssignableGenerator<RuntimeRole>.CreateInstance(GamePlayer player, int[] arguments) => new Instance(player);
 
     private static IntegerConfiguration CharCountOption = NebulaAPI.Configurations.Configuration("options.role.spiritualist.charCount", (1, 100), 5);
-    private static BoolConfiguration OnlyLettersOption = NebulaAPI.Configurations.Configuration("options.role.spiritualist.onlyLetters", true);
+    private static IntegerConfiguration LettersEachMeetingOption = NebulaAPI.Configurations.Configuration("options.role.spiritualist.lettersEachMeeting", (1, 36), 5);
 
     static public Spiritualist MyRole = new Spiritualist();
     [NebulaRPCHolder]
     public class Instance : RuntimeAssignableTemplate, RuntimeRole
     {
+        const string letterTab = "qwertyuiopasdfghjklzxcvbnm1234567890";
         DefinedRole RuntimeRole.Role => MyRole;
         public Instance(GamePlayer player) : base(player) { }
 
         void RuntimeAssignable.OnActivated() { }
 
         GamePlayer? lastReported = null;
+        string subTab = string.Empty;
 
         void OnMeetingEnd(MeetingEndEvent ev) => lastReported = null;
 
@@ -38,7 +38,16 @@ void OnReportDeadBody(ReportDeadBodyEvent ev)
             if (ev.Reported != null)
             {
                 lastReported = ev.Reported;
-                RpcNoticeSeleted.Invoke(ev.Reported.PlayerId);
+                var tab = letterTab.ToList();
+                while (subTab.Length < LettersEachMeetingOption)
+                {
+                    char c = tab.Random();
+                    subTab += c;
+                    tab.Remove(c);
+                }
+                var tmp = subTab.OrderBy(x => x).ToList();
+                subTab = tmp.Join();
+                RpcNoticeSeleted.Invoke((ev.Reported.PlayerId, subTab));
             }
         }
 
@@ -50,7 +59,9 @@ void CheckAddChat(PlayerAddChatEvent ev)
             if (lastReported != null && ev.source.PlayerId == lastReported.PlayerId)
             {
                 //Debug.LogError(1);
-                if (OnlyLettersOption) ev.chatText = Regex.Replace(ev.chatText, "[^0-9A-Za-z]", "", RegexOptions.IgnoreCase);
+                ev.chatText = ev.chatText.ToLower();
+                //ev.chatText = Regex.Replace(ev.chatText, subTab, "", RegexOptions.IgnoreCase);
+                ev.chatText = ev.chatText.RemoveAll(letterTab.RemoveAll(subTab.ToCharArray()).ToCharArray());
                 ev.chatText = ev.chatText.Substring(0, Math.Min(CharCountOption, ev.chatText.Length));
                 if (ev.chatText == string.Empty) return;
                 ev.SetExtraShow();
@@ -66,23 +77,37 @@ void CheckCanSeeAllInfo(RequestEvent ev)
         }
         */
 
-        private static readonly RemoteProcess<byte> RpcNoticeSeleted = new(
+        private static readonly RemoteProcess<(byte, string)> RpcNoticeSeleted = new(
             "NoticeSeleted",
             (message, _) =>
             {
-                if (message == PlayerControl.LocalPlayer.PlayerId)
+                if (message.Item1 == PlayerControl.LocalPlayer.PlayerId)
                 {
                     var Message = GameObject.Instantiate(VanillaAsset.StandardTextPrefab, HudManager.Instance.transform);
                     new TextAttributeOld(TextAttributeOld.NormalAttr) { Size = new Vector2(4f, 0.72f) }.EditFontSize(2.7f, 2.7f, 2.7f).Reflect(Message);
                     Message.transform.localPosition = new Vector3(0, -1.5f, -5f);
                     Message.color = MyRole.UnityColor;
                     Message.text = Language.Translate("role.spiritualist.seleted");
                     float duration = 5f;
-                    var timer = new FunctionalLifespan(() => duration > 0);
+                    bool flag = true;
+                    var timer = new GameObjectLifespan(Message.gameObject);
                     GameOperatorManager.Instance?.Register<GameUpdateEvent>(ev =>
                     {
                         duration -= Time.deltaTime;
-                        if (duration < 0f) UnityEngine.GameObject.Destroy(Message);
+                        if (flag && duration <= 0f)
+                        {
+                            Message.text = message.Item2;
+                            flag = false;
+                        }
+                        //if (duration <= 0f) UnityEngine.GameObject.Destroy(Message);
+                    }, timer);
+                    GameOperatorManager.Instance?.Register<MeetingVoteEndEvent>(ev =>
+                    {
+                        if(Message != null)
+                        {
+                            UnityEngine.GameObject.Destroy(Message);
+                            Message = null;
+                        }
                     }, timer);
                 }
             });

NebulaPluginNova/Roles/Crewmate/Spiritualist.cs

@@ -136,7 +136,11 @@ void RuntimeAssignable.OnActivated()
         }
 
         [Local]
-        void OnMeetingStart(MeetingStartEvent ev) => Target = null;
+        void OnMeetingStart(MeetingStartEvent ev)
+        {
+            Target = null;
+            AmongUsUtil.SetCamTarget();
+        }
 
         [Local]
         void OnDied(PlayerDieEvent ev)

NebulaPluginNova/Roles/Impostor/Assassin.cs

@@ -72,11 +72,6 @@ void RuntimeAssignable.OnActivated()
             }
         }
 
-        void RuntimeAssignable.OnInactivated()
-        {
-            PavlovsDog.Instance.RpcSetOwnerDied.Invoke(hasDog);
-        }
-
         [OnlyMyPlayer]
         void CheckWins(PlayerCheckWinEvent ev) => ev.SetWinIf(ev.GameEnd == NebulaGameEnd.PavlovWin 
             && NebulaGameManager.Instance!.AllPlayerInfo().Any(p => !p.IsDead && IsSameTeam(p)));
@@ -104,20 +99,13 @@ void OnGameEnd(PlayerCheckWinEvent ev)
         }
 
         [Local]
-        void OnDied(PlayerDieEvent ev)
-        {
-            if (ev.Player.PlayerId == MyPlayer.PlayerId)
-                PavlovsDog.Instance.RpcSetOwnerDied.Invoke(hasDog);
-        }
-
-        [Local]
-        void DecorateSidekickColor(PlayerDecorateNameEvent ev)
+        void DecorateDogColor(PlayerDecorateNameEvent ev)
         {
             if (IsSameTeam(ev.Player)) ev.Color = MyRole.RoleColor;
         }
 
         [OnlyMyPlayer]
-        void DecorateJackalColor(PlayerDecorateNameEvent ev)
+        void DecoratePavlovColor(PlayerDecorateNameEvent ev)
         {
             var myInfo = PlayerControl.LocalPlayer.GetModInfo();
             if (myInfo == null) return;

NebulaPluginNova/Roles/Neutral/Pavlov.cs

@@ -102,12 +102,12 @@ private void UpdateArrows()
             Virial.Game.Player[] players = NebulaGameManager.Instance?.AllPlayerInfo().Where(p => 
                 !p.IsDead && 
                 !p.AmOwner &&
-                p.IsImpostor || 
-                p.Role.Role == Crewmate.Sheriff.MyRole || 
-                p.Role.Role == Jackal.MyRole || 
-                p.Role.Role == PavlovsDog.MyRole || 
+                (p.IsImpostor ||
+                p.Role.Role == Crewmate.Sheriff.MyRole ||
+                p.Role.Role == Jackal.MyRole ||
+                p.Role.Role == PavlovsDog.MyRole ||
                 p.Role.Role == Moriarty.MyRole ||
-                p.Role.Role == Moran.MyRole).ToArray() ?? new Virial.Game.Player[0];
+                p.Role.Role == Moran.MyRole)).ToArray() ?? new Virial.Game.Player[0];
             for(int i = 0;i < Math.Min(players.Length, arrows.Count); i++)
                 arrows[i].Reset(players[i], players[i].Role.Role.Color.ToUnityColor());
             for (int i = players.Length; i < arrows.Count; i++)