generated from tipragot/rust
This commit is contained in:
parent
106cabe951
commit
c808a1e7a5
|
@ -43,4 +43,7 @@ pub struct Player {
|
||||||
|
|
||||||
/// The color of the player.
|
/// The color of the player.
|
||||||
pub color: (u8, u8, u8),
|
pub color: (u8, u8, u8),
|
||||||
|
|
||||||
|
/// The resources of the player.
|
||||||
|
pub resources: crate::resources::Resources,
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ use std::ops::{
|
||||||
|
|
||||||
use bevy::prelude::*;
|
use bevy::prelude::*;
|
||||||
use paste::paste;
|
use paste::paste;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
/// Represents a number that can be used in calculations for hexagonal grids.
|
/// Represents a number that can be used in calculations for hexagonal grids.
|
||||||
pub trait Number:
|
pub trait Number:
|
||||||
|
@ -99,7 +100,7 @@ number_impl! {
|
||||||
/// Represents a position in a hexagonal grid.
|
/// Represents a position in a hexagonal grid.
|
||||||
/// We use the axial coordinate system explained in this
|
/// We use the axial coordinate system explained in this
|
||||||
/// [documentation](https://www.redblobgames.com/grids/hexagons/#coordinates).
|
/// [documentation](https://www.redblobgames.com/grids/hexagons/#coordinates).
|
||||||
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Component)]
|
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Component, Serialize, Deserialize)]
|
||||||
pub struct HexPosition<T: Number>(pub T, pub T);
|
pub struct HexPosition<T: Number>(pub T, pub T);
|
||||||
|
|
||||||
/// All possible directions in a hexagonal grid.
|
/// All possible directions in a hexagonal grid.
|
||||||
|
|
|
@ -7,6 +7,7 @@ pub mod renderer;
|
||||||
pub mod selected_tile;
|
pub mod selected_tile;
|
||||||
|
|
||||||
use bevy::prelude::*;
|
use bevy::prelude::*;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use self::hex::*;
|
use self::hex::*;
|
||||||
|
|
||||||
|
@ -14,7 +15,7 @@ use self::hex::*;
|
||||||
pub type TilePosition = HexPosition<i32>;
|
pub type TilePosition = HexPosition<i32>;
|
||||||
|
|
||||||
/// The tile of the map.
|
/// The tile of the map.
|
||||||
#[derive(Component, Debug)]
|
#[derive(Component, Debug, Clone, Serialize, Deserialize)]
|
||||||
pub enum Tile {
|
pub enum Tile {
|
||||||
/// The breeding tile.
|
/// The breeding tile.
|
||||||
Breeding,
|
Breeding,
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
//! All code related to the ownership of the tiles.
|
//! All code related to the ownership of the tiles.
|
||||||
|
|
||||||
use bevy::prelude::*;
|
use bevy::prelude::*;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use crate::Player;
|
use crate::Player;
|
||||||
|
|
||||||
/// The owner of a tile.
|
/// The owner of a tile.
|
||||||
#[derive(Component, Clone)]
|
#[derive(Component, Clone, Serialize, Deserialize)]
|
||||||
pub struct Owner(pub Player);
|
pub struct Owner(pub Player);
|
||||||
|
|
||||||
/// The plugin to render the ownership of the tiles.
|
/// The plugin to render the ownership of the tiles.
|
||||||
|
|
|
@ -6,11 +6,13 @@ use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use self::check_connection::CheckConnectionPlugin;
|
use self::check_connection::CheckConnectionPlugin;
|
||||||
use self::connection::ConnectionPlugin;
|
use self::connection::ConnectionPlugin;
|
||||||
|
use self::reconnection::ReconnectionPlugin;
|
||||||
use crate::map::generation::StartMapGeneration;
|
use crate::map::generation::StartMapGeneration;
|
||||||
use crate::CurrentScene;
|
use crate::CurrentScene;
|
||||||
|
|
||||||
pub mod check_connection;
|
pub mod check_connection;
|
||||||
pub mod connection;
|
pub mod connection;
|
||||||
|
pub mod reconnection;
|
||||||
|
|
||||||
/// The plugin for the networking.
|
/// The plugin for the networking.
|
||||||
pub struct NetworkingPlugin;
|
pub struct NetworkingPlugin;
|
||||||
|
@ -21,6 +23,7 @@ impl Plugin for NetworkingPlugin {
|
||||||
.add_plugins(ConnectionPlugin)
|
.add_plugins(ConnectionPlugin)
|
||||||
.add_systems(Update, handle_start_game)
|
.add_systems(Update, handle_start_game)
|
||||||
.add_network_event::<StartGame>()
|
.add_network_event::<StartGame>()
|
||||||
|
.add_plugins(ReconnectionPlugin)
|
||||||
.add_plugins(CheckConnectionPlugin);
|
.add_plugins(CheckConnectionPlugin);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
36
crates/border-wars/src/networking/reconnection.rs
Normal file
36
crates/border-wars/src/networking/reconnection.rs
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
//! All program related to reconnection logic.
|
||||||
|
|
||||||
|
use bevnet::NetworkAppExt;
|
||||||
|
use bevy::prelude::*;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::map::ownership::Owner;
|
||||||
|
use crate::map::{Tile, TilePosition};
|
||||||
|
use crate::Player;
|
||||||
|
|
||||||
|
/// The plugin for the reconnection.
|
||||||
|
pub struct ReconnectionPlugin;
|
||||||
|
|
||||||
|
impl Plugin for ReconnectionPlugin {
|
||||||
|
fn build(&self, app: &mut App) {
|
||||||
|
app.add_network_event::<ReconnectionRequest>()
|
||||||
|
.add_network_event::<ReconnectionResponse>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The event to request the reconnection.
|
||||||
|
#[derive(Event, Serialize, Deserialize)]
|
||||||
|
pub struct ReconnectionRequest;
|
||||||
|
|
||||||
|
/// The event to response to the reconnection.
|
||||||
|
#[derive(Event, Serialize, Deserialize)]
|
||||||
|
pub struct ReconnectionResponse {
|
||||||
|
/// All the players in the game.
|
||||||
|
pub players: Vec<Player>,
|
||||||
|
|
||||||
|
/// The map of the game.
|
||||||
|
pub map: Vec<(Option<Owner>, Tile, TilePosition)>,
|
||||||
|
|
||||||
|
/// The current player.
|
||||||
|
pub current_player: Player,
|
||||||
|
}
|
|
@ -1,6 +1,7 @@
|
||||||
//! All program related to the resources of the game.
|
//! All program related to the resources of the game.
|
||||||
|
|
||||||
use bevy::prelude::*;
|
use bevy::prelude::*;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
/// The plugin that manage the resources.
|
/// The plugin that manage the resources.
|
||||||
pub struct ResourcesPlugin;
|
pub struct ResourcesPlugin;
|
||||||
|
@ -14,7 +15,7 @@ impl Plugin for ResourcesPlugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The resources of the game.
|
/// The resources of the game.
|
||||||
#[derive(Resource, Default)]
|
#[derive(Resource, Default, Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||||||
pub struct Resources {
|
pub struct Resources {
|
||||||
/// The stone resource.
|
/// The stone resource.
|
||||||
pub stone: u32,
|
pub stone: u32,
|
||||||
|
@ -28,7 +29,7 @@ pub struct Resources {
|
||||||
|
|
||||||
impl Resources {
|
impl Resources {
|
||||||
/// Returns the initial resources of the game.
|
/// Returns the initial resources of the game.
|
||||||
const fn initial() -> Self {
|
pub const fn initial() -> Self {
|
||||||
Self {
|
Self {
|
||||||
stone: 100,
|
stone: 100,
|
||||||
wood: 100,
|
wood: 100,
|
||||||
|
|
|
@ -6,6 +6,7 @@ use bevy_egui::{egui, EguiContexts};
|
||||||
|
|
||||||
use crate::networking::connection::RequestJoin;
|
use crate::networking::connection::RequestJoin;
|
||||||
use crate::networking::PlayerRank;
|
use crate::networking::PlayerRank;
|
||||||
|
use crate::resources::Resources;
|
||||||
use crate::{CurrentScene, Player};
|
use crate::{CurrentScene, Player};
|
||||||
|
|
||||||
/// The plugin for the menu.
|
/// The plugin for the menu.
|
||||||
|
@ -59,6 +60,7 @@ fn menu_ui(
|
||||||
rank: PlayerRank::Player,
|
rank: PlayerRank::Player,
|
||||||
uuid,
|
uuid,
|
||||||
color: rand::random::<(u8, u8, u8)>(),
|
color: rand::random::<(u8, u8, u8)>(),
|
||||||
|
resources: Resources::initial(),
|
||||||
}),
|
}),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
@ -73,6 +75,7 @@ fn menu_ui(
|
||||||
rank: PlayerRank::Admin,
|
rank: PlayerRank::Admin,
|
||||||
uuid,
|
uuid,
|
||||||
color: rand::random::<(u8, u8, u8)>(),
|
color: rand::random::<(u8, u8, u8)>(),
|
||||||
|
resources: Resources::initial(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue