rename bag and trigger to silo and button

This commit is contained in:
Crispy 2024-12-12 22:56:01 +01:00
parent 6dcb6c9dd7
commit 611a02c3b4
3 changed files with 21 additions and 21 deletions

View file

@ -9,7 +9,7 @@ pub enum Tile {
Marble { value: MarbleValue, dir: Direction },
Mirror(MirrorType),
Arrow(Direction),
Trigger(bool),
Button(bool),
Wire(WireType, bool),
Powerable(PTile, bool),
}
@ -33,7 +33,7 @@ pub enum OpenTile {
pub enum PTile {
Gate(GateType),
Math(MathOp),
Bag,
Silo,
Flipper,
IO,
}
@ -84,7 +84,7 @@ impl Tile {
value: 0,
dir: Direction::Down,
},
'*' => Tile::Trigger(false),
'*' => Tile::Button(false),
'-' => Tile::Wire(WireType::Horizontal, false),
'|' => Tile::Wire(WireType::Vertical, false),
'+' => Tile::Wire(WireType::Cross, false),
@ -105,7 +105,7 @@ impl Tile {
'M' => Tile::Powerable(PTile::Math(MathOp::Mul), false),
'D' => Tile::Powerable(PTile::Math(MathOp::Div), false),
'R' => Tile::Powerable(PTile::Math(MathOp::Rem), false),
'B' => Tile::Powerable(PTile::Bag, false),
'B' => Tile::Powerable(PTile::Silo, false),
d @ '0'..='9' => Tile::Open(OpenTile::Digit(d as u8 - b'0'), Claim::Free),
'#' => Tile::Block,
_ => Tile::Open(OpenTile::Blank, Claim::Free),
@ -128,7 +128,7 @@ impl Tile {
Direction::Left => '<',
Direction::Right => '>',
},
Tile::Trigger(_) => '*',
Tile::Button(_) => '*',
Tile::Wire(wire, _) => match wire {
WireType::Vertical => '|',
WireType::Horizontal => '-',
@ -148,7 +148,7 @@ impl Tile {
MathOp::Div => 'D',
MathOp::Rem => 'R',
},
PTile::Bag => 'B',
PTile::Silo => 'B',
PTile::Flipper => 'F',
PTile::IO => 'I',
},
@ -175,7 +175,7 @@ impl Tile {
Tile::Open(OpenTile::Digit(n), _) => return format!("tile_digit_{n}"),
Tile::Mirror(mirror) => mirror.texture_name(),
Tile::Arrow(dir) => dir.arrow_tile_texture_name(),
Tile::Trigger(state) => {
Tile::Button(state) => {
if *state {
"trigger_on"
} else {
@ -193,7 +193,7 @@ impl Tile {
let root = match tile {
PTile::Gate(gate) => gate.texture_name(),
PTile::Math(math_op) => math_op.texture_name(),
PTile::Bag => "bag",
PTile::Silo => "bag",
PTile::Flipper => "flipper",
PTile::IO => "io_tile",
};