Fix Terrorist

mxyx-club · Apr 21, 2024 · 9dca179 · 9dca179
1 parent 1741ba3
commit 9dca179
Show file tree

Hide file tree

Showing 14 changed files with 247 additions and 47 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,183 @@
+[*.cs]
+
+# IDE1006: 命名样式
+dotnet_diagnostic.IDE1006.severity = suggestion
+
+# Default severity for all analyzer diagnostics
+dotnet_analyzer_diagnostic.severity = suggestion
+
+[*.cs]
+#### 命名样式 ####
+
+# 命名规则
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# 符号规范
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# 命名样式
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+csharp_using_directive_placement = outside_namespace:silent
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_conditional_delegate_call = true:suggestion
+csharp_style_var_for_built_in_types = false:silent
+csharp_style_var_when_type_is_apparent = false:silent
+csharp_style_var_elsewhere = false:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_prefer_braces = when_multiline:silent
+csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_prefer_static_local_function = true:suggestion
+csharp_style_prefer_readonly_struct = true:suggestion
+csharp_style_prefer_readonly_struct_member = true:suggestion
+csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
+csharp_style_prefer_switch_expression = true:suggestion
+csharp_style_prefer_pattern_matching = true:silent
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_prefer_not_pattern = true:suggestion
+csharp_style_prefer_extended_property_pattern = true:suggestion
+csharp_style_throw_expression = true:suggestion
+csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:suggestion
+csharp_style_prefer_index_operator = true:suggestion
+csharp_style_prefer_range_operator = true:suggestion
+csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_prefer_utf8_string_literals = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+
+[*.vb]
+#### 命名样式 ####
+
+# 命名规则
+
+dotnet_naming_rule.interface_should_be_以_i_开始.severity = suggestion
+dotnet_naming_rule.interface_should_be_以_i_开始.symbols = interface
+dotnet_naming_rule.interface_should_be_以_i_开始.style = 以_i_开始
+
+dotnet_naming_rule.类型_should_be_帕斯卡拼写法.severity = suggestion
+dotnet_naming_rule.类型_should_be_帕斯卡拼写法.symbols = 类型
+dotnet_naming_rule.类型_should_be_帕斯卡拼写法.style = 帕斯卡拼写法
+
+dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.severity = suggestion
+dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.symbols = 非字段成员
+dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.style = 帕斯卡拼写法
+
+# 符号规范
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.类型.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.类型.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
+dotnet_naming_symbols.类型.required_modifiers = 
+
+dotnet_naming_symbols.非字段成员.applicable_kinds = property, event, method
+dotnet_naming_symbols.非字段成员.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
+dotnet_naming_symbols.非字段成员.required_modifiers = 
+
+# 命名样式
+
+dotnet_naming_style.以_i_开始.required_prefix = I
+dotnet_naming_style.以_i_开始.required_suffix = 
+dotnet_naming_style.以_i_开始.word_separator = 
+dotnet_naming_style.以_i_开始.capitalization = pascal_case
+
+dotnet_naming_style.帕斯卡拼写法.required_prefix = 
+dotnet_naming_style.帕斯卡拼写法.required_suffix = 
+dotnet_naming_style.帕斯卡拼写法.word_separator = 
+dotnet_naming_style.帕斯卡拼写法.capitalization = pascal_case
+
+dotnet_naming_style.帕斯卡拼写法.required_prefix = 
+dotnet_naming_style.帕斯卡拼写法.required_suffix = 
+dotnet_naming_style.帕斯卡拼写法.word_separator = 
+dotnet_naming_style.帕斯卡拼写法.capitalization = pascal_case
+
+[*.{cs,vb}]
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_property = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
+end_of_line = crlf
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_code_quality_unused_parameters = all:suggestion
+dotnet_style_readonly_field = true:suggestion
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+dotnet_style_allow_multiple_blank_lines_experimental = true:silent
+dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
diff --git a/README_ZH-CN.md b/README_ZH-CN.md
@@ -11,13 +11,14 @@
 **The Other Us - Edited** is a mod for [Among Us](https://store.steampowered.com/app/945360/Among_Us) which adds many new roles, new [Settings](#settings) and new [Custom Hats](#custom-hats) to the game.
 Even more roles are coming soon.
 
-## 发行版
+## 模组下载
 
 | 游戏版本  | 模组版本 | 下载链接                                                     |
 | --------- | -------- | ------------------------------------------------------------ |
 | 2024.3.5s | v1.0.3.3 | [下载](https://github.com/mxyx-club/TheOtherUs-Edited/releases/download/v1.0.3.3/TheOtherUs.zip) |
 | 2024.3.5s | v1.0.3.1 | [下载](https://github.com/mxyx-club/TheOtherUs/releases/download/v1.0.3.1/TheOtherUs.zip) |
 
+注：本模组只发布经过测试后的文件，其余仅为内测版本。
 
 
 ## 更新日志
@@ -26,10 +27,17 @@ Even more roles are coming soon.
 
  - #### 新增内容：
 
-    - 对模组选项增加英译
     - 对所有按钮增加默认冷却为2.5s（给一部分无冷却技能增加提醒）
     - 法医：延长被保护的玩家被击杀时的闪光提醒时间（从0.5s增加到1.5s）
-    - 
+    - 魅魔：将真爱的任务从船员中移除
+
+ - #### Bug修复：
+
+    - 恐怖分子：修复自爆时会死两次的问题
+    - 豺狼：尝试修复招募按钮
+
+<details>
+  <summary>点我查看更多更新日志</summary>
 
 ###  v1.0.3.4:
 
@@ -39,9 +47,7 @@ Even more roles are coming soon.
     - 修复一部分技能按钮文本错误
     - 交换师：修复无法与追踪者交换的问题
     - 告密者：在设置告密者可揭示击杀中立但实际无法揭示的问题
-
-<details>
-  <summary>点我查看更多更新日志</summary>
+    - 恐怖分子：对自爆的情况下强制自杀（避免小孩自爆不会死的问题）
 
 ###  v1.0.3.3:
 
@@ -68,6 +74,7 @@ Even more roles are coming soon.
     - 执钮人：不会分配给市长
     - 传送师 & 逃逸者：增加总传送次数的选项，以避免一回合只能传送一次的问题
     - 告密者：目前可以在会议中查看红名（还无法得知具体职业）
+    - 反骨：增加隐藏职业选项
 
  - #### Bug修复：
 

diff --git a/Strings.xlsx b/Strings.xlsx
diff --git a/TheOtherRoles.sln b/TheOtherRoles.sln
@@ -7,6 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheOtherRoles", "TheOtherRo
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Other Files", "Other Files", "{3001A2DD-334B-4483-A9AF-0B64F733CDBC}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		README.md = README.md
 		README_ZH-CN.md = README_ZH-CN.md
 	EndProjectSection
@@ -22,4 +23,10 @@ Global
 		{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11FBC798-BAF5-4EE5-9511-BE6DB0592F99}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {BB62BA8F-8537-46D7-A0B9-F10BF8610DD7}
+	EndGlobalSection
 EndGlobal
diff --git a/TheOtherRoles/Buttons.cs b/TheOtherRoles/Buttons.cs
@@ -3561,17 +3561,18 @@ public static void createButtonsPostfix(HudManager __instance)
 
                 terroristButton.Timer = terroristButton.MaxTimer;
                 Terrorist.isPlanted = true;
-                if (Terrorist.defuseDuration + Terrorist.bombActiveAfter <= 1)
+                //在自爆时增加强制自杀
+                if (Terrorist.selfExplosion)
                 {
                     var loacl = CachedPlayer.LocalPlayer.PlayerId;
 
-                    var killWriter = AmongUsClient.Instance.StartRpcImmediately(
+                    var writer = AmongUsClient.Instance.StartRpcImmediately(
                         CachedPlayer.LocalPlayer.PlayerControl.NetId, (byte)CustomRPC.UncheckedMurderPlayer,
                         SendOption.Reliable);
-                    killWriter.Write(Terrorist.terrorist.Data.PlayerId);
-                    killWriter.Write(loacl);
-                    killWriter.Write(byte.MaxValue);
-                    AmongUsClient.Instance.FinishRpcImmediately(killWriter);
+                    writer.Write(Terrorist.terrorist.Data.PlayerId);
+                    writer.Write(loacl);
+                    writer.Write(byte.MaxValue);
+                    AmongUsClient.Instance.FinishRpcImmediately(writer);
                     RPCProcedure.uncheckedMurderPlayer(Terrorist.terrorist.Data.PlayerId, loacl, byte.MaxValue);
                 }
             },

diff --git a/TheOtherRoles/GameHistory.cs b/TheOtherRoles/GameHistory.cs
@@ -20,7 +20,7 @@ public enum CustomDeathReason
         Bomb,
         LoveStolen,
         Loneliness,
-        Arson
+        Arson,
     }
 
     public CustomDeathReason deathReason;

diff --git a/TheOtherRoles/Helper/Helpers.cs b/TheOtherRoles/Helper/Helpers.cs
@@ -399,7 +399,7 @@ public static AudioClip loadAudioClipFromResources(string path, string clipName
         }
         catch
         {
-            System.Console.WriteLine("Error loading AudioClip from resources: " + path);
+            Error("Error loading AudioClip from resources: " + path);
         }
 
         return null;
@@ -1336,16 +1336,14 @@ public static bool isShiftNeutral(PlayerControl player)
     {
         if (CustomOptionHolder.modifierShiftNeutral.getBool())
         {
-            var roleInfo = RoleInfo.getRoleInfoForPlayer(player, false).FirstOrDefault();
-            if (roleInfo != null)
-                return roleInfo.color.Equals(Jackal.color) ||
-                       roleInfo.color.Equals(Sidekick.color) ||
-                       roleInfo.color.Equals(Werewolf.color) ||
-                       //roleInfo.color.Equals(Lawyer.color) ||
-                       roleInfo.color.Equals(Akujo.color) ||
-                       roleInfo.color.Equals(Juggernaut.color) ||
-                       roleInfo.color.Equals(Swooper.color) ||
-                       roleInfo.color.Equals(Arsonist.color);
+            if (player != null)
+                return player == (Jackal.jackal
+                        || Sidekick.sidekick
+                        || Werewolf.werewolf
+                        || Akujo.akujo
+                        || Juggernaut.juggernaut
+                        || Swooper.swooper
+                        || Arsonist.arsonist);
             return false;
         }
         else

diff --git a/TheOtherRoles/Helper/LogHelper.cs b/TheOtherRoles/Helper/LogHelper.cs
@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
 using System.Text;
 using BepInEx;
 using BepInEx.Logging;
-using InnerNet;
 
 namespace TheOtherRoles.Helper;
 

diff --git a/TheOtherRoles/Objects/Bomb.cs b/TheOtherRoles/Objects/Bomb.cs
@@ -85,6 +85,7 @@ public static Sprite getDefuseSprite()
 
     public static void explode(Bomb b)
     {
+        var local = CachedPlayer.LocalPlayer.PlayerControl;
         if (b == null) return;
         if (Terrorist.terrorist != null)
         {
@@ -93,7 +94,8 @@ public static void explode(Bomb b)
                 Vector2.Distance(position,
                     CachedPlayer.LocalPlayer.transform
                         .position); // every player only checks that for their own client (desynct with positions sucks)
-            if (distance < Terrorist.destructionRange && !CachedPlayer.LocalPlayer.Data.IsDead)
+            if (distance < Terrorist.destructionRange && !CachedPlayer.LocalPlayer.Data.IsDead 
+                || (Terrorist.selfExplosion && local != Terrorist.terrorist))
             {
                 Helpers.checkMurderAttemptAndKill(Terrorist.terrorist, CachedPlayer.LocalPlayer.PlayerControl, false, false,
                     true, true);

diff --git a/TheOtherRoles/Patches/UpdatePatch.cs b/TheOtherRoles/Patches/UpdatePatch.cs
@@ -95,12 +95,12 @@ private static void setNameColors()
             if (Deputy.deputy != null && Deputy.knowsSheriff) {
                 setPlayerNameColor(Deputy.deputy, Deputy.color);
             }
-        } else*/
+        } else
         if (Deputy.deputy != null && Deputy.deputy == localPlayer)
         {
             setPlayerNameColor(Deputy.deputy, Deputy.color);
             if (Sheriff.sheriff != null && Deputy.knowsSheriff) setPlayerNameColor(Sheriff.sheriff, Sheriff.color);
-        }
+        }*/
 
         if (Prophet.prophet != null && Prophet.prophet == localPlayer)
         {