BibliothecaDAO · ponderingdemocritus · Aug 20, 2024 · Jul 5, 2024 · Jul 5, 2024 · Jul 6, 2024
diff --git a/.DS_Store b/.DS_Store
diff --git a/bot/.gitignore b/bot/.gitignore
diff --git a/bot/README.md b/bot/README.md
diff --git a/bot/drizzle.config.ts b/bot/drizzle.config.ts
diff --git a/bot/migrate.ts b/bot/migrate.ts
diff --git a/bot/package.json b/bot/package.json
diff --git a/bot/src/db/schema.ts b/bot/src/db/schema.ts
diff --git a/bot/src/index.ts b/bot/src/index.ts
diff --git a/bot/src/routes/users.ts b/bot/src/routes/users.ts
diff --git a/bot/src/types/index.ts b/bot/src/types/index.ts
diff --git a/bot/tsconfig.json b/bot/tsconfig.json
diff --git a/contracts/src/models/event.cairo b/contracts/src/models/event.cairo
@@ -10,7 +10,7 @@ pub struct EternumEvent {
     #[key]
     event_id: EventType,
     timestamp: u64,
-    data: EventData,
+    // data: EventData,
 }
 
 #[derive(Introspect, Copy, Drop, Serde)]
@@ -32,10 +32,18 @@ pub enum EventData {
 }
 
 #[derive(Introspect, Copy, Drop, Serde)]
+#[dojo::event]
+#[dojo::model]
 pub struct BattleStartData {
+    #[key]
+    id: ID,
+    #[key]
+    event_id: EventType,
     battle_entity_id: ID,
     attacker: ContractAddress,
+    attacker_name: felt252,
     attacker_army_entity_id: ID,
+    defender_name: felt252,
     defender: ContractAddress,
     defender_army_entity_id: ID,
     duration_left: u64,
@@ -45,9 +53,16 @@ pub struct BattleStartData {
 }
 
 #[derive(Introspect, Copy, Drop, Serde)]
+#[dojo::event]
+#[dojo::model]
 pub struct BattleJoinData {
+    #[key]
+    id: ID,
+    #[key]
+    event_id: EventType,
     battle_entity_id: ID,
     joiner: ContractAddress,
+    joiner_name: felt252,
     joiner_army_entity_id: ID,
     joiner_side: BattleSide,
     duration_left: u64,
@@ -56,9 +71,16 @@ pub struct BattleJoinData {
 }
 
 #[derive(Introspect, Copy, Drop, Serde)]
+#[dojo::event]
+#[dojo::model]
 pub struct BattleLeaveData {
+    #[key]
+    id: ID,
+    #[key]
+    event_id: EventType,
     battle_entity_id: ID,
     leaver: ContractAddress,
+    leaver_name: felt252,
     leaver_army_entity_id: ID,
     leaver_side: BattleSide,
     duration_left: u64,
@@ -67,9 +89,16 @@ pub struct BattleLeaveData {
 }
 
 #[derive(Introspect, Copy, Drop, Serde)]
+#[dojo::event]
+#[dojo::model]
 pub struct BattleClaimData {
+    #[key]
+    id: ID,
+    #[key]
+    event_id: EventType,
     structure_entity_id: ID,
     claimer: ContractAddress,
+    claimer_name: felt252,
     claimer_army_entity_id: ID,
     previous_owner: ContractAddress,
     x: u32,
@@ -78,8 +107,15 @@ pub struct BattleClaimData {
 }
 
 #[derive(Introspect, Copy, Drop, Serde)]
+#[dojo::event]
+#[dojo::model]
 pub struct BattlePillageData {
+    #[key]
+    id: ID,
+    #[key]
+    event_id: EventType,
     pillager: ContractAddress,
+    pillager_name: felt252,
     pillager_army_entity_id: ID,
     pillaged_structure_owner: ContractAddress,
     pillaged_structure_entity_id: ID,