valter/kroz-rs
valter/kroz-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Wiki Activity

Remove unnecessary blink field from TileData

Browse source
This commit is contained in:
Alex Page 2022-01-30 03:55:59 -05:00
parent 3da6f63b8e
commit 1628abea0e
1 changed files with 0 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/tile_data.rs
View file

@ -8,7 +8,6 @@ pub struct TileData {
pub color_fg: (u8, u8, u8), pub color_fg: (u8, u8, u8),
pub color_bg: (u8, u8, u8), pub color_bg: (u8, u8, u8),
pub serialized_char: char, pub serialized_char: char,
pub blink: bool,
} }
#[derive(Eq, PartialEq, Copy, Clone, Hash)] #[derive(Eq, PartialEq, Copy, Clone, Hash)]
@ -73,357 +72,306 @@ pub fn tile_data(tile: TileType) -> TileData {
serialized_char: ' ', serialized_char: ' ',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Slow => TileData { TileType::Slow => TileData {
glyph: 0, glyph: 0,
serialized_char: '1', serialized_char: '1',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Medium => TileData { TileType::Medium => TileData {
glyph: 0, glyph: 0,
serialized_char: '2', serialized_char: '2',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Fast => TileData { TileType::Fast => TileData {
glyph: 0, glyph: 0,
serialized_char: '3', serialized_char: '3',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Block => TileData { TileType::Block => TileData {
glyph: to_cp437('▓'), glyph: to_cp437('▓'),
serialized_char: 'X', serialized_char: 'X',
color_fg: vga::YELLOW, color_fg: vga::YELLOW,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Whip => TileData { TileType::Whip => TileData {
glyph: to_cp437('⌠'), glyph: to_cp437('⌠'),
serialized_char: 'W', serialized_char: 'W',
color_fg: vga::WHITE_BRIGHT, color_fg: vga::WHITE_BRIGHT,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Stairs => TileData { TileType::Stairs => TileData {
glyph: to_cp437('≡'), glyph: to_cp437('≡'),
serialized_char: 'L', serialized_char: 'L',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::WHITE, color_bg: vga::WHITE,
blink: true,
}, },
TileType::Chest => TileData { TileType::Chest => TileData {
glyph: to_cp437('C'), glyph: to_cp437('C'),
serialized_char: 'C', serialized_char: 'C',
color_fg: vga::YELLOW_BRIGHT, color_fg: vga::YELLOW_BRIGHT,
color_bg: vga::RED, color_bg: vga::RED,
blink: false,
}, },
TileType::SlowTime => TileData { TileType::SlowTime => TileData {
glyph: to_cp437('Φ'), glyph: to_cp437('Φ'),
serialized_char: 'S', serialized_char: 'S',
color_fg: vga::CYAN_BRIGHT, color_fg: vga::CYAN_BRIGHT,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Gem => TileData { TileType::Gem => TileData {
glyph: to_cp437('♦'), glyph: to_cp437('♦'),
serialized_char: '+', serialized_char: '+',
color_fg: vga::WHITE, color_fg: vga::WHITE,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Invisible => TileData { TileType::Invisible => TileData {
glyph: to_cp437('¡'), glyph: to_cp437('¡'),
serialized_char: 'I', serialized_char: 'I',
color_fg: vga::GREEN, color_fg: vga::GREEN,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Teleport => TileData { TileType::Teleport => TileData {
glyph: to_cp437('↑'), glyph: to_cp437('↑'),
serialized_char: 'T', serialized_char: 'T',
color_fg: vga::MAGENTA_BRIGHT, color_fg: vga::MAGENTA_BRIGHT,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Key => TileData { TileType::Key => TileData {
glyph: to_cp437('î'), glyph: to_cp437('î'),
serialized_char: 'K', serialized_char: 'K',
color_fg: vga::RED_BRIGHT, color_fg: vga::RED_BRIGHT,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Door => TileData { TileType::Door => TileData {
glyph: to_cp437('∞'), glyph: to_cp437('∞'),
serialized_char: 'D', serialized_char: 'D',
color_fg: vga::CYAN, color_fg: vga::CYAN,
color_bg: vga::MAGENTA, color_bg: vga::MAGENTA,
blink: false,
}, },
TileType::Wall => TileData { TileType::Wall => TileData {
glyph: to_cp437('█'), glyph: to_cp437('█'),
serialized_char: '#', serialized_char: '#',
color_fg: vga::YELLOW, color_fg: vga::YELLOW,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::SpeedTime => TileData { TileType::SpeedTime => TileData {
glyph: to_cp437('Θ'), glyph: to_cp437('Θ'),
serialized_char: 'F', serialized_char: 'F',
color_fg: vga::CYAN_BRIGHT, color_fg: vga::CYAN_BRIGHT,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Trap => TileData { TileType::Trap => TileData {
glyph: to_cp437('∙'), glyph: to_cp437('∙'),
serialized_char: '.', serialized_char: '.',
color_fg: vga::WHITE, color_fg: vga::WHITE,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::River => TileData { TileType::River => TileData {
glyph: to_cp437('≈'), glyph: to_cp437('≈'),
serialized_char: 'R', serialized_char: 'R',
color_fg: vga::BLUE_BRIGHT, color_fg: vga::BLUE_BRIGHT,
color_bg: vga::BLUE, color_bg: vga::BLUE,
blink: false,
}, },
TileType::Power => TileData { TileType::Power => TileData {
glyph: to_cp437('○'), glyph: to_cp437('○'),
serialized_char: 'Q', serialized_char: 'Q',
color_fg: vga::WHITE_BRIGHT, color_fg: vga::WHITE_BRIGHT,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Forest => TileData { TileType::Forest => TileData {
glyph: to_cp437('█'), glyph: to_cp437('█'),
serialized_char: '/', serialized_char: '/',
color_fg: vga::GREEN, color_fg: vga::GREEN,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Tree => TileData { TileType::Tree => TileData {
glyph: to_cp437('♣'), glyph: to_cp437('♣'),
serialized_char: '\\', serialized_char: '\\',
color_fg: vga::YELLOW, color_fg: vga::YELLOW,
color_bg: vga::GREEN, color_bg: vga::GREEN,
blink: false,
}, },
TileType::Bomb => TileData { TileType::Bomb => TileData {
glyph: to_cp437('¥'), glyph: to_cp437('¥'),
serialized_char: 'B', serialized_char: 'B',
color_fg: vga::WHITE_BRIGHT, color_fg: vga::WHITE_BRIGHT,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Lava => TileData { TileType::Lava => TileData {
glyph: to_cp437('▓'), glyph: to_cp437('▓'),
serialized_char: 'V', serialized_char: 'V',
color_fg: vga::RED_BRIGHT, color_fg: vga::RED_BRIGHT,
color_bg: vga::RED, color_bg: vga::RED,
blink: false,
}, },
TileType::Pit => TileData { TileType::Pit => TileData {
glyph: to_cp437('░'), glyph: to_cp437('░'),
serialized_char: '=', serialized_char: '=',
color_fg: vga::WHITE, color_fg: vga::WHITE,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Tome => TileData { TileType::Tome => TileData {
glyph: to_cp437('♀'), glyph: to_cp437('♀'),
serialized_char: 'A', serialized_char: 'A',
color_fg: vga::WHITE_BRIGHT, color_fg: vga::WHITE_BRIGHT,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: true,
}, },
TileType::Tunnel => TileData { TileType::Tunnel => TileData {
glyph: to_cp437('∩'), glyph: to_cp437('∩'),
serialized_char: 'U', serialized_char: 'U',
color_fg: vga::WHITE_BRIGHT, color_fg: vga::WHITE_BRIGHT,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Freeze => TileData { TileType::Freeze => TileData {
glyph: to_cp437('ƒ'), glyph: to_cp437('ƒ'),
serialized_char: 'Z', serialized_char: 'Z',
color_fg: vga::CYAN_BRIGHT, color_fg: vga::CYAN_BRIGHT,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Nugget => TileData { TileType::Nugget => TileData {
glyph: to_cp437('☼'), glyph: to_cp437('☼'),
serialized_char: '*', serialized_char: '*',
color_fg: vga::YELLOW_BRIGHT, color_fg: vga::YELLOW_BRIGHT,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Quake => TileData { TileType::Quake => TileData {
glyph: 0, glyph: 0,
serialized_char: 'E', serialized_char: 'E',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::InvisibleBlock => TileData { TileType::InvisibleBlock => TileData {
glyph: 0, glyph: 0,
serialized_char: ';', serialized_char: ';',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::InvisibleWall => TileData { TileType::InvisibleWall => TileData {
glyph: 0, glyph: 0,
serialized_char: ':', serialized_char: ':',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::InvisibleDoor => TileData { TileType::InvisibleDoor => TileData {
glyph: 0, glyph: 0,
serialized_char: '`', serialized_char: '`',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Stop => TileData { TileType::Stop => TileData {
glyph: 0, glyph: 0,
serialized_char: '-', serialized_char: '-',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Zap => TileData { TileType::Zap => TileData {
glyph: to_cp437('▲'), glyph: to_cp437('▲'),
serialized_char: '%', serialized_char: '%',
color_fg: vga::RED_BRIGHT, color_fg: vga::RED_BRIGHT,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Create => TileData { TileType::Create => TileData {
glyph: to_cp437('▼'), glyph: to_cp437('▼'),
serialized_char: ']', serialized_char: ']',
color_fg: vga::WHITE_BRIGHT, color_fg: vga::WHITE_BRIGHT,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Generator => TileData { TileType::Generator => TileData {
glyph: to_cp437('♠'), glyph: to_cp437('♠'),
serialized_char: 'G', serialized_char: 'G',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Trap2 => TileData { TileType::Trap2 => TileData {
glyph: 0, glyph: 0,
serialized_char: '@', serialized_char: '@',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Trap3 => TileData { TileType::Trap3 => TileData {
glyph: 0, glyph: 0,
serialized_char: ')', serialized_char: ')',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Trap4 => TileData { TileType::Trap4 => TileData {
glyph: 0, glyph: 0,
serialized_char: '(', serialized_char: '(',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Trap5 => TileData { TileType::Trap5 => TileData {
glyph: 0, glyph: 0,
serialized_char: '$', // Unsure about this serialized_char: '$', // Unsure about this
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Trap6 => TileData { TileType::Trap6 => TileData {
glyph: 0, glyph: 0,
serialized_char: 'α', serialized_char: 'α',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Trap7 => TileData { TileType::Trap7 => TileData {
glyph: 0, glyph: 0,
serialized_char: 'ß', serialized_char: 'ß',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Trap8 => TileData { TileType::Trap8 => TileData {
glyph: 0, glyph: 0,
serialized_char: 'Γ', serialized_char: 'Γ',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Trap9 => TileData { TileType::Trap9 => TileData {
glyph: 0, glyph: 0,
serialized_char: 'π', serialized_char: 'π',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Trap10 => TileData { TileType::Trap10 => TileData {
glyph: 0, glyph: 0,
serialized_char: 'Σ', serialized_char: 'Σ',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Trap11 => TileData { TileType::Trap11 => TileData {
glyph: 0, glyph: 0,
serialized_char: 'σ', serialized_char: 'σ',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Trap12 => TileData { TileType::Trap12 => TileData {
glyph: 0, glyph: 0,
serialized_char: 'µ', serialized_char: 'µ',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Trap13 => TileData { TileType::Trap13 => TileData {
glyph: 0, glyph: 0,
serialized_char: 'τ', serialized_char: 'τ',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Player => TileData { TileType::Player => TileData {
glyph: 0, glyph: 0,
serialized_char: 'P', serialized_char: 'P',
color_fg: vga::BLACK, color_fg: vga::BLACK,
color_bg: vga::BLACK, color_bg: vga::BLACK,
blink: false,
}, },
TileType::Punctuation => TileData { TileType::Punctuation => TileData {
glyph: to_cp437('!'), glyph: to_cp437('!'),
serialized_char: '!', serialized_char: '!',
color_fg: vga::WHITE_BRIGHT, color_fg: vga::WHITE_BRIGHT,
color_bg: vga::YELLOW, color_bg: vga::YELLOW,
blink: false,
}, },
TileType::Letter(c) => TileData { TileType::Letter(c) => TileData {
glyph: to_cp437(c.to_ascii_uppercase()), glyph: to_cp437(c.to_ascii_uppercase()),
serialized_char: c, serialized_char: c,
color_fg: vga::WHITE_BRIGHT, color_fg: vga::WHITE_BRIGHT,
color_bg: vga::YELLOW, color_bg: vga::YELLOW,
blink: false,
}, },
} }
} }