- chore: ran cargo fix on the codebase
This commit is contained in:
@@ -1,7 +1,11 @@
|
||||
use tonic::transport::Channel;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use crate::database::character_db_service_client::CharacterDbServiceClient;
|
||||
use crate::database::{CharacterRequest, Character, CharacterListRequest, CharacterListResponse, CreateCharacterRequest, CreateCharacterResponse, DeleteCharacterRequest, DeleteCharacterResponse};
|
||||
use crate::database::{
|
||||
Character, CharacterListRequest, CharacterListResponse, CharacterRequest,
|
||||
CreateCharacterRequest, CreateCharacterResponse, DeleteCharacterRequest,
|
||||
DeleteCharacterResponse,
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tonic::transport::Channel;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct CharacterDbClient {
|
||||
@@ -71,7 +75,11 @@ impl CharacterDbClient {
|
||||
Ok(Self { client })
|
||||
}
|
||||
|
||||
pub async fn get_character(&mut self, user_id: &str, char_id: &str) -> Result<Character, Box<dyn std::error::Error>> {
|
||||
pub async fn get_character(
|
||||
&mut self,
|
||||
user_id: &str,
|
||||
char_id: &str,
|
||||
) -> Result<Character, Box<dyn std::error::Error>> {
|
||||
let request = tonic::Request::new(CharacterRequest {
|
||||
user_id: user_id.parse().unwrap(),
|
||||
character_id: char_id.parse().unwrap(),
|
||||
@@ -80,7 +88,10 @@ impl CharacterDbClient {
|
||||
Ok(response.into_inner())
|
||||
}
|
||||
|
||||
pub async fn get_character_list(&mut self, user_id: &str) -> Result<CharacterListResponse, Box<dyn std::error::Error>> {
|
||||
pub async fn get_character_list(
|
||||
&mut self,
|
||||
user_id: &str,
|
||||
) -> Result<CharacterListResponse, Box<dyn std::error::Error>> {
|
||||
let request = tonic::Request::new(CharacterListRequest {
|
||||
user_id: user_id.parse().unwrap(),
|
||||
});
|
||||
@@ -88,12 +99,20 @@ impl CharacterDbClient {
|
||||
Ok(response.into_inner())
|
||||
}
|
||||
|
||||
pub async fn create_character(&mut self, user_id: &str, name: &str, race: i32, face: i32, hair: i32, stone: i32) -> Result<CreateCharacterResponse, Box<dyn std::error::Error>> {
|
||||
pub async fn create_character(
|
||||
&mut self,
|
||||
user_id: &str,
|
||||
name: &str,
|
||||
race: i32,
|
||||
face: i32,
|
||||
hair: i32,
|
||||
stone: i32,
|
||||
) -> Result<CreateCharacterResponse, Box<dyn std::error::Error>> {
|
||||
let mut hatid = 221;
|
||||
if 0 == race {
|
||||
hatid = 222;
|
||||
}
|
||||
|
||||
|
||||
let inventory = vec![
|
||||
Item {
|
||||
item_id: 30,
|
||||
@@ -135,7 +154,7 @@ impl CharacterDbClient {
|
||||
slot: 12,
|
||||
},
|
||||
];
|
||||
|
||||
|
||||
let stats = Stats {
|
||||
job: 0,
|
||||
str: 10,
|
||||
@@ -160,8 +179,19 @@ impl CharacterDbClient {
|
||||
pat_cooldown_time: 0,
|
||||
};
|
||||
|
||||
let looks = Looks {race, face, hair, stone};
|
||||
let position = Position {map_id: 20, x: 5200.00, y: 5200.00, z: 1.0, spawn_id: 1};
|
||||
let looks = Looks {
|
||||
race,
|
||||
face,
|
||||
hair,
|
||||
stone,
|
||||
};
|
||||
let position = Position {
|
||||
map_id: 20,
|
||||
x: 5200.00,
|
||||
y: 5200.00,
|
||||
z: 1.0,
|
||||
spawn_id: 1,
|
||||
};
|
||||
|
||||
let request = tonic::Request::new(CreateCharacterRequest {
|
||||
user_id: user_id.parse().unwrap(),
|
||||
@@ -175,7 +205,12 @@ impl CharacterDbClient {
|
||||
Ok(response.into_inner())
|
||||
}
|
||||
|
||||
pub async fn delete_character(&mut self, user_id: &str, char_id: &str, delete_type: i32) -> Result<DeleteCharacterResponse, Box<dyn std::error::Error>> {
|
||||
pub async fn delete_character(
|
||||
&mut self,
|
||||
user_id: &str,
|
||||
char_id: &str,
|
||||
delete_type: i32,
|
||||
) -> Result<DeleteCharacterResponse, Box<dyn std::error::Error>> {
|
||||
let request = tonic::Request::new(DeleteCharacterRequest {
|
||||
user_id: user_id.parse().unwrap(),
|
||||
character_id: char_id.parse().unwrap(),
|
||||
@@ -184,4 +219,4 @@ impl CharacterDbClient {
|
||||
let response = self.client.delete_character(request).await?;
|
||||
Ok(response.into_inner())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user