yarukon
/
FFXIV_Triggers
mirror of https://github.com/RedAsteroid/FFXIV_Triggers
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复 泛生论脚本初始塔指路错误 

请卸载此脚本后重新安装，跟随错误指路将导致炸塔
duplicate
RedAsteroid 2024-07-04 23:51:03 +08:00
parent df81895a6e
commit d0a06b0510
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Endwalker/9-12savage.md
View File

@ -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) - [**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，请正确选择您需要的打法。 - 进本请打开脚本设置初始化**小队列表**并选择**打法(2+1 Game8, 2+0 美服, 2+0 菓子)**，菓子踩塔安排有别于2+0，请正确选择您需要的打法。
- 2024.07.04 修复了泛生论 2+1、2+0 打法初始塔指路错误，**请卸载此脚本重新安装！否则会发生错误指路，导致炸塔！**
# 预设 Presets # 预设 Presets

19
src/Endwalker/P12S Pangenesis 泛生论.cs
View File

@ -28,7 +28,7 @@ namespace SplatoonScriptsOfficial.Duties.Endwalker
DebuffType MyDebuff = DebuffType.None; DebuffType MyDebuff = DebuffType.None;
public override HashSet<uint> ValidTerritories => new() { 1154 }; public override HashSet<uint> 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 string ElementNamePrefix = "P12SSC";
private int towerCount = 0; private int towerCount = 0;
@ -97,10 +97,9 @@ namespace SplatoonScriptsOfficial.Duties.Endwalker
Vector2 blackPos = blackTower.Position.ToVector2(); 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($"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; 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 // short white, go black tower
Indicator.refX = blackPos.X; Indicator.refX = blackPos.X;
@ -110,7 +109,7 @@ namespace SplatoonScriptsOfficial.Duties.Endwalker
lastTowerBlack = true; lastTowerBlack = true;
MyDebuff = DebuffType.Short_2; 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 // long white, wait
int biasX = blackPos.X < 100 ? 5 : -5; int biasX = blackPos.X < 100 ? 5 : -5;
@ -121,7 +120,7 @@ namespace SplatoonScriptsOfficial.Duties.Endwalker
lastTowerBlack = true; lastTowerBlack = true;
MyDebuff = DebuffType.Long_2; 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 // short black, go white tower
Indicator.refX = whitePos.X; Indicator.refX = whitePos.X;
@ -131,7 +130,7 @@ namespace SplatoonScriptsOfficial.Duties.Endwalker
lastTowerBlack = false; lastTowerBlack = false;
MyDebuff = DebuffType.Short_2; 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 // long black, wait
int biasX = whitePos.X < 100 ? 5 : -5; int biasX = whitePos.X < 100 ? 5 : -5;
@ -143,7 +142,7 @@ namespace SplatoonScriptsOfficial.Duties.Endwalker
MyDebuff = DebuffType.Long_2; MyDebuff = DebuffType.Long_2;
} }
// Ç‘×Ó2+0ħ¸Ä // Ç‘×Ó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 // short white, go black tower
Indicator.refX = blackPos.X; Indicator.refX = blackPos.X;
@ -397,8 +396,10 @@ namespace SplatoonScriptsOfficial.Duties.Endwalker
{ {
ImGui.SetNextItemWidth(200f); ImGui.SetNextItemWidth(200f);
ImGuiEx.EnumCombo("Ñ¡Ôñ´ò·¨", ref C.Strat); // Select strat ImGuiEx.EnumCombo("Ñ¡Ôñ´ò·¨", ref C.Strat); // Select strat
ImGui.Text("使用前请在Debug2中初始化队伍，调整小队成员为正确的职能"); ImGui.Text("使用前请在Debug2中初始化队伍，调整小队成员为正确的职能！");
ImGui.Text("如果您使用菓子攻略泛生论踩塔，请务必在 \"选择打法\" 中切换！！！"); ImGui.Text("绿毛肥(Game8)打法请选择 First 2 1，2+0打法请选择 First 2 0，菓子打法请选择 First 2 0 菓子");
ImGui.Text("\n修复 2+1 、2+0 打法初次塔指路错误 - 2024.07.04");
if (ImGui.CollapsingHeader("Debug")) if (ImGui.CollapsingHeader("Debug"))
{ {