From 61fc78e6f3c3aff95a098a51bfaeff59fa31352d Mon Sep 17 00:00:00 2001
From: MedovTimur <medov.tr@phystech.edu>
Date: Wed, 16 Apr 2025 06:51:07 +0300
Subject: [PATCH] Updating battle

---
 contracts/battle/app/src/services/game/funcs.rs | 10 ++++++++--
 contracts/battle/app/src/services/game/mod.rs   |  3 +++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/contracts/battle/app/src/services/game/funcs.rs b/contracts/battle/app/src/services/game/funcs.rs
index 8d2cf8187..dcb8ea16f 100644
--- a/contracts/battle/app/src/services/game/funcs.rs
+++ b/contracts/battle/app/src/services/game/funcs.rs
@@ -81,6 +81,7 @@ pub async fn create_new_battle(
         dodge,
         player_id,
         msg_value,
+        msg_src,
     )
     .await;
     if reply.is_err() {
@@ -100,6 +101,7 @@ async fn create(
     dodge: u16,
     player_id: ActorId,
     msg_value: u128,
+    msg_src: ActorId,
 ) -> Result<Event, BattleError> {
     let time_creation = exec::block_timestamp();
     check_player_settings(attack, defence, dodge, &storage.config)?;
@@ -149,6 +151,8 @@ async fn create(
     Ok(Event::NewBattleCreated {
         battle_id: player_id,
         bid: msg_value,
+        user_id: msg_src,
+        user_name,
     })
 }
 
@@ -176,7 +180,7 @@ pub async fn battle_registration(
 
     let reply = register(
         storage, admin_id, warrior_id, appearance, user_name, attack, defence, dodge, player_id,
-        msg_value,
+        msg_value, msg_src
     )
     .await;
     if reply.is_err() {
@@ -196,6 +200,7 @@ async fn register(
     dodge: u16,
     player_id: ActorId,
     msg_value: u128,
+    msg_src: ActorId,
 ) -> Result<Event, BattleError> {
     check_player_settings(attack, defence, dodge, &storage.config)?;
 
@@ -219,7 +224,7 @@ async fn register(
     if battle.state != State::Registration {
         return Err(BattleError::WrongState);
     }
-    if battle.participants.len() >= storage.config.max_participants.into() {
+    if battle.participants.len() >= storage.config.max_participants as usize {
         return Err(BattleError::BattleFull);
     }
     if battle.bid != msg_value {
@@ -255,6 +260,7 @@ async fn register(
     Ok(Event::PlayerRegistered {
         admin_id,
         user_name,
+        user_id: msg_src,
         bid: msg_value,
     })
 }
diff --git a/contracts/battle/app/src/services/game/mod.rs b/contracts/battle/app/src/services/game/mod.rs
index c31232c14..aea899764 100644
--- a/contracts/battle/app/src/services/game/mod.rs
+++ b/contracts/battle/app/src/services/game/mod.rs
@@ -29,9 +29,12 @@ pub enum Event {
     NewBattleCreated {
         battle_id: ActorId,
         bid: u128,
+        user_id: ActorId,
+        user_name: String,
     },
     PlayerRegistered {
         admin_id: ActorId,
+        user_id: ActorId,
         user_name: String,
         bid: u128,
     },