From e56a312055dfa96efea3ed1e439428c354868d74 Mon Sep 17 00:00:00 2001 From: Wouter Koppenol Date: Thu, 28 Mar 2024 22:20:34 +0100 Subject: [PATCH 1/2] #2301 Hotfixes for release v9.1 --- app/Service/Spell/SpellService.php | 1 + app/Service/View/ViewService.php | 2 + database/seeders/dungeondata/dungeons.json | 102 +++++++++--------- database/seeders/dungeondata/spells.json | 18 ++-- .../images/spells/spell_nature_bloodlust.jpg | Bin 0 -> 2142 bytes 5 files changed, 63 insertions(+), 60 deletions(-) create mode 100644 resources/assets/images/spells/spell_nature_bloodlust.jpg diff --git a/app/Service/Spell/SpellService.php b/app/Service/Spell/SpellService.php index 811277fe2..8e6c86f66 100644 --- a/app/Service/Spell/SpellService.php +++ b/app/Service/Spell/SpellService.php @@ -77,6 +77,7 @@ public function getCategoryNameFromRowClassName(string $rowClassName): ?string { // Try to match the category directly first $categorySlug = Str::slug($rowClassName, '_'); + if (!in_array($categorySlug, Spell::ALL_CATEGORIES)) { // Try to find the associated class first, then use that class to identify the category $characterClass = $this->getCharacterClassFromClassName($rowClassName); diff --git a/app/Service/View/ViewService.php b/app/Service/View/ViewService.php index 6109dae16..eece4de3c 100644 --- a/app/Service/View/ViewService.php +++ b/app/Service/View/ViewService.php @@ -76,6 +76,8 @@ public function getGlobalViewVariables(bool $useCache = true): array // Spells $selectableSpellsByCategory = Spell::where('selectable', true) + ->orderBy('category') + ->orderBy('name') ->get() ->groupBy('category') ->mapWithKeys(static fn(Collection $spells, string $key) => [__($key) => $spells]); diff --git a/database/seeders/dungeondata/dungeons.json b/database/seeders/dungeondata/dungeons.json index 7d7d292c6..42e9b0aa1 100644 --- a/database/seeders/dungeondata/dungeons.json +++ b/database/seeders/dungeondata/dungeons.json @@ -4204,7 +4204,7 @@ { "id": 42, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4494, "map_id": 619, "challenge_mode_id": null, @@ -4245,7 +4245,7 @@ { "id": 43, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4277, "map_id": 601, "challenge_mode_id": null, @@ -4357,7 +4357,7 @@ { "id": 44, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4196, "map_id": 600, "challenge_mode_id": null, @@ -4434,7 +4434,7 @@ { "id": 45, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4416, "map_id": 604, "challenge_mode_id": null, @@ -4475,7 +4475,7 @@ { "id": 46, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4272, "map_id": 602, "challenge_mode_id": null, @@ -4552,7 +4552,7 @@ { "id": 47, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4820, "map_id": 668, "challenge_mode_id": null, @@ -4593,7 +4593,7 @@ { "id": 48, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4264, "map_id": 599, "challenge_mode_id": null, @@ -4634,7 +4634,7 @@ { "id": 49, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4813, "map_id": 658, "challenge_mode_id": null, @@ -4675,7 +4675,7 @@ { "id": 50, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4100, "map_id": 595, "challenge_mode_id": null, @@ -4752,7 +4752,7 @@ { "id": 51, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4809, "map_id": 632, "challenge_mode_id": null, @@ -4793,7 +4793,7 @@ { "id": 52, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4265, "map_id": 576, "challenge_mode_id": null, @@ -4834,7 +4834,7 @@ { "id": 53, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4228, "map_id": 578, "challenge_mode_id": null, @@ -5016,7 +5016,7 @@ { "id": 54, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4415, "map_id": 1494, "challenge_mode_id": null, @@ -5057,7 +5057,7 @@ { "id": 55, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4723, "map_id": 650, "challenge_mode_id": null, @@ -5098,7 +5098,7 @@ { "id": 56, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 206, "map_id": 574, "challenge_mode_id": null, @@ -5210,7 +5210,7 @@ { "id": 57, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 1196, "map_id": 575, "challenge_mode_id": null, @@ -5287,7 +5287,7 @@ { "id": 58, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4812, "map_id": 631, "challenge_mode_id": null, @@ -5604,7 +5604,7 @@ { "id": 59, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 2159, "map_id": 249, "challenge_mode_id": null, @@ -5645,7 +5645,7 @@ { "id": 60, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 3456, "map_id": 533, "challenge_mode_id": null, @@ -6255,7 +6255,7 @@ { "id": 61, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4722, "map_id": 649, "challenge_mode_id": null, @@ -6318,7 +6318,7 @@ { "id": 62, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4500, "map_id": 616, "challenge_mode_id": null, @@ -6359,7 +6359,7 @@ { "id": 63, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4493, "map_id": 615, "challenge_mode_id": null, @@ -6400,7 +6400,7 @@ { "id": 64, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4987, "map_id": 724, "challenge_mode_id": null, @@ -6441,7 +6441,7 @@ { "id": 65, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4273, "map_id": 603, "challenge_mode_id": null, @@ -7226,7 +7226,7 @@ { "id": 66, "expansion_id": 6, - "game_version_id": 2, + "game_version_id": 3, "zone_id": 4603, "map_id": 624, "challenge_mode_id": null, @@ -8181,7 +8181,7 @@ { "id": 78, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 719, "map_id": 48, "challenge_mode_id": null, @@ -8293,7 +8293,7 @@ { "id": 79, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 1584, "map_id": 230, "challenge_mode_id": null, @@ -8370,7 +8370,7 @@ { "id": 80, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 1581, "map_id": 36, "challenge_mode_id": null, @@ -8447,7 +8447,7 @@ { "id": 81, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 2557, "map_id": 429, "challenge_mode_id": null, @@ -8559,7 +8559,7 @@ { "id": 82, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 721, "map_id": 90, "challenge_mode_id": null, @@ -8706,7 +8706,7 @@ { "id": 83, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 1583, "map_id": 10000, "challenge_mode_id": null, @@ -8953,7 +8953,7 @@ { "id": 84, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 2100, "map_id": 349, "challenge_mode_id": null, @@ -9030,7 +9030,7 @@ { "id": 85, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 2437, "map_id": 389, "challenge_mode_id": null, @@ -9071,7 +9071,7 @@ { "id": 86, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 722, "map_id": 129, "challenge_mode_id": null, @@ -9112,7 +9112,7 @@ { "id": 87, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 491, "map_id": 47, "challenge_mode_id": null, @@ -9153,7 +9153,7 @@ { "id": 88, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 796, "map_id": 189, "challenge_mode_id": null, @@ -9194,7 +9194,7 @@ { "id": 89, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 796, "map_id": 189, "challenge_mode_id": null, @@ -9235,7 +9235,7 @@ { "id": 90, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 796, "map_id": 189, "challenge_mode_id": null, @@ -9276,7 +9276,7 @@ { "id": 91, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 796, "map_id": 189, "challenge_mode_id": null, @@ -9317,7 +9317,7 @@ { "id": 92, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 2057, "map_id": 289, "challenge_mode_id": null, @@ -9476,7 +9476,7 @@ { "id": 93, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 209, "map_id": 33, "challenge_mode_id": null, @@ -9734,7 +9734,7 @@ { "id": 94, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 2017, "map_id": 329, "challenge_mode_id": null, @@ -9811,7 +9811,7 @@ { "id": 95, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 717, "map_id": 34, "challenge_mode_id": null, @@ -9852,7 +9852,7 @@ { "id": 96, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 1477, "map_id": 109, "challenge_mode_id": null, @@ -10046,7 +10046,7 @@ { "id": 97, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 1337, "map_id": 70, "challenge_mode_id": null, @@ -10123,7 +10123,7 @@ { "id": 98, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 718, "map_id": 43, "challenge_mode_id": null, @@ -10164,7 +10164,7 @@ { "id": 99, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 1176, "map_id": 209, "challenge_mode_id": null, @@ -10205,7 +10205,7 @@ { "id": 100, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 2557, "map_id": 429, "challenge_mode_id": null, @@ -10246,7 +10246,7 @@ { "id": 101, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 2557, "map_id": 429, "challenge_mode_id": null, @@ -10499,7 +10499,7 @@ { "id": 104, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 1583, "map_id": 229, "challenge_mode_id": 167, @@ -11211,7 +11211,7 @@ { "id": 107, "expansion_id": 4, - "game_version_id": 3, + "game_version_id": 2, "zone_id": 721, "map_id": 90, "challenge_mode_id": null, diff --git a/database/seeders/dungeondata/spells.json b/database/seeders/dungeondata/spells.json index 1fc7aecfd..5e372be23 100644 --- a/database/seeders/dungeondata/spells.json +++ b/database/seeders/dungeondata/spells.json @@ -100,8 +100,8 @@ }, { "id": 2825, - "category": "shaman", - "cooldown_group": "all", + "category": "spells.category.general", + "cooldown_group": "spells.cooldown_group.all", "dispel_type": "Magic", "icon_name": "spell_nature_bloodlust", "name": "Bloodlust", @@ -133,7 +133,7 @@ }, { "id": 5512, - "category": null, + "category": "spells.category.general", "cooldown_group": "spells.cooldown_group.all", "dispel_type": "Magic", "icon_name": "warlock_-healthstone", @@ -617,7 +617,7 @@ }, { "id": 78151, - "category": null, + "category": "spells.category.general", "cooldown_group": "spells.cooldown_group.all", "dispel_type": "Magic", "icon_name": "ability_shaman_heroism", @@ -639,7 +639,7 @@ }, { "id": 80353, - "category": null, + "category": "spells.category.general", "cooldown_group": "spells.cooldown_group.all", "dispel_type": "Magic", "icon_name": "ability_mage_timewarp", @@ -969,7 +969,7 @@ }, { "id": 120257, - "category": null, + "category": "spells.category.general", "cooldown_group": "spells.cooldown_group.all", "dispel_type": "Magic", "icon_name": "inv_misc_drum_01", @@ -1134,7 +1134,7 @@ }, { "id": 191380, - "category": null, + "category": "spells.category.general", "cooldown_group": "spells.cooldown_group.all", "dispel_type": "Magic", "icon_name": "inv_10_alchemy_bottle_shape4_red", @@ -1497,7 +1497,7 @@ }, { "id": 264667, - "category": null, + "category": "spells.category.general", "cooldown_group": "spells.cooldown_group.all", "dispel_type": "Magic", "icon_name": "spell_shadow_unholyfrenzy", @@ -1860,7 +1860,7 @@ }, { "id": 390386, - "category": null, + "category": "spells.category.general", "cooldown_group": "spells.cooldown_group.all", "dispel_type": "Magic", "icon_name": "ability_evoker_furyoftheaspects", diff --git a/resources/assets/images/spells/spell_nature_bloodlust.jpg b/resources/assets/images/spells/spell_nature_bloodlust.jpg new file mode 100644 index 0000000000000000000000000000000000000000..037e967a74b81887ca374360890871f63439fe11 GIT binary patch literal 2142 zcmb7^c{tRI8pnUXSqwwWj2XKb%*?^Dbc{&aEH#aZkx977L3Ac%jx9R25LzhP*ed%n zhRn4^T)DPpXpv=NDjZ9ZA|W@G zNgxmum32ruc#;O5fd2sjC8r1}guJx0JRXb2;{R{$bOLB;zyh#M4MNf2PA{MV z01yaN^6lS}f+HYM7$_}qO;G>{l?Vbwz@Y!#03{Y&3JqYi5sD@{))c2;EY8%%Cq6@( z*fnI!ERh_kf`EkhHxB^dQa^waYd0DIAuzb4;s5hN2pWLGwBZ;NYbV8epWyfmtWHVS z5Rqat{b}bFASVGq&`>mR7})sq#rCoPO(7maW#li_$gj3~ET3Rqypg5talF2`HZVad z$VF-}mdkjk$ZI)r-x%2wrbc!@qj1!B?_~XzXLVecVlJlWdn5{R;E%5fqc;Lyi_|9A zaAByZI`CwX5yEA~7wcDyT76>IjY>@9CdOx_6~?*xrewNc`envjXT8U7F3-yCQK8+A zH*vrGpk14`u*)lVe6Pb8+r$4JuAUNdI_t`+|E-y|`2sm#qxIQ4x$&6f`nU>v%OoE2fYeV^`%u~MUd71=6SL}(!_rp@+ zg)xC|n_OyZ*%qk#Y`fJx=LJ;4u`z1eQ%Z&Zw z@h#oa3`)Q^@8a}0J5KX4wW6}xqn{_?X|<+MAx62%j(^0L_CId z?EX1gnealZU3CYBnTxs`*JnqJq?GfBEU1OL=_|OOv;} zCagHmOs0Ytf(3hoB6Ie4_Vdc0=Hr2CylxSsfY060A=Zh}S+grf$cCxY-OcWs@u-!j;3Pt9DO z=v*Hq@|b!-Y-i6g|Jf7m)k|c%#b1(mrP*ZLfWjyQ8ylnVs48d@j|I9dwUg8zbj`*arO?wiPl$))fL^CqkX_4qAa^#mrRvC9JCWU~;!tZU5g405B`ruTz} z1RMO9r!#sb7isV=f~$5vGpa@s%v(>&{Wz2IW? zn`||QkrVk0x<~4wP}4_$0F&8ZMQ|iES2)=k*Pl~_Cbr@u!#BH-0U{@w{nPj(oP@c> zUUAgq^pf({pKZsis$NPd_Um8Ay^jnrE4^kmPlvhVoD3+sa1EJ2;2FU6%JqZCJXDKxVUt9ph0K z{ht5f=m(e94?N!Eq6x~#1kGkmOufWH-?G-2^5!I12sm}G&aGA2S2#X~^go-bJOOR} zte$7;)e)bEz3f0*;O+kX9%H?uMdxZ5xy_!7eO2;^Wf`7ikvs@EX$3LB&$A9We>xjn zc=^$}vfE~EKdvwA{hg?&r6rl;*PRZOLz?^a*Sm`qr*+H*Y70(eDg{n{T+t4C z;ow5nPo6$@W)YnNYZBXqW%E2Z(LAqvF@PvQG*j9 Date: Thu, 28 Mar 2024 22:20:59 +0100 Subject: [PATCH 2/2] #2301 Added release v9.1.1 --- database/seeders/releases/v9.1.1.json | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 database/seeders/releases/v9.1.1.json diff --git a/database/seeders/releases/v9.1.1.json b/database/seeders/releases/v9.1.1.json new file mode 100644 index 000000000..0015d18d2 --- /dev/null +++ b/database/seeders/releases/v9.1.1.json @@ -0,0 +1,35 @@ +{ + "id": 230, + "release_changelog_id": 237, + "version": "v9.1.1", + "title": "Classic Era and Wrath dungeons are no longer assigned to an incorrect game version", + "silent": 1, + "spotlight": 0, + "created_at": "2024-03-28T21:20:04+00:00", + "updated_at": "2024-03-28T21:20:04+00:00", + "changelog": { + "id": 237, + "release_id": 230, + "description": null, + "changes": [ + { + "release_changelog_id": 237, + "release_changelog_category_id": 1, + "ticket_id": null, + "change": "The new spells that you can attach to your pulls are now ordered alphabetically (by category, name)." + }, + { + "release_changelog_id": 237, + "release_changelog_category_id": 5, + "ticket_id": null, + "change": "Classic Era and Wrath dungeons are no longer assigned to an incorrect game version." + }, + { + "release_changelog_id": 237, + "release_changelog_category_id": 5, + "ticket_id": null, + "change": "Added missing Bloodlust icon." + } + ] + } +}