Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
fix: fixed raising using in macro.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Apr 30, 2023
1 parent ca4f4af commit 7f8233f
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 4 deletions.
26 changes: 26 additions & 0 deletions Resources/AnimationLockTime.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,16 @@
"3593": 0.6,
"3595": 0.6,
"3596": 0.1,
"3598": 0.1,
"3599": 0.6,
"3600": 0.1,
"3601": 0.1,
"3603": 0.6,
"3606": 0.6,
"3608": 0.6,
"3610": 0.1,
"3612": 0.6,
"3613": 0.6,
"3614": 0.6,
"3615": 0.1,
"4401": 0.6,
Expand Down Expand Up @@ -65,8 +70,26 @@
"7560": 0.6,
"7561": 0.6,
"7562": 0.6,
"7568": 0.1,
"9793": 0.1,
"12260": 0.1,
"16137": 0.6,
"16138": 0.6,
"16139": 0.6,
"16142": 0.6,
"16145": 0.6,
"16146": 0.70000005,
"16147": 0.5,
"16150": 0.77000004,
"16153": 0.6,
"16154": 0.6,
"16156": 0.6,
"16157": 0.6,
"16158": 0.6,
"16159": 0.6,
"16162": 0.6,
"16164": 0.6,
"16165": 0.6,
"16462": 0.6,
"16464": 0.6,
"16505": 0.1,
Expand All @@ -75,10 +98,13 @@
"16525": 0.1,
"16527": 0.6,
"16552": 0.6,
"16553": 0.6,
"20243": 0.1,
"25751": 0.6,
"25752": 0.6,
"25753": 1.15,
"25759": 0.6,
"25760": 0.6,
"25796": 0.6,
"25797": 0.6,
"25870": 0.6
Expand Down
2 changes: 1 addition & 1 deletion RotationSolver.Basic/Rotations/CustomRotation_GCD.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ private bool RaiseSpell(SpecialCommandType specialType, out IAction act, bool mu

if (specialType == SpecialCommandType.RaiseShirk && DataCenter.DeathPeopleAll.Any())
{
return true;
if (Raise.CanUse(out act)) return true;
}

if ((Service.Config.RaiseAll ? DataCenter.DeathPeopleAll.Any() : DataCenter.DeathPeopleParty.Any())
Expand Down
3 changes: 0 additions & 3 deletions RotationSolver/Updaters/SocialUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,8 @@ private static async void SayHelloToAuthor()
await Task.Delay(100);
}

#if DEBUG
#else
Service.TargetManager.SetTarget(author.c);
Service.SubmitToChat($"/{_macroToAuthor[new Random().Next(_macroToAuthor.Count)]} <t>");
#endif
var message = new SeString(new IconPayload(BitmapFontIcon.Mentor),

new UIForegroundPayload(31),
Expand Down

0 comments on commit 7f8233f

Please sign in to comment.