mindustry logic execution, map- and schematic- parsing and rendering
30 files changed, 4 insertions, 4 deletions
diff --git a/mindus/Cargo.toml b/mindus/Cargo.toml index e9b73aa..f2f7d58 100644 --- a/mindus/Cargo.toml +++ b/mindus/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mindus" -version = "5.0.13" +version = "5.0.14" edition = "2021" description = "A library for working with mindustry data formats (eg schematics and maps) (fork of plandustry)" authors = [ diff --git a/mindus/assets/blocks/defense/force-projector.png b/mindus/assets/blocks/defense/force-projector.png Binary files differindex 72bd63e..4d3606c 100644 --- a/mindus/assets/blocks/defense/force-projector.png +++ b/mindus/assets/blocks/defense/force-projector.png diff --git a/mindus/assets/blocks/distribution/conveyors/armored-conveyor-1-2-h.png b/mindus/assets/blocks/distribution/conveyors/armored-conveyor-1-2-h.png Binary files differnew file mode 100644 index 0000000..f8450af --- /dev/null +++ b/mindus/assets/blocks/distribution/conveyors/armored-conveyor-1-2-h.png diff --git a/mindus/assets/blocks/distribution/conveyors/conveyor-1-2-h.png b/mindus/assets/blocks/distribution/conveyors/conveyor-1-2-h.png Binary files differnew file mode 100644 index 0000000..6a8a597 --- /dev/null +++ b/mindus/assets/blocks/distribution/conveyors/conveyor-1-2-h.png diff --git a/mindus/assets/blocks/distribution/conveyors/titanium-conveyor-1-2-h.png b/mindus/assets/blocks/distribution/conveyors/titanium-conveyor-1-2-h.png Binary files differnew file mode 100644 index 0000000..a3843dd --- /dev/null +++ b/mindus/assets/blocks/distribution/conveyors/titanium-conveyor-1-2-h.png diff --git a/mindus/assets/blocks/distribution/ducts/armored-duct-1-2-h.png b/mindus/assets/blocks/distribution/ducts/armored-duct-1-2-h.png Binary files differnew file mode 100644 index 0000000..c20d689 --- /dev/null +++ b/mindus/assets/blocks/distribution/ducts/armored-duct-1-2-h.png diff --git a/mindus/assets/blocks/distribution/ducts/duct-1-2-h.png b/mindus/assets/blocks/distribution/ducts/duct-1-2-h.png Binary files differnew file mode 100644 index 0000000..0f6baca --- /dev/null +++ b/mindus/assets/blocks/distribution/ducts/duct-1-2-h.png diff --git a/mindus/assets/blocks/distribution/ducts/duct-unloader-top.png b/mindus/assets/blocks/distribution/ducts/duct-unloader-top.png Binary files differindex cb76b14..97d11de 100644 --- a/mindus/assets/blocks/distribution/ducts/duct-unloader-top.png +++ b/mindus/assets/blocks/distribution/ducts/duct-unloader-top.png diff --git a/mindus/assets/blocks/liquid/conduits/conduit-1-2-h.png b/mindus/assets/blocks/liquid/conduits/conduit-1-2-h.png Binary files differnew file mode 100644 index 0000000..9955513 --- /dev/null +++ b/mindus/assets/blocks/liquid/conduits/conduit-1-2-h.png diff --git a/mindus/assets/blocks/liquid/conduits/plated-conduit-1-2-h.png b/mindus/assets/blocks/liquid/conduits/plated-conduit-1-2-h.png Binary files differnew file mode 100644 index 0000000..81fec55 --- /dev/null +++ b/mindus/assets/blocks/liquid/conduits/plated-conduit-1-2-h.png diff --git a/mindus/assets/blocks/liquid/conduits/pulse-conduit-1-2-h.png b/mindus/assets/blocks/liquid/conduits/pulse-conduit-1-2-h.png Binary files differnew file mode 100644 index 0000000..4c77532 --- /dev/null +++ b/mindus/assets/blocks/liquid/conduits/pulse-conduit-1-2-h.png diff --git a/mindus/assets/blocks/liquid/conduits/reinforced-conduit-1-2-h.png b/mindus/assets/blocks/liquid/conduits/reinforced-conduit-1-2-h.png Binary files differnew file mode 100644 index 0000000..e017861 --- /dev/null +++ b/mindus/assets/blocks/liquid/conduits/reinforced-conduit-1-2-h.png diff --git a/mindus/assets/blocks/liquid/liquid-router.png b/mindus/assets/blocks/liquid/liquid-router.png Binary files differindex 75adcb1..2f32662 100644 --- a/mindus/assets/blocks/liquid/liquid-router.png +++ b/mindus/assets/blocks/liquid/liquid-router.png diff --git a/mindus/assets/blocks/liquid/liquid-tank.png b/mindus/assets/blocks/liquid/liquid-tank.png Binary files differindex f4e9396..11e9c29 100644 --- a/mindus/assets/blocks/liquid/liquid-tank.png +++ b/mindus/assets/blocks/liquid/liquid-tank.png diff --git a/mindus/assets/blocks/production/heat-router-top1.png b/mindus/assets/blocks/production/heat-router-top1.png Binary files differindex 75a62a4..27bf1ca 100644 --- a/mindus/assets/blocks/production/heat-router-top1.png +++ b/mindus/assets/blocks/production/heat-router-top1.png diff --git a/mindus/assets/blocks/production/melter.png b/mindus/assets/blocks/production/melter.png Binary files differindex 97b0278..4ce9865 100644 --- a/mindus/assets/blocks/production/melter.png +++ b/mindus/assets/blocks/production/melter.png diff --git a/mindus/assets/blocks/production/oxidation-chamber.png b/mindus/assets/blocks/production/oxidation-chamber.png Binary files differindex 55ce729..7a2bd11 100644 --- a/mindus/assets/blocks/production/oxidation-chamber.png +++ b/mindus/assets/blocks/production/oxidation-chamber.png diff --git a/mindus/assets/blocks/production/slag-incinerator.png b/mindus/assets/blocks/production/slag-incinerator.png Binary files differindex 8cb0be7..8d41873 100644 --- a/mindus/assets/blocks/production/slag-incinerator.png +++ b/mindus/assets/blocks/production/slag-incinerator.png diff --git a/mindus/assets/blocks/storage/core-foundation.png b/mindus/assets/blocks/storage/core-foundation.png Binary files differindex 8c02e4f..364891a 100644 --- a/mindus/assets/blocks/storage/core-foundation.png +++ b/mindus/assets/blocks/storage/core-foundation.png diff --git a/mindus/assets/blocks/storage/reinforced-container.png b/mindus/assets/blocks/storage/reinforced-container.png Binary files differindex 2c52768..522d4a3 100644 --- a/mindus/assets/blocks/storage/reinforced-container.png +++ b/mindus/assets/blocks/storage/reinforced-container.png diff --git a/mindus/assets/blocks/units/basic-assembler-module-side1.png b/mindus/assets/blocks/units/basic-assembler-module-side1.png Binary files differindex 4dcdaa9..e877529 100644 --- a/mindus/assets/blocks/units/basic-assembler-module-side1.png +++ b/mindus/assets/blocks/units/basic-assembler-module-side1.png diff --git a/mindus/assets/blocks/units/basic-assembler-module-side2.png b/mindus/assets/blocks/units/basic-assembler-module-side2.png Binary files differindex d665e35..6eede6e 100644 --- a/mindus/assets/blocks/units/basic-assembler-module-side2.png +++ b/mindus/assets/blocks/units/basic-assembler-module-side2.png diff --git a/mindus/assets/blocks/units/mech-assembler-side1.png b/mindus/assets/blocks/units/mech-assembler-side1.png Binary files differindex 64eecdb..1655b33 100644 --- a/mindus/assets/blocks/units/mech-assembler-side1.png +++ b/mindus/assets/blocks/units/mech-assembler-side1.png diff --git a/mindus/assets/blocks/units/mech-assembler-side2.png b/mindus/assets/blocks/units/mech-assembler-side2.png Binary files differindex 3d922e2..bae99c7 100644 --- a/mindus/assets/blocks/units/mech-assembler-side2.png +++ b/mindus/assets/blocks/units/mech-assembler-side2.png diff --git a/mindus/assets/blocks/units/ship-assembler-side1.png b/mindus/assets/blocks/units/ship-assembler-side1.png Binary files differindex b735f1a..ae5251f 100644 --- a/mindus/assets/blocks/units/ship-assembler-side1.png +++ b/mindus/assets/blocks/units/ship-assembler-side1.png diff --git a/mindus/assets/blocks/units/ship-assembler-side2.png b/mindus/assets/blocks/units/ship-assembler-side2.png Binary files differindex 0943ca1..09ae9e1 100644 --- a/mindus/assets/blocks/units/ship-assembler-side2.png +++ b/mindus/assets/blocks/units/ship-assembler-side2.png diff --git a/mindus/assets/blocks/units/tank-assembler-side1.png b/mindus/assets/blocks/units/tank-assembler-side1.png Binary files differindex fe6c913..a5e88ba 100644 --- a/mindus/assets/blocks/units/tank-assembler-side1.png +++ b/mindus/assets/blocks/units/tank-assembler-side1.png diff --git a/mindus/assets/blocks/units/tank-assembler-side2.png b/mindus/assets/blocks/units/tank-assembler-side2.png Binary files differindex eb3800c..a8345ea 100644 --- a/mindus/assets/blocks/units/tank-assembler-side2.png +++ b/mindus/assets/blocks/units/tank-assembler-side2.png diff --git a/mindus/assets/blocks/walls/scrap-wall-large.png b/mindus/assets/blocks/walls/scrap-wall-large.png Binary files differindex 5785da4..f755c40 100644 --- a/mindus/assets/blocks/walls/scrap-wall-large.png +++ b/mindus/assets/blocks/walls/scrap-wall-large.png diff --git a/mindus/src/data/autotile.rs b/mindus/src/data/autotile.rs index f8021f3..48362e6 100644 --- a/mindus/src/data/autotile.rs +++ b/mindus/src/data/autotile.rs @@ -111,9 +111,9 @@ pub fn mask2tile(mask: U4, rot: Rotation, name: &str, scale: Scale) -> ImageHold }, // from below B0010 => match rot { - Rotation::Left => p!("1-2"), // ┐ - Rotation::Right => p!("1-1"), // ┌ - Rotation::Up => p!("0-3"), // │ + Rotation::Left => p!("1-2"), // ┐ + Rotation::Right => p!("1-2-h"), // ┌ + Rotation::Up => p!("0-3"), // │ Rotation::Down => unreachable!(), }, // from bottom + left |
