mindustry logic execution, map- and schematic- parsing and rendering
erikir turret support
74 files changed, 6 insertions, 2 deletions
diff --git a/assets/blocks/turrets/afflict.png b/assets/blocks/turrets/afflict.png Binary files differnew file mode 100644 index 0000000..3deaca7 --- /dev/null +++ b/assets/blocks/turrets/afflict.png diff --git a/assets/blocks/turrets/afflict/afflict-blade-l.png b/assets/blocks/turrets/afflict/afflict-blade-l.png Binary files differdeleted file mode 100644 index 7868ea7..0000000 --- a/assets/blocks/turrets/afflict/afflict-blade-l.png +++ /dev/null diff --git a/assets/blocks/turrets/afflict/afflict-blade-r.png b/assets/blocks/turrets/afflict/afflict-blade-r.png Binary files differdeleted file mode 100644 index 11bf00f..0000000 --- a/assets/blocks/turrets/afflict/afflict-blade-r.png +++ /dev/null diff --git a/assets/blocks/turrets/afflict/afflict-preview.png b/assets/blocks/turrets/afflict/afflict-preview.png Binary files differdeleted file mode 100644 index ad13428..0000000 --- a/assets/blocks/turrets/afflict/afflict-preview.png +++ /dev/null diff --git a/assets/blocks/turrets/afflict/afflict.png b/assets/blocks/turrets/afflict/afflict.png Binary files differdeleted file mode 100644 index a7dfef6..0000000 --- a/assets/blocks/turrets/afflict/afflict.png +++ /dev/null diff --git a/assets/blocks/turrets/diffuse.png b/assets/blocks/turrets/diffuse.png Binary files differnew file mode 100644 index 0000000..e00fbfb --- /dev/null +++ b/assets/blocks/turrets/diffuse.png diff --git a/assets/blocks/turrets/diffuse/diffuse-front-l.png b/assets/blocks/turrets/diffuse/diffuse-front-l.png Binary files differdeleted file mode 100644 index 751f7ad..0000000 --- a/assets/blocks/turrets/diffuse/diffuse-front-l.png +++ /dev/null diff --git a/assets/blocks/turrets/diffuse/diffuse-front-r.png b/assets/blocks/turrets/diffuse/diffuse-front-r.png Binary files differdeleted file mode 100644 index 3ffe87a..0000000 --- a/assets/blocks/turrets/diffuse/diffuse-front-r.png +++ /dev/null diff --git a/assets/blocks/turrets/diffuse/diffuse-preview.png b/assets/blocks/turrets/diffuse/diffuse-preview.png Binary files differdeleted file mode 100644 index 4fb9338..0000000 --- a/assets/blocks/turrets/diffuse/diffuse-preview.png +++ /dev/null diff --git a/assets/blocks/turrets/diffuse/diffuse.png b/assets/blocks/turrets/diffuse/diffuse.png Binary files differdeleted file mode 100644 index 314cb63..0000000 --- a/assets/blocks/turrets/diffuse/diffuse.png +++ /dev/null diff --git a/assets/blocks/turrets/disperse.png b/assets/blocks/turrets/disperse.png Binary files differnew file mode 100644 index 0000000..f78d310 --- /dev/null +++ b/assets/blocks/turrets/disperse.png diff --git a/assets/blocks/turrets/disperse/disperse-blade-l.png b/assets/blocks/turrets/disperse/disperse-blade-l.png Binary files differdeleted file mode 100644 index 53db9d3..0000000 --- a/assets/blocks/turrets/disperse/disperse-blade-l.png +++ /dev/null diff --git a/assets/blocks/turrets/disperse/disperse-blade-r.png b/assets/blocks/turrets/disperse/disperse-blade-r.png Binary files differdeleted file mode 100644 index ac0d100..0000000 --- a/assets/blocks/turrets/disperse/disperse-blade-r.png +++ /dev/null diff --git a/assets/blocks/turrets/disperse/disperse-mid.png b/assets/blocks/turrets/disperse/disperse-mid.png Binary files differdeleted file mode 100644 index 774cb86..0000000 --- a/assets/blocks/turrets/disperse/disperse-mid.png +++ /dev/null diff --git a/assets/blocks/turrets/disperse/disperse-preview.png b/assets/blocks/turrets/disperse/disperse-preview.png Binary files differdeleted file mode 100644 index 0375cbb..0000000 --- a/assets/blocks/turrets/disperse/disperse-preview.png +++ /dev/null diff --git a/assets/blocks/turrets/disperse/disperse-side-l.png b/assets/blocks/turrets/disperse/disperse-side-l.png Binary files differdeleted file mode 100644 index 4bda8f4..0000000 --- a/assets/blocks/turrets/disperse/disperse-side-l.png +++ /dev/null diff --git a/assets/blocks/turrets/disperse/disperse-side-r.png b/assets/blocks/turrets/disperse/disperse-side-r.png Binary files differdeleted file mode 100644 index 9a80804..0000000 --- a/assets/blocks/turrets/disperse/disperse-side-r.png +++ /dev/null diff --git a/assets/blocks/turrets/lustre.png b/assets/blocks/turrets/lustre.png Binary files differnew file mode 100644 index 0000000..23fb05e --- /dev/null +++ b/assets/blocks/turrets/lustre.png diff --git a/assets/blocks/turrets/lustre/lustre-blade-l.png b/assets/blocks/turrets/lustre/lustre-blade-l.png Binary files differdeleted file mode 100644 index 3d165d1..0000000 --- a/assets/blocks/turrets/lustre/lustre-blade-l.png +++ /dev/null diff --git a/assets/blocks/turrets/lustre/lustre-blade-r.png b/assets/blocks/turrets/lustre/lustre-blade-r.png Binary files differdeleted file mode 100644 index c346c7c..0000000 --- a/assets/blocks/turrets/lustre/lustre-blade-r.png +++ /dev/null diff --git a/assets/blocks/turrets/lustre/lustre-inner-l.png b/assets/blocks/turrets/lustre/lustre-inner-l.png Binary files differdeleted file mode 100644 index e36be8a..0000000 --- a/assets/blocks/turrets/lustre/lustre-inner-l.png +++ /dev/null diff --git a/assets/blocks/turrets/lustre/lustre-inner-r.png b/assets/blocks/turrets/lustre/lustre-inner-r.png Binary files differdeleted file mode 100644 index aa3fede..0000000 --- a/assets/blocks/turrets/lustre/lustre-inner-r.png +++ /dev/null diff --git a/assets/blocks/turrets/lustre/lustre-mid.png b/assets/blocks/turrets/lustre/lustre-mid.png Binary files differdeleted file mode 100644 index 629c1d8..0000000 --- a/assets/blocks/turrets/lustre/lustre-mid.png +++ /dev/null diff --git a/assets/blocks/turrets/lustre/lustre-preview.png b/assets/blocks/turrets/lustre/lustre-preview.png Binary files differdeleted file mode 100644 index b481f86..0000000 --- a/assets/blocks/turrets/lustre/lustre-preview.png +++ /dev/null diff --git a/assets/blocks/turrets/malign.png b/assets/blocks/turrets/malign.png Binary files differnew file mode 100644 index 0000000..894ec99 --- /dev/null +++ b/assets/blocks/turrets/malign.png diff --git a/assets/blocks/turrets/malign/malign-back-l.png b/assets/blocks/turrets/malign/malign-back-l.png Binary files differdeleted file mode 100644 index 9a2cb1f..0000000 --- a/assets/blocks/turrets/malign/malign-back-l.png +++ /dev/null diff --git a/assets/blocks/turrets/malign/malign-back-r.png b/assets/blocks/turrets/malign/malign-back-r.png Binary files differdeleted file mode 100644 index a40066e..0000000 --- a/assets/blocks/turrets/malign/malign-back-r.png +++ /dev/null diff --git a/assets/blocks/turrets/malign/malign-end.png b/assets/blocks/turrets/malign/malign-end.png Binary files differdeleted file mode 100644 index 336cfa0..0000000 --- a/assets/blocks/turrets/malign/malign-end.png +++ /dev/null diff --git a/assets/blocks/turrets/malign/malign-front-l.png b/assets/blocks/turrets/malign/malign-front-l.png Binary files differdeleted file mode 100644 index a0a707f..0000000 --- a/assets/blocks/turrets/malign/malign-front-l.png +++ /dev/null diff --git a/assets/blocks/turrets/malign/malign-front-r.png b/assets/blocks/turrets/malign/malign-front-r.png Binary files differdeleted file mode 100644 index 06d66dc..0000000 --- a/assets/blocks/turrets/malign/malign-front-r.png +++ /dev/null diff --git a/assets/blocks/turrets/malign/malign-main.png b/assets/blocks/turrets/malign/malign-main.png Binary files differdeleted file mode 100644 index 3ee133b..0000000 --- a/assets/blocks/turrets/malign/malign-main.png +++ /dev/null diff --git a/assets/blocks/turrets/malign/malign-mid.png b/assets/blocks/turrets/malign/malign-mid.png Binary files differdeleted file mode 100644 index abecc84..0000000 --- a/assets/blocks/turrets/malign/malign-mid.png +++ /dev/null diff --git a/assets/blocks/turrets/malign/malign-mouth.png b/assets/blocks/turrets/malign/malign-mouth.png Binary files differdeleted file mode 100644 index 14d11e8..0000000 --- a/assets/blocks/turrets/malign/malign-mouth.png +++ /dev/null diff --git a/assets/blocks/turrets/malign/malign-preview.png b/assets/blocks/turrets/malign/malign-preview.png Binary files differdeleted file mode 100644 index 084b362..0000000 --- a/assets/blocks/turrets/malign/malign-preview.png +++ /dev/null diff --git a/assets/blocks/turrets/malign/malign-spine-l.png b/assets/blocks/turrets/malign/malign-spine-l.png Binary files differdeleted file mode 100644 index eb85228..0000000 --- a/assets/blocks/turrets/malign/malign-spine-l.png +++ /dev/null diff --git a/assets/blocks/turrets/malign/malign-spine-r.png b/assets/blocks/turrets/malign/malign-spine-r.png Binary files differdeleted file mode 100644 index eb85228..0000000 --- a/assets/blocks/turrets/malign/malign-spine-r.png +++ /dev/null diff --git a/assets/blocks/turrets/scathe.png b/assets/blocks/turrets/scathe.png Binary files differnew file mode 100644 index 0000000..c4ab23f --- /dev/null +++ b/assets/blocks/turrets/scathe.png diff --git a/assets/blocks/turrets/scathe/scathe-blade-l.png b/assets/blocks/turrets/scathe/scathe-blade-l.png Binary files differdeleted file mode 100644 index 50bee73..0000000 --- a/assets/blocks/turrets/scathe/scathe-blade-l.png +++ /dev/null diff --git a/assets/blocks/turrets/scathe/scathe-blade-r.png b/assets/blocks/turrets/scathe/scathe-blade-r.png Binary files differdeleted file mode 100644 index 79f0e91..0000000 --- a/assets/blocks/turrets/scathe/scathe-blade-r.png +++ /dev/null diff --git a/assets/blocks/turrets/scathe/scathe-mid.png b/assets/blocks/turrets/scathe/scathe-mid.png Binary files differdeleted file mode 100644 index 7cbf78c..0000000 --- a/assets/blocks/turrets/scathe/scathe-mid.png +++ /dev/null diff --git a/assets/blocks/turrets/scathe/scathe-preview.png b/assets/blocks/turrets/scathe/scathe-preview.png Binary files differdeleted file mode 100644 index cfd0cef..0000000 --- a/assets/blocks/turrets/scathe/scathe-preview.png +++ /dev/null diff --git a/assets/blocks/turrets/scathe/scathe-side-l.png b/assets/blocks/turrets/scathe/scathe-side-l.png Binary files differdeleted file mode 100644 index 3c91c14..0000000 --- a/assets/blocks/turrets/scathe/scathe-side-l.png +++ /dev/null diff --git a/assets/blocks/turrets/scathe/scathe-side-r.png b/assets/blocks/turrets/scathe/scathe-side-r.png Binary files differdeleted file mode 100644 index 3d76429..0000000 --- a/assets/blocks/turrets/scathe/scathe-side-r.png +++ /dev/null diff --git a/assets/blocks/turrets/smite.png b/assets/blocks/turrets/smite.png Binary files differnew file mode 100644 index 0000000..5319594 --- /dev/null +++ b/assets/blocks/turrets/smite.png diff --git a/assets/blocks/turrets/smite/smite-back-l.png b/assets/blocks/turrets/smite/smite-back-l.png Binary files differdeleted file mode 100644 index 1abaf9a..0000000 --- a/assets/blocks/turrets/smite/smite-back-l.png +++ /dev/null diff --git a/assets/blocks/turrets/smite/smite-back-r.png b/assets/blocks/turrets/smite/smite-back-r.png Binary files differdeleted file mode 100644 index 02ad987..0000000 --- a/assets/blocks/turrets/smite/smite-back-r.png +++ /dev/null diff --git a/assets/blocks/turrets/smite/smite-blade-bar-l.png b/assets/blocks/turrets/smite/smite-blade-bar-l.png Binary files differdeleted file mode 100644 index 0c16776..0000000 --- a/assets/blocks/turrets/smite/smite-blade-bar-l.png +++ /dev/null diff --git a/assets/blocks/turrets/smite/smite-blade-bar-r.png b/assets/blocks/turrets/smite/smite-blade-bar-r.png Binary files differdeleted file mode 100644 index 0c16776..0000000 --- a/assets/blocks/turrets/smite/smite-blade-bar-r.png +++ /dev/null diff --git a/assets/blocks/turrets/smite/smite-blade-l.png b/assets/blocks/turrets/smite/smite-blade-l.png Binary files differdeleted file mode 100644 index 69aa96f..0000000 --- a/assets/blocks/turrets/smite/smite-blade-l.png +++ /dev/null diff --git a/assets/blocks/turrets/smite/smite-blade-r.png b/assets/blocks/turrets/smite/smite-blade-r.png Binary files differdeleted file mode 100644 index 2b6e5b8..0000000 --- a/assets/blocks/turrets/smite/smite-blade-r.png +++ /dev/null diff --git a/assets/blocks/turrets/smite/smite-front-l.png b/assets/blocks/turrets/smite/smite-front-l.png Binary files differdeleted file mode 100644 index a53a2f9..0000000 --- a/assets/blocks/turrets/smite/smite-front-l.png +++ /dev/null diff --git a/assets/blocks/turrets/smite/smite-front-r.png b/assets/blocks/turrets/smite/smite-front-r.png Binary files differdeleted file mode 100644 index 7056811..0000000 --- a/assets/blocks/turrets/smite/smite-front-r.png +++ /dev/null diff --git a/assets/blocks/turrets/smite/smite-mid.png b/assets/blocks/turrets/smite/smite-mid.png Binary files differdeleted file mode 100644 index ed87823..0000000 --- a/assets/blocks/turrets/smite/smite-mid.png +++ /dev/null diff --git a/assets/blocks/turrets/smite/smite-preview.png b/assets/blocks/turrets/smite/smite-preview.png Binary files differdeleted file mode 100644 index 1cdd682..0000000 --- a/assets/blocks/turrets/smite/smite-preview.png +++ /dev/null diff --git a/assets/blocks/turrets/smite/smite-spine-l.png b/assets/blocks/turrets/smite/smite-spine-l.png Binary files differdeleted file mode 100644 index 6522cbb..0000000 --- a/assets/blocks/turrets/smite/smite-spine-l.png +++ /dev/null diff --git a/assets/blocks/turrets/smite/smite-spine-r.png b/assets/blocks/turrets/smite/smite-spine-r.png Binary files differdeleted file mode 100644 index 1bc408c..0000000 --- a/assets/blocks/turrets/smite/smite-spine-r.png +++ /dev/null diff --git a/assets/blocks/turrets/sublimate.png b/assets/blocks/turrets/sublimate.png Binary files differnew file mode 100644 index 0000000..77ebdd3 --- /dev/null +++ b/assets/blocks/turrets/sublimate.png diff --git a/assets/blocks/turrets/sublimate/sublimate-back-l.png b/assets/blocks/turrets/sublimate/sublimate-back-l.png Binary files differdeleted file mode 100644 index af23438..0000000 --- a/assets/blocks/turrets/sublimate/sublimate-back-l.png +++ /dev/null diff --git a/assets/blocks/turrets/sublimate/sublimate-back-r.png b/assets/blocks/turrets/sublimate/sublimate-back-r.png Binary files differdeleted file mode 100644 index 96cd36e..0000000 --- a/assets/blocks/turrets/sublimate/sublimate-back-r.png +++ /dev/null diff --git a/assets/blocks/turrets/sublimate/sublimate-front-l.png b/assets/blocks/turrets/sublimate/sublimate-front-l.png Binary files differdeleted file mode 100644 index 6360648..0000000 --- a/assets/blocks/turrets/sublimate/sublimate-front-l.png +++ /dev/null diff --git a/assets/blocks/turrets/sublimate/sublimate-front-r.png b/assets/blocks/turrets/sublimate/sublimate-front-r.png Binary files differdeleted file mode 100644 index 7ac7785..0000000 --- a/assets/blocks/turrets/sublimate/sublimate-front-r.png +++ /dev/null diff --git a/assets/blocks/turrets/sublimate/sublimate-liquid.png b/assets/blocks/turrets/sublimate/sublimate-liquid.png Binary files differdeleted file mode 100644 index 715427a..0000000 --- a/assets/blocks/turrets/sublimate/sublimate-liquid.png +++ /dev/null diff --git a/assets/blocks/turrets/sublimate/sublimate-nozzle-l.png b/assets/blocks/turrets/sublimate/sublimate-nozzle-l.png Binary files differdeleted file mode 100644 index fbe9ebe..0000000 --- a/assets/blocks/turrets/sublimate/sublimate-nozzle-l.png +++ /dev/null diff --git a/assets/blocks/turrets/sublimate/sublimate-nozzle-r.png b/assets/blocks/turrets/sublimate/sublimate-nozzle-r.png Binary files differdeleted file mode 100644 index ed41554..0000000 --- a/assets/blocks/turrets/sublimate/sublimate-nozzle-r.png +++ /dev/null diff --git a/assets/blocks/turrets/sublimate/sublimate-preview.png b/assets/blocks/turrets/sublimate/sublimate-preview.png Binary files differdeleted file mode 100644 index 31105b3..0000000 --- a/assets/blocks/turrets/sublimate/sublimate-preview.png +++ /dev/null diff --git a/assets/blocks/turrets/sublimate/sublimate-top.png b/assets/blocks/turrets/sublimate/sublimate-top.png Binary files differdeleted file mode 100644 index 366a967..0000000 --- a/assets/blocks/turrets/sublimate/sublimate-top.png +++ /dev/null diff --git a/assets/blocks/turrets/sublimate/sublimate.png b/assets/blocks/turrets/sublimate/sublimate.png Binary files differdeleted file mode 100644 index aebdb0e..0000000 --- a/assets/blocks/turrets/sublimate/sublimate.png +++ /dev/null diff --git a/assets/blocks/turrets/titan.png b/assets/blocks/turrets/titan.png Binary files differnew file mode 100644 index 0000000..b5061d0 --- /dev/null +++ b/assets/blocks/turrets/titan.png diff --git a/assets/blocks/turrets/titan/titan-barrel.png b/assets/blocks/turrets/titan/titan-barrel.png Binary files differdeleted file mode 100644 index 20f8e40..0000000 --- a/assets/blocks/turrets/titan/titan-barrel.png +++ /dev/null diff --git a/assets/blocks/turrets/titan/titan-preview.png b/assets/blocks/turrets/titan/titan-preview.png Binary files differdeleted file mode 100644 index b1728f3..0000000 --- a/assets/blocks/turrets/titan/titan-preview.png +++ /dev/null diff --git a/assets/blocks/turrets/titan/titan-side-l.png b/assets/blocks/turrets/titan/titan-side-l.png Binary files differdeleted file mode 100644 index eb77686..0000000 --- a/assets/blocks/turrets/titan/titan-side-l.png +++ /dev/null diff --git a/assets/blocks/turrets/titan/titan-side-r.png b/assets/blocks/turrets/titan/titan-side-r.png Binary files differdeleted file mode 100644 index ee8048d..0000000 --- a/assets/blocks/turrets/titan/titan-side-r.png +++ /dev/null diff --git a/assets/blocks/turrets/titan/titan.png b/assets/blocks/turrets/titan/titan.png Binary files differdeleted file mode 100644 index e055d78..0000000 --- a/assets/blocks/turrets/titan/titan.png +++ /dev/null diff --git a/src/block/simple.rs b/src/block/simple.rs index 47e115b..546f36b 100644 --- a/src/block/simple.rs +++ b/src/block/simple.rs @@ -85,8 +85,12 @@ impl BlockLogic for SimpleBlock { if category != "turrets" { return None; } - // TODO: erekir - let mut base = load(category, &format!("bases/block-{}", self.size)).unwrap(); + let path = match name { + "breach" | "diffuse" | "sublimate" | "titan" | "disperse" | "afflict" | "lustre" + | "scathe" | "malign" => format!("bases/reinforced-block-{}", self.size), + _ => format!("bases/block-{}", self.size), + }; + let mut base = load(category, &path).unwrap(); let top = read(category, name, self.size); image::imageops::overlay(&mut base, &top, 0, 0); Some(base) |
