final stream fixes

bananaturtlesandwich · Apr 17, 2023 · 0d70ad8 · 0d70ad8
1 parent d962d96
commit 0d70ad8
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 22 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["spuds"]
 edition = "2021"
 
 [dependencies]
-eframe = { version = "0.21", features = ["persistence"] }
+eframe = { version = "0.21", default-features = false, features = ["glow", "persistence"] }
 unreal_asset = { git = "https://github.com/astrotechies/unrealmodding", package = "unreal_asset" }
 unpak = { version = "1.0", default-features = false, features = ["asset-paths"] }
 strum = { version = "0.24", features = ["derive"] }

diff --git a/src/Cinzel-Regular.ttf b/src/Cinzel-Regular.ttf
diff --git a/src/lib.rs b/src/lib.rs
@@ -102,7 +102,7 @@ fn ask_game_path() -> Option<std::path::PathBuf> {
 fn get_pak_str(pak: &std::path::PathBuf) -> String {
     let mut pak_str = pak.to_str().unwrap_or_default().to_string();
     pak_str.truncate(pak_str.len() - 13);
-    pak_str = "...".to_string() + &pak_str[(pak_str.len() - 40).clamp(0, 1000)..];
+    pak_str = "...".to_string() + &pak_str[(pak_str.len() - 50).clamp(0, 1000)..];
     pak_str
 }
 
@@ -147,6 +147,19 @@ macro_rules! notify {
 impl eframe::App for Rando {
     fn update(&mut self, ctx: &eframe::egui::Context, _: &mut eframe::Frame) {
         use eframe::egui;
+
+        let mut fonts = egui::FontDefinitions::default();
+        fonts.font_data.insert(
+            "cinzel".to_string(),
+            egui::FontData::from_static(include_bytes!("Cinzel-Regular.ttf")),
+        );
+        fonts
+            .families
+            .get_mut(&egui::FontFamily::Proportional)
+            .unwrap()
+            .insert(0, "cinzel".to_string());
+        ctx.set_fonts(fonts);
+
         egui::CentralPanel::default().show(ctx, |ui| {
             ui.horizontal(|ui| {
                 ui.heading(

diff --git a/src/logic/checks.rs b/src/logic/checks.rs
@@ -1,7 +1,7 @@
 use super::*;
 use crate::{no_walljump, walljump};
 
-pub const CHECKS: [Check; 255] = [
+pub const CHECKS: [Check; 252] = [
     // Fire Keep
     Check {
         location: Locations::Lab,
@@ -955,24 +955,25 @@ pub const CHECKS: [Check; 255] = [
         drop: Drop::Tunic(Tunics::ForestTunic),
         locks: &[],
     },
-    Check {
-        location: Locations::TempleGardens,
-        context: Context::Shop(Shop::Nilo, 0, 1500),
-        drop: Drop::Item(Items::EmeraldOre, 1),
-        locks: &[Lock::Money(1500)],
-    },
-    Check {
-        location: Locations::TempleGardens,
-        context: Context::Shop(Shop::Nilo, 1, 800),
-        drop: Drop::Item(Items::SapphireOre, 1),
-        locks: &[Lock::Money(800)],
-    },
-    Check {
-        location: Locations::TempleGardens,
-        context: Context::Shop(Shop::Nilo, 2, 500),
-        drop: Drop::Item(Items::RubyOre, 1),
-        locks: &[Lock::Money(500)],
-    },
+    // editing the savegame doesn't edit unlike other shops
+    // Check {
+    //     location: Locations::TempleGardens,
+    //     context: Context::Shop(Shop::Nilo, 0, 1500),
+    //     drop: Drop::Item(Items::EmeraldOre, 1),
+    //     locks: &[Lock::Money(1500)],
+    // },
+    // Check {
+    //     location: Locations::TempleGardens,
+    //     context: Context::Shop(Shop::Nilo, 1, 800),
+    //     drop: Drop::Item(Items::SapphireOre, 1),
+    //     locks: &[Lock::Money(800)],
+    // },
+    // Check {
+    //     location: Locations::TempleGardens,
+    //     context: Context::Shop(Shop::Nilo, 2, 500),
+    //     drop: Drop::Item(Items::RubyOre, 1),
+    //     locks: &[Lock::Money(500)],
+    // },
     Check {
         location: Locations::TempleGardens,
         context: Context::Overworld("Dance_Platform_Wave_Chest"),

diff --git a/src/main.rs b/src/main.rs
@@ -6,7 +6,7 @@ fn main() -> Result<(), eframe::Error> {
     eframe::run_native(
         "",
         eframe::NativeOptions {
-            initial_window_size: Some(eframe::epaint::Vec2::new(400.0, 360.0)),
+            initial_window_size: Some(eframe::epaint::Vec2::new(500.0, 390.0)),
             resizable: false,
             icon_data: Some(eframe::IconData {
                 rgba: include_bytes!("umby.rgba").to_vec(),

diff --git a/src/writing/overworld.rs b/src/writing/overworld.rs
@@ -110,6 +110,7 @@ pub fn write(
                                             (0.0, 0.0, 100.0)
                                         }
                                         Locations::WaterwayDucks => (800.0, 0.0, 100.0),
+                                        Locations::Queen => (500.0, -500.0, 0.0),
                                         _ => (0.0, 0.0, 0.0),
                                     },
                                 );