diff --git a/Presets/Dawntrail/Raids/The Arcadion 4 Savage.md b/Presets/Dawntrail/Raids/The Arcadion 4 Savage.md index 8cb49a92..d88ad059 100644 --- a/Presets/Dawntrail/Raids/The Arcadion 4 Savage.md +++ b/Presets/Dawntrail/Raids/The Arcadion 4 Savage.md @@ -45,7 +45,8 @@ Configuration: - **Add 1 to long debuff bearers:** Adds an extra count if you have a long debuff because the mechanic in between the two sets of explosions "adds 1." _It's recommended to check this because all of the known strategies add 1 count to long debuffs._ - **Resolve safe spots:** Creates a tether to your configured safe spot when it's your turn to explode. Refer to [this RaidPlan](https://raidplan.io/plan/yMwb_GE5-EzMo6Ei) for suggested safe spots, but check which your party is using. -- **Show much/few:** (not pictured) Adds additional text next to the number displayed on your character. **Much** shows when you are a 3 + short debuff or 2 + long debuff and **few** shows when you are a 2 + short debuff or 1 + long debuff. _It is recommended to leave this unchecked to avoid confusion._ +- **Show much/few:** Adds additional text next to the number displayed on your character. **Much** shows when you are a 3 + short debuff or 2 + long debuff and **few** shows when you are a 2 + short debuff or 1 + long debuff. _It is recommended to leave this unchecked to avoid confusion._ +- **Sidewise Spark:** Shows you a tether to the position you should be in when resolving Sidewise Spark, depending on how many times you were hit by Witchgleam. The possible positions are: **North**, **Inside**, **South**, and **Side**. If you're using [this RaidPlan](https://raidplan.io/plan/yMwb_GE5-EzMo6Ei) and are playing as a DPS, for instance, you should select **Inside** for _2 short / 1 long_ and **Side** for _3 short / 2 long_. Set the option to **None** to hide the tethers. ![R4S Electrope Edge Script Instructions](/docs/images/instructions/dawntrail/raids/R4S_2.png) diff --git a/SplatoonScripts/Duties/Dawntrail/R4S Electrope Edge.cs b/SplatoonScripts/Duties/Dawntrail/R4S Electrope Edge.cs index 223aa098..3cb14dac 100644 --- a/SplatoonScripts/Duties/Dawntrail/R4S Electrope Edge.cs +++ b/SplatoonScripts/Duties/Dawntrail/R4S Electrope Edge.cs @@ -37,7 +37,7 @@ public enum SidewiseSparkPosition : byte public override HashSet? ValidTerritories { get; } = [1232]; - public override Metadata? Metadata => new(6, "NightmareXIV"); + public override Metadata? Metadata => new(7, "NightmareXIV"); List Hits = []; List Longs = []; uint Debuff = 3999; @@ -194,13 +194,13 @@ public override void OnSettingsDraw() { ImGui.SetNextItemWidth(150f); ImGui.Checkbox("Add 1 to long debuff bearers", ref C.AddOne); - ImGuiEx.HelpMarker("If you have long debuff, visually will add 1 to it's count. Does not affects actual functions of the script."); + ImGuiEx.HelpMarker("If you have a long debuff, this will visually add 1 to its count. It does not affect the actual function of the script"); ImGui.Checkbox("Show much/few.", ref C.showMuchFew); - ImGuiEx.HelpMarker("If selected, In addition to short and long, display much and few."); + ImGuiEx.HelpMarker("If selected, in addition to short and long, it will display \"much\" and \"few\". This indicator is used primarily in Japan, so don't set this if you don't recognize it"); if(C.showMuchFew) { ImGui.Indent(); - ImGui.TextWrapped("You can change the string to be displayed instead of much and few."); + ImGui.TextWrapped("Change the displayed text from \"much\" and \"few\":"); ImGui.SetNextItemWidth(150f); ImGui.InputText("Much", ref C.stringMuch, 100); ImGui.SetNextItemWidth(150f); @@ -209,7 +209,7 @@ public override void OnSettingsDraw() } ImGui.Checkbox("Resolve safe spots", ref C.ResolveBox); - ImGuiEx.HelpMarker("If selected, these safe spots will be highlighted when it's time for you to explode."); + ImGuiEx.HelpMarker("If selected, these safe spots will be highlighted when it's time for you to explode"); if(C.ResolveBox) { diff --git a/SplatoonScripts/update.csv b/SplatoonScripts/update.csv index 280161bc..3d0875ce 100644 --- a/SplatoonScripts/update.csv +++ b/SplatoonScripts/update.csv @@ -48,7 +48,7 @@ SplatoonScriptsOfficial.Duties.Dawntrail@R1S_Multiscript,3,https://github.com/Pu SplatoonScriptsOfficial.Duties.Dawntrail@R1S_Protean_Highlight,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/R1S Protean Highlight.cs SplatoonScriptsOfficial.Duties.Dawntrail@EX2_Projection_of_Triumph,3,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/EX2 Projection of Triumph.cs SplatoonScriptsOfficial.Duties.Dawntrail@R4S_Unsafe_Cannon,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/R4S Unsafe Cannon.cs -SplatoonScriptsOfficial.Duties.Dawntrail@R4S_Electrope_Edge,6,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/R4S Electrope Edge.cs +SplatoonScriptsOfficial.Duties.Dawntrail@R4S_Electrope_Edge,7,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/R4S Electrope Edge.cs SplatoonScriptsOfficial.Duties.Dawntrail@R4S_Witch_Hunt,4,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/R4S Witch Hunt.cs SplatoonScriptsOfficial.Duties.Dawntrail@R4S_Midnight_Sabbath,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/R4S Midnight Sabbath.cs SplatoonScriptsOfficial.Duties.Dawntrail@R4S_Sunrise_Sabbath,5,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/R4S Sunrise Sabbath.cs diff --git a/docs/images/instructions/dawntrail/raids/R4S_2.png b/docs/images/instructions/dawntrail/raids/R4S_2.png index 52d4f681..34a1058c 100644 Binary files a/docs/images/instructions/dawntrail/raids/R4S_2.png and b/docs/images/instructions/dawntrail/raids/R4S_2.png differ