evan/ludum-dare-48
Archived
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move shop file

Browse Source
This commit is contained in:
Evan Pratten 2021-04-25 10:42:03 -04:00
parent fa7040f626
commit 010ad7ce26
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/logic/mod.rs
View File

@ -4,4 +4,4 @@ pub mod mainmenu;
pub mod pausemenu;
pub mod ingame;
pub mod gameend;
pub mod shopscreen;
pub mod shop;

2
src/logic/shopscreen.rs → src/logic/shop/mod.rs
View File

@ -36,7 +36,7 @@ impl ShopScreen {
// Title
draw_handle.draw_text(
"SHOP",
bounds.x as i32 + 30,
bounds.x as i32 + (bounds.width / 2.0) as i32 - 50,
bounds.y as i32 + 20,
40,
Color::BLACK,

29
src/main.rs
View File

@ -1,19 +1,22 @@
mod entities;
mod gamecore;
mod items;
mod lib;
mod logic;
mod resources;
mod player;
mod world;
mod pallette;
mod entities;
mod items;
mod player;
mod resources;
mod world;
use gamecore::{GameCore, GameProgress, GameState};
use lib::{utils::profiler::GameProfiler, wrappers::audio::player::AudioPlayer};
use log::info;
use logic::{gameend::GameEndScreen, ingame::InGameScreen, loadingscreen::LoadingScreen, mainmenu::MainMenuScreen, pausemenu::PauseMenuScreen, screen::Screen, shopscreen::ShopScreen};
use logic::{
gameend::GameEndScreen, ingame::InGameScreen, loadingscreen::LoadingScreen,
mainmenu::MainMenuScreen, pausemenu::PauseMenuScreen, screen::Screen, shop::ShopScreen,
};
use raylib::prelude::*;
use world::{World, load_world_colliders};
use world::{load_world_colliders, World};
// Game Launch Configuration
const DEFAULT_WINDOW_DIMENSIONS: Vector2 = Vector2 {
@ -32,7 +35,8 @@ fn main() {
.size(
DEFAULT_WINDOW_DIMENSIONS.x as i32,
DEFAULT_WINDOW_DIMENSIONS.y as i32,
).msaa_4x()
)
.msaa_4x()
.title(WINDOW_TITLE)
.build();
raylib.set_target_fps(MAX_FPS);
@ -41,8 +45,13 @@ fn main() {
raylib.set_exit_key(None);
// Load the world
let world_colliders = load_world_colliders("./assets/img/map/cave.json".to_string()).expect("Failed to load world colliders");
let world = World::load_from_json("./assets/worlds/mainworld.json".to_string(), world_colliders).expect("Failed to load main world JSON");
let world_colliders = load_world_colliders("./assets/img/map/cave.json".to_string())
.expect("Failed to load world colliders");
let world = World::load_from_json(
"./assets/worlds/mainworld.json".to_string(),
world_colliders,
)
.expect("Failed to load main world JSON");
// Load the game progress
let game_progress = GameProgress::try_from_file("./assets/savestate.json".to_string());