diff --git a/assets/buttons/PressStart2P.ttf b/assets/buttons/PressStart2P.ttf new file mode 100644 index 0000000..98044e9 Binary files /dev/null and b/assets/buttons/PressStart2P.ttf differ diff --git a/assets/buttons/joystix monospace.ttf b/assets/buttons/joystix monospace.ttf deleted file mode 100644 index 5fd36a5..0000000 Binary files a/assets/buttons/joystix monospace.ttf and /dev/null differ diff --git a/src/battle.rs b/src/battle.rs index efc07af..494406a 100644 --- a/src/battle.rs +++ b/src/battle.rs @@ -168,17 +168,17 @@ pub(crate) fn setup_battle_stats( TextBundle::from_sections([ // health header for player's monster TextSection::new( - "Health:", + "HEALTH:", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }, ), // health of player's monster TextSection::from_style(TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }), ]) @@ -202,10 +202,10 @@ pub(crate) fn setup_battle_stats( TextBundle::from_sections([ // level header for player's monster TextSection::new( - "Level:", + "LEVEL:", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }, ), @@ -213,8 +213,8 @@ pub(crate) fn setup_battle_stats( TextSection::new( my_lvl.to_string(), TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }, ), @@ -239,17 +239,17 @@ pub(crate) fn setup_battle_stats( TextBundle::from_sections([ // health header for enemy's monster TextSection::new( - "Health:", + "HEALTH:", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }, ), // health of enemy's monster TextSection::from_style(TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }), ]) @@ -274,10 +274,10 @@ pub(crate) fn setup_battle_stats( TextBundle::from_sections([ // level header for player's monster TextSection::new( - "Level:", + "LEVEL:", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }, ), @@ -285,8 +285,8 @@ pub(crate) fn setup_battle_stats( TextSection::new( enemy_lvl.to_string(), TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }, ), diff --git a/src/game_client.rs b/src/game_client.rs index 2a95001..a935f0c 100644 --- a/src/game_client.rs +++ b/src/game_client.rs @@ -30,23 +30,6 @@ pub(crate) struct ReadyToSpawnFriend {} pub(crate) struct EnemyMonsterSpawned {} -// #[derive(Debug)] -// pub(crate) struct Package { -// pub(crate) message: String, -// } - -// impl Package { -// pub(crate) fn new(message: String) -> Self { -// Package { message } -// } -// } - -// impl fmt::Display for Package { -// fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { -// write!(f, "{}", self.message) -// } -// } - /// Choose a random port of the known, normally open UDP ports pub(crate) fn get_randomized_port() -> i32 { let port_list = vec![ @@ -57,9 +40,6 @@ pub(crate) fn get_randomized_port() -> i32 { /// Get the local address to bind a socket to pub(crate) fn get_addr() -> Vec { - // let ip_addr = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)); - // let socket_addr = SocketAddr::new(ip_addr, 0 as u16); - // socket_addr let my_ip_address = local_ip().unwrap(); vec![ SocketAddr::from((my_ip_address, 9800)), diff --git a/src/help.rs b/src/help.rs index 70224df..e407c81 100644 --- a/src/help.rs +++ b/src/help.rs @@ -64,8 +64,8 @@ pub(crate) fn setup_help( .spawn_bundle(TextBundle::from_section( "HELP", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }, )) @@ -84,8 +84,8 @@ pub(crate) fn setup_help( .spawn_bundle(TextBundle::from_section( "MAIN CONTROLS", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 35.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 30.0, color: Color::BLACK, }, )) @@ -102,10 +102,10 @@ pub(crate) fn setup_help( commands .spawn_bundle(TextBundle::from_section( - "W: move up, S: move down, A: move left, D: move right\nP: party size, G: game progress, I: inventory\nEsc: pause, Q: quit", + "W: move up, S: move down, A: move left, \nD: move right, P: party size, G: game progress, \nI: inventory, Esc: pause, Q: quit", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 30.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 25.0, color: Color::BLACK, }, )) @@ -124,8 +124,8 @@ pub(crate) fn setup_help( .spawn_bundle(TextBundle::from_section( "BATTLE CONTROLS", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 35.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 30.0, color: Color::BLACK, }, )) @@ -144,8 +144,8 @@ pub(crate) fn setup_help( .spawn_bundle(TextBundle::from_section( "A: attack, E: elemental, D: defend, S: special\n1: heal item, 2: buff item", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 30.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 25.0, color: Color::BLACK, }, )) @@ -164,8 +164,8 @@ pub(crate) fn setup_help( .spawn_bundle(TextBundle::from_section( "TRADE CONTROLS", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 35.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 30.0, color: Color::BLACK, }, )) @@ -182,10 +182,10 @@ pub(crate) fn setup_help( commands .spawn_bundle(TextBundle::from_section( - "3: trade heal item, 4: trade buff item, M: trade monster", + "3: trade heal item, 4: trade buff item, \nM: trade monster", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 30.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 25.0, color: Color::BLACK, }, )) diff --git a/src/main.rs b/src/main.rs index d655315..68394b1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -272,10 +272,6 @@ pub fn display_text( mut text_buffer: ResMut, ) { // take the text buffer and display it on the screen - // let text = text_buffer.bottom_middle.pop_front(); - // if text.is_none() { - // return; - // } let display_latest = 725.0; for i in 0..text_buffer.bottom_text.len() { let mut text = text_buffer.bottom_text.get_mut(i); @@ -291,14 +287,14 @@ pub fn display_text( TextSection::new( text.as_ref().unwrap().text.clone(), TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 30.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }, ), TextSection::from_style(TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 30.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }), ]) diff --git a/src/monster.rs b/src/monster.rs index 515a9e7..04ac553 100644 --- a/src/monster.rs +++ b/src/monster.rs @@ -70,8 +70,6 @@ pub(crate) struct Boss; // bundle stores all relevant compnents of monsters #[derive(Bundle, Component, Copy, Clone, Serialize, Deserialize)] pub(crate) struct MonsterStats { - // we need a &str that is texture of our monster - // might need name as well pub(crate) typing: Element, pub(crate) lvl: Level, pub(crate) hp: Health, diff --git a/src/multiplayer_menu.rs b/src/multiplayer_menu.rs index bfa8d82..6b8ac76 100644 --- a/src/multiplayer_menu.rs +++ b/src/multiplayer_menu.rs @@ -66,19 +66,6 @@ impl Plugin for MultMenuPlugin { } } -// fn is_client(game_client: ResMut) -> bool { -// if game_client.player_type == PlayerType::Client { -// return true; -// } -// false - -// fn client_ready_for_battle(game_client: ResMut) -> bool { -// if game_client.player_type == PlayerType::Client && game_client.ready_for_battle == true { -// return true; -// } -// false -// } - /// System to listen for UDP messages. The socket is non-blocking intentionally, /// so this works by running an "infinite" loop that will continually try to fill a /// 2048 byte buffer until the OS tells it that recv would block, and then it will exit the loop @@ -193,10 +180,10 @@ fn setup_mult( }) .with_children(|parent| { parent.spawn_bundle(TextBundle::from_section( - "Host PVP Game", + "HOST PVP GAME", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: TEXT_COLOR, }, )); @@ -228,10 +215,10 @@ fn setup_mult( }) .with_children(|parent| { parent.spawn_bundle(TextBundle::from_section( - "Join PVP Game", + "JOIN PVP GAME", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: TEXT_COLOR, }, )); @@ -263,10 +250,10 @@ fn setup_mult( }) .with_children(|parent| { parent.spawn_bundle(TextBundle::from_section( - "Host PVE Game", + "HOST PVE GAME", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: TEXT_COLOR, }, )); @@ -298,10 +285,10 @@ fn setup_mult( }) .with_children(|parent| { parent.spawn_bundle(TextBundle::from_section( - "Join PVE Game", + "JOIN PVE GAME", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: TEXT_COLOR, }, )); @@ -317,8 +304,8 @@ pub(crate) fn mult_options(mut commands: Commands, asset_server: Res { info!("Hosting pvp game..."); - text.sections[0].value = "Host PVP Game".to_string(); + text.sections[0].value = "HOST PVP GAME".to_string(); *color = PRESSED_BUTTON.into(); // Having a listener here doesn't make sense. Networking listeners should not be attached to @@ -395,11 +382,11 @@ pub(crate) fn host_pvp_button_handler( // } } Interaction::Hovered => { - text.sections[0].value = "Host PVP Game".to_string(); + text.sections[0].value = "HOST PVP GAME".to_string(); *color = HOVERED_BUTTON.into(); } Interaction::None => { - text.sections[0].value = "Host PVP Game".to_string(); + text.sections[0].value = "HOST PVP GAME".to_string(); *color = NORMAL_BUTTON.into(); } } @@ -421,7 +408,7 @@ pub(crate) fn client_pvp_button_handler( .unwrap(); match *interaction { Interaction::Clicked => { - text.sections[0].value = "Join PVP Game".to_string(); + text.sections[0].value = "JOIN PVP GAME".to_string(); *color = PRESSED_BUTTON.into(); // if player clicks on client button, designate them as the client @@ -469,11 +456,11 @@ pub(crate) fn client_pvp_button_handler( .expect("Error on send"); } Interaction::Hovered => { - text.sections[0].value = "Join PVP Game".to_string(); + text.sections[0].value = "JOIN PVP GAME".to_string(); *color = HOVERED_BUTTON.into(); } Interaction::None => { - text.sections[0].value = "Join PVP Game".to_string(); + text.sections[0].value = "JOIN PVP GAME".to_string(); *color = NORMAL_BUTTON.into(); } } @@ -497,7 +484,7 @@ pub(crate) fn host_pve_button_handler( match *interaction { Interaction::Clicked => { info!("Hosting pve game..."); - text.sections[0].value = "Host PVE Game".to_string(); + text.sections[0].value = "HOST PVE GAME".to_string(); *color = PRESSED_BUTTON.into(); // Having a listener here doesn't make sense. Networking listeners should not be attached to @@ -536,11 +523,11 @@ pub(crate) fn host_pve_button_handler( // } } Interaction::Hovered => { - text.sections[0].value = "Host PVE Game".to_string(); + text.sections[0].value = "HOST PVE GAME".to_string(); *color = HOVERED_BUTTON.into(); } Interaction::None => { - text.sections[0].value = "Host PVE Game".to_string(); + text.sections[0].value = "HOST PVE GAME".to_string(); *color = NORMAL_BUTTON.into(); } } @@ -561,7 +548,7 @@ pub(crate) fn client_pve_button_handler( .unwrap(); match *interaction { Interaction::Clicked => { - text.sections[0].value = "Join PVE Game".to_string(); + text.sections[0].value = "JOIN PVE GAME".to_string(); *color = PRESSED_BUTTON.into(); // if player clicks on client button, designate them as the client @@ -609,11 +596,11 @@ pub(crate) fn client_pve_button_handler( .expect("Error on send"); } Interaction::Hovered => { - text.sections[0].value = "Join PVE Game".to_string(); + text.sections[0].value = "JOIN PVE GAME".to_string(); *color = HOVERED_BUTTON.into(); } Interaction::None => { - text.sections[0].value = "Join PVE Game".to_string(); + text.sections[0].value = "JOIN PVE GAME".to_string(); *color = NORMAL_BUTTON.into(); } } diff --git a/src/multiplayer_pve.rs b/src/multiplayer_pve.rs index 3b543f7..7ddaf48 100644 --- a/src/multiplayer_pve.rs +++ b/src/multiplayer_pve.rs @@ -444,17 +444,17 @@ pub(crate) fn setup_pve_battle_stats( TextBundle::from_sections([ // health header for player's monster TextSection::new( - "Your Health:", + "YOUR HEALTH:", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 30.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 25.0, color: Color::BLACK, }, ), // health of player's monster TextSection::from_style(TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 30.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 25.0, color: Color::BLACK, }), ]) @@ -478,17 +478,17 @@ pub(crate) fn setup_pve_battle_stats( TextBundle::from_sections([ // health header for player's monster TextSection::new( - "Friend Health:", + "FRIEND HEALTH:", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 30.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 25.0, color: Color::BLACK, }, ), // health of player's monster TextSection::from_style(TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 30.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 25.0, color: Color::BLACK, }), ]) @@ -512,17 +512,17 @@ pub(crate) fn setup_pve_battle_stats( TextBundle::from_sections([ // health header for opponent's monster TextSection::new( - "Boss Health:", + "BOSS HEALTH:", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 30.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 25.0, color: Color::BLACK, }, ), // health of opponent's monster TextSection::from_style(TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 30.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 25.0, color: Color::BLACK, }), ]) diff --git a/src/multiplayer_pvp.rs b/src/multiplayer_pvp.rs index 5c3941b..383634b 100644 --- a/src/multiplayer_pvp.rs +++ b/src/multiplayer_pvp.rs @@ -234,8 +234,6 @@ fn client_action_handler( return; } - // info!("client flag status: {:?}", turn.0); - let (_client_hp, client_stg, client_def, _client_entity, client_element) = client_monster_query.single(); @@ -259,8 +257,6 @@ fn client_action_handler( .udp_socket .send(&bincode::serialize(&msg).unwrap()); - // client_action_event.send(ClientActionEvent(battle_data.0)); - // client_cached_action.0 = 0; } else if input.just_pressed(KeyCode::D) { turn.0 = false; // flip TurnFlag to false let mut action_and_data: Vec = Vec::new(); @@ -278,8 +274,6 @@ fn client_action_handler( .udp_socket .send(&bincode::serialize(&msg).unwrap()); - // client_action_event.send(ClientActionEvent(battle_data.0)); - // client_cached_action.0 = 1; } else if input.just_pressed(KeyCode::E) { turn.0 = false; // flip TurnFlag to false let mut action_and_data: Vec = Vec::new(); @@ -297,8 +291,6 @@ fn client_action_handler( .udp_socket .send(&bincode::serialize(&msg).unwrap()); - // client_action_event.send(ClientActionEvent(battle_data.0)); - // client_cached_action.0 = 2; } else if input.just_pressed(KeyCode::S) { if game_progress.spec_moves_left[0] > 0 { turn.0 = false; // flip TurnFlag to false @@ -549,8 +541,6 @@ fn host_action_handler( return; } - // info!("Host flag status: {:?}", turn.0); - let (_host_hp, mut host_stg, host_def, _host_entity, host_element) = host_monster_query.single_mut(); // turn.0 accesses status of TurnFlag (what's in 0th index) @@ -834,7 +824,6 @@ pub(crate) fn host_end_turn_handler( enemy_monster_query.single_mut(); - // Client buff if data.act == 5 { game_progress.turns_left_of_buff[1] = 3; @@ -1009,17 +998,17 @@ pub(crate) fn setup_mult_battle_stats( TextBundle::from_sections([ // health header for player's monster TextSection::new( - "Health:", + "HEALTH:", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }, ), // health of player's monster TextSection::from_style(TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }), ]) @@ -1043,17 +1032,17 @@ pub(crate) fn setup_mult_battle_stats( TextBundle::from_sections([ // health header for opponent's monster TextSection::new( - "Health:", + "HEALTH:", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }, ), // health of opponent's monster TextSection::from_style(TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: Color::BLACK, }), ]) diff --git a/src/multiplayer_waiting.rs b/src/multiplayer_waiting.rs index 21354a1..06ea979 100644 --- a/src/multiplayer_waiting.rs +++ b/src/multiplayer_waiting.rs @@ -77,8 +77,8 @@ pub(crate) fn mult_waiting_text(mut commands: Commands, asset_server: Res { - text.sections[0].value = "Start Game".to_string(); + text.sections[0].value = "START GAME".to_string(); *color = PRESSED_BUTTON.into(); commands.insert_resource(NextState(GameState::StartPlaying)); } Interaction::Hovered => { - text.sections[0].value = "Start Game".to_string(); + text.sections[0].value = "START GAME".to_string(); *color = HOVERED_BUTTON.into(); } Interaction::None => { - text.sections[0].value = "Start Game".to_string(); + text.sections[0].value = "START GAME".to_string(); *color = NORMAL_BUTTON.into(); } } @@ -124,16 +124,16 @@ pub(crate) fn credits_button_handler( .unwrap(); match *interaction { Interaction::Clicked => { - text.sections[0].value = "Credits".to_string(); + text.sections[0].value = "CREDITS".to_string(); *color = PRESSED_BUTTON.into(); commands.insert_resource(NextState(GameState::Credits)); } Interaction::Hovered => { - text.sections[0].value = "Credits".to_string(); + text.sections[0].value = "CREDITS".to_string(); *color = HOVERED_BUTTON.into(); } Interaction::None => { - text.sections[0].value = "Credits".to_string(); + text.sections[0].value = "CREDITS".to_string(); *color = NORMAL_BUTTON.into(); } } @@ -154,16 +154,16 @@ pub(crate) fn multiplayer_button_handler( .unwrap(); match *interaction { Interaction::Clicked => { - text.sections[0].value = "Multiplayer".to_string(); + text.sections[0].value = "MULTIPLAYER".to_string(); *color = PRESSED_BUTTON.into(); commands.insert_resource(NextState(GameState::MultiplayerMenu)); } Interaction::Hovered => { - text.sections[0].value = "Multiplayer".to_string(); + text.sections[0].value = "MULTIPLAYER".to_string(); *color = HOVERED_BUTTON.into(); } Interaction::None => { - text.sections[0].value = "Multiplayer".to_string(); + text.sections[0].value = "MULTIPLAYER".to_string(); *color = NORMAL_BUTTON.into(); } } @@ -184,16 +184,16 @@ pub(crate) fn help_button_handler( .unwrap(); match *interaction { Interaction::Clicked => { - text.sections[0].value = "Help".to_string(); + text.sections[0].value = "HELP".to_string(); *color = PRESSED_BUTTON.into(); commands.insert_resource(NextState(GameState::Help)); } Interaction::Hovered => { - text.sections[0].value = "Help".to_string(); + text.sections[0].value = "HELP".to_string(); *color = HOVERED_BUTTON.into(); } Interaction::None => { - text.sections[0].value = "Help".to_string(); + text.sections[0].value = "HELP".to_string(); *color = NORMAL_BUTTON.into(); } } @@ -272,10 +272,10 @@ fn setup_menu( }) .with_children(|parent| { parent.spawn_bundle(TextBundle::from_section( - "Start Game", + "START GAME", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: TEXT_COLOR, }, )); @@ -307,10 +307,10 @@ fn setup_menu( }) .with_children(|parent| { parent.spawn_bundle(TextBundle::from_section( - "Multiplayer", + "MULTIPLAYER", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: TEXT_COLOR, }, )); @@ -342,10 +342,10 @@ fn setup_menu( }) .with_children(|parent| { parent.spawn_bundle(TextBundle::from_section( - "Credits", + "CREDITS", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: TEXT_COLOR, }, )); @@ -377,10 +377,10 @@ fn setup_menu( }) .with_children(|parent| { parent.spawn_bundle(TextBundle::from_section( - "Help", + "HELP", TextStyle { - font: asset_server.load("buttons/joystix monospace.ttf"), - font_size: 40.0, + font: asset_server.load("buttons/PressStart2P.ttf"), + font_size: 28.0, color: TEXT_COLOR, }, ));