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

Commit

Permalink
fix: add restrict about animation timeline.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ArchiDog1998
ArchiDog1998 committed Apr 28, 2023
1 parent a498ef4 commit bf0e33e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 343 deletions.
341 changes: 1 addition & 340 deletions Resources/AnimationLockTime.json
View file
Original file line number Diff line number Diff line change
@@ -1,340 +1 @@
{
"3": 0.6,
"5": 2.1,
"9": 0.6,
"15": 0.6,
"16": 0.6,
"20": 0.6,
"23": 0.6,
"28": 0.6,
"31": 0.6,
"37": 0.6,
"40": 0.6,
"42": 0.6,
"45": 0.6,
"46": 0.6,
"48": 0.6,
"52": 0.6,
"53": 0.6,
"54": 0.6,
"56": 0.6,
"61": 0.6,
"66": 0.6,
"69": 0.6,
"74": 0.6,
"75": 0.6,
"78": 0.6,
"83": 0.6,
"85": 0.6,
"87": 0.6,
"95": 0.8,
"96": 0.8,
"101": 0.6,
"107": 0.6,
"110": 0.6,
"114": 0.6,
"118": 0.6,
"120": 0.1,
"121": 0.6,
"124": 0.1,
"125": 0.6,
"127": 0.1,
"131": 0.1,
"132": 0.6,
"133": 0.1,
"135": 0.1,
"136": 0.6,
"137": 0.6,
"139": 0.1,
"140": 0.6,
"141": 0.1,
"149": 0.6,
"152": 0.1,
"153": 0.6,
"154": 0.1,
"156": 0.6,
"158": 0.6,
"167": 0.6,
"181": 0.6,
"185": 0.1,
"190": 0.1,
"260": 0.6,
"1128": 2.1,
"1129": 2.1,
"2240": 0.6,
"2242": 0.6,
"2248": 0.6,
"2255": 0.6,
"2258": 0.6,
"2259": 0.35,
"2264": 0.6,
"2267": 0.6,
"2271": 0.6,
"2469": 0.6,
"2470": 0.6,
"2874": 0.6,
"2876": 0.6,
"2878": 0.6,
"2890": 0.6,
"3538": 0.6,
"3539": 0.6,
"3545": 0.6,
"3546": 0.6,
"3547": 0.6,
"3549": 0.6,
"3554": 0.6,
"3555": 0.6,
"3556": 0.6,
"3557": 0.6,
"3558": 0.6,
"3559": 0.6,
"3560": 0.6,
"3562": 0.6,
"3563": 0.6,
"3566": 0.6,
"3573": 0.6,
"3574": 0.6,
"3576": 0.1,
"3577": 0.1,
"3579": 0.1,
"3582": 0.6,
"3587": 0.6,
"3590": 0.6,
"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,
"3614": 0.6,
"3615": 0.1,
"3617": 0.6,
"3621": 0.6,
"3623": 0.6,
"3624": 0.6,
"3625": 0.6,
"3629": 0.6,
"3632": 0.6,
"3639": 0.6,
"3640": 0.6,
"3643": 0.6,
"4262": 0.6,
"4401": 0.6,
"4402": 0.6,
"4403": 0.6,
"4404": 0.6,
"4405": 0.6,
"4406": 0.6,
"4574": 0.6,
"4582": 0.6,
"4639": 0.6,
"7383": 0.6,
"7384": 0.6,
"7386": 0.6,
"7387": 0.6,
"7389": 0.6,
"7390": 0.6,
"7392": 0.6,
"7395": 0.6,
"7396": 0.6,
"7398": 0.6,
"7399": 0.6,
"7400": 0.6,
"7402": 0.6,
"7403": 0.6,
"7404": 0.6,
"7406": 0.6,
"7407": 0.6,
"7409": 0.6,
"7410": 0.6,
"7411": 0.6,
"7412": 0.6,
"7413": 0.6,
"7414": 0.6,
"7419": 0.8,
"7421": 0.6,
"7426": 0.6,
"7427": 0.6,
"7429": 0.6,
"7436": 0.6,
"7477": 0.6,
"7478": 0.6,
"7479": 0.6,
"7480": 0.6,
"7481": 0.6,
"7482": 0.6,
"7486": 0.6,
"7487": 0.1,
"7489": 0.1,
"7490": 0.6,
"7499": 0.6,
"7503": 0.1,
"7505": 0.6,
"7506": 0.6,
"7507": 0.6,
"7509": 0.6,
"7510": 0.1,
"7511": 0.1,
"7517": 0.6,
"7518": 0.6,
"7527": 0.6,
"7528": 0.6,
"7529": 0.6,
"7541": 0.6,
"7542": 0.6,
"7546": 0.6,
"7548": 0.6,
"7557": 0.6,
"7559": 0.6,
"7560": 0.6,
"7561": 0.6,
"7562": 0.6,
"7568": 2.1,
"9826": 0.1,
"10084": 2.1,
"13704": 2.1,
"13706": 2.1,
"13707": 2.1,
"14971": 1.1,
"15818": 2.1,
"15989": 0.6,
"15990": 0.6,
"15991": 0.6,
"15992": 0.6,
"15997": 0.6,
"15999": 0.6,
"16000": 0.6,
"16007": 0.6,
"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,
"16192": 0.6,
"16459": 0.6,
"16460": 0.6,
"16461": 0.6,
"16465": 0.6,
"16469": 0.6,
"16470": 0.6,
"16472": 0.6,
"16478": 0.8,
"16479": 0.6,
"16480": 1.5,
"16489": 0.6,
"16493": 0.6,
"16495": 0.6,
"16498": 0.6,
"16500": 0.6,
"16501": 0.6,
"16505": 0.1,
"16508": 0.6,
"16514": 0.6,
"16516": 0.6,
"16524": 0.1,
"16525": 0.1,
"16527": 0.6,
"16540": 0.6,
"16552": 0.6,
"17209": 0.6,
"17215": 0.1,
"18806": 0.35,
"18807": 0.35,
"18873": 0.6,
"18877": 0.6,
"18881": 0.6,
"19004": 0.6,
"19012": 0.6,
"19297": 0.6,
"20667": 2.1,
"22378": 2.1,
"22379": 2.1,
"22380": 2.1,
"22497": 2.1,
"24001": 2.1,
"24284": 0.1,
"24285": 0.6,
"24290": 0.6,
"24291": 0.6,
"24294": 0.6,
"24300": 0.6,
"24309": 0.6,
"24312": 0.1,
"24313": 0.6,
"24314": 0.6,
"24317": 0.6,
"24373": 0.6,
"24374": 0.6,
"24375": 0.6,
"24378": 0.6,
"24380": 0.6,
"24382": 0.6,
"24383": 0.6,
"24385": 0.6,
"24387": 0.6,
"24390": 0.6,
"24391": 0.6,
"24393": 0.6,
"24405": 0.6,
"24801": 2.1,
"25746": 0.6,
"25747": 0.6,
"25748": 0.6,
"25749": 0.6,
"25750": 0.6,
"25753": 1.15,
"25755": 0.6,
"25756": 0.6,
"25757": 0.6,
"25759": 0.6,
"25760": 0.6,
"25766": 0.6,
"25768": 0.6,
"25771": 0.6,
"25772": 0.6,
"25773": 0.6,
"25774": 0.6,
"25778": 0.6,
"25785": 0.6,
"25788": 0.6,
"25797": 0.1,
"25798": 0.1,
"25801": 0.6,
"25820": 0.6,
"25823": 0.1,
"25824": 0.6,
"25825": 0.6,
"25830": 0.6,
"25831": 0.6,
"25835": 0.75,
"25836": 0.6,
"25837": 0.1,
"25838": 0.6,
"25839": 0.6,
"25840": 0.6,
"25865": 0.1,
"25870": 0.6,
"25876": 0.6,
"25885": 0.6,
"27970": 2.1,
"31404": 2.1,
"32850": 2.1
}
{}
2 changes: 1 addition & 1 deletion RotationSolver.Basic/Helpers/IActionHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace RotationSolver.Basic.Helpers;

public static class IActionHelper
{
public static SortedList<uint, float> AnimationLockTime = new SortedList<uint, float>();
public static SortedList<uint, float> AnimationLockTime { get; private set; } = new SortedList<uint, float>();

public static async void GetAnimationLockTimeAsync(string directory)
{
Expand Down
2 changes: 1 addition & 1 deletion RotationSolver/Localization/Localization.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,6 @@
"OverheatedEndAfterGCD": "OverheatedEndAfterGCD",
"Chakra": "Chakra"
},
"HighEndWarning": "You'd better not use Rotation Solver in {0}!",
"HighEndWarning": "Please separately keybind damage reduction / shield cooldowns in case RS fails at a crucial moment in {0}!",
"HighEndBan": "{0} can not be used in High-end Duty!"
}
5 changes: 4 additions & 1 deletion RotationSolver/Watcher.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ private static void ActionFromSelf(uint sourceId, ActionEffectSet set, uint id)
if (set.Type != ActionType.Spell && set.Type != ActionType.Item) return;
if ((ActionCate)set.Action?.ActionCategory.Value.RowId == ActionCate.AutoAttack) return;

DateTime.Now.AddSeconds(IActionHelper.AnimationLockTime[id] = set.AnimationLock);
if(set.Action.ClassJob.Row > 0)
{
IActionHelper.AnimationLockTime[id] = set.AnimationLock;
}

if (!set.TargetEffects.Any()) return;
var flag = set.TargetEffects.FirstOrDefault()[0].Param2;
Expand Down

0 comments on commit bf0e33e

Please sign in to comment.