Skip to content

Commit

Permalink
Merge pull request #457 from FFXIV-CombatReborn/resource-update
Browse files Browse the repository at this point in the history
Update various JSON files with new and modified entries
  • Loading branch information
LTS-FFXIV authored Dec 2, 2024
2 parents 8c159ae + 9eb1a17 commit d365f6b
Show file tree
Hide file tree
Showing 7 changed files with 210 additions and 14 deletions.
137 changes: 126 additions & 11 deletions Resources/AnimationLockTime.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"85": 0.6,
"87": 0.6,
"90": 0.6,
"94": 0.8,
"95": 0.8,
"96": 0.8,
"97": 0.6,
Expand All @@ -51,6 +52,7 @@
"106": 0.6,
"107": 0.6,
"110": 0.6,
"112": 0.8,
"113": 0.6,
"114": 0.6,
"116": 0.6,
Expand All @@ -75,7 +77,9 @@
"152": 0.6,
"153": 0.1,
"154": 0.1,
"155": 0.8,
"156": 0.6,
"157": 0.6,
"158": 0.6,
"159": 0.1,
"162": 0.1,
Expand All @@ -88,10 +92,17 @@
"189": 0.6,
"190": 0.1,
"210": 0.6,
"215": 0.6,
"218": 0.6,
"220": 0.6,
"221": 0.6,
"224": 0.6,
"227": 0.6,
"232": 0.6,
"235": 0.6,
"237": 0.6,
"238": 0.6,
"239": 0.6,
"241": 0.6,
"260": 0.6,
"261": 0.6,
Expand All @@ -100,8 +111,13 @@
"264": 0.6,
"265": 0.6,
"266": 0.6,
"267": 0.6,
"272": 0.6,
"273": 0.6,
"290": 0.6,
"295": 0.6,
"1694": 0.1,
"1695": 2.1,
"2240": 0.6,
"2241": 0.6,
"2242": 0.6,
Expand All @@ -116,6 +132,9 @@
"2267": 0.6,
"2269": 0.6,
"2271": 0.6,
"2469": 0.6,
"2470": 0.6,
"2471": 0.6,
"2864": 0.6,
"2874": 0.6,
"2876": 0.6,
Expand Down Expand Up @@ -185,7 +204,11 @@
"3640": 0.6,
"3641": 0.6,
"3643": 0.6,
"4100": 0.6,
"4101": 0.6,
"4239": 3.1,
"4244": 3.6999998,
"4245": 3.6999998,
"4262": 0.6,
"4401": 0.6,
"4402": 0.6,
Expand All @@ -202,14 +225,24 @@
"4579": 0.6,
"4580": 0.6,
"4581": 0.6,
"4582": 0.6,
"4594": 1.1,
"4595": 0.6,
"4596": 0.6,
"4631": 0.6,
"4632": 0.6,
"4633": 0.6,
"4634": 0.6,
"4637": 0.6,
"4638": 0.6,
"4639": 0.6,
"4640": 0.6,
"4641": 0.6,
"4642": 0.6,
"4643": 0.6,
"4644": 0.6,
"4868": 2.1,
"6297": 2.6,
"6993": 2.1,
"7381": 0.6,
"7382": 0.6,
Expand Down Expand Up @@ -312,6 +345,7 @@
"7549": 0.6,
"7551": 0.6,
"7552": 0.1,
"7554": 0.6,
"7557": 0.6,
"7559": 0.6,
"7560": 0.6,
Expand All @@ -321,8 +355,12 @@
"7571": 0.6,
"7863": 0.6,
"7869": 0.6,
"7903": 0.6,
"7905": 0.6,
"7906": 0.6,
"7909": 0.6,
"7910": 0.6,
"7911": 0.6,
"8166": 2.1,
"8341": 0.1,
"8570": 0.1,
Expand All @@ -335,7 +373,11 @@
"11406": 0.1,
"11411": 0.1,
"11423": 0.6,
"11426": 0.6,
"11427": 0.6,
"11429": 0.6,
"11430": 0.6,
"11500": 2.6,
"12260": 0.1,
"12669": 1.1,
"12911": 0.6,
Expand Down Expand Up @@ -381,6 +423,7 @@
"16141": 0.6,
"16142": 0.6,
"16143": 0.6,
"16144": 0.6,
"16145": 0.6,
"16146": 0.70000005,
"16147": 0.5,
Expand All @@ -407,6 +450,8 @@
"16461": 0.6,
"16462": 0.6,
"16464": 0.6,
"16466": 0.6,
"16467": 0.6,
"16469": 0.6,
"16470": 0.6,
"16471": 0.6,
Expand Down Expand Up @@ -469,11 +514,14 @@
"17842": 2.1,
"17843": 2.1,
"18073": 0.6,
"18188": 2.6,
"18303": 0.1,
"18308": 0.1,
"18309": 0.1,
"18318": 0.1,
"18322": 0.1,
"18323": 0.6,
"18325": 0.90000004,
"18873": 0.6,
"18877": 0.6,
"18881": 0.6,
Expand Down Expand Up @@ -503,6 +551,9 @@
"19302": 0.6,
"19303": 0.6,
"19304": 0.6,
"19700": 2.1,
"20031": 2.6,
"20122": 2.6,
"20243": 0.1,
"20245": 0.1,
"20250": 0.1,
Expand All @@ -517,6 +568,8 @@
"20727": 0.6,
"21052": 2.1,
"21054": 2.1,
"21177": 0.6,
"21178": 0.6,
"21206": 0.6,
"21282": 2.1,
"21291": 2.1,
Expand All @@ -539,11 +592,14 @@
"23048": 0.1,
"23264": 0.1,
"23284": 0.1,
"23288": 0.6,
"23290": 0.6,
"23317": 2.1,
"23915": 0.1,
"23986": 2.1,
"24222": 2.1,
"24235": 2.1,
"24280": 2.1,
"24283": 0.1,
"24284": 0.1,
"24285": 0.6,
Expand Down Expand Up @@ -609,6 +665,8 @@
"25063": 2.1,
"25064": 2.1,
"25065": 2.1,
"25589": 0.6,
"25590": 0.6,
"25746": 0.6,
"25747": 0.6,
"25748": 0.6,
Expand Down Expand Up @@ -679,12 +737,14 @@
"25875": 0.6,
"25882": 0.6,
"25885": 0.6,
"26521": 0.6,
"26762": 0.1,
"26768": 0.1,
"26791": 2.1,
"26798": 2.1,
"26802": 2.1,
"26804": 0.6,
"26988": 0.6,
"27524": 0.1,
"28619": 2.1,
"28662": 0.1,
Expand All @@ -693,29 +753,47 @@
"28901": 2.1,
"28917": 2.1,
"28924": 2.1,
"29054": 0.6,
"29056": 0.6,
"29054": 0.46499997,
"29056": 0.24499997,
"29223": 0.1,
"29224": 0.1,
"29226": 0.6,
"29228": 0.6,
"29234": 0.1,
"29236": 0.1,
"29237": 0.1,
"29247": 0.1,
"29248": 0.1,
"29255": 0.33899978,
"29391": 0.1,
"29392": 0.6,
"29393": 0.6,
"29394": 0.6,
"29395": 0.6,
"29395": 0.1,
"29396": 0.6,
"29397": 0.6,
"29398": 0.6,
"29399": 0.6,
"29400": 0.6,
"29401": 2.5,
"29399": 0.1,
"29400": 0.1,
"29401": 0.1,
"29409": 0.6,
"29410": 0.1,
"29411": 0.1,
"29414": 0.6,
"29415": 2.9299998,
"29481": 0.1,
"29482": 0.1,
"29483": 0.1,
"29484": 0.24099997,
"29485": 0.4190002,
"29709": 0.1,
"29711": 0.6,
"29711": 0.37399998,
"29716": 0.1,
"29731": 0.1,
"29732": 0.6,
"29733": 0.6,
"30800": 0.1,
"31116": 2.6,
"31323": 2.1,
"31338": 2.1,
"31929": 0.1,
Expand All @@ -729,7 +807,9 @@
"33337": 0.1,
"33341": 0.1,
"33708": 2.1,
"33863": 0.6,
"33907": 2.1,
"34582": 0.6,
"34634": 0.6,
"34635": 0.6,
"34636": 0.6,
Expand All @@ -752,20 +832,23 @@
"34675": 0.6,
"34676": 0.6,
"34677": 0.6,
"34682": 0.1,
"34683": 0.6,
"34684": 0.8,
"34685": 0.6,
"34686": 0.6,
"34711": 0.1,
"35663": 0.1,
"36623": 0.1,
"36059": 2.6,
"36623": 0.10999995,
"36920": 0.6,
"36921": 0.6,
"36922": 0.6,
"36923": 0.6,
"36924": 0.6,
"36926": 0.6,
"36927": 0.6,
"36934": 0.6,
"36935": 0.6,
"36936": 0.6,
"36951": 0.6,
Expand All @@ -778,6 +861,11 @@
"36975": 0.6,
"36979": 0.6,
"36980": 0.6,
"36988": 0.6,
"36990": 0.6,
"36991": 0.6,
"36996": 0.6,
"36998": 0.6,
"37005": 0.6,
"37008": 0.70000005,
"37011": 0.6,
Expand All @@ -786,12 +874,39 @@
"37017": 0.6,
"37018": 0.6,
"37023": 0.6,
"37024": 0.6,
"37026": 0.6,
"37028": 0.6,
"37029": 0.6,
"37033": 0.6,
"37035": 0.6,
"37157": 0.1,
"39177": 0.6,
"39184": 0.6,
"39190": 1.62
"37173": 2.6,
"37174": 2.6,
"39174": 0.1,
"39177": 0.28699997,
"39178": 1.4410001,
"39179": 0.28699997,
"39180": 0.33199996,
"39181": 0.24199995,
"39182": 0.42099997,
"39184": 0.28699997,
"39185": 0.46499994,
"39187": 0.1,
"39189": 0.1,
"39190": 1.0830002,
"40109": 2.6,
"40110": 2.6,
"40111": 2.6,
"41467": 0.112999976,
"41494": 0.1,
"41496": 0.1,
"41498": 0.15499976,
"41502": 0.1,
"41503": 0.1,
"41504": 0.1,
"41505": 0.1,
"41506": 0.46699998,
"41507": 0.46499994,
"41508": 0.1
}
5 changes: 4 additions & 1 deletion Resources/BeneficialPositions.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,8 @@
],
"981": [],
"1064": [],
"1062": []
"1062": [],
"1209": [],
"130": [],
"171": []
}
Loading

0 comments on commit d365f6b

Please sign in to comment.