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