更新哈迪斯歼灭战

05-Shadowbringers/Trials/Hades.cs

@@ -16,6 +16,7 @@ using ECommons.DalamudServices;
 using ECommons.GameFunctions;
 using ECommons.MathHelpers;
 using System.Threading.Tasks;
+using KodakkuAssist.Extensions;
 
 namespace Hades;
 
@@ -159,17 +160,41 @@ public class Hades
         dp.Owner = @event.SourceId();
         dp.Scale = new Vector2(100);
         dp.Radian = 180f.DegToRad();
+        dp.Offset = new Vector3 (0,0,12);
+        dp.Rotation = @event.ActionId == 16739 ? 75f.DegToRad() : 285f.DegToRad();
         dp.DestoryAt = 6700;
         accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Fan, dp); 
     }
     
-    [ScriptMethod(name: "DR - 自动QTE", eventType: EventTypeEnum.StartCasting, eventCondition: ["StatusID:1271"])]
+    [ScriptMethod(name: "地狱之声（大地摇动）", eventType: EventTypeEnum.TargetIcon, eventCondition: ["Id:0028"])]
+    public void 地狱之声(Event @event, ScriptAccessory accessory)
+    {
+        if (isText && @event.TargetId() == accessory.Data.Me) accessory.Method.TextInfo("诱导大地摇动", duration: 4000, false);
+        // if (isTTS && @event.TargetId() == accessory.Data.Me)accessory.Method.TTS("诱导大地摇动");
+        // if (isEdgeTTS && @event.TargetId() == accessory.Data.Me)accessory.Method.EdgeTTS("诱导大地摇动");
+        
+        var dp = accessory.Data.GetDefaultDrawProperties();
+        
+        var boss = accessory.Data.Objects.GetByDataId(10570).FirstOrDefault();
+        if (boss == null) return;
+        dp.Owner = boss.GameObjectId;
+        dp.TargetObject = @event.TargetId();
+        
+        dp.Name = "地狱之声";
+        dp.Color = accessory.Data.DefaultDangerColor.WithW(0.4f);
+        dp.Scale = new Vector2(100);
+        dp.Radian = 60f.DegToRad();
+        dp.DestoryAt = 5000;
+        accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Fan, dp); 
+    }
+    
+    [ScriptMethod(name: "DR - 自动QTE", eventType: EventTypeEnum.ActionEffect, eventCondition: ["ActionId:16758"])]
     public void 自动QTE(Event @event, ScriptAccessory accessory)
     {
         if (isDRHelper) accessory.Method.SendChat("/pdr load AutoQTE");
     }
 
-    [ScriptMethod(name: "DR - 自动关闭免疫输入禁用", eventType: EventTypeEnum.StartCasting, eventCondition: ["StatusID:1271"])]
+    [ScriptMethod(name: "DR - 自动关闭免疫输入禁用", eventType: EventTypeEnum.ActionEffect, eventCondition: ["ActionId:16758"])]
     public void 自动关闭Hack(Event @event, ScriptAccessory accessory)
     {
         if (isDRHackOff) accessory.Method.SendChat("/pdr unload AutoImmunizeInputDisable");
@@ -178,9 +203,9 @@ public class Hades
     [ScriptMethod(name: "死亡宣告 踩光圈提示", eventType: EventTypeEnum.StatusAdd, eventCondition: ["StatusID:210"])]
     public void 死亡宣告(Event @event, ScriptAccessory accessory)
     {
-        if (isText && @event.TargetId() == accessory.Data.Me) accessory.Method.TextInfo("踩光圈", duration: 3000, true);
-        // if (isTTS && @event.TargetId() == accessory.Data.Me)accessory.Method.TTS("踩光圈");
-        // if (isEdgeTTS && @event.TargetId() == accessory.Data.Me)accessory.Method.EdgeTTS("踩光圈");
+        if (isText && @event.TargetId() == accessory.Data.Me) accessory.Method.TextInfo("踩满全部光圈", duration: 3000, true);
+        // if (isTTS && @event.TargetId() == accessory.Data.Me)accessory.Method.TTS("踩满光圈");
+        // if (isEdgeTTS && @event.TargetId() == accessory.Data.Me)accessory.Method.EdgeTTS("踩满光圈");
     }
     
 }

OnlineRepo.json

@@ -207,19 +207,6 @@
       679
     ]
   },
-  {
-    "Name": "朱雀镇魂战",
-    "Guid": "fc907987-bad9-4c70-97f6-b91e2e70544b",
-    "Version": "0.0.0.1",
-    "Author": "Tetora",
-    "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main",
-    "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/04-Stormblood/Trial/Suzaku.cs",
-    "Note": "v0.0.0.1:\r\nLV70 朱雀镇魂战 初版绘制\r\n跳楼机问就是不会，希望有人帮我画了",
-    "UpdateInfo": "",
-    "TerritoryIds": [
-      810
-    ]
-  },
   {
     "Name": "月读歼灭战",
     "Guid": "97415dc8-cd16-4c9b-87be-026a297c3451",
@@ -233,6 +220,19 @@
       778
     ]
   },
+  {
+    "Name": "朱雀镇魂战",
+    "Guid": "fc907987-bad9-4c70-97f6-b91e2e70544b",
+    "Version": "0.0.0.1",
+    "Author": "Tetora",
+    "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main",
+    "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/04-Stormblood/Trial/Suzaku.cs",
+    "Note": "v0.0.0.1:\r\nLV70 朱雀镇魂战 初版绘制\r\n跳楼机问就是不会，希望有人帮我画了",
+    "UpdateInfo": "",
+    "TerritoryIds": [
+      810
+    ]
+  },
   {
     "Name": "保镖歼灭战",
     "Guid": "944c8879-0d4e-4182-87ea-c38769990f2d",
@@ -246,6 +246,19 @@
       806
     ]
   },
+  {
+    "Name": "哈迪斯歼灭战",
+    "Guid": "ebcac22b-8a1d-49c4-ae1f-1470be15f7e3",
+    "Version": "0.0.0.1",
+    "Author": "Tetora",
+    "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main",
+    "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/05-Shadowbringers/Trials/Hades.cs",
+    "Note": "v0.0.0.1:\r\nLV80 哈迪斯歼灭战 初版绘制",
+    "UpdateInfo": "",
+    "TerritoryIds": [
+      847
+    ]
+  },
   {
     "Name": "高贝扎歼灭战",
     "Guid": "8a526afb-eefd-44ec-a105-7dc8fcd28e47",

README.md

@@ -31,6 +31,7 @@ Thanks for [Ciceros](https://github.com/AdmiralLvtzov) 、[Cyf](https://github.c
 - `LV50 伊弗利特歼灭战` `LV50 迦楼罗歼灭战` `LV50 拉姆歼灭战` `LV50 莫古力贤王歼灭战` `LV50 那布里亚勒斯讨伐战` `LV50 海德拉讨伐战` `LV50 死化奇美拉讨伐战` `LV50 奥丁歼灭战` `LV50 大桥上的决斗`
 - `LV60 萨菲洛特歼灭战` `LV60 祖尔宛歼灭战`
 - `LV63 须佐之男歼灭战` `LV67 吉祥天女歼灭战` `LV70 神龙歼灭战` `LV70 月读歼灭战` `LV70 朱雀镇魂战` `LV70 保镖歼灭战`
+- `LV80 哈迪斯歼灭战`
 - `LV90 高贝扎歼灭战` `LV90 泽罗姆斯歼灭战`
 
 **讨伐歼殛战 / Trials-Extreme**