mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-06-24 15:37:46 +00:00
Code Activity

Add duration field to statuses

Browse source
This commit is contained in:
Lucy 2023-03-06 23:05:21 +01:00
parent 7f70248836
commit 114bd28538
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tools/action_parse/main.cpp
View file

@ -40,6 +40,7 @@ struct StatusModifier
struct StatusEntry struct StatusEntry
{ {
uint16_t id; uint16_t id;
int32_t duration;
std::vector< StatusModifier > modifiers; std::vector< StatusModifier > modifiers;
}; };
@ -76,6 +77,7 @@ void to_json( nlohmann::ordered_json& j, const StatusEntry& statusEntry )
{ {
j = nlohmann::ordered_json{ j = nlohmann::ordered_json{
{ "id", statusEntry.id }, { "id", statusEntry.id },
{ "duration", statusEntry.duration },
{ "modifiers", statusEntry.modifiers } { "modifiers", statusEntry.modifiers }
}; };
} }

1
src/world/Action/ActionLut.h
View file

@ -17,6 +17,7 @@ namespace Sapphire::World::Action
struct StatusEntry struct StatusEntry
{ {
uint16_t id; uint16_t id;
int32_t duration;
std::vector< StatusModifier > modifiers; std::vector< StatusModifier > modifiers;
}; };

1
src/world/Action/ActionLutData.h
View file

@ -32,6 +32,7 @@ namespace Sapphire::World::Action
inline void from_json( const nlohmann::json& j, StatusEntry& statusEntry ) inline void from_json( const nlohmann::json& j, StatusEntry& statusEntry )
{ {
j.at( "id" ).get_to( statusEntry.id ); j.at( "id" ).get_to( statusEntry.id );
j.at( "duration" ).get_to( statusEntry.duration );
if( j.contains( "modifiers" ) ) if( j.contains( "modifiers" ) )
j.at( "modifiers" ).get_to( statusEntry.modifiers ); j.at( "modifiers" ).get_to( statusEntry.modifiers );
} }