From fe140ab2d67711d34da98abf1881286411efd69f Mon Sep 17 00:00:00 2001 From: Pinapelz Date: Tue, 9 May 2023 17:06:50 -0700 Subject: [PATCH] Added Item Icons to notices in some existing quests - Miner Job Quest - White Mage Quest - MSQ --- src/scripts/quest/classquest/MIN/ClsMin502.cpp | 3 ++- src/scripts/quest/classquest/MIN/ClsMin600.cpp | 3 ++- src/scripts/quest/classquest/WHM/JobWhm001.cpp | 11 +++++++---- src/scripts/quest/classquest/WHM/JobWhm450.cpp | 12 ++++++++---- .../quest/subquest/blackshroud_central/SubFst069.cpp | 3 ++- .../quest/subquest/coerthas_central/GaiUsb808.cpp | 3 ++- src/scripts/quest/subquest/gridania/GaiUsc609.cpp | 6 ++++-- 7 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/scripts/quest/classquest/MIN/ClsMin502.cpp b/src/scripts/quest/classquest/MIN/ClsMin502.cpp index ee123859..05505cdf 100644 --- a/src/scripts/quest/classquest/MIN/ClsMin502.cpp +++ b/src/scripts/quest/classquest/MIN/ClsMin502.cpp @@ -45,6 +45,7 @@ private: static constexpr auto Actor4 = 1013231;//Hatchling static constexpr auto BindActor1 = 5896086; static constexpr auto Item0 = 2001726; + static constexpr auto Item0Icon = 26177; static constexpr auto LocBgm1 = 313; public: @@ -137,7 +138,7 @@ private: void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { quest.setUI8BH( 1 ); - eventMgr().sendEventNotice( player, getId(), 0, 0 );//TODO: Item Icon, probably + eventMgr().sendNotice( player, getId(), 0, { Item0Icon } ); quest.setSeq( Seq2 ); } diff --git a/src/scripts/quest/classquest/MIN/ClsMin600.cpp b/src/scripts/quest/classquest/MIN/ClsMin600.cpp index 7e733494..df5fd18f 100644 --- a/src/scripts/quest/classquest/MIN/ClsMin600.cpp +++ b/src/scripts/quest/classquest/MIN/ClsMin600.cpp @@ -56,6 +56,7 @@ private: static constexpr auto Actor7 = 1013961;//Goblin Trader (Seq5) static constexpr auto BindActor1 = 5896328; static constexpr auto Item0 = 2001729; + static constexpr auto Item0Icon = 25919; static constexpr auto LocActor1 = 1013954; static constexpr auto LocActor2 = 1013955; static constexpr auto LocBgm1 = 313; @@ -390,7 +391,7 @@ private: void Scene00019Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { - eventMgr().sendEventNotice( player, getId(), 5, 0 );//TODO: Item Icon? + eventMgr().sendNotice( player, getId(), 5, { Item0Icon } ); quest.setSeq( SeqFinish ); quest.setUI8BH( 0 ); } diff --git a/src/scripts/quest/classquest/WHM/JobWhm001.cpp b/src/scripts/quest/classquest/WHM/JobWhm001.cpp index 4a809993..82d98728 100644 --- a/src/scripts/quest/classquest/WHM/JobWhm001.cpp +++ b/src/scripts/quest/classquest/WHM/JobWhm001.cpp @@ -13,7 +13,7 @@ // Quest Script: JobWhm001_01124 // Quest Name: A Relic Reborn (Thyrus) // Quest ID: 66660 -// Start NPC: 1003075 +// Start NPC: 1003075a // End NPC: 1003075 using namespace Sapphire; @@ -101,6 +101,8 @@ private: static constexpr auto Item4 = 2001029; static constexpr auto Item5 = 2001038; static constexpr auto Item6 = 2001047; + static constexpr auto Item0Icon = 21003; + static constexpr auto Item3Icon = 26002; static constexpr auto LocAction0 = 858; static constexpr auto LocAction1 = 995; static constexpr auto LocAction2 = 936; @@ -109,6 +111,7 @@ private: static constexpr auto Ritem0 = 2049;//Madman's Whispering Rod static constexpr auto Ritem1 = 2046;//Unfinished Thyrus static constexpr auto Ritem2 = 6267;//Radz-at-Han Quenching Oil + static constexpr auto Ritem1Icon = 32627; public: JobWhm001() : Sapphire::ScriptAPI::QuestScript( 66660 ){}; @@ -327,7 +330,7 @@ private: void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { quest.setUI8BH( 1 ); - eventMgr().sendEventNotice( player, getId(), 0, 0 );//TODO:Item Icon + eventMgr().sendNotice( player, getId(), 0, { Item0Icon } ); quest.setSeq( Seq2 ); } @@ -469,7 +472,7 @@ private: void Scene00013Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { - eventMgr().sendEventNotice( player, getId(), 7, 0 );//TODO: Item Icon + eventMgr().sendNotice( player, getId(), 7, { Item3Icon } ); quest.setSeq( Seq9 ); quest.setUI8BH( 1 ); } @@ -497,7 +500,7 @@ private: void Scene00015Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { quest.setUI8BH( 0 ); - eventMgr().sendEventNotice( player, getId(), 8, 0 );//TODO: Item Icon? + eventMgr().sendNotice( player, getId(), 8, { Ritem1Icon } ); player.addItem( Ritem1 ); quest.setSeq( Seq10 ); } diff --git a/src/scripts/quest/classquest/WHM/JobWhm450.cpp b/src/scripts/quest/classquest/WHM/JobWhm450.cpp index 4953a214..fae06547 100644 --- a/src/scripts/quest/classquest/WHM/JobWhm450.cpp +++ b/src/scripts/quest/classquest/WHM/JobWhm450.cpp @@ -80,6 +80,10 @@ private: static constexpr auto Ritem1 = 3894; static constexpr auto Ritem2 = 3463; static constexpr auto Ritem3 = 2902; + static constexpr auto Ritem0Icon = 48242; + static constexpr auto Ritem1Icon = 48219; + static constexpr auto Ritem2Icon = 45189; + static constexpr auto Ritem3Icon = 40616; static constexpr auto VfxReaction = 177; public: @@ -214,7 +218,7 @@ private: void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { - eventMgr().sendEventNotice( player, getId(), 0, 0 );//TODO:Item Icon, Cleric's Gloves + eventMgr().sendNotice( player, getId(), 0, { Ritem0Icon } ); playerMgr().sendLogMessage( player, Logmessage0 ); quest.setUI8AL( 1 ); quest.setUI8CH( 0 ); @@ -241,7 +245,7 @@ private: void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { - eventMgr().sendEventNotice( player, getId(), 1, 0 );//TODO:Item Icon, Cleric's Culottes + eventMgr().sendNotice( player, getId(), 1, { Ritem2Icon } ); playerMgr().sendLogMessage( player, Logmessage0 ); quest.setUI8BH( 1 ); quest.setUI8CL( 0 ); @@ -268,7 +272,7 @@ private: void Scene00007Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { - eventMgr().sendEventNotice( player, getId(), 2, 0 );//TODO:Item Icon, Cleric's Boots + eventMgr().sendNotice( player, getId(), 2, {Ritem1Icon} ); playerMgr().sendLogMessage( player, Logmessage0 ); quest.setUI8BL( 1 ); quest.setUI8DH( 0 ); @@ -436,7 +440,7 @@ private: void Scene00021Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { - eventMgr().sendEventNotice( player, getId(), 6, 0 );//TODO:Item Icon, Cleric's Circlet + eventMgr().sendNotice( player, getId(), 6, { Ritem3Icon } ); playerMgr().sendLogMessage( player, Logmessage0 ); quest.setSeq( SeqFinish ); quest.setUI8BH( 0 ); diff --git a/src/scripts/quest/subquest/blackshroud_central/SubFst069.cpp b/src/scripts/quest/subquest/blackshroud_central/SubFst069.cpp index 855624f1..14a68e7b 100644 --- a/src/scripts/quest/subquest/blackshroud_central/SubFst069.cpp +++ b/src/scripts/quest/subquest/blackshroud_central/SubFst069.cpp @@ -39,6 +39,7 @@ private: static constexpr auto Eobject0 = 2000685;//Well-worn Fishing Rod static constexpr auto EventActionSearch = 1; static constexpr auto Item0 = 2000185; + static constexpr auto Item0Icon = 38201; static constexpr auto Seq0Actor0 = 0; static constexpr auto Seq1Eobject0 = 1; static constexpr auto Seq1Eobject0Eventactionno = 99; @@ -169,7 +170,7 @@ private: void Scene00100Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { - eventMgr().sendEventNotice( player, getId(), 0, 0 );//TODO: Probably Item Icon + eventMgr().sendNotice( player, getId(), 0, { Item0Icon } ); quest.setUI8BH( 1 ); quest.setSeq( SeqFinish ); } diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb808.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb808.cpp index 5ef10f23..3630fb8f 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb808.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb808.cpp @@ -55,6 +55,7 @@ private: static constexpr auto Item0 = 2000720; static constexpr auto Item1 = 2000721; static constexpr auto Item2 = 2000722; + static constexpr auto Item0Icon = 26002; public: GaiUsb808() : Sapphire::ScriptAPI::QuestScript( 66453 ){}; @@ -162,7 +163,7 @@ private: void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { - eventMgr().sendEventNotice( player, getId(), 1, 0 );//TODO:Show Item Icon (Needs func update) + eventMgr().sendNotice( player, getId(), 1, { Item0Icon } ); quest.setUI8BH( 1 ); quest.setSeq( Seq3 ); } diff --git a/src/scripts/quest/subquest/gridania/GaiUsc609.cpp b/src/scripts/quest/subquest/gridania/GaiUsc609.cpp index 7b1b1047..a5cff6f2 100644 --- a/src/scripts/quest/subquest/gridania/GaiUsc609.cpp +++ b/src/scripts/quest/subquest/gridania/GaiUsc609.cpp @@ -61,6 +61,8 @@ private: static constexpr auto EventActionSearch = 1; static constexpr auto Item0 = 2000963; static constexpr auto Item1 = 2000965; + static constexpr auto Item0Icon = 22614; + static constexpr auto Item1Icon = 21452; static constexpr auto Poprange0 = 3884000; static constexpr auto Territorytype0 = 204; @@ -263,7 +265,7 @@ private: void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { - eventMgr().sendEventNotice( player, getId(), 0, 0 ); + eventMgr().sendNotice( player, getId(), 0, { Item0Icon } ); quest.setUI8BH( 1 ); quest.setSeq( Seq2 ); } @@ -393,7 +395,7 @@ private: { quest.setSeq( Seq4 ); quest.setUI8BH( 1 ); - eventMgr().sendEventNotice( player, getId(), 2, 0 /*1, Item1*/ );//TODO:Item Icon Event Notice + eventMgr().sendNotice( player, getId(), 2, { Item1Icon } ); } //////////////////////////////////////////////////////////////////////