From 69415b3f951a3960175ac69214d64a8f49a52b16 Mon Sep 17 00:00:00 2001 From: Sergei Surovtsev Date: Thu, 4 Jan 2024 23:18:20 +0300 Subject: [PATCH] cutscene fix --- src/cutscene.rs | 35 +++++++++++++++++++---------------- src/main.rs | 2 +- src/menu.rs | 6 +++--- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/cutscene.rs b/src/cutscene.rs index a49440b..02af446 100644 --- a/src/cutscene.rs +++ b/src/cutscene.rs @@ -116,7 +116,7 @@ fn setup_cutscene( NodeBundle { style: Style { position_type: PositionType::Absolute, - margin: UiRect::bottom(Val::Percent(5.)), + margin: UiRect::bottom(Val::Percent(10.)), ..default() }, ..default() @@ -145,7 +145,7 @@ fn setup_cutscene( flex_direction: FlexDirection::Row, align_items: AlignItems::Center, justify_content: JustifyContent::SpaceAround, - top: Val::Percent(5.), + top: Val::Percent(10.), width: Val::Percent(100.), position_type: PositionType::Absolute, ..default() @@ -262,20 +262,23 @@ fn handle_cutscene_text( fn get_cutscene_dialog_text() -> Vec<(usize, String)> { vec![ (0, "ALLO GENNADIY?".to_string()), - (1, "da-da".to_string()), - (0, "Yeah, hi. So, Shapka the First. Shapka.".to_string()), - (0, "I am Alexey Viktorovich Makeev, AlexTime".to_string()), - (0, "Date of birth 08/22/1974".to_string()), - (0, "Citizen of Russia, citizen of Mexico".to_string()), - (0, "Received political asylum in Mexico.".to_string()), - ( - 0, - "I am under the international protection of the UN, the United Nations.".to_string(), - ), + (1, "Da Da, Gennadiy!".to_string()), + (0, "Yeah, hi.".to_string()), + (0, "So, Shapka the First.".to_string()), + (0, "Shapka.".to_string()), + (0, "I am".to_string()), + (0, "Alexey Viktorovich Makeev".to_string()), + (0, "AlexTime".to_string()), + (0, "Date of birth".to_string()), + (0, "08/22/1974".to_string()), + (0, "Citizen of Russia".to_string()), + (0, "Citizen of Mexico".to_string()), + (0, "Received".to_string()), + (0, "political asylum".to_string()), + (0, "I am under the international protection ".to_string()), + (0, "of the UN, the United Nations.".to_string()), (0, "wikipedia.org/en/alextime".to_string()), - ( - 0, - "From Mexican prison number 17. CPS. Michoacan.".to_string(), - ), + (0, "From Mexican prison number 17.".to_string()), + (0, "CPS. Michoacan.".to_string()), ] } diff --git a/src/main.rs b/src/main.rs index 2b0480c..d8aab7b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -46,7 +46,7 @@ fn main() { DefaultPlugins .set(WindowPlugin { primary_window: Some(Window { - title: "I am a window!".into(), + title: "Legend of Mierda".into(), resolution: (1024., 1024.).into(), present_mode: PresentMode::AutoVsync, // Tells wasm to resize the window according to the available canvas diff --git a/src/menu.rs b/src/menu.rs index b94e2ec..ae9f98f 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -105,7 +105,7 @@ fn setup_menu( .spawn(( ButtonBundle { style: Style { - width: Val::Px(128.0), + width: Val::Px(318.0), height: Val::Px(50.0), justify_content: JustifyContent::Center, align_items: AlignItems::Center, @@ -120,9 +120,9 @@ fn setup_menu( .with_children(|parent| { parent.spawn(( TextBundle::from_section( - "START", + "start game", TextStyle { - font_size: 88.0, + font_size: 50.0, font: font_assets.pixeloid_mono.clone(), color: Color::WHITE.into(), ..default()