From 163052cd25d927c9437a2234befd22c9d143c4d4 Mon Sep 17 00:00:00 2001
From: metamuffin <yvchraiqi@protonmail.com>
Date: Sat, 11 Jun 2022 18:55:54 +0200
Subject: redundant Instance

---
 karlcommon/src/protocol.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'karlcommon/src')

diff --git a/karlcommon/src/protocol.rs b/karlcommon/src/protocol.rs
index de65802..25dfc66 100644
--- a/karlcommon/src/protocol.rs
+++ b/karlcommon/src/protocol.rs
@@ -8,7 +8,7 @@ pub enum ClientboundPacket {
     Handshake { version: String },
     Error(ProtoError),
     TaskList(Vec<Task>),
-    InstanceList(Vec<Instance>),
+    InstanceList(Vec<Range<Option<i64>>>),
     Sync,
 }
 
@@ -52,17 +52,13 @@ pub enum Schedule {
     Dynamic {
         priority: f64,
         scheduled: Option<i64>,
-        deadline: Option<Condition>,
+        duration: i64,
+        condition: Condition, // duration, during which the task should be scheduled
     },
     Condition(Condition),
     Static(Range<i64>),
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Instance {
-    pub of: u64,
-    pub at: Range<Option<i64>>,
-}
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-- 
cgit v1.2.3-70-g09d2