From d0a06b051096e5abc7e0aeb829146ea48984ed3a Mon Sep 17 00:00:00 2001 From: RedAsteroid <123588653+RedAsteroid@users.noreply.github.com> Date: Thu, 4 Jul 2024 23:51:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=B3=9B=E7=94=9F?= =?UTF-8?q?=E8=AE=BA=E8=84=9A=E6=9C=AC=E5=88=9D=E5=A7=8B=E5=A1=94=E6=8C=87?= =?UTF-8?q?=E8=B7=AF=E9=94=99=E8=AF=AF=20=E8=AF=B7=E5=8D=B8=E8=BD=BD?= =?UTF-8?q?=E6=AD=A4=E8=84=9A=E6=9C=AC=E5=90=8E=E9=87=8D=E6=96=B0=E5=AE=89?= =?UTF-8?q?=E8=A3=85=EF=BC=8C=E8=B7=9F=E9=9A=8F=E9=94=99=E8=AF=AF=E6=8C=87?= =?UTF-8?q?=E8=B7=AF=E5=B0=86=E5=AF=BC=E8=87=B4=E7=82=B8=E5=A1=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Endwalker/9-12savage.md | 1 + src/Endwalker/P12S Pangenesis 泛生论.cs | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Endwalker/9-12savage.md b/src/Endwalker/9-12savage.md index 1de60e9..adcd41e 100644 --- a/src/Endwalker/9-12savage.md +++ b/src/Endwalker/9-12savage.md @@ -47,6 +47,7 @@ P9S-P12S Splatoon 预设 个人改版 - [**P12S Pangenesis 泛生论**](https://github.com/RedAsteroid/FFXIV_Triggers/blob/main/src/Endwalker/P12S%20Pangenesis%20%E6%B3%9B%E7%94%9F%E8%AE%BA.cs) - 进本请打开脚本设置初始化**小队列表**并选择**打法(2+1 Game8, 2+0 美服, 2+0 菓子)**，菓子踩塔安排有别于2+0，请正确选择您需要的打法。 + - 2024.07.04 修复了泛生论 2+1、2+0 打法初始塔指路错误，**请卸载此脚本重新安装！否则会发生错误指路，导致炸塔！** # 预设 Presets diff --git a/src/Endwalker/P12S Pangenesis 泛生论.cs b/src/Endwalker/P12S Pangenesis 泛生论.cs index 8d1dfd5..1f43467 100644 --- a/src/Endwalker/P12S Pangenesis 泛生论.cs +++ b/src/Endwalker/P12S Pangenesis 泛生论.cs @@ -28,7 +28,7 @@ namespace SplatoonScriptsOfficial.Duties.Endwalker DebuffType MyDebuff = DebuffType.None; public override HashSet ValidTerritories => new() { 1154 }; - public override Metadata? Metadata => new(4, "tatad2-fra, RedAsteroid ޸"); + public override Metadata? Metadata => new(5, "tatad2-fra, RedAsteroid ޸"); private string ElementNamePrefix = "P12SSC"; private int towerCount = 0; @@ -97,10 +97,9 @@ namespace SplatoonScriptsOfficial.Duties.Endwalker Vector2 blackPos = blackTower.Position.ToVector2(); PluginLog.Information($"wtower: {whiteTower.ObjectId}, blacktower: {blackTower.ObjectId}, casttime: {whiteTower.CurrentCastTime}, {blackTower.CurrentCastTime}, position: {whiteTower.Position.ToVector2().ToString()}, {blackTower.Position.ToVector2().ToString()}"); - PluginLog.Information($": {whiteTower.ObjectId}, : {blackTower.ObjectId}, ӽʱ: {whiteTower.CurrentCastTime}, {blackTower.CurrentCastTime}, λ: {whiteTower.Position.ToVector2().ToString()}, {blackTower.Position.ToVector2().ToString()}"); StatusList statusList = PC.StatusList; - if (statusList.Any(x => x.StatusId == whiteDebuff && x.RemainingTime <= 8) && !(C.Strat == Strat.First_2_0_Ǒ)) + if (statusList.Any(x => x.StatusId == whiteDebuff && x.RemainingTime <= 8) && (C.Strat == Strat.First_2_0 || C.Strat == Strat.First_2_1)) { // short white, go black tower Indicator.refX = blackPos.X; @@ -110,7 +109,7 @@ namespace SplatoonScriptsOfficial.Duties.Endwalker lastTowerBlack = true; MyDebuff = DebuffType.Short_2; } - else if (statusList.Any(x => x.StatusId == whiteDebuff && x.RemainingTime > 8) && !(C.Strat == Strat.First_2_0_Ǒ)) + else if (statusList.Any(x => x.StatusId == whiteDebuff && x.RemainingTime > 8) && (C.Strat == Strat.First_2_0 || C.Strat == Strat.First_2_1)) { // long white, wait int biasX = blackPos.X < 100 ? 5 : -5; @@ -121,7 +120,7 @@ namespace SplatoonScriptsOfficial.Duties.Endwalker lastTowerBlack = true; MyDebuff = DebuffType.Long_2; } - else if (statusList.Any(x => x.StatusId == blackDebuff && x.RemainingTime <= 8) && !(C.Strat == Strat.First_2_0_Ǒ)) + else if (statusList.Any(x => x.StatusId == blackDebuff && x.RemainingTime <= 8) && (C.Strat == Strat.First_2_0 || C.Strat == Strat.First_2_1)) { // short black, go white tower Indicator.refX = whitePos.X; @@ -131,7 +130,7 @@ namespace SplatoonScriptsOfficial.Duties.Endwalker lastTowerBlack = false; MyDebuff = DebuffType.Short_2; } - else if (statusList.Any(x => x.StatusId == blackDebuff && x.RemainingTime > 8) && !(C.Strat == Strat.First_2_0_Ǒ)) + else if (statusList.Any(x => x.StatusId == blackDebuff && x.RemainingTime > 8) && (C.Strat == Strat.First_2_0 || C.Strat == Strat.First_2_1)) { // long black, wait int biasX = whitePos.X < 100 ? 5 : -5; @@ -143,7 +142,7 @@ namespace SplatoonScriptsOfficial.Duties.Endwalker MyDebuff = DebuffType.Long_2; } // Ǒ2+0ħ - if (statusList.Any(x => x.StatusId == whiteDebuff && x.RemainingTime <= 8) && (C.Strat == Strat.First_2_0_Ǒ)) + else if (statusList.Any(x => x.StatusId == whiteDebuff && x.RemainingTime <= 8) && (C.Strat == Strat.First_2_0_Ǒ)) { // short white, go black tower Indicator.refX = blackPos.X; @@ -397,8 +396,10 @@ namespace SplatoonScriptsOfficial.Duties.Endwalker { ImGui.SetNextItemWidth(200f); ImGuiEx.EnumCombo("ѡ", ref C.Strat); // Select strat - ImGui.Text("ʹǰDebug2гʼ飬СӳԱΪȷְ"); - ImGui.Text("ʹǑӹԷ۲ \"ѡ\" л"); + ImGui.Text("ʹǰDebug2гʼ飬СӳԱΪȷְܣ"); + ImGui.Text("ë(Game8)ѡ First 2 12+0ѡ First 2 0ǑӴѡ First 2 0 Ǒ"); + ImGui.Text("\n޸ 2+1 2+0 򷨳ָ· - 2024.07.04"); + if (ImGui.CollapsingHeader("Debug")) {