fix game runner and start migrating to actual game data; fix game data loading errors

This commit is contained in:
2021-05-19 20:09:12 +01:00
parent d93f777b66
commit 98288a4426
3 changed files with 75 additions and 69 deletions

View File

@@ -99,14 +99,14 @@ pub struct Position {
// }
pub struct Game {
config: Config,
palettes: Vec<Palette>,
images: Vec<Image>,
tiles: Vec<Tile>,
entities: Vec<Entity>,
// variables: Vec<Variable>,
// triggers: HashMap<String, ScriptCollection>,
music: Vec<Music>,
pub config: Config,
pub palettes: Vec<Palette>,
pub images: Vec<Image>,
pub tiles: Vec<Tile>,
pub entities: Vec<Entity>,
// pub variables: Vec<Variable>,
// pub triggers: HashMap<String, ScriptCollection>,
pub music: Vec<Music>,
}
#[derive(Debug)]
@@ -129,7 +129,6 @@ impl Game {
for file in music_files.unwrap() {
let file = file.unwrap();
music.push(Music::from_file(file.path()));
println!("music found: {:?}", file.file_name());
}
}
@@ -142,11 +141,10 @@ impl Game {
for file in palette_files {
let file = file.unwrap();
palettes.push(Palette::from_file(file.path()));
println!("palette found: {:?}", file.file_name());
}
let mut images_dir = path.clone();
images_dir.push("palettes");
images_dir.push("images");
let image_files = images_dir.read_dir()
.expect("couldn't read image dir");
@@ -154,11 +152,10 @@ impl Game {
for file in image_files {
let file = file.unwrap();
images.push(Image::from_file(file.path()));
println!("image found: {:?}", file.file_name());
}
let mut tiles_dir = path.clone();
tiles_dir.push("palettes");
tiles_dir.push("tiles");
let tiles_files = tiles_dir.read_dir()
.expect("couldn't read tile dir");
@@ -166,11 +163,10 @@ impl Game {
for file in tiles_files {
let file = file.unwrap();
tiles.push(Tile::from_file(file.path()));
println!("tile found: {:?}", file.file_name());
}
let mut entities_dir = path.clone();
entities_dir.push("palettes");
entities_dir.push("entities");
let entities_files = entities_dir.read_dir()
.expect("couldn't read tile dir");
@@ -178,7 +174,6 @@ impl Game {
for file in entities_files {
let file = file.unwrap();
entities.push(Entity::from_file(file.path()));
println!("entity found: {:?}", file.file_name());
}
let mut game_config = path.clone();