diff --git a/Carrier.rs b/Carrier.rs index 5b83c72..e7c23db 100644 --- a/Carrier.rs +++ b/Carrier.rs @@ -14,7 +14,8 @@ enum Action { struct Carrier { ships: u16, - action_queue: VecDeque<(&star, Action)>, - past_actions: VecDeque<(&star, Action)>, + location: &Star + action_queue: VecDeque<(&Star, Action)>, + past_actions: VecDeque<(&Star, Action)>, owner: &player } \ No newline at end of file diff --git a/Player.rs b/Player.rs index a1e6083..e173fd3 100644 --- a/Player.rs +++ b/Player.rs @@ -1,25 +1,26 @@ enum Race { Griffin, + Catte +} + +struct ResearchItem { + levels: u8, + points: u16 } struct Research { - Weapons: u8, - Banking: u8, - Manufactoring: u8, - Terraforming: u8, - Hyperspace: u8, - Experimentation: u8, - Scanning: u8 -} - -impl Research { - fn getWeaponsLevel() { - this.Weapons. - } + Weapons: ResearchItem + Banking: ResearchItem, + Manufactoring: ResearchItem, + Terraforming: ResearchItem, + Hyperspace: ResearchItem, + Experimentation: ResearchItem, + Scanning: ResearchItem } struct Player { Name: String, Color: (u8, u8, u8), Race: Race, + Research } \ No newline at end of file diff --git a/static/images/cybkatte.png b/static/images/cybkatte.png new file mode 100644 index 0000000..37da953 Binary files /dev/null and b/static/images/cybkatte.png differ diff --git a/static/index.html b/static/index.html index edece3a..e07c055 100644 --- a/static/index.html +++ b/static/index.html @@ -12,6 +12,10 @@

Welcome to Neo Poseidon

This is an open source game inspired by Neptune's Pride. An extremely slow paced real time strategy game

+

Races:

+

The Catte

+ + \ No newline at end of file