From ac94e9beffa5ee99f3287679ddf9f08a4a6a8467 Mon Sep 17 00:00:00 2001 From: Mordred Date: Thu, 15 Mar 2018 20:03:29 +0100 Subject: [PATCH] Update some script flags --- src/servers/Scripts/opening/OpeningGridania.cpp | 4 +++- src/servers/Scripts/opening/OpeningLimsa.cpp | 4 +++- src/servers/Scripts/opening/OpeningUldah.cpp | 4 +++- src/servers/Scripts/quest/ManFst001.cpp | 4 ++-- src/servers/Scripts/quest/ManFst002.cpp | 10 +++++----- src/servers/Scripts/quest/ManFst004.cpp | 6 +++--- src/servers/Scripts/quest/ManSea001.cpp | 2 +- src/servers/Scripts/quest/ManSea002.cpp | 2 +- src/servers/Scripts/quest/ManWil001.cpp | 4 ++-- 9 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/servers/Scripts/opening/OpeningGridania.cpp b/src/servers/Scripts/opening/OpeningGridania.cpp index 86775868..0c218e02 100644 --- a/src/servers/Scripts/opening/OpeningGridania.cpp +++ b/src/servers/Scripts/opening/OpeningGridania.cpp @@ -34,7 +34,9 @@ private: Scene00001( player ); }; - player.eventPlay( getId(), 0, 0x04AC05, 0, 1, callback ); + player.eventPlay( getId(), 0, NO_DEFAULT_CAMERA | INVIS_ENPC | + CONDITION_CUTSCENE | HIDE_UI | + HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback ); } void Scene00001( Entity::Player& player ) diff --git a/src/servers/Scripts/opening/OpeningLimsa.cpp b/src/servers/Scripts/opening/OpeningLimsa.cpp index 84a1f771..24a11421 100644 --- a/src/servers/Scripts/opening/OpeningLimsa.cpp +++ b/src/servers/Scripts/opening/OpeningLimsa.cpp @@ -49,7 +49,9 @@ private: Scene00001( player ); }; - player.eventPlay( getId(), 0, 0x04AC05, 0, 1, callback ); + player.eventPlay( getId(), 0, NO_DEFAULT_CAMERA | INVIS_ENPC | + CONDITION_CUTSCENE | HIDE_UI | + HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback ); } void Scene00001( Entity::Player& player ) diff --git a/src/servers/Scripts/opening/OpeningUldah.cpp b/src/servers/Scripts/opening/OpeningUldah.cpp index c3edda7e..2c66cffe 100644 --- a/src/servers/Scripts/opening/OpeningUldah.cpp +++ b/src/servers/Scripts/opening/OpeningUldah.cpp @@ -35,7 +35,9 @@ private: Scene00001( player ); }; - player.eventPlay( getId(), 0, 0x04AC05, 0, 1, callback ); + player.eventPlay( getId(), 0, NO_DEFAULT_CAMERA | INVIS_ENPC | + CONDITION_CUTSCENE | HIDE_UI | + HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback ); } void Scene00001( Entity::Player& player ) diff --git a/src/servers/Scripts/quest/ManFst001.cpp b/src/servers/Scripts/quest/ManFst001.cpp index 8f03aeab..8b813fe5 100644 --- a/src/servers/Scripts/quest/ManFst001.cpp +++ b/src/servers/Scripts/quest/ManFst001.cpp @@ -53,7 +53,7 @@ private: Scene00002( player ); }; - player.eventPlay( getId(), 1, 0xF8482EFB, 0, 0, callback ); + player.eventPlay( getId(), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, 0, 0, callback ); } void Scene00002( Entity::Player& player ) @@ -75,7 +75,7 @@ private: Scene00005( player ); }; - player.eventPlay( getId(), 4, 0x2c02, 0, 0, callback ); + player.eventPlay( getId(), 4, FADE_OUT | HIDE_HOTBAR | CONDITION_CUTSCENE | HIDE_UI , 0, 0, callback ); } void Scene00005( Entity::Player& player ) diff --git a/src/servers/Scripts/quest/ManFst002.cpp b/src/servers/Scripts/quest/ManFst002.cpp index dd99f0d3..98c0f0da 100644 --- a/src/servers/Scripts/quest/ManFst002.cpp +++ b/src/servers/Scripts/quest/ManFst002.cpp @@ -108,7 +108,7 @@ private: checkQuestCompletion( player, 3 ); }; - player.eventPlay( getId(), 2, 0, 0, 0, callback ); + player.eventPlay( getId(), 2, NONE, 0, 0, callback ); } void Scene00003( Entity::Player& player ) @@ -121,12 +121,12 @@ private: Scene00099( player ); }; - player.eventPlay( getId(), 3, 0, 0, 0, callback ); + player.eventPlay( getId(), 3, NONE, 0, 0, callback ); } void Scene00004( Entity::Player& player ) { - player.eventPlay( getId(), 4, 0, 0, 0 ); + player.eventPlay( getId(), 4, NONE, 0, 0 ); } void Scene00005( Entity::Player& player ) @@ -165,7 +165,7 @@ private: Scene00001( player ); }; - player.eventPlay( getId(), 51, 0, 0, 0, callback ); + player.eventPlay( getId(), 51, NONE, 0, 0, callback ); } void Scene00099( Entity::Player& player ) @@ -175,7 +175,7 @@ private: Scene00004( player ); }; - player.eventPlay( getId(), 99, 0, 0, 0, callback ); + player.eventPlay( getId(), 99, NONE, 0, 0, callback ); } void Scene00100( Entity::Player& player ) diff --git a/src/servers/Scripts/quest/ManFst004.cpp b/src/servers/Scripts/quest/ManFst004.cpp index 738444e0..62adad46 100644 --- a/src/servers/Scripts/quest/ManFst004.cpp +++ b/src/servers/Scripts/quest/ManFst004.cpp @@ -225,7 +225,7 @@ class ManFst004 : public EventScript void Scene00051( Entity::Player& player ) { - player.eventPlay( m_id, 51, 0, + player.eventPlay( m_id, 51, NONE, [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 ) { Scene00001( player ); @@ -234,7 +234,7 @@ class ManFst004 : public EventScript void Scene00099( Entity::Player& player ) { - player.eventPlay( m_id, 99, 0, + player.eventPlay( m_id, 99, NONE, [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 ) { Scene00004( player ); @@ -243,7 +243,7 @@ class ManFst004 : public EventScript void Scene00100( Entity::Player& player ) { - player.eventPlay( m_id, 100, 0, + player.eventPlay( m_id, 100, NONE, [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 ) { player.setQuestUI8CH( m_id, 0 ); // remove key item, since we have just traded it diff --git a/src/servers/Scripts/quest/ManSea001.cpp b/src/servers/Scripts/quest/ManSea001.cpp index 4ad91b50..568b190e 100644 --- a/src/servers/Scripts/quest/ManSea001.cpp +++ b/src/servers/Scripts/quest/ManSea001.cpp @@ -46,7 +46,7 @@ private: Scene00002( player ); }; - player.eventPlay( getId(), 1, 0xF8482EFB, 0, 0, callback ); + player.eventPlay( getId(), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, 0, 0, callback ); } void Scene00002( Entity::Player& player ) diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp index 8cb1b0b8..23a017b0 100644 --- a/src/servers/Scripts/quest/ManSea002.cpp +++ b/src/servers/Scripts/quest/ManSea002.cpp @@ -132,7 +132,7 @@ private: player.updateQuest( getId(), 1 ); player.setQuestUI8CH( getId(), 1 ); // receive key item - // teleport to real gridania + // teleport to real limsa player.forceZoneing( 128 ); }; diff --git a/src/servers/Scripts/quest/ManWil001.cpp b/src/servers/Scripts/quest/ManWil001.cpp index 18669bd1..867399ec 100644 --- a/src/servers/Scripts/quest/ManWil001.cpp +++ b/src/servers/Scripts/quest/ManWil001.cpp @@ -47,7 +47,7 @@ private: Scene00002( player ); }; - player.eventPlay( getId(), 1, 0xF8482EFB, 0, 0, callback ); + player.eventPlay( getId(), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, 0, 0, callback ); } void Scene00002( Entity::Player& player ) @@ -62,7 +62,7 @@ private: void Scene00003( Entity::Player& player ) { - player.eventPlay( getId(), 3, 0, 0, 0 ); + player.eventPlay( getId(), 3, NONE, 0, 0 ); } void Scene00004( Entity::Player& player )