remove other fonts from game just use lunchds now

cdsupina · Jun 1, 2024 · 0daaea3 · 0daaea3
1 parent 45cb92c
commit 0daaea3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/assets/ui_assets.assets.ron b/assets/ui_assets.assets.ron
@@ -1,4 +1,5 @@
 ({
+    "font.lunchds": File( path: "fonts/Lunchds.ttf"),
     "thetawave_logo.layout": TextureAtlasLayout (
         tile_size_x: 1920.,
         tile_size_y: 1080.,
@@ -19,7 +20,6 @@
     "ability_icon.standard_bullet": File ( path: "texture/bullet_ability.png"),
     "ability_slot.left": File ( path: "texture/ability_square_left.png"),
     "ability_slot.right": File ( path: "texture/ability_square_right.png"),
-    "font.wibletown": File (path: "fonts/wibletown-regular.otf"),
     "warning_gradient": File( path: "texture/warning_gradient.png"),
     "defense_gradient": File( path: "texture/defense_gradient.png"),
 })
diff --git a/src/assets/ui.rs b/src/assets/ui.rs
@@ -8,6 +8,8 @@ use thetawave_interface::abilities::{SlotOneAbilityType, SlotTwoAbilityType};
 
 #[derive(AssetCollection, Resource)]
 pub struct UiAssets {
+    #[asset(key = "font.lunchds")]
+    pub lunchds_font: Handle<Font>,
     #[asset(key = "thetawave_logo.layout")]
     pub thetawave_logo_layout: Handle<TextureAtlasLayout>,
     #[asset(key = "thetawave_logo.image")]
@@ -28,8 +30,6 @@ pub struct UiAssets {
     pub left_ability_slot: Handle<Image>,
     #[asset(key = "ability_slot.right")]
     pub right_ability_slot: Handle<Image>,
-    #[asset(key = "font.wibletown")]
-    pub wibletown_font: Handle<Font>,
     #[asset(key = "warning_gradient")]
     pub warning_gradient: Handle<Image>,
     #[asset(key = "defense_gradient")]

diff --git a/src/ui/game/parent.rs b/src/ui/game/parent.rs
@@ -87,7 +87,7 @@ pub(super) fn setup_game_ui_system(
     players_resource: Res<PlayersResource>,
     characters_resource: Res<CharactersResource>,
 ) {
-    let font: Handle<Font> = ui_assets.wibletown_font.clone();
+    let font: Handle<Font> = ui_assets.lunchds_font.clone();
 
     commands.spawn_border_gradient(&ui_assets, BorderGradientType::Defense);
     commands.spawn_border_gradient(&ui_assets, BorderGradientType::Warning);

diff --git a/src/ui/main_menu/mod.rs b/src/ui/main_menu/mod.rs
@@ -53,11 +53,10 @@ impl Plugin for MainMenuUIPlugin {
 /// component is the main way to undo the side effects of this system.
 fn setup_main_menu_system(
     mut commands: Commands,
-    asset_server: Res<AssetServer>,
     mut change_bg_music_event_writer: EventWriter<ChangeBackgroundMusicEvent>,
     ui_assets: Res<UiAssets>,
 ) {
-    let font: Handle<Font> = asset_server.load("fonts/Lunchds.ttf");
+    let font = ui_assets.lunchds_font.clone();
 
     change_bg_music_event_writer.send(ChangeBackgroundMusicEvent {
         bg_music_type: Some(BGMusicType::Main),