first real gameplay

mattzque · Dec 7, 2023 · fdaba25 · fdaba25
1 parent 705cf95
commit fdaba25
Show file tree

Hide file tree

Showing 21 changed files with 936 additions and 152 deletions.
diff --git a/README.md b/README.md
@@ -29,6 +29,32 @@ License: [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) + MIT
 * [`@fortawesome/free-regular-svg-icons`](https://www.npmjs.com/package/@fortawesome/free-regular-svg-icons)
 * [`@fortawesome/free-brands-svg-icons`](https://www.npmjs.com/package/@fortawesome/free-brands-svg-icons)
 
+### Fonts
+
+* [Gasoek One](https://fonts.google.com/specimen/Gasoek+One), SIL Open Font License. Designed by Jiashuo Zhang, JAMO
+
+> Copyright 2022 The Gasoek Project Authors (https://github.com/JAMO-TYPEFACE/Gasoek)
+> 
+> This Font Software is licensed under the SIL Open Font License, Version 1.1.
+> This license is copied below, and is also available with a FAQ at:
+> http://scripts.sil.org/OFL
+
+* [DM Sans](https://fonts.google.com/specimen/DM+Sans), SIL Open Font License. Designed by Colophon Foundry, Jonny Pinhorn, Indian Type Foundry.
+
+> Copyright 2014 The DM Sans Project Authors (https://github.com/googlefonts/dm-fonts)
+>                                                                                                   
+> This Font Software is licensed under the SIL Open Font License, Version 1.1.
+> This license is copied below, and is also available with a FAQ at:
+> http://scripts.sil.org/OFL
+
+### Background Music
+
+* [From the Stillness of Winter](https://freemusicarchive.org/music/Brylie_Christopher_Oxley/liminal-space/from-the-stillness-of-winter/) by Brylie Christopher Oxley is licensed under a Attribution 4.0 International License.
+* [Praise the Day](https://freemusicarchive.org/music/Brylie_Christopher_Oxley/liminal-space/praise-the-day/) by Brylie Christopher Oxley is licensed under a Attribution 4.0 International License.
+* [Pack Dynamic](https://freemusicarchive.org/music/Brylie_Christopher_Oxley/liminal-space/pack-dynamic/) by Brylie Christopher Oxley is licensed under a Attribution 4.0 International License.
+* [Silver Linings](https://freemusicarchive.org/music/Brylie_Christopher_Oxley/liminal-space/silver-linings/) by Brylie Christopher Oxley is licensed under a Attribution 4.0 International License.
+* [Our Slow Recovery](https://freemusicarchive.org/music/Brylie_Christopher_Oxley/liminal-space/our-slow-recovery/) by Brylie Christopher Oxley is licensed under a Attribution 4.0 International License.
+
 ### Dependencies
 
 * [`bevy`](https://crates.io/crates/bevy) (MIT OR Apache-2.0)

diff --git a/assets/fonts/DMSans-Black-OFL.txt b/assets/fonts/DMSans-Black-OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2014 The DM Sans Project Authors (https://github.com/googlefonts/dm-fonts)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/assets/fonts/DMSans-Black.ttf b/assets/fonts/DMSans-Black.ttf
diff --git a/assets/fonts/GasoekOne-Regular-OFL.txt b/assets/fonts/GasoekOne-Regular-OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2022 The Gasoek Project Authors (https://github.com/JAMO-TYPEFACE/Gasoek)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/assets/fonts/GasoekOne-Regular.ttf b/assets/fonts/GasoekOne-Regular.ttf
diff --git a/assets/music/LICENSE b/assets/music/LICENSE
@@ -0,0 +1,5 @@
+* [From the Stillness of Winter](https://freemusicarchive.org/music/Brylie_Christopher_Oxley/liminal-space/from-the-stillness-of-winter/) by Brylie Christopher Oxley is licensed under a Attribution 4.0 International License.
+* [Praise the Day](https://freemusicarchive.org/music/Brylie_Christopher_Oxley/liminal-space/praise-the-day/) by Brylie Christopher Oxley is licensed under a Attribution 4.0 International License.
+* [Pack Dynamic](https://freemusicarchive.org/music/Brylie_Christopher_Oxley/liminal-space/pack-dynamic/) by Brylie Christopher Oxley is licensed under a Attribution 4.0 International License.
+* [Silver Linings](https://freemusicarchive.org/music/Brylie_Christopher_Oxley/liminal-space/silver-linings/) by Brylie Christopher Oxley is licensed under a Attribution 4.0 International License.
+* [Our Slow Recovery](https://freemusicarchive.org/music/Brylie_Christopher_Oxley/liminal-space/our-slow-recovery/) by Brylie Christopher Oxley is licensed under a Attribution 4.0 International License.
diff --git a/assets/music/track1.ogg b/assets/music/track1.ogg
diff --git a/assets/music/track2.ogg b/assets/music/track2.ogg
diff --git a/assets/music/track3.ogg b/assets/music/track3.ogg
diff --git a/assets/music/track4.ogg b/assets/music/track4.ogg
diff --git a/assets/music/track5.ogg b/assets/music/track5.ogg
diff --git a/src/game/assets/mod.rs b/src/game/assets/mod.rs
@@ -7,6 +7,7 @@ use bevy::render::texture::{ImageFilterMode, ImageSampler, ImageSamplerDescripto
 
 use self::icons::IconSheetAsset;
 
+use super::hud::FontResource;
 use super::icons::IconSheetResource;
 use super::states::GameState;
 
@@ -35,12 +36,19 @@ fn load_assets_system(
     server: Res<AssetServer>,
     mut state: ResMut<NextState<GameState>>,
 ) {
+    let font: Handle<Font> = server.load("fonts/GasoekOne-Regular.ttf");
     let icons: Handle<IconSheetAsset> = server.load("icons.icon.json");
     commands.insert_resource(IconSheetResource {
         handle: icons.clone(),
         texture_array: None,
     });
-    commands.insert_resource(PendingAssets(HashSet::from_iter(vec![icons.untyped()])));
+    commands.insert_resource(FontResource {
+        handle: font.clone(),
+    });
+    commands.insert_resource(PendingAssets(HashSet::from_iter(vec![
+        icons.untyped(),
+        font.untyped(),
+    ])));
     state.set(GameState::AssetsLoading);
 }
 

diff --git a/src/game/debug.rs b/src/game/debug.rs
@@ -66,6 +66,13 @@ pub fn render_settings_gui(mut settings: ResMut<SettingsResource>, mut contexts:
         ui.add(
             egui::Slider::new(&mut settings.cohesion_weight, 0.0..=10.0).text("Cohesion Weight"),
         );
+        ui.add(egui::Slider::new(&mut settings.seek_weight, 0.0..=100.0).text("Follower: Weight"));
+        ui.add(
+            egui::Slider::new(&mut settings.seek_max_speed, 0.0..=2.0).text("Follower: Max Speed"),
+        );
+        ui.add(
+            egui::Slider::new(&mut settings.seek_max_force, 0.0..=2.0).text("Follower: Max Force"),
+        );
         ui.add(
             egui::Slider::new(&mut settings.controller_turn_speed, 0.0..=10.0)
                 .text("Controller Turn Speed"),
@@ -82,5 +89,14 @@ pub fn render_settings_gui(mut settings: ResMut<SettingsResource>, mut contexts:
             egui::Slider::new(&mut settings.controller_max_speed, 0.0..=1000.0)
                 .text("Controller Max Speed"),
         );
+
+        ui.add(
+            egui::Slider::new(&mut settings.max_hover_distance, 0.0..=1000.0)
+                .text("Max Hover Distance"),
+        );
+        ui.add(
+            egui::Slider::new(&mut settings.capture_time, 0.0..=10.0)
+                .text("Time to Capture (secs)"),
+        );
     });
 }
diff --git a/src/game/hud.rs b/src/game/hud.rs
@@ -0,0 +1,18 @@
+use bevy::prelude::*;
+
+use super::{settings::SettingsResource, states::GameState};
+
+#[derive(Resource)]
+pub struct FontResource {
+    pub handle: Handle<Font>,
+}
+
+pub struct HudPlugin;
+
+impl Plugin for HudPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(OnEnter(GameState::GameLoading), init_hud);
+    }
+}
+
+pub fn init_hud(mut _settings: ResMut<SettingsResource>) {}