Compare commits

...

3 commits

Author SHA1 Message Date
CoCo_Sol 93d07bdb2d save
Some checks failed
Rust Checks / checks (push) Failing after 12m11s
2024-04-07 20:30:19 +02:00
CoCo_Sol b0d743f1b6 save
All checks were successful
Rust Checks / checks (push) Successful in 2m30s
Rust Checks / checks (pull_request) Successful in 2m22s
2024-04-07 18:54:39 +02:00
CoCo_Sol 6dfde67300 Add resources system and update player struct
All checks were successful
Rust Checks / checks (push) Successful in 3m9s
2024-04-07 17:34:28 +02:00
8 changed files with 99 additions and 6 deletions

View file

@ -43,4 +43,7 @@ pub struct Player {
/// The color of the player.
pub color: (u8, u8, u8),
/// The resources of the player.
pub resources: resources::Resources,
}

View file

@ -6,6 +6,7 @@ use std::ops::{
use bevy::prelude::*;
use paste::paste;
use serde::{Deserialize, Serialize};
/// Represents a number that can be used in calculations for hexagonal grids.
pub trait Number:
@ -99,7 +100,7 @@ number_impl! {
/// Represents a position in a hexagonal grid.
/// We use the axial coordinate system explained in this
/// [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);
/// All possible directions in a hexagonal grid.

View file

@ -7,6 +7,7 @@ pub mod renderer;
pub mod selected_tile;
use bevy::prelude::*;
use serde::{Deserialize, Serialize};
use self::hex::*;
@ -14,7 +15,7 @@ use self::hex::*;
pub type TilePosition = HexPosition<i32>;
/// The tile of the map.
#[derive(Component, Debug)]
#[derive(Component, Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub enum Tile {
/// The breeding tile.
Breeding,

View file

@ -1,11 +1,12 @@
//! All code related to the ownership of the tiles.
use bevy::prelude::*;
use serde::{Deserialize, Serialize};
use crate::Player;
/// The owner of a tile.
#[derive(Component, Clone)]
#[derive(Component, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub struct Owner(pub Player);
/// The plugin to render the ownership of the tiles.

View file

@ -11,6 +11,7 @@ use crate::CurrentScene;
pub mod check_connection;
pub mod connection;
pub mod reconnection;
/// The plugin for the networking.
pub struct NetworkingPlugin;

View 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,
}

View file

@ -1,6 +1,10 @@
//! All program related to the resources of the game.
use bevnet::{NetworkAppExt, Receive, SendTo};
use bevy::prelude::*;
use serde::{Deserialize, Serialize};
use crate::Player;
/// The plugin that manage the resources.
pub struct ResourcesPlugin;
@ -9,12 +13,16 @@ impl Plugin for ResourcesPlugin {
fn build(&self, app: &mut App) {
app.add_event::<ResetResources>()
.insert_resource(Resources::initial())
.add_systems(Update, handle_reset_resources);
.add_network_event::<UpdateResources>()
.add_systems(
Update,
(handle_reset_resources, save_resources, update_resources),
);
}
}
/// The resources of the game.
#[derive(Resource, Default)]
#[derive(Resource, Default, Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub struct Resources {
/// The stone resource.
pub stone: u32,
@ -28,7 +36,7 @@ pub struct Resources {
impl Resources {
/// Returns the initial resources of the game.
const fn initial() -> Self {
pub const fn initial() -> Self {
Self {
stone: 100,
wood: 100,
@ -50,3 +58,42 @@ fn handle_reset_resources(
*resources = Resources::initial();
}
}
/// An event send to update the resources of a player.
#[derive(Event, Serialize, Deserialize, Clone, Copy)]
pub struct UpdateResources(pub Resources);
/// Save the resources of the game when you modify it.
fn save_resources(
mut update_resources_event: EventWriter<SendTo<UpdateResources>>,
resources: Res<Resources>,
players: Query<&Player>,
) {
if !resources.is_changed() {
return;
}
let event = UpdateResources(*resources);
for player in players.iter() {
update_resources_event.send(SendTo(player.uuid, event));
}
}
/// Update the resources of all player.
fn update_resources(
mut update_resources_event: EventReader<Receive<UpdateResources>>,
mut players: Query<&mut Player>,
) {
for event in update_resources_event.read() {
let Some(mut player) = players.iter_mut().find(|player| player.uuid == event.0) else {
continue;
};
player.resources = event.1.0;
println!(
"Update resources for player {:?} to {:?}",
player.uuid, player.resources
);
}
}

View file

@ -6,6 +6,7 @@ use bevy_egui::{egui, EguiContexts};
use crate::networking::connection::RequestJoin;
use crate::networking::PlayerRank;
use crate::resources::Resources;
use crate::{CurrentScene, Player};
/// The plugin for the menu.
@ -59,6 +60,7 @@ fn menu_ui(
rank: PlayerRank::Player,
uuid,
color: rand::random::<(u8, u8, u8)>(),
resources: Resources::initial(),
}),
));
}
@ -73,6 +75,7 @@ fn menu_ui(
rank: PlayerRank::Admin,
uuid,
color: rand::random::<(u8, u8, u8)>(),
resources: Resources::initial(),
});
}
});