lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tile variants, and applying colour offsets again

Browse source
This commit is contained in:
Llywelwyn 2023-10-07 10:36:36 +01:00
parent 396d548bf2
commit 0ee2a80715
5 changed files with 532 additions and 459 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -9,7 +9,7 @@ edition = "2021"
notan = { version = "0.10.0", features = ["text", "audio"] } notan = { version = "0.10.0", features = ["text", "audio"] }
bracket-lib = { git = "https://github.com/amethyst/bracket-lib.git", rev = "851f6f08675444fb6fa088b9e67bee9fd75554c6", features = ["serde"] } bracket-lib = { git = "https://github.com/amethyst/bracket-lib.git", rev = "851f6f08675444fb6fa088b9e67bee9fd75554c6", features = ["serde"] }
regex = "1.3.6" regex = "1.3.6"
specs = { version = "0.16.1", features = ["serde"] } specs = { version = "0.20.0", features = ["serde"] }
specs-derive = "0.4.1" specs-derive = "0.4.1"
serde = { version = "1.0.93", features = ["derive"]} serde = { version = "1.0.93", features = ["derive"]}
serde_json = "1.0.39" serde_json = "1.0.39"

972
resources/atlas.json
View file

File diff suppressed because it is too large Load diff

BIN
resources/atlas.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Before After
Before After

2
src/map/themes.rs
View file

@ -41,7 +41,7 @@ pub fn get_sprite_for_id(idx: usize, map: &Map, other_pos: Option<Point>) -> (&s
} }
}; };
// Apply our offsets to our base colour. // Apply our offsets to our base colour.
colour = apply_colour_offset(colour, map, idx, offset, false); colour = apply_colour_offset(colour, map, idx, offset, true);
// Apply our visibility modifier // Apply our visibility modifier
colour = colour.mul(visibility); colour = colour.mul(visibility);
// Convert to a notan colour. // Convert to a notan colour.

15
src/map/tiletype.rs
View file

@ -49,12 +49,21 @@ impl TileType {
TileType::ImpassableMountain => vec!["wall_b"], TileType::ImpassableMountain => vec!["wall_b"],
TileType::Wall => vec!["wall"], TileType::Wall => vec!["wall"],
TileType::DeepWater => vec!["water", "water2"], TileType::DeepWater => vec!["water", "water2"],
TileType::Fence => vec!["fence"], TileType::Fence => vec!["tiles4"],
TileType::Bars => vec!["wall_b"], TileType::Bars => vec!["wall_b"],
TileType::Floor => vec!["dot", "fluff", "fluff2"], TileType::Floor => vec!["dot"],
TileType::WoodFloor => vec!["planks", "planks_missing", "planks_missing2"], TileType::WoodFloor => vec!["planks", "planks_missing", "planks_missing2"],
TileType::Gravel => vec!["fluff", "fluff2"], TileType::Gravel => vec!["fluff", "fluff2"],
TileType::Road => vec!["tiles"], TileType::Road =>
vec![
"tiles",
"tiles_missing",
"tiles_missing2",
"tiles_missing3",
"tiles_missing4",
"tiles_missing5",
"tiles_missing6"
],
TileType::Grass => vec!["fluff", "fluff2"], TileType::Grass => vec!["fluff", "fluff2"],
TileType::Foliage => vec!["grass_small", "grass"], TileType::Foliage => vec!["grass_small", "grass"],
TileType::HeavyFoliage => vec!["grass_flower"], TileType::HeavyFoliage => vec!["grass_flower"],