From ab6849bc2602428dbf18c9549665c4d5f6942571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=97=E6=B2=A2=E5=93=8D=E4=B9=9F?= <72963826+Hibiya615@users.noreply.github.com> Date: Sun, 30 Mar 2025 21:39:11 +0800 Subject: [PATCH] API12 --- .../Raid-Bahamute/T03_T09_T13_for_BLU.cs | 10 +- .../Good_King_Moggle(Extreme).cs | 22 +-- .../Trials-Extreme/Leviathan(Extreme).cs | 9 +- .../Trials/BattleOnTheBigBridge.cs | 29 ++- .../Trials/Good_King_Moggle-Hard.cs | 9 +- 02-A-Realm-Reborn/Trials/Hydra.cs | 9 +- 02-A-Realm-Reborn/Trials/Ifrit(Hard).cs | 11 +- 02-A-Realm-Reborn/Trials/Nabriales.cs | 10 +- 02-A-Realm-Reborn/Trials/Odin.cs | 10 +- 02-A-Realm-Reborn/Trials/Ramuh(Hard).cs | 9 +- .../Trials-Extreme/Ravana-Extreme.cs | 6 +- 03-Heavensward/Trials/Zurvan.cs | 10 +- .../SaintMocianne'sArboretum (Hard).cs | 38 +--- .../Dungeon/theFractalContinuum-Hard.cs | 10 +- .../Raid-Omega_Quests/Normal/O11n.cs | 9 +- 04-Stormblood/Trial/Lakshmi.cs | 35 +--- 04-Stormblood/Trial/Shinryu.cs | 34 +--- 05-Shadowbringers/Raid-Eden/Normal/E10n.cs | 10 +- 05-Shadowbringers/Raid-Eden/Normal/E12n.cs | 10 +- 05-Shadowbringers/Raid-Eden/Normal/E1n.cs | 36 +--- 05-Shadowbringers/Raid-Eden/Normal/E8n.cs | 36 +--- 06-EndWalker/Raid-Pandæmonium/Normal/P10n.cs | 27 +-- 06-EndWalker/Trial/Golbez.cs | 10 +- 06-EndWalker/Trial/Hydaelyn.cs | 19 +- Celestium/18-Midsummer_Night's_Explosion.cs | 11 +- Deep_Dungeon/Eureka_Orthos.cs | 10 +- Deep_Dungeon/the_Palace_of_the_Dead.cs | 13 +- Fate/Archaeotania.cs | 11 +- Fate/Chi.cs | 11 +- Fate/Daivadipa.cs | 40 ++--- Fate/Formidable.cs | 11 +- Fate/Mica_the_MagicalMu.cs | 11 +- Fate/Ttokrrone.cs | 11 +- .../The_Baldesion_Arsenal.cs | 11 +- OnlineRepo.json | 166 +++++++++--------- TestScriptRepo.json | 18 +- 36 files changed, 322 insertions(+), 420 deletions(-) diff --git a/02-A-Realm-Reborn/Raid-Bahamute/T03_T09_T13_for_BLU.cs b/02-A-Realm-Reborn/Raid-Bahamute/T03_T09_T13_for_BLU.cs index 50506da..bb4f3d5 100644 --- a/02-A-Realm-Reborn/Raid-Bahamute/T03_T09_T13_for_BLU.cs +++ b/02-A-Realm-Reborn/Raid-Bahamute/T03_T09_T13_for_BLU.cs @@ -3,28 +3,30 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace Bahamute_NormalRaid_for_BLU; [ScriptType(guid: "8d41b5f9-0ab6-404a-9572-aabb390023f0", name: "巴哈姆特大迷宫（青魔专用）", territorys: [196,245,358], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class Bahamute_NormalRaid_for_BLU { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: 巴哈姆特大迷宫 普通难度绘制 为青魔魔界花成就适配 目前支持：T5 diff --git a/02-A-Realm-Reborn/Trials-Extreme/Good_King_Moggle(Extreme).cs b/02-A-Realm-Reborn/Trials-Extreme/Good_King_Moggle(Extreme).cs index 62304a8..48a8f32 100644 --- a/02-A-Realm-Reborn/Trials-Extreme/Good_King_Moggle(Extreme).cs +++ b/02-A-Realm-Reborn/Trials-Extreme/Good_King_Moggle(Extreme).cs @@ -3,13 +3,14 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; @@ -19,32 +20,19 @@ using System.Threading.Tasks; namespace Thornmarch_Extreme; [ScriptType(guid: "fc6a6125-4a1d-4669-be4c-9b375dc70ae0", name: "莫古力贤王歼殛战", territorys: [364], - version: "0.0.0.11", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class ThornmarchExtreme { const string noteStr = """ - v0.0.0.11: + v0.0.0.2: LV50 莫古力贤王歼殛战 初版绘制 不看攻略基本能打，没有做职能限制，不需要的提示自行关闭 """; // 缺少机制：莫古助威歌 - public static class IbcHelper - { - public static IBattleChara? GetById(uint id) - { - return (IBattleChara?)Svc.Objects.SearchByEntityId(id); - } - - public static IEnumerable GetByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId); - } - } - // BOSS复活技能 位高任重 计数 private volatile int timeMooglesseOblige=0; public void Init(ScriptAccessory accessory) { diff --git a/02-A-Realm-Reborn/Trials-Extreme/Leviathan(Extreme).cs b/02-A-Realm-Reborn/Trials-Extreme/Leviathan(Extreme).cs index 0799c82..51d3085 100644 --- a/02-A-Realm-Reborn/Trials-Extreme/Leviathan(Extreme).cs +++ b/02-A-Realm-Reborn/Trials-Extreme/Leviathan(Extreme).cs @@ -3,13 +3,14 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; @@ -19,13 +20,13 @@ using System.Threading.Tasks; namespace the_Whorleater_Extreme; [ScriptType(guid: "07f20e0e-9463-4a10-9dd1-956fde6a9c46", name: "利维亚桑歼殛战", territorys: [359], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class the_Whorleater_Extreme { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV50 利维亚桑歼殛战 初版绘制 """; diff --git a/02-A-Realm-Reborn/Trials/BattleOnTheBigBridge.cs b/02-A-Realm-Reborn/Trials/BattleOnTheBigBridge.cs index c354a0e..1e89c55 100644 --- a/02-A-Realm-Reborn/Trials/BattleOnTheBigBridge.cs +++ b/02-A-Realm-Reborn/Trials/BattleOnTheBigBridge.cs @@ -3,44 +3,35 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; +using KodakkuAssist.Extensions; namespace BattleOnTheBigBridgen; [ScriptType(guid: "3e4102cb-9410-44fd-85e8-d43a3bc25737", name: "大桥上的决斗", territorys: [366], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class BattleOnTheBigBridge { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV50 大桥上的决斗 初版绘制 """; - public static class IbcHelper - { - public static IBattleChara? GetById(uint id) - { - return (IBattleChara?)Svc.Objects.SearchByEntityId(id); - } - - public static IEnumerable GetByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId); - } - } - [ScriptMethod(name: "蛙变之歌", eventType: EventTypeEnum.StatusAdd, eventCondition: ["StatusID:439"])] public void 蛙变之歌(Event @event, ScriptAccessory accessory) { @@ -48,8 +39,8 @@ public class BattleOnTheBigBridge accessory.Method.TextInfo("躲避绿鸡", duration: 5000, true); accessory.Method.EdgeTTS("躲避绿鸡"); - - foreach (var item in IbcHelper.GetByDataId(2824)) + + foreach (var item in accessory.Data.Objects.GetByDataId(2824)) { var dp = accessory.Data.GetDefaultDrawProperties(); dp.Name = "恩奇都"; @@ -57,7 +48,7 @@ public class BattleOnTheBigBridge dp.Color = new Vector4(1f, 0f, 0f, 2f); dp.Scale = new Vector2(1.5f); dp.DestoryAt = 20000; - accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp); + accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp); } } diff --git a/02-A-Realm-Reborn/Trials/Good_King_Moggle-Hard.cs b/02-A-Realm-Reborn/Trials/Good_King_Moggle-Hard.cs index 12b8c88..3fc59e4 100644 --- a/02-A-Realm-Reborn/Trials/Good_King_Moggle-Hard.cs +++ b/02-A-Realm-Reborn/Trials/Good_King_Moggle-Hard.cs @@ -3,13 +3,14 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; @@ -19,13 +20,13 @@ using System.Threading.Tasks; namespace Thornmarch_Hard; [ScriptType(guid: "cd81e178-12e6-4e53-9b81-63002cc51ecb", name: "莫古力贤王歼灭战(?)", territorys: [1067], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class Thornmarch_Hard { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV50 莫古力贤王歼灭战 纯整活无意义，不喜欢可以不用 台词暂时适用于CN版，暂未适配其他语言端 diff --git a/02-A-Realm-Reborn/Trials/Hydra.cs b/02-A-Realm-Reborn/Trials/Hydra.cs index 88df61f..5410c8f 100644 --- a/02-A-Realm-Reborn/Trials/Hydra.cs +++ b/02-A-Realm-Reborn/Trials/Hydra.cs @@ -3,27 +3,30 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace A_Relic_Reborn_the_Hydra; [ScriptType(guid: "d32d7489-a1bb-4117-98dd-ee895390804d", name: "海德拉讨伐战", territorys: [369], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class theBowlofEmbers_Hard { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV50 海德拉讨伐战 初版绘制 """; diff --git a/02-A-Realm-Reborn/Trials/Ifrit(Hard).cs b/02-A-Realm-Reborn/Trials/Ifrit(Hard).cs index 5002181..ea4d987 100644 --- a/02-A-Realm-Reborn/Trials/Ifrit(Hard).cs +++ b/02-A-Realm-Reborn/Trials/Ifrit(Hard).cs @@ -3,28 +3,31 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace theBowlofEmbers_Hard; [ScriptType(guid: "d3d532f1-0707-427f-ac04-871a22022c11", name: "伊弗利特歼灭战", territorys: [292], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class theBowlofEmbers_Hard { const string noteStr = """ - v0.0.0.1: - LV50 真火神 初版绘制 + v0.0.0.2: + LV50 伊弗利特歼灭战 初版绘制 """; [UserSetting("顺劈死刑预测")] diff --git a/02-A-Realm-Reborn/Trials/Nabriales.cs b/02-A-Realm-Reborn/Trials/Nabriales.cs index 2bccef8..88049b0 100644 --- a/02-A-Realm-Reborn/Trials/Nabriales.cs +++ b/02-A-Realm-Reborn/Trials/Nabriales.cs @@ -3,28 +3,30 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace Nabriales; [ScriptType(guid: "64206b9e-cd0a-47ec-960d-15f39a888f9e", name: "那布里亚勒斯讨伐战", territorys: [426], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class Nabriales { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV50 那布里亚勒斯讨伐战 初版绘制 """; diff --git a/02-A-Realm-Reborn/Trials/Odin.cs b/02-A-Realm-Reborn/Trials/Odin.cs index 28e3e0f..b6c10cc 100644 --- a/02-A-Realm-Reborn/Trials/Odin.cs +++ b/02-A-Realm-Reborn/Trials/Odin.cs @@ -3,27 +3,29 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace Urths_Fount; [ScriptType(guid: "1a07440d-a7bd-4b67-b781-90d14087ee60", name: "奥丁歼灭战", territorys: [394], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class Urths_Fount { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV50 奥丁歼灭战 初版绘制 """; diff --git a/02-A-Realm-Reborn/Trials/Ramuh(Hard).cs b/02-A-Realm-Reborn/Trials/Ramuh(Hard).cs index 6ea7603..f7f8be4 100644 --- a/02-A-Realm-Reborn/Trials/Ramuh(Hard).cs +++ b/02-A-Realm-Reborn/Trials/Ramuh(Hard).cs @@ -3,27 +3,30 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace theStrikingTree_Hard; [ScriptType(guid: "de6d6f10-775d-4c45-91ec-2bd4ed6762c7", name: "拉姆歼灭战", territorys: [374], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class theStrikingTree_Hard_ { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV50 拉姆歼灭战 初版绘制 """; diff --git a/03-Heavensward/Trials-Extreme/Ravana-Extreme.cs b/03-Heavensward/Trials-Extreme/Ravana-Extreme.cs index 4c11cc4..9541d6f 100644 --- a/03-Heavensward/Trials-Extreme/Ravana-Extreme.cs +++ b/03-Heavensward/Trials-Extreme/Ravana-Extreme.cs @@ -3,17 +3,19 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace Ravana; diff --git a/03-Heavensward/Trials/Zurvan.cs b/03-Heavensward/Trials/Zurvan.cs index 88774b5..19255dc 100644 --- a/03-Heavensward/Trials/Zurvan.cs +++ b/03-Heavensward/Trials/Zurvan.cs @@ -3,28 +3,30 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; - +using System.Threading.Tasks; namespace Zurvan; [ScriptType(guid: "214f8fbd-ad04-430f-8bba-fd7319581780", name: "祖尔宛歼灭战", territorys: [637], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class Zurvan { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV60 祖尔宛歼灭战 初版绘制 """; diff --git a/04-Stormblood/Dungeon/SaintMocianne'sArboretum (Hard).cs b/04-Stormblood/Dungeon/SaintMocianne'sArboretum (Hard).cs index 937c085..e9807f0 100644 --- a/04-Stormblood/Dungeon/SaintMocianne'sArboretum (Hard).cs +++ b/04-Stormblood/Dungeon/SaintMocianne'sArboretum (Hard).cs @@ -3,54 +3,34 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; +using KodakkuAssist.Extensions; namespace SaintMociannesArboretum_Hard; [ScriptType(guid: "7e87b5d1-ae21-4115-9483-d8dc0f1d1652", name: "污染庭园圣茉夏娜植物园", territorys: [788], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class SaintMociannesArboretum_Hard { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV70 污染庭园圣茉夏娜植物园 初版绘制 """; - public static class IbcHelper - { - public static IBattleChara? GetById(uint id) - { - return (IBattleChara?)Svc.Objects.SearchByEntityId(id); - } - - public static IBattleChara? GetMe() - { - return Svc.ClientState.LocalPlayer; - } - - public static IGameObject? GetFirstByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId).FirstOrDefault(); - } - - public static IEnumerable GetByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId); - } - } - #region BOSS1_泥口花 [ScriptMethod(name: "BOSS1_泥口花 泥浆炸弹（点名毒圈）", eventType: EventTypeEnum.TargetIcon, eventCondition: ["Id:0001"])] public void 泥浆炸弹(Event @event, ScriptAccessory accessory) @@ -85,7 +65,7 @@ public class SaintMociannesArboretum_Hard accessory.Method.TextInfo("躲在小花后", duration: 8000, true); accessory.Method.EdgeTTS("躲在小花后"); - foreach (var item in IbcHelper.GetByDataId(9264)) + foreach (var item in accessory.Data.Objects.GetByDataId(9264)) { var dp = accessory.Data.GetDefaultDrawProperties(); dp.Name = "恶意毒境"; @@ -146,7 +126,7 @@ public class SaintMociannesArboretum_Hard { var dp = accessory.Data.GetDefaultDrawProperties(); - var boss = IbcHelper.GetFirstByDataId(9257); + var boss = accessory.Data.Objects.GetByDataId(9257).FirstOrDefault(); if (boss == null) return; dp.Owner = boss.GameObjectId; dp.TargetObject = @event.TargetId(); diff --git a/04-Stormblood/Dungeon/theFractalContinuum-Hard.cs b/04-Stormblood/Dungeon/theFractalContinuum-Hard.cs index 5f41004..8b8eb53 100644 --- a/04-Stormblood/Dungeon/theFractalContinuum-Hard.cs +++ b/04-Stormblood/Dungeon/theFractalContinuum-Hard.cs @@ -3,29 +3,31 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace the_Fractal_Continuum_Hard; [ScriptType(guid: "c76136e1-1b5b-4cfb-a677-4cc0917fa050", name: "疯狂战舰无限回廊", territorys: [743], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class the_Fractal_Continuum_Hard { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: 疯狂战舰无限回廊 副本绘制 注意：BOSS2三斗神与尾王光柱地火未经实战测试，若有误请带ARR反馈 """; diff --git a/04-Stormblood/Raid-Omega_Quests/Normal/O11n.cs b/04-Stormblood/Raid-Omega_Quests/Normal/O11n.cs index 4e36286..b60e4bc 100644 --- a/04-Stormblood/Raid-Omega_Quests/Normal/O11n.cs +++ b/04-Stormblood/Raid-Omega_Quests/Normal/O11n.cs @@ -3,13 +3,14 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; @@ -19,13 +20,13 @@ using System.Threading.Tasks; namespace The_Navel___EX._04_Omega_Quests.Normal; [ScriptType(guid: "2232ae84-c1e7-4382-88b4-d691887f27cf", name: "O11N", territorys: [800], - version: "0.0.0.1" , author: "Tetora", note: noteStr)] + version: "0.0.0.2" , author: "Tetora", note: noteStr)] public class O11n { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV70 欧米茄时空狭缝 阿尔法幻境3（欧米茄）初版绘制 """; diff --git a/04-Stormblood/Trial/Lakshmi.cs b/04-Stormblood/Trial/Lakshmi.cs index 13930c9..dd682b0 100644 --- a/04-Stormblood/Trial/Lakshmi.cs +++ b/04-Stormblood/Trial/Lakshmi.cs @@ -3,53 +3,34 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace Emanation; [ScriptType(guid: "a7bacd3e-834f-41ba-a210-c66e2c12d208", name: "吉祥天女歼灭战", territorys: [719], - version: "0.0.0.2", author: "Tetora", note: noteStr)] + version: "0.0.0.3", author: "Tetora", note: noteStr)] public class Lakshmi { const string noteStr = """ - v0.0.0.2: + v0.0.0.3: LV70 吉祥天女歼灭战 初版绘制 """; - public static class IbcHelper - { - public static IBattleChara? GetById(uint id) - { - return (IBattleChara?)Svc.Objects.SearchByEntityId(id); - } - - public static IBattleChara? GetMe() - { - return Svc.ClientState.LocalPlayer; - } - - public static IGameObject? GetFirstByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId).FirstOrDefault(); - } - - public static IEnumerable GetByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId); - } - } - [ScriptMethod(name: "元气刷新提示", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:regex:^93(47|74)$"])] public void 元气刷新(Event @event, ScriptAccessory accessory) { @@ -83,7 +64,7 @@ public class Lakshmi { var dp = accessory.Data.GetDefaultDrawProperties(); - var boss = IbcHelper.GetFirstByDataId(7712); + var boss = accessory.Data.Objects.GetByDataId(7712).FirstOrDefault(); if (boss == null) return; dp.Owner = boss.GameObjectId; diff --git a/04-Stormblood/Trial/Shinryu.cs b/04-Stormblood/Trial/Shinryu.cs index b29ec48..d6dd4c9 100644 --- a/04-Stormblood/Trial/Shinryu.cs +++ b/04-Stormblood/Trial/Shinryu.cs @@ -3,57 +3,37 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; using System.Threading.Tasks; +using KodakkuAssist.Extensions; namespace theRoyalMenagerie; [ScriptType(guid: "da23fd13-2d1f-41d3-b2c9-91fd8d948a98", name: "神龙歼灭战", territorys: [679], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class Shinryu { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV70 神龙歼灭战 初版绘制 缺少部分机制：如闪电分散、钻石星尘等 若有遇见可通过DC将ARR录像文件私发给我补充 """; - public static class IbcHelper - { - public static IBattleChara? GetById(uint id) - { - return (IBattleChara?)Svc.Objects.SearchByEntityId(id); - } - - public static IBattleChara? GetMe() - { - return Svc.ClientState.LocalPlayer; - } - - public static IGameObject? GetFirstByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId).FirstOrDefault(); - } - - public static IEnumerable GetByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId); - } - } - [ScriptMethod(name: "巨浪 击退连线", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:8075"])] public void 巨浪连线(Event @event, ScriptAccessory accessory) { @@ -93,7 +73,7 @@ public class Shinryu { accessory.Method.TextInfo("AOE，离开水圈", duration: 9700, false); - foreach (var item in IbcHelper.GetByDataId(2004237)) + foreach (var item in accessory.Data.Objects.GetByDataId(2004237)) { var dp = accessory.Data.GetDefaultDrawProperties(); dp.Color = new Vector4(1f, 0f, 0f, 4f); diff --git a/05-Shadowbringers/Raid-Eden/Normal/E10n.cs b/05-Shadowbringers/Raid-Eden/Normal/E10n.cs index 7764749..7082db5 100644 --- a/05-Shadowbringers/Raid-Eden/Normal/E10n.cs +++ b/05-Shadowbringers/Raid-Eden/Normal/E10n.cs @@ -3,27 +3,31 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace E10n; [ScriptType(guid: "038e00e8-d378-4f43-89ab-e27df5561d5a", name: "E10N", territorys: [943], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class E10n { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV80 伊甸希望乐园 再生之章2（影之王）初版绘制 """; diff --git a/05-Shadowbringers/Raid-Eden/Normal/E12n.cs b/05-Shadowbringers/Raid-Eden/Normal/E12n.cs index f1fa84e..c638c32 100644 --- a/05-Shadowbringers/Raid-Eden/Normal/E12n.cs +++ b/05-Shadowbringers/Raid-Eden/Normal/E12n.cs @@ -3,13 +3,15 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; @@ -19,13 +21,13 @@ using System.Threading.Tasks; namespace E12n; [ScriptType(guid: "3f88ad9c-e7a7-4e00-b19e-546609b319ba", name: "E12N", territorys: [945], - version: "0.0.0.1" , author: "Tetora", note: noteStr)] + version: "0.0.0.2" , author: "Tetora", note: noteStr)] public class E12n { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV80 伊甸希望乐园 再生之章4（伊甸之约）初版绘制 """; diff --git a/05-Shadowbringers/Raid-Eden/Normal/E1n.cs b/05-Shadowbringers/Raid-Eden/Normal/E1n.cs index 4820ef7..44b8a4e 100644 --- a/05-Shadowbringers/Raid-Eden/Normal/E1n.cs +++ b/05-Shadowbringers/Raid-Eden/Normal/E1n.cs @@ -3,54 +3,34 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Extensions; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace E1n; [ScriptType(guid: "35c751e5-2958-4f55-b783-405b4acfde1b", name: "E1N", territorys: [849], - version: "0.0.0.11", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class E1n { const string noteStr = """ - v0.0.0.11: + v0.0.0.2: LV80 伊甸希望乐园 觉醒之章1（至尊伊甸）初版绘制 """; - public static class IbcHelper - { - public static IBattleChara? GetById(uint id) - { - return (IBattleChara?)Svc.Objects.SearchByEntityId(id); - } - - public static IBattleChara? GetMe() - { - return Svc.ClientState.LocalPlayer; - } - - public static IGameObject? GetFirstByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId).FirstOrDefault(); - } - - public static IEnumerable GetByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId); - } - } - [ScriptMethod(name: "伊甸重力（百分比AOE）", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:15764"])] public void 伊甸重力(Event @event, ScriptAccessory accessory) { @@ -86,7 +66,7 @@ public class E1n var dp = accessory.Data.GetDefaultDrawProperties(); - var boss = IbcHelper.GetFirstByDataId(9369); + var boss = accessory.Data.Objects.GetByDataId(9369).FirstOrDefault(); if (boss == null) return; dp.Owner = boss.GameObjectId; diff --git a/05-Shadowbringers/Raid-Eden/Normal/E8n.cs b/05-Shadowbringers/Raid-Eden/Normal/E8n.cs index 334f600..9bc93d8 100644 --- a/05-Shadowbringers/Raid-Eden/Normal/E8n.cs +++ b/05-Shadowbringers/Raid-Eden/Normal/E8n.cs @@ -3,57 +3,35 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; using System.Threading.Tasks; - namespace E8n; [ScriptType(guid: "c4d533c8-8798-441d-b849-fc3cd5cf63d9", name: "E8N", territorys: [905], - version: "0.0.0.2" , author: "Tetora", note: noteStr)] + version: "0.0.0.3" , author: "Tetora", note: noteStr)] public class E8n { const string noteStr = """ - v0.0.0.2: + v0.0.0.3: LV80 伊甸希望乐园 共鸣之章4（构想希瓦）初版绘制 """; - public static class IbcHelper - { - public static IBattleChara? GetById(uint id) - { - return (IBattleChara?)Svc.Objects.SearchByEntityId(id); - } - - public static IBattleChara? GetMe() - { - return Svc.ClientState.LocalPlayer; - } - - public static IGameObject? GetFirstByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId).FirstOrDefault(); - } - - public static IEnumerable GetByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId); - } - } - #region P1 [ScriptMethod(name: "换装_闪光护甲（背对）", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:20303"])] @@ -262,7 +240,7 @@ public class E8n public void 光之海啸(Event @event, ScriptAccessory accessory) { var dp = accessory.Data.GetDefaultDrawProperties(); - var boss = IbcHelper.GetFirstByDataId(11635); + var boss = accessory.Data.Objects.GetByDataId(11635).FirstOrDefault(); if (boss == null) return; dp.Owner = boss.GameObjectId; diff --git a/06-EndWalker/Raid-Pandæmonium/Normal/P10n.cs b/06-EndWalker/Raid-Pandæmonium/Normal/P10n.cs index a6e1bb0..a921089 100644 --- a/06-EndWalker/Raid-Pandæmonium/Normal/P10n.cs +++ b/06-EndWalker/Raid-Pandæmonium/Normal/P10n.cs @@ -3,13 +3,15 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; @@ -19,29 +21,16 @@ using System.Threading.Tasks; namespace Pandæmonium.Normal; [ScriptType(guid: "f28cc2f2-6ce2-4526-a303-56fe1c02dea8", name: "P10N", territorys: [1149], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class P10n { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV90 万魔殿 荒天之狱2（万魔殿）初版绘制 """; - public static class IbcHelper - { - public static IBattleChara? GetById(uint id) - { - return (IBattleChara?)Svc.Objects.SearchByEntityId(id); - } - - public static IEnumerable GetByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId); - } - } - [ScriptMethod(name: "喷吐丝网 分散提示", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:33369"])] public void 喷吐丝网(Event @event, ScriptAccessory accessory) { @@ -56,7 +45,7 @@ public class P10n if ( @event.TargetId() != accessory.Data.Me) return; var dp = accessory.Data.GetDefaultDrawProperties(); - foreach (var item in IbcHelper.GetByDataId(16156)) + foreach (var item in accessory.Data.Objects.GetByDataId(16156)) { dp.Name = "柱子危险区"; dp.Color = new Vector4(1f, 0f, 0f, 2f); @@ -74,7 +63,7 @@ public class P10n if ( @event.TargetId() != accessory.Data.Me) return; var dp = accessory.Data.GetDefaultDrawProperties(); - foreach (var item in IbcHelper.GetByDataId(16156)) + foreach (var item in accessory.Data.Objects.GetByDataId(16156)) { dp.Name = "柱子危险区"; dp.Color = new Vector4(1f, 1f, 1f, 0.4f); diff --git a/06-EndWalker/Trial/Golbez.cs b/06-EndWalker/Trial/Golbez.cs index eb3fd50..4466f51 100644 --- a/06-EndWalker/Trial/Golbez.cs +++ b/06-EndWalker/Trial/Golbez.cs @@ -3,27 +3,31 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace the_Voidcast_Dais; [ScriptType(guid: "8a526afb-eefd-44ec-a105-7dc8fcd28e47", name: "高贝扎歼灭战", territorys: [1140], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class Golbez { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV90 高贝扎歼灭战 初版绘制 """; diff --git a/06-EndWalker/Trial/Hydaelyn.cs b/06-EndWalker/Trial/Hydaelyn.cs index 0c6a2de..358eabb 100644 --- a/06-EndWalker/Trial/Hydaelyn.cs +++ b/06-EndWalker/Trial/Hydaelyn.cs @@ -3,17 +3,19 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace Hydaelyn; @@ -40,19 +42,6 @@ public class Hydaelyn Beacon = 0; } - public static class IbcHelper - { - public static IBattleChara? GetById(uint id) - { - return (IBattleChara?)Svc.Objects.SearchByEntityId(id); - } - - public static IEnumerable GetByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId); - } - } - [ScriptMethod(name: "职责更换记录", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:27660"], userControl:false)] public void 职责更换(Event @event, ScriptAccessory accessory) { diff --git a/Celestium/18-Midsummer_Night's_Explosion.cs b/Celestium/18-Midsummer_Night's_Explosion.cs index 17f8646..885a77d 100644 --- a/Celestium/18-Midsummer_Night's_Explosion.cs +++ b/Celestium/18-Midsummer_Night's_Explosion.cs @@ -3,28 +3,31 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace Midsummer_Night_s_Explosion; [ScriptType(guid: "7703f1a9-5698-4896-8908-bb8e415c1321", name: "天青斗场18 - 爆破死斗", territorys: [796], - version: "0.0.0.2", author: "Tetora", note: noteStr)] + version: "0.0.0.3", author: "Tetora", note: noteStr)] public class Midsummer_Night_s_Explosion { const string noteStr = """ - v0.0.0.2: + v0.0.0.3: 天青斗场第18层 爆破死斗绘制 """; diff --git a/Deep_Dungeon/Eureka_Orthos.cs b/Deep_Dungeon/Eureka_Orthos.cs index f78a72a..4358f2d 100644 --- a/Deep_Dungeon/Eureka_Orthos.cs +++ b/Deep_Dungeon/Eureka_Orthos.cs @@ -3,13 +3,15 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; @@ -21,12 +23,12 @@ namespace Eureka_Orthos; [ScriptType(guid: "5e8a4051-53f7-4eb3-bb32-b18df8b113aa", name: "正统优雷卡", territorys: [1099,1100,1101,1102,1103,1104,1105,1106,1107,1108], - version: "0.0.0.2", author: "Tetora", note: noteStr)] + version: "0.0.0.3", author: "Tetora", note: noteStr)] public class Eureka_Orthos { const string noteStr = """ - v0.0.0.2: + v0.0.0.3: 正统优雷卡绘制 注：方法设置中的层数仅做分割线效果，并不是批量开关 现支持层数：1~20、71~100 diff --git a/Deep_Dungeon/the_Palace_of_the_Dead.cs b/Deep_Dungeon/the_Palace_of_the_Dead.cs index d758261..fb27813 100644 --- a/Deep_Dungeon/the_Palace_of_the_Dead.cs +++ b/Deep_Dungeon/the_Palace_of_the_Dead.cs @@ -3,35 +3,36 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; -using System.Threading; using System.Threading.Tasks; namespace the_Palace_of_the_Dead; [ScriptType(guid: "4210c323-eba4-4d67-a7e7-b90799494729", name: "死者宫殿", author: "Tetora", territorys: [561,562,563,564,565,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607], - version: "0.0.0.2",note: noteStr)] + version: "0.0.0.3",note: noteStr)] public class the_Palace_of_the_Dead { const string noteStr = """ - v0.0.0.2: + v0.0.0.3: 死者宫殿绘制 注：方法设置中的层数仅做分割线效果，并不是批量开关 重要：1~80层暂无录像证实，可能会有部分绘制错误，如发现错误请带着ARR联系我 - 严重错误：暂未支持【形态变化】【眩晕】【催眠】等限制 + 严重错误：暂未支持【形态变化】【眩晕】【催眠】等限制，有需可以考虑使用Splatoon """; //眩晕、催眠、无法发动技能1113等状态都需要销毁绘图 diff --git a/Fate/Archaeotania.cs b/Fate/Archaeotania.cs index 9edaf6f..19637f9 100644 --- a/Fate/Archaeotania.cs +++ b/Fate/Archaeotania.cs @@ -3,28 +3,31 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace TheHead_theTail_theWholeDamnedThing; [ScriptType(guid: "f11c3069-d163-41dd-904e-b016cfcf089c", name: "灾厄的古塔尼亚之深海讨伐战", territorys: [818], - version: "0.0.0.2", author: "Tetora", note: noteStr)] + version: "0.0.0.3", author: "Tetora", note: noteStr)] public class Archaeotania { const string noteStr = """ - v0.0.0.2: + v0.0.0.3: LV80 特殊Fate 绘制 灾厄的古塔尼亚之深海讨伐战 """; diff --git a/Fate/Chi.cs b/Fate/Chi.cs index 16336d5..0bab32b 100644 --- a/Fate/Chi.cs +++ b/Fate/Chi.cs @@ -3,28 +3,31 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace Omicron_Recall_Killing_Order; [ScriptType(guid: "b73d07ef-aa90-45a9-ab4b-fc3ccce8791b", name: "侵略兵器召回指令：破坏侵略兵器希", territorys: [960], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class Chi { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: LV90 特殊Fate 绘制 侵略兵器召回指令：破坏侵略兵器希 """; diff --git a/Fate/Daivadipa.cs b/Fate/Daivadipa.cs index 3aff7f1..abb08d8 100644 --- a/Fate/Daivadipa.cs +++ b/Fate/Daivadipa.cs @@ -3,13 +3,15 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; @@ -19,13 +21,13 @@ using System.Threading.Tasks; namespace DevoutPilgrimsVSDaivadipa; [ScriptType(guid: "da82aeb0-9635-4f13-a1c1-39a0c859f596", name: "兽道诸神信仰：伪神降临", territorys: [957], - version: "0.0.0.11", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class Daivadipa { const string noteStr = """ - v0.0.0.11: + v0.0.0.2: LV90 特殊Fate 绘制 兽道诸神信仰：伪神降临 """; @@ -94,19 +96,7 @@ public class Daivadipa } accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Fan, dp); } - - public static class IbcHelper - { - public static IBattleChara? GetById(uint id) - { - return (IBattleChara?)Svc.Objects.SearchByEntityId(id); - } - - public static IEnumerable GetByDataId(uint dataId) - { - return Svc.Objects.Where(x => x.DataId == dataId); - } - } + [ScriptMethod(name: "圣火猛击（直线）", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:regex:^2649[89]$"])] public void 圣火猛击(Event @event, ScriptAccessory accessory) @@ -129,14 +119,14 @@ public class Daivadipa switch (@event.ActionId()) { case 26498: - foreach (var item in IbcHelper.GetByDataId(13679)) + foreach (var item in accessory.Data.Objects.GetByDataId(13679)) { dp.Name = "圣火猛击红"; dp.Owner = item.EntityId; accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Rect, dp); } - foreach (var item in IbcHelper.GetByDataId(13680)) + foreach (var item in accessory.Data.Objects.GetByDataId(13680)) { dp1.Name = "圣火猛击蓝"; dp1.Owner = item.EntityId; @@ -146,14 +136,14 @@ public class Daivadipa break; case 26499: - foreach (var item in IbcHelper.GetByDataId(13680)) + foreach (var item in accessory.Data.Objects.GetByDataId(13680)) { dp.Name = "圣火猛击蓝"; dp.Owner = item.EntityId; accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Rect, dp); } - foreach (var item in IbcHelper.GetByDataId(13679)) + foreach (var item in accessory.Data.Objects.GetByDataId(13679)) { dp1.Name = "圣火猛击红"; dp1.Owner = item.EntityId; @@ -184,14 +174,14 @@ public class Daivadipa switch (@event.ActionId()) { case 26498: - foreach (var item in IbcHelper.GetByDataId(13681)) + foreach (var item in accessory.Data.Objects.GetByDataId(13681)) { dp.Name = "燃烧红"; dp.Owner = item.EntityId; accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp); } - foreach (var item in IbcHelper.GetByDataId(13682)) + foreach (var item in accessory.Data.Objects.GetByDataId(13682)) { dp1.Name = "燃烧蓝"; dp1.Owner = item.EntityId; @@ -201,14 +191,14 @@ public class Daivadipa break; case 26499: - foreach (var item in IbcHelper.GetByDataId(13682)) + foreach (var item in accessory.Data.Objects.GetByDataId(13682)) { dp.Name = "燃烧蓝"; dp.Owner = item.EntityId; accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp); } - foreach (var item in IbcHelper.GetByDataId(13681)) + foreach (var item in accessory.Data.Objects.GetByDataId(13681)) { dp1.Name = "燃烧红"; dp1.Owner = item.EntityId; diff --git a/Fate/Formidable.cs b/Fate/Formidable.cs index cbccfa2..4941e93 100644 --- a/Fate/Formidable.cs +++ b/Fate/Formidable.cs @@ -3,30 +3,31 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; using System.Threading.Tasks; -using FFXIVClientStructs.FFXIV.Client.Game.Character; namespace A_Finale_Most_Formidable; [ScriptType(guid: "5f55a121-1fcc-48ce-a0e8-b6fbd4ce8489", name: "激斗畏惧装甲之秘密武器", territorys: [814], - version: "0.0.0.21", author: "Tetora", note: noteStr)] + version: "0.0.0.3", author: "Tetora", note: noteStr)] public class Formidable { const string noteStr = """ - v0.0.0.21: + v0.0.0.3: LV80 特殊Fate 绘制 激斗畏惧装甲之秘密武器 """; diff --git a/Fate/Mica_the_MagicalMu.cs b/Fate/Mica_the_MagicalMu.cs index c9545ba..6a6c18b 100644 --- a/Fate/Mica_the_MagicalMu.cs +++ b/Fate/Mica_the_MagicalMu.cs @@ -3,29 +3,32 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace Mascot_Murder; [ScriptType(guid: "22134617-0ca4-463e-a40d-675ef1c20cf2", name: "亩鼠米卡：盛装巡游皆大欢喜", territorys: [1192], - version: "0.0.0.12", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class Mica_the_Magical_Mu { const string noteStr = """ - v0.0.0.12: + v0.0.0.2: LV100 特殊Fate 绘制 亩鼠米卡：盛装巡游皆大欢喜 """; diff --git a/Fate/Ttokrrone.cs b/Fate/Ttokrrone.cs index e59f2eb..ddb213d 100644 --- a/Fate/Ttokrrone.cs +++ b/Fate/Ttokrrone.cs @@ -3,28 +3,31 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace The_Serpentlord_Seethes; [ScriptType(guid: "ab67129e-880f-48e8-852e-f92b4afa68e5", name: "蛇王得酷热涅：荒野的死斗", territorys: [1190], - version: "0.0.0.2", author: "Tetora", note: noteStr)] + version: "0.0.0.3", author: "Tetora", note: noteStr)] public class Ttokrrone { const string noteStr = """ - v0.0.0.2: + v0.0.0.3: LV100 特殊Fate 绘制 蛇王得酷热涅：荒野的死斗 """; diff --git a/Field_Operations/The_Forbidden_Land_Eureka/The_Baldesion_Arsenal.cs b/Field_Operations/The_Forbidden_Land_Eureka/The_Baldesion_Arsenal.cs index e66f239..53a5cce 100644 --- a/Field_Operations/The_Forbidden_Land_Eureka/The_Baldesion_Arsenal.cs +++ b/Field_Operations/The_Forbidden_Land_Eureka/The_Baldesion_Arsenal.cs @@ -3,29 +3,32 @@ using System.ComponentModel; using System.Linq; using System.Numerics; using System.Collections.Generic; -using System.Text.RegularExpressions; -using Dalamud.Game.ClientState.Objects.Types; +// using Dalamud.Game.ClientState.Objects.Subkinds; +// using Dalamud.Game.ClientState.Objects.Types; using Newtonsoft.Json; using Dalamud.Utility.Numerics; using KodakkuAssist.Script; using KodakkuAssist.Module.GameEvent; using KodakkuAssist.Module.Draw; +using KodakkuAssist.Data; +using KodakkuAssist.Extensions; using ECommons; using ECommons.DalamudServices; using ECommons.GameFunctions; using ECommons.MathHelpers; +using System.Threading.Tasks; namespace The_Baldesion_Arsenal_Eureka; [ScriptType(guid: "cb001385-81e0-4c16-8bb3-fb51fd70336a", name: "禁地优雷卡 - 巴尔德西昂兵武塔", territorys: [827], - version: "0.0.0.1", author: "Tetora", note: noteStr)] + version: "0.0.0.2", author: "Tetora", note: noteStr)] public class The_Baldesion_Arsenal { const string noteStr = """ - v0.0.0.1: + v0.0.0.2: 禁地优雷卡 - 巴尔德西昂兵武塔 初版绘制 【施工中】 """; diff --git a/OnlineRepo.json b/OnlineRepo.json index d34e570..abef343 100644 --- a/OnlineRepo.json +++ b/OnlineRepo.json @@ -2,12 +2,12 @@ { "Name": "疯狂战舰无限回廊", "Guid": "c76136e1-1b5b-4cfb-a677-4cc0917fa050", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/04-Stormblood/Dungeon/theFractalContinuum-Hard.cs", - "Note": "v0.0.0.1:\r\n疯狂战舰无限回廊 副本绘制\r\n注意：BOSS2三斗神与尾王光柱地火未经实战测试，若有误请带ARR反馈", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\n疯狂战舰无限回廊 副本绘制\r\n注意：BOSS2三斗神与尾王光柱地火未经实战测试，若有误请带ARR反馈", + "UpdateInfo": "API12", "TerritoryIds": [ 743 ] @@ -15,12 +15,12 @@ { "Name": "污染庭园圣茉夏娜植物园", "Guid": "7e87b5d1-ae21-4115-9483-d8dc0f1d1652", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/04-Stormblood/Dungeon/SaintMocianne'sArboretum%20(Hard).cs", - "Note": "v0.0.0.1:\r\nLV70 污染庭园圣茉夏娜植物园 初版绘制", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV70 污染庭园圣茉夏娜植物园 初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 788 ] @@ -28,12 +28,12 @@ { "Name": "伊弗利特歼灭战", "Guid": "d3d532f1-0707-427f-ac04-871a22022c11", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/02-A-Realm-Reborn/Trials/Ifrit(Hard).cs", - "Note": "", - "UpdateInfo": "", + "Note": "v0.0.0.1:\r\nLV50 伊弗利特歼灭战 初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 292 ] @@ -41,12 +41,12 @@ { "Name": "拉姆歼灭战", "Guid": "de6d6f10-775d-4c45-91ec-2bd4ed6762c7", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/02-A-Realm-Reborn/Trials/Ramuh(Hard).cs", - "Note": "v0.0.0.1:\r\nLV50 拉姆歼灭战 初版绘制", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV50 拉姆歼灭战 初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 374 ] @@ -54,12 +54,12 @@ { "Name": "莫古力贤王歼灭战(?)", "Guid": "cd81e178-12e6-4e53-9b81-63002cc51ecb", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/02-A-Realm-Reborn/Trials/Good_King_Moggle-Hard.cs", - "Note": "v0.0.0.1:\r\nLV50 莫古力贤王歼灭战\r\n纯整活无意义，不喜欢可以不用\r\n台词暂时适用于CN版，暂未适配其他语言端", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV50 莫古力贤王歼灭战\r\n纯整活无意义，不喜欢可以不用\r\n台词暂时适用于CN版，暂未适配其他语言端", + "UpdateInfo": "API12", "TerritoryIds": [ 1067 ] @@ -67,12 +67,12 @@ { "Name": "那布里亚勒斯讨伐战", "Guid": "64206b9e-cd0a-47ec-960d-15f39a888f9e", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/02-A-Realm-Reborn/Trials/Nabriales.cs", - "Note": "v0.0.0.1:\r\nLV50 那布里亚勒斯讨伐战 初版绘制", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV50 那布里亚勒斯讨伐战 初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 426 ] @@ -80,12 +80,12 @@ { "Name": "海德拉讨伐战", "Guid": "d32d7489-a1bb-4117-98dd-ee895390804d", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/02-A-Realm-Reborn/Trials/Hydra.cs", - "Note": "", - "UpdateInfo": "", + "Note": "v0.0.0.2:\nLV50 海德拉讨伐战 初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 369 ] @@ -93,12 +93,12 @@ { "Name": "奥丁歼灭战", "Guid": "1a07440d-a7bd-4b67-b781-90d14087ee60", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/02-A-Realm-Reborn/Trials/Odin.cs", - "Note": "v0.0.0.1:\r\nLV50 奥丁歼灭战 初版绘制", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV50 奥丁歼灭战 初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 394 ] @@ -106,12 +106,12 @@ { "Name": "大桥上的决斗", "Guid": "3e4102cb-9410-44fd-85e8-d43a3bc25737", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/02-A-Realm-Reborn/Trials/BattleOnTheBigBridge.cs", - "Note": "v0.0.0.1:\r\nLV50 大桥上的决斗 初版绘制", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV50 大桥上的决斗 初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 366 ] @@ -119,12 +119,12 @@ { "Name": "祖尔宛歼灭战", "Guid": "214f8fbd-ad04-430f-8bba-fd7319581780", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/03-Heavensward/Trials/Zurvan.cs", - "Note": "v0.0.0.1:\r\nLV60 祖尔宛歼灭战 初版绘制", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV60 祖尔宛歼灭战 初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 637 ] @@ -132,12 +132,12 @@ { "Name": "吉祥天女歼灭战", "Guid": "a7bacd3e-834f-41ba-a210-c66e2c12d208", - "Version": "0.0.0.2", + "Version": "0.0.0.3", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/04-Stormblood/Trial/Lakshmi.cs", - "Note": "v0.0.0.2:\r\nLV70 吉祥天女歼灭战 初版绘制", - "UpdateInfo": "", + "Note": "v0.0.0.3:\r\nLV70 吉祥天女歼灭战 初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 719 ] @@ -145,12 +145,12 @@ { "Name": "神龙歼灭战", "Guid": "da23fd13-2d1f-41d3-b2c9-91fd8d948a98", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/04-Stormblood/Trial/Shinryu.cs", - "Note": "v0.0.0.1:\r\nLV70 神龙歼灭战 初版绘制", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV70 神龙歼灭战 初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 679 ] @@ -158,12 +158,12 @@ { "Name": "高贝扎歼灭战", "Guid": "8a526afb-eefd-44ec-a105-7dc8fcd28e47", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/06-EndWalker/Trial/Golbez.cs", - "Note": "", - "UpdateInfo": "", + "Note": "v0.0.0.2:\nLV90 高贝扎歼灭战 初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 1140 ] @@ -171,12 +171,12 @@ { "Name": "莫古力贤王歼殛战", "Guid": "fc6a6125-4a1d-4669-be4c-9b375dc70ae0", - "Version": "0.0.0.11", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/02-A-Realm-Reborn/Trials-Extreme/Good_King_Moggle(Extreme).cs", - "Note": "v0.0.0.11:\r\nLV50 莫古力贤王歼殛战 初版绘制", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV50 莫古力贤王歼殛战 初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 364 ] @@ -184,12 +184,12 @@ { "Name": "O11N", "Guid": "2232ae84-c1e7-4382-88b4-d691887f27cf", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/04-Stormblood/Raid-Omega_Quests/Normal/O11n.cs", - "Note": "v0.0.0.1:\r\nLV70 欧米茄时空狭缝 阿尔法幻境3（欧米茄）初版绘制", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV70 欧米茄时空狭缝 阿尔法幻境3（欧米茄）初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 800 ] @@ -197,12 +197,12 @@ { "Name": "E1N", "Guid": "35c751e5-2958-4f55-b783-405b4acfde1b", - "Version": "0.0.0.11", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/05-Shadowbringers/Raid-Eden/Normal/E1n.cs", - "Note": "v0.0.0.11:\r\nLV80 伊甸希望乐园 觉醒之章1（至尊伊甸）初版绘制", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV80 伊甸希望乐园 觉醒之章1（至尊伊甸）初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 849 ] @@ -210,12 +210,12 @@ { "Name": "E8N", "Guid": "c4d533c8-8798-441d-b849-fc3cd5cf63d9", - "Version": "0.0.0.2", + "Version": "0.0.0.3", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/05-Shadowbringers/Raid-Eden/Normal/E8n.cs", - "Note": "v0.0.0.2:\r\nLV80 伊甸希望乐园 共鸣之章4（构想希瓦）初版绘制", - "UpdateInfo": "修正镜子范围错误", + "Note": "v0.0.0.3:\r\nLV80 伊甸希望乐园 共鸣之章4（构想希瓦）初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 905 ] @@ -223,12 +223,12 @@ { "Name": "E10N", "Guid": "038e00e8-d378-4f43-89ab-e27df5561d5a", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/05-Shadowbringers/Raid-Eden/Normal/E10n.cs", - "Note": "", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV80 伊甸希望乐园 再生之章2（影之王）初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 943 ] @@ -236,12 +236,12 @@ { "Name": "E12N", "Guid": "3f88ad9c-e7a7-4e00-b19e-546609b319ba", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/05-Shadowbringers/Raid-Eden/Normal/E12n.cs", - "Note": "v0.0.0.1:\r\nLV80 伊甸希望乐园 再生之章4（伊甸之约）初版绘制", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV80 伊甸希望乐园 再生之章4（伊甸之约）初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 945 ] @@ -249,12 +249,12 @@ { "Name": "P10N", "Guid": "f28cc2f2-6ce2-4526-a303-56fe1c02dea8", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/06-EndWalker/Raid-Pand%C3%A6monium/Normal/P10n.cs", - "Note": "v0.0.0.1:\r\nLV90 万魔殿 荒天之狱2（万魔殿）初版绘制", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV90 万魔殿 荒天之狱2（万魔殿）初版绘制", + "UpdateInfo": "API12", "TerritoryIds": [ 1149 ] @@ -262,12 +262,12 @@ { "Name": "死者宫殿", "Guid": "4210c323-eba4-4d67-a7e7-b90799494729", - "Version": "0.0.0.2", + "Version": "0.0.0.3", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/Deep_Dungeon/the_Palace_of_the_Dead.cs", - "Note": "", - "UpdateInfo": "v0.0.0.2 将特殊符号的字符改为正常数字，伤心鸭", + "Note": "v0.0.0.3:\n死者宫殿 初版绘制", + "UpdateInfo": "v0.0.0.3 API12", "TerritoryIds": [ 561, 562, @@ -294,12 +294,12 @@ { "Name": "天青斗场18 - 爆破死斗", "Guid": "7703f1a9-5698-4896-8908-bb8e415c1321", - "Version": "0.0.0.2", + "Version": "0.0.0.3", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/Celestium/18-Midsummer_Night's_Explosion.cs", "Note": "", - "UpdateInfo": "", + "UpdateInfo": "API12", "TerritoryIds": [ 796 ] @@ -307,12 +307,12 @@ { "Name": "激斗畏惧装甲之秘密武器", "Guid": "5f55a121-1fcc-48ce-a0e8-b6fbd4ce8489", - "Version": "0.0.0.21", + "Version": "0.0.0.3", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/Fate/Formidable.cs", - "Note": "v0.0.0.21:\r\nLV80 特殊Fate 绘制\r\n激斗畏惧装甲之秘密武器", - "UpdateInfo": "v0.0.0.21: 在蒸汽喷发开启防击退时将销毁击退预测", + "Note": "v0.0.0.3:\r\nLV80 特殊Fate 绘制\r\n激斗畏惧装甲之秘密武器", + "UpdateInfo": "v0.0.0.3 API12", "TerritoryIds": [ 814 ] @@ -320,12 +320,12 @@ { "Name": "灾厄的古塔尼亚之深海讨伐战", "Guid": "f11c3069-d163-41dd-904e-b016cfcf089c", - "Version": "0.0.0.2", + "Version": "0.0.0.3", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/Fate/Archaeotania.cs", - "Note": "v0.0.0.2:\r\nLV80 特殊Fate 绘制\r\n灾厄的古塔尼亚之深海讨伐战", - "UpdateInfo": "", + "Note": "v0.0.0.3:\r\nLV80 特殊Fate 绘制\r\n灾厄的古塔尼亚之深海讨伐战", + "UpdateInfo": "API12", "TerritoryIds": [ 818 ] @@ -333,12 +333,12 @@ { "Name": "兽道诸神信仰：伪神降临", "Guid": "da82aeb0-9635-4f13-a1c1-39a0c859f596", - "Version": "0.0.0.11", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/Fate/Daivadipa.cs", - "Note": "v0.0.0.11:\r\nLV90 特殊Fate 绘制\r\n兽道诸神信仰：伪神降临", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV90 特殊Fate 绘制\r\n兽道诸神信仰：伪神降临", + "UpdateInfo": "API12", "TerritoryIds": [ 957 ] @@ -346,12 +346,12 @@ { "Name": "侵略兵器召回指令：破坏侵略兵器希", "Guid": "b73d07ef-aa90-45a9-ab4b-fc3ccce8791b", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/Fate/Chi.cs", - "Note": "v0.0.0.1:\r\nLV90 特殊Fate 绘制\r\n侵略兵器召回指令：破坏侵略兵器希", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV90 特殊Fate 绘制\r\n侵略兵器召回指令：破坏侵略兵器希", + "UpdateInfo": "API12", "TerritoryIds": [ 960 ] @@ -359,12 +359,12 @@ { "Name": "蛇王得酷热涅：荒野的死斗", "Guid": "ab67129e-880f-48e8-852e-f92b4afa68e5", - "Version": "0.0.0.2", + "Version": "0.0.0.3", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/Fate/Ttokrrone.cs", - "Note": "v0.0.0.2:\r\nLV100 特殊Fate 绘制\r\n蛇王得酷热涅：荒野的死斗", - "UpdateInfo": "", + "Note": "v0.0.0.3:\r\nLV100 特殊Fate 绘制\r\n蛇王得酷热涅：荒野的死斗", + "UpdateInfo": "API12", "TerritoryIds": [ 1190 ] @@ -372,12 +372,12 @@ { "Name": "亩鼠米卡：盛装巡游皆大欢喜", "Guid": "22134617-0ca4-463e-a40d-675ef1c20cf2", - "Version": "0.0.0.11", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/Fate/Mica_the_MagicalMu.cs", - "Note": "v0.0.0.12:\r\nLV100 特殊Fate 绘制\r\n亩鼠米卡：盛装巡游皆大欢喜", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\nLV100 特殊Fate 绘制\r\n亩鼠米卡：盛装巡游皆大欢喜", + "UpdateInfo": "API12", "TerritoryIds": [ 1192 ] diff --git a/TestScriptRepo.json b/TestScriptRepo.json index 8763f3f..7a13799 100644 --- a/TestScriptRepo.json +++ b/TestScriptRepo.json @@ -2,12 +2,12 @@ { "Name": "正统优雷卡", "Guid": "5e8a4051-53f7-4eb3-bb32-b18df8b113aa", - "Version": "0.0.0.1", + "Version": "0.0.0.3", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/Deep_Dungeon/Eureka_Orthos.cs", - "Note": "v0.0.0.1:\r\n正统优雷卡绘制\r\n注：方法设置中的层数仅做分割线效果，并不是批量开关\r\n现支持层数：1~20、71~100\r\n严重错误：暂未支持【缓速】【形态变化】【石化】【眩晕】【催眠】等限制\r\n怪物死亡也暂时没有销毁绘图，先拯救ARR完再说[?]", - "UpdateInfo": "", + "Note": "v0.0.0.3:\r\n正统优雷卡绘制\r\n注：方法设置中的层数仅做分割线效果，并不是批量开关\r\n现支持层数：1~20、71~100\r\n严重错误：暂未支持【缓速】【形态变化】【石化】【眩晕】【催眠】等限制\r\n怪物死亡也暂时没有销毁绘图，先拯救ARR完再说[?]", + "UpdateInfo": "API12", "TerritoryIds": [ 1099, 1100, @@ -24,12 +24,12 @@ { "Name": "禁地优雷卡 - 巴尔德西昂兵武塔", "Guid": "cb001385-81e0-4c16-8bb3-fb51fd70336a", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/Field_Operations/The_Forbidden_Land_Eureka/The_Baldesion_Arsenal.cs", - "Note": "v0.0.0.1:\r\n禁地优雷卡 - 巴尔德西昂兵武塔 初版绘制\r\n【施工中】", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\n禁地优雷卡 - 巴尔德西昂兵武塔 初版绘制\r\n【施工中】", + "UpdateInfo": "API12", "TerritoryIds": [ 827 ] @@ -37,12 +37,12 @@ { "Name": "巴哈姆特大迷宫 - 普通难度", "Guid": "8d41b5f9-0ab6-404a-9572-aabb390023f0", - "Version": "0.0.0.1", + "Version": "0.0.0.2", "Author": "Tetora", "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main", "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/02-A-Realm-Reborn/Raid-Bahamute/T03_T09_T13_for_BLU.cs", - "Note": "v0.0.0.1:\r\n巴哈姆特大迷宫 普通难度绘制\r\n目前支持：T5\r\n计划中：T9 T13", - "UpdateInfo": "", + "Note": "v0.0.0.2:\r\n巴哈姆特大迷宫 普通难度绘制\r\n目前支持：T5\r\n计划中：T9 T13", + "UpdateInfo": "API12", "TerritoryIds": [ 196, 245,