Feat/ship sync

README.md

@@ -1,6 +1,6 @@
-# Textship #
+# Text Sub #
 
-Build a spaceship out of ASCII Symbols and fight in a 2 Player deathmatch.
+Build a submarine out of ASCII Symbols and fight in a multiplayer deathmatch.
 
 ## Setup Bevy to run in the browser ##
 
@@ -49,18 +49,18 @@ Build a spaceship out of ASCII Symbols and fight in a 2 Player deathmatch.
 
 ## Client: Run a development build ##
 
+- Run the signalling server locally:
+    ```
+    matchbox_server
+    ```
+
 - Start the wasm-server-runner:
     ```
     cargo run --target wasm32-unknown-unknown
     ```
 
 - Open a browser tab at 127.0.0.1:1334 (or whatever the port is).
 
-- Run the signalling server locally:
-    ```
-    matchbox_server
-    ```
-
 Multiple tabs can connect to the wasm-server-runner, which means you can run multiple clients on the same machine.
 
 ### Client: Run tests ###
@@ -77,14 +77,18 @@ wasm-pack build --release --target bundler --out-dir target/bundle
 
 ## FAQ ##
 
-### My ships don't move when I open two tabs! ###
+### My subs don't move when I open two tabs! ###
 
-This is a known bug with the ship detection algorithm. It will work with multi windows and real 2 player scenarios.
+This is a known bug with the sub detection algorithm. It will work with multi windows and real 2 player scenarios.
 
 ## Libraries ##
 
 - rust syntax refresher: https://learnxinyminutes.com/docs/rust/
 
+- rust book: https://doc.rust-lang.org/stable/book/
+
+- rust api: https://doc.rust-lang.org/std/
+
 - bevy api: https://docs.rs/bevy/latest/bevy/
 
 - bevy unofficial book: https://bevy-cheatbook.github.io/
@@ -103,6 +107,12 @@ This is a known bug with the ship detection algorithm. It will work with multi w
 
 - rocket api: https://api.rocket.rs/v0.5-rc/rocket/
 
-- matchbox: https://github.com/johanhelsing/matchbox/
+- bevy_ggrs api: https://docs.rs/bevy_ggrs/0.12.0/bevy_ggrs/
+
+- bevy_matchbox api: https://docs.rs/bevy_matchbox/0.7.0/bevy_matchbox/index.html
 
 - wasm server runner: https://github.com/jakobhellermann/wasm-server-runner
+
+- bevy_ui api: https://docs.rs/bevy_ui/latest/bevy_ui/
+
+- bevy_pkg: https://docs.rs/bevy_pkv/0.8.0/bevy_pkv/

TODO.md

@@ -1 +1,19 @@
+- ship builder feature
 
+    - fix not able to draw outside the box
+
+    - fix being able to draw where parts are not connected
+
+    - spawn placement grid
+
+- fixes feature
+
+    - direction of torpedo should rotate with ship
+
+    - change explosions into text, not sprites
+
+    - change torpedos into text, not sprites
+
+    - fix player should be in the center of the screen at all times
+
+    - send sub builds to other players

client/Cargo.toml

@@ -1,44 +1,49 @@
 [package]
-name = "textship"
+name = "textsub"
 version = "0.1.0"
 edition = "2021"
 authors = ["doublecouponday <[email protected]>", "bobscorn <[email protected]>" ]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = { version = "0.10.1", features = [] }
-bevycheck = "0.5.2"
+bevy = { version = "0.11", features = [] }
 console_error_panic_hook = "0.1.7"
 web-sys = { version = "0.3", features = ["console"] }
 wasm-bindgen = "0.2.87"
 wasm-bindgen-futures = "0.4.37"
 wee_alloc = { version = "0.4.5", optional = true } #enables smaller builds at the cost of runtime allocation time
-bevy_ggrs = { version = "0.12", features = ["wasm-bindgen"] }
-bevy_matchbox = { version = "0.6", features = ["ggrs"] }
-bevy_asset_loader = "0.15"
+bevy_ggrs = { version = "0.13", features = ["wasm-bindgen"] }
+bevy_matchbox = { version = "0.7", features = ["ggrs"] }
+bevy_asset_loader = "0.17"
+bevy_pkv = "0.8.0"
+serde = "1.0.188"
+serde_json = "1.0"
+bevy-inspector-egui = "0.19"
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.13"
-bevy-inspector-egui = "0.18.3"
 
-# Enable a small amount of optimization in debug mode
+#dont optimise runtime performance in dev mode
 [profile.dev]
-opt-level = 1
+opt-level = 0
 
 # Enable high optimizations for dependencies (incl. Bevy), but not for our code:
 [profile.dev.package."*"]
-opt-level = 3
+opt-level = 0
 
 [profile.release]
 # Tell `rustc` to optimize for small code size.
 opt-level = "s"
 
+[profile.release.package."*"]
+opt-level = 3
+
 [[bin]]
-name = "textship"
+name = "textsub"
 path = "main.rs"
 
 [lib]
-name = "textship_lib"
+name = "textsub_lib"
 crate-type = ["cdylib", "rlib"]
 path = "lib.rs"

client/assets/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "textship"
+name = "textsub"
 version = "0.1.0"
 edition = "2021"
 authors = ["doublecouponday <[email protected]>", "bobscorn <[email protected]>" ]

client/components.rs

@@ -1,4 +1,24 @@
 use bevy::prelude::*;
+use crate::constants::*;
+use crate::enums::*;
+use crate::resources::*;
+use crate::structs::*;
+
+#[derive(Component)]
+pub struct SymbolButton {}
+
+#[derive(Component)]
+pub struct HoverText {}
+
+#[derive(Component)]
+pub struct MyButton {
+    pub identifier: ButtonType
+}
+
+#[derive(Component)]
+pub struct SubBuilderButton {
+    pub part: SubPart,
+}
 
 #[derive(Component, Reflect, Default)]
 pub struct Velocity {
@@ -105,7 +125,7 @@ pub struct HangarDoor {
 }
 
 #[derive(Component)]
-pub struct Thruster {
+pub struct Propeller {
 
 }
 
@@ -114,11 +134,18 @@ pub struct FighterDrone {
 
 }
 
-#[derive(Component, Default)]
-pub struct Mothership {
+#[derive(Component)]
+pub struct SubsRoot {
+    pub parts: Vec<char>,
     pub num_entities: u32
 }
 
+impl Default for SubsRoot {
+    fn default() -> Self {
+        SubsRoot { parts: Vec::new(), num_entities: 0 }
+    }
+}
+
 #[derive(Component)]
 pub struct Player {
     pub handle: usize
@@ -128,3 +155,12 @@ pub struct Player {
 pub struct Lifetime {
     pub lifetime: f32 // Remaining Lifetime in seconds
 }
+
+#[derive(Component)]
+pub struct MainCamera;
+
+#[derive(Component)]
+pub struct MySubmarineTag;
+
+#[derive(Component)]
+pub struct UnerasablePiece;

client/constants.rs

@@ -1,37 +1,56 @@
-
-pub const MOTHERSHIP_SPEED: f32 = 0.25;
+pub const SUB_SPEED: f32 = 0.25;
 pub const ROTATION_SPEED: f32 = 0.025;
 
-pub const MOTHERSHIP_STRUCTURE_SPACING: f32 = 15.0;
+pub const SUB_STRUCTURE_SPACING: f32 = 3.5;
+pub const SUB_SCALE: f32 = 0.2;
+pub const SUB_MAX_WIDTH: usize = 100;
+pub const SUB_MAX_HEIGHT: usize = 100;
 
 pub const TEXT_FONT_SIZE: f32 = 30.0;
+pub const EMPTY_CHAR: char = '\0';
+
+//armour
+pub const ARMOUR_LABEL: &'static str = "Hull Panel";
+pub const ARMOUR_DESC: &'static str = "Submarine construction part. Suitable for pressurised environments.";
 
 pub const SQUARE_OPEN: char = '[';
 pub const SQUARE_CLOSE: char = ']';
-pub const ANGLE_OPEN: char = '<';
-pub const ANGLE_CLOSE: char = '>';
+
 pub const ROUND_OPEN: char = '(';
 pub const ROUND_CLOSE: char = ')';
+
 pub const CURLY_OPEN: char = '{';
-pub const CURL_CLOSE: char = '}';
+pub const CURLY_CLOSE: char = '}';
 
 pub const BACKSLASH: char = '\\';
 pub const FORWARD_SLASH: char = '/';
 pub const PIPE: char = '|';
-pub const EQUALS: char = '=';
-pub const PERCENT: char = '%';
-pub const TILDE: char = '~';
 
-pub const FULLSTOP: char = '.';
+//utilities
+pub static PROPELLER_LABEL: &'static str = "Propeller ";
+pub static PROPELLER_DESCRIPTION: &'static str = "Used for propulsion in the watery depths.";
 pub const PLUS: char = '+';
 pub const MINUS: char = '-';
-pub const BACKTICK: char = '`';
 
-pub const STAR: char = '*';
+
+pub static TORPEDO_LABEL: &'static str = "Torpedo   ";
+pub static TORPEDO_DESC: &'static str = "Explodey thing";
 pub const EXCLAMATION: char = '!';
+
+
+pub static TORPEDO_LAUNCHER_LABEL: &'static str = "Torpedo Launcher";
+pub static TORPEDO_LAUNCHER_DESC: &'static str = "Throws explodey things.";
+pub const EQUALS: char = '=';
+
+pub static REACTOR_LABEL: &'static str = "Reactor   ";
+pub static REACTOR_DESC: &'static str = "Generates power using unholy science.";
 pub const AT: char = '@';
-pub const DOLLAR: char = '$';
-pub const QUESTION: char = '?';
-pub const APOSTROPHE: char = '\'';
-pub const COLON: char = ':';
 
+//debris
+pub const TILDE: char = '~';
+pub const FULLSTOP: char = '.';
+pub const BUBBLE: char = 'o';
+
+pub const TEAM_KEY: &'static str = "amogus";
+pub const GAME_NAME: &'static str = "Text Sub";
+pub const CACHED_KEY: &'static str = "saved_build";

client/enums.rs

@@ -0,0 +1,75 @@
+use std::{default, f32::consts::PI};
+
+use bevy::prelude::*;
+use serde::{Serialize, Deserialize};
+
+use crate::resources::Submarine;
+
+#[derive(PartialEq)]
+pub enum ButtonType {
+    PlayButton,
+    SubBuilderButton,
+    BackToMenuButton,
+    SaveButton
+}
+
+#[derive(States, Clone, Eq, PartialEq, Debug, Hash, Default)]
+pub enum GameState {
+    #[default]
+    AssetLoading,
+    SubBuilding,
+    MainMenu,
+    MatchMaking,
+    SubSyncing,
+    InGame,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Default, Serialize, Deserialize, Reflect)]
+pub enum PieceRotation {
+    #[default]
+    North,
+    East,
+    South,
+    West
+}
+
+impl PieceRotation {
+    pub fn default() -> PieceRotation {
+        PieceRotation::North
+    }
+
+    pub fn rotated_cw(&self) -> Self {
+        match self {
+            Self::North => Self::East,
+            Self::East  => Self::South,
+            Self::South => Self::West,
+            Self::West  => Self::North
+        }
+    }
+
+    pub fn rotated_ccw(&self) -> Self {
+        match self {
+            Self::North => Self::West,
+            Self::West  => Self::South,
+            Self::South => Self::East,
+            Self::East  => Self::North
+        }
+    }
+
+    pub fn rotation_radians(&self) -> f32 {
+        match self {
+            Self::North => 0.0,
+            Self::East => PI * 1.5,
+            Self::South => PI,
+            Self::West => PI * 0.5
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize)]
+pub enum SyncShipsMessageType {
+    SyncShip(Submarine),
+    SyncShipAck,
+    ReadyToStart,
+    ReadyToStartAck
+}

client/events.rs

@@ -1,20 +1,14 @@
 use bevy::prelude::*;
 
-#[derive(Debug)]
+#[derive(Debug, Event)]
 pub struct TorpedoCollisionEvent {
     pub position: Vec3,
     pub damage: u8,
     pub radius: f32
 }
 
-#[derive(Debug)]
+#[derive(Debug, Event)]
 pub struct SpawnTorpedoEvent {
     pub position: Vec3,
     pub velocity: Vec3
 }
-
-#[derive(Resource, Default)]
-pub struct FontResource {
-    pub font: TextStyle,
-    pub p1_font: TextStyle,
-}