From 114bd28538c7132bda8bb0b82a4f3bc2d9af9179 Mon Sep 17 00:00:00 2001
From: Lucy <44952533+Skyliegirl33@users.noreply.github.com>
Date: Mon, 6 Mar 2023 23:05:21 +0100
Subject: [PATCH] Add duration field to statuses

---
 src/tools/action_parse/main.cpp  | 2 ++
 src/world/Action/ActionLut.h     | 1 +
 src/world/Action/ActionLutData.h | 1 +
 3 files changed, 4 insertions(+)

diff --git a/src/tools/action_parse/main.cpp b/src/tools/action_parse/main.cpp
index c542eae7..dee585cc 100644
--- a/src/tools/action_parse/main.cpp
+++ b/src/tools/action_parse/main.cpp
@@ -40,6 +40,7 @@ struct StatusModifier
 struct StatusEntry
 {
   uint16_t id;
+  int32_t duration;
   std::vector< StatusModifier > modifiers;
 };
 
@@ -76,6 +77,7 @@ void to_json( nlohmann::ordered_json& j, const StatusEntry& statusEntry )
 {
   j = nlohmann::ordered_json{
     { "id", statusEntry.id },
+    { "duration", statusEntry.duration },
     { "modifiers", statusEntry.modifiers }
   };
 }
diff --git a/src/world/Action/ActionLut.h b/src/world/Action/ActionLut.h
index 3ea20cdb..bd0fbe3f 100644
--- a/src/world/Action/ActionLut.h
+++ b/src/world/Action/ActionLut.h
@@ -17,6 +17,7 @@ namespace Sapphire::World::Action
   struct StatusEntry
   {
     uint16_t id;
+    int32_t duration;
     std::vector< StatusModifier > modifiers;
   };
 
diff --git a/src/world/Action/ActionLutData.h b/src/world/Action/ActionLutData.h
index 61225af6..99e78f03 100644
--- a/src/world/Action/ActionLutData.h
+++ b/src/world/Action/ActionLutData.h
@@ -32,6 +32,7 @@ namespace Sapphire::World::Action
   inline void from_json( const nlohmann::json& j, StatusEntry& statusEntry )
   {
     j.at( "id" ).get_to( statusEntry.id );
+    j.at( "duration" ).get_to( statusEntry.duration );
     if( j.contains( "modifiers" ) )
       j.at( "modifiers" ).get_to( statusEntry.modifiers );
   }