mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 05:57:45 +00:00
Code Activity

Update some script flags

Browse source
This commit is contained in:
Mordred 2018-03-15 20:03:29 +01:00
parent e59728f820
commit ac94e9beff
9 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/servers/Scripts/opening/OpeningGridania.cpp
View file

@ -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 )

4
src/servers/Scripts/opening/OpeningLimsa.cpp
View file

@ -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 )

4
src/servers/Scripts/opening/OpeningUldah.cpp
View file

@ -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 )

4
src/servers/Scripts/quest/ManFst001.cpp
View file

@ -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 )

10
src/servers/Scripts/quest/ManFst002.cpp
View file

@ -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 )

6
src/servers/Scripts/quest/ManFst004.cpp
View file

@ -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

2
src/servers/Scripts/quest/ManSea001.cpp
View file

@ -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 )

2
src/servers/Scripts/quest/ManSea002.cpp
View file

@ -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 );
};

4
src/servers/Scripts/quest/ManWil001.cpp
View file

@ -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 )