diff --git a/api/analysis.php b/api/analysis.php index 088e3a2..ad48db3 100644 --- a/api/analysis.php +++ b/api/analysis.php @@ -88,10 +88,12 @@ const MITIGATION_ABILITIES = [ 'Dark Missionary' => ['dr' => 10, 'buffType' => 'buff', 'statusId' => 1001894, 'extraAbilityGameID' => 16471], 'Heart of Light' => ['dr' => 10, 'buffType' => 'buff', 'statusId' => 1001839, 'extraAbilityGameID' => 16160], 'Temperance' => ['dr' => 10, 'buffType' => 'buff', 'statusId' => 1001873, 'extraAbilityGameID' => 16536], + 'Aquaveil' => ['dr' => 15, 'buffType' => 'buff', 'statusId' => 1002708, 'extraAbilityGameID' => 25861], // Personal, WHM auf Ziel 'Sacred Soil' => ['dr' => 10, 'buffType' => 'buff', 'statusId' => 1001944, 'extraAbilityGameID' => 188], 'Expedient' => ['dr' => 10, 'buffType' => 'buff', 'statusId' => 1002711, 'extraAbilityGameID' => 25868], // FFLogs: "Desperate Measures" 'Fey Illumination' => ['dr' => 5, 'buffType' => 'buff', 'statusId' => 1000317, 'extraAbilityGameID' => 16538], 'Collective Unconscious' => ['dr' => 10, 'buffType' => 'buff', 'statusId' => 1000849, 'extraAbilityGameID' => 3613], + 'Exaltation' => ['dr' => 10, 'buffType' => 'buff', 'statusId' => 1002717, 'extraAbilityGameID' => 25873], // Personal, AST auf Ziel 'Holos' => ['dr' => 10, 'buffType' => 'buff', 'statusId' => 1003003, 'extraAbilityGameID' => 24310], 'Kerachole' => ['dr' => 10, 'buffType' => 'buff', 'statusId' => 1002618, 'extraAbilityGameID' => 24298], 'Troubadour' => ['dr' => 15, 'buffType' => 'buff', 'statusId' => 1001934, 'extraAbilityGameID' => 7405], @@ -106,12 +108,15 @@ const MITIGATION_ABILITIES = [ 'Bulwark' => ['dr' => 0, 'buffType' => 'buff', 'extraAbilityGameID' => 22], 'Holy Sheltron' => ['dr' => 15, 'buffType' => 'buff', 'extraAbilityGameID' => 25746], 'Intervention' => ['dr' => 10, 'buffType' => 'buff', 'extraAbilityGameID' => 7382], + 'Knight\'s Resolve' => ['dr' => 10, 'buffType' => 'buff', 'statusId' => 1002675, 'extraAbilityGameID' => 7382], // Proc von Intervention // WAR 'Holmgang' => ['dr' => 0, 'buffType' => 'buff', 'extraAbilityGameID' => 43], 'Vengeance' => ['dr' => 30, 'buffType' => 'buff', 'extraAbilityGameID' => 44], 'Damnation' => ['dr' => 40, 'buffType' => 'buff', 'extraAbilityGameID' => 36923], 'Thrill of Battle' => ['dr' => 0, 'buffType' => 'buff', 'extraAbilityGameID' => 40], 'Raw Intuition' => ['dr' => 10, 'buffType' => 'buff', 'extraAbilityGameID' => 3551], + 'Nascent Glint' => ['dr' => 10, 'buffType' => 'buff', 'statusId' => 1001858, 'extraAbilityGameID' => 16464], // Proc von Nascent Flash auf Ziel + 'Stem the Flow' => ['dr' => 10, 'buffType' => 'buff', 'statusId' => 1002679, 'extraAbilityGameID' => 25751], // Proc von Bloodwhetting / Nascent Flash // DRK 'Living Dead' => ['dr' => 0, 'buffType' => 'buff', 'extraAbilityGameID' => 3638], 'Shadow Wall' => ['dr' => 30, 'buffType' => 'buff', 'extraAbilityGameID' => 3636], @@ -140,6 +145,7 @@ const MITIGATION_ABILITIES = [ // WAR 'Shake It Off' => ['dr' => 0, 'buffType' => 'shield', 'statusId' => 1001457, 'extraAbilityGameID' => 7388], 'Bloodwhetting' => ['dr' => 10, 'buffType' => 'shield', 'statusId' => 1002678, 'extraAbilityGameID' => 25751], + 'Stem the Tide' => ['dr' => 0, 'buffType' => 'shield', 'statusId' => 1002680, 'extraAbilityGameID' => 25751], // Proc von Bloodwhetting / Nascent Flash // WHM 'Divine Benison' => ['dr' => 0, 'buffType' => 'shield', 'statusId' => 1001218, 'extraAbilityGameID' => 7432], 'Divine Caress' => ['dr' => 0, 'buffType' => 'shield', 'statusId' => 1003903, 'extraAbilityGameID' => 37011], diff --git a/api/cache.php b/api/cache.php index cd8c630..7b18331 100644 --- a/api/cache.php +++ b/api/cache.php @@ -2,7 +2,7 @@ declare(strict_types=1); const CACHED_LOG_DIR = __DIR__ . '/../cached_logs'; -const CACHED_LOG_VERSION = 'v6'; +const CACHED_LOG_VERSION = 'v8'; function cache_language(string $language): string { $language = strtolower(trim($language)); diff --git a/assets/icons/mitigation/aquaveil.png b/assets/icons/mitigation/aquaveil.png new file mode 100644 index 0000000..d77da55 Binary files /dev/null and b/assets/icons/mitigation/aquaveil.png differ diff --git a/assets/icons/mitigation/exaltation.png b/assets/icons/mitigation/exaltation.png new file mode 100644 index 0000000..60e81eb Binary files /dev/null and b/assets/icons/mitigation/exaltation.png differ diff --git a/assets/icons/mitigation/knights-resolve.png b/assets/icons/mitigation/knights-resolve.png new file mode 100644 index 0000000..ca958ca Binary files /dev/null and b/assets/icons/mitigation/knights-resolve.png differ diff --git a/assets/icons/mitigation/nascent-glint.png b/assets/icons/mitigation/nascent-glint.png new file mode 100644 index 0000000..77df47b Binary files /dev/null and b/assets/icons/mitigation/nascent-glint.png differ diff --git a/assets/icons/mitigation/stem-the-flow.png b/assets/icons/mitigation/stem-the-flow.png new file mode 100644 index 0000000..9ea36f4 Binary files /dev/null and b/assets/icons/mitigation/stem-the-flow.png differ diff --git a/assets/icons/mitigation/stem-the-tide.png b/assets/icons/mitigation/stem-the-tide.png new file mode 100644 index 0000000..0ad879c Binary files /dev/null and b/assets/icons/mitigation/stem-the-tide.png differ diff --git a/assets/jsons/Action.json b/assets/jsons/Action.json index 3da9e33..ddb34e8 100644 --- a/assets/jsons/Action.json +++ b/assets/jsons/Action.json @@ -778,5 +778,41 @@ }, "icon": "https://xivapi.com/i/003000/003689_hr1.png", "shield": "360% of HP restored" + }, + "16464": { + "cast": 0, + "recast": 250, + "names": { + "en": "Nascent Flash", + "de": "Urflackern", + "fr": "Exaltation naissante", + "jp": "原初の猛り" + }, + "icon": null, + "shield": null + }, + "25861": { + "cast": 0, + "recast": 600, + "names": { + "en": "Aquaveil", + "de": "Wasserschleier", + "fr": "Aquavoile", + "jp": "アクアヴェール" + }, + "icon": null, + "shield": null + }, + "25873": { + "cast": 0, + "recast": 600, + "names": { + "en": "Exaltation", + "de": "Exaltation", + "fr": "Exaltation", + "jp": "エクザルテーション" + }, + "icon": null, + "shield": null } } diff --git a/js/ffxiv-data.js b/js/ffxiv-data.js index 43b71c3..a3e600f 100644 --- a/js/ffxiv-data.js +++ b/js/ffxiv-data.js @@ -36,6 +36,7 @@ { name: 'Bulwark', buffType: 'buff', extraAbilityGameID: 22, duration: 10 }, { name: 'Holy Sheltron', buffType: 'buff', extraAbilityGameID: 25746, duration: 8 }, { name: 'Intervention', buffType: 'buff', extraAbilityGameID: 7382, duration: 8 }, + { name: 'Knight\'s Resolve', buffType: 'buff', extraAbilityGameID: 7382, duration: 4 }, // Proc von Intervention { name: 'Reprisal', buffType: 'debuff' }, ], 'WAR': [ @@ -47,6 +48,9 @@ { name: 'Thrill of Battle', buffType: 'buff', extraAbilityGameID: 40, duration: 10 }, { name: 'Raw Intuition', buffType: 'buff', extraAbilityGameID: 3551, duration: 6 }, { name: 'Bloodwhetting', buffType: 'shield', extraAbilityGameID: 25751, duration: 8 }, + { name: 'Nascent Glint', buffType: 'buff', extraAbilityGameID: 16464, duration: 8 }, // Proc von Nascent Flash auf Ziel + { name: 'Stem the Flow', buffType: 'buff', extraAbilityGameID: 25751, duration: 4 }, // Proc von Bloodwhetting / Nascent Flash + { name: 'Stem the Tide', buffType: 'shield', extraAbilityGameID: 25751, duration: 4 }, // Proc von Bloodwhetting / Nascent Flash { name: 'Reprisal', buffType: 'debuff' }, ], 'DRK': [ @@ -74,6 +78,7 @@ ], 'WHM': [ { name: 'Temperance', buffType: 'buff' }, + { name: 'Aquaveil', buffType: 'buff', extraAbilityGameID: 25861, duration: 8 }, // Personal, WHM auf Ziel { name: 'Divine Benison', buffType: 'shield', extraAbilityGameID: 7432, duration: 15 }, { name: 'Divine Caress', buffType: 'shield' }, ], @@ -87,6 +92,7 @@ ], 'AST': [ { name: 'Collective Unconscious', buffType: 'buff' }, + { name: 'Exaltation', buffType: 'buff', extraAbilityGameID: 25873, duration: 8 }, // Personal, AST auf Ziel { name: 'Neutral Sect', buffType: 'shield' }, { name: 'Intersection', buffType: 'shield', extraAbilityGameID: 16556, duration: 30 }, { name: 'the Spire', buffType: 'shield', extraAbilityGameID: 37025, duration: 30 }, @@ -149,19 +155,21 @@ 'Passage of Arms': 'PLD', 'Divine Veil': 'PLD', 'Hallowed Ground': 'PLD', 'Sentinel': 'PLD', 'Guardian': 'PLD', 'Bulwark': 'PLD', 'Holy Sheltron': 'PLD', 'Intervention': 'PLD', + 'Knight\'s Resolve': 'PLD', 'Shake It Off': 'WAR', 'Holmgang': 'WAR', 'Vengeance': 'WAR', 'Damnation': 'WAR', 'Thrill of Battle': 'WAR', 'Raw Intuition': 'WAR', - 'Bloodwhetting': 'WAR', + 'Bloodwhetting': 'WAR', 'Nascent Glint': 'WAR', + 'Stem the Flow': 'WAR', 'Stem the Tide': 'WAR', 'Dark Missionary': 'DRK', 'Living Dead': 'DRK', 'Shadow Wall': 'DRK', 'Shadowed Vigil': 'DRK', 'Dark Mind': 'DRK', 'The Blackest Night': 'DRK', 'Oblation': 'DRK', 'Heart of Light': 'GNB', 'Superbolide': 'GNB', 'Nebula': 'GNB', 'Great Nebula': 'GNB', 'Camouflage': 'GNB', 'Heart of Stone': 'GNB', 'Heart of Corundum': 'GNB', 'Clarity of Corundum': 'GNB', - 'Temperance': 'WHM', 'Divine Benison': 'WHM', 'Divine Caress': 'WHM', + 'Temperance': 'WHM', 'Aquaveil': 'WHM', 'Divine Benison': 'WHM', 'Divine Caress': 'WHM', 'Sacred Soil': 'SCH', 'Expedient': 'SCH', 'Fey Illumination': 'SCH', 'Galvanize': 'SCH', 'Seraphic Veil': 'SCH', 'Catalyze': 'SCH', - 'Collective Unconscious': 'AST', 'Neutral Sect': 'AST', + 'Collective Unconscious': 'AST', 'Exaltation': 'AST', 'Neutral Sect': 'AST', 'Intersection': 'AST', 'the Spire': 'AST', 'Kerachole': 'SGE', 'Holos': 'SGE', 'Holosakos': 'SGE', 'Panhaima': 'SGE', 'Haima': 'SGE', @@ -220,9 +228,15 @@ 'Tempera Coat': 'assets/icons/mitigation/tempera-coat.png', 'Tempera Grassa': 'assets/icons/mitigation/tempera-grassa.png', 'Improvised Finish': 'assets/icons/mitigation/improvised-finish.png', + 'Aquaveil': 'assets/icons/mitigation/aquaveil.png', + 'Exaltation': 'assets/icons/mitigation/exaltation.png', 'Heart of Corundum': 'assets/icons/mitigation/heart-of-corundum.png', 'Clarity of Corundum': 'assets/icons/mitigation/clarity-of-corundum.png', 'Heart of Stone': 'assets/icons/mitigation/heart-of-stone.png', + 'Knight\'s Resolve': 'assets/icons/mitigation/knights-resolve.png', + 'Nascent Glint': 'assets/icons/mitigation/nascent-glint.png', + 'Stem the Flow': 'assets/icons/mitigation/stem-the-flow.png', + 'Stem the Tide': 'assets/icons/mitigation/stem-the-tide.png', }; const ABILITY_DR = { @@ -249,10 +263,15 @@ 'Guardian': 0.40, 'Holy Sheltron': 0.15, 'Intervention': 0.10, + 'Knight\'s Resolve': 0.10, + 'Aquaveil': 0.15, + 'Exaltation': 0.10, 'Vengeance': 0.30, 'Damnation': 0.40, 'Raw Intuition': 0.10, 'Bloodwhetting': 0.10, + 'Nascent Glint': 0.10, + 'Stem the Flow': 0.10, 'Shadow Wall': 0.30, 'Shadowed Vigil': 0.40, 'Dark Mind': 0.20, diff --git a/js/planner.js b/js/planner.js index 1988e6e..6a7c9d5 100644 --- a/js/planner.js +++ b/js/planner.js @@ -735,12 +735,18 @@ const TIMELINE_PERSONAL_ABILITIES = new Set([ 'Bulwark', 'Holy Sheltron', 'Intervention', + 'Knight\'s Resolve', + 'Aquaveil', + 'Exaltation', 'Holmgang', 'Vengeance', 'Damnation', 'Thrill of Battle', 'Raw Intuition', 'Bloodwhetting', + 'Nascent Glint', + 'Stem the Flow', + 'Stem the Tide', 'Living Dead', 'Shadow Wall', 'Shadowed Vigil',