From 739b1b7676db0d7b302a82722c2c8e1d440e1194 Mon Sep 17 00:00:00 2001 From: David Vierra Date: Sat, 31 Mar 2018 13:51:35 -1000 Subject: Rewrite Power Sub-Station machine structure Machine now allows variable height with 2-16 layers of cells (configurable via CELL_HEIGHT_MIN/MAX constants). Machine now affords more cell types for its interior (as detected in `getCellTier()`). Three more tiers of cells are added. Machine now computes energy storage from the number and type of cells in its interior. Base energy storage drastically reduced. Energy storage is now computed using a base value for the lowest tier of cells along with a tier multiplier. If the machine fails to form, stored energy is conserved. When the machine successfully forms, any energy above the storage capacity is deleted. Machine fails to form if not all cells are identical, or if dynamo/energy hatches are above the cells' tier. TODO: Add more tiers of energy cells, add crafting recipes for all new energy cells, rename and retexture cells to match tier and/or recipe, maybe adjust energy storage values. --- src/resources/assets/miscutils/lang/en_US.lang | 2 +- .../assets/miscutils/textures/blocks/redox/redox1.png | Bin 0 -> 717 bytes .../assets/miscutils/textures/blocks/redox/redox2.png | Bin 0 -> 741 bytes .../assets/miscutils/textures/blocks/redox/redox3.png | Bin 0 -> 693 bytes .../assets/miscutils/textures/blocks/redox/redox4.png | Bin 0 -> 708 bytes 5 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/resources/assets/miscutils/textures/blocks/redox/redox1.png create mode 100644 src/resources/assets/miscutils/textures/blocks/redox/redox2.png create mode 100644 src/resources/assets/miscutils/textures/blocks/redox/redox3.png create mode 100644 src/resources/assets/miscutils/textures/blocks/redox/redox4.png (limited to 'src/resources/assets/miscutils') diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang index a90bf55f89..0a842d7cd5 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -150,7 +150,7 @@ item.backpackBlack.name=Black Backpack item.backpackWhite.name=White Backpack item.itemBlueprint.name=Blueprint [I am useless] item.itemGemShards.name=Diamond Shards -item.itemHalfCompleteCasings.name=Half Complete Casing I +item.itemHalfCompleteCasings.name=Half Complete Casing item.itemSulfuricPotion.name=Thowable Vial of Sulfuric Acid item.itemHydrofluoricPotion.name=Thowable Vial of Hydrofluoric Acid item.itemIngotRaisinBread.name=A Serving of Raisin Bread diff --git a/src/resources/assets/miscutils/textures/blocks/redox/redox1.png b/src/resources/assets/miscutils/textures/blocks/redox/redox1.png new file mode 100644 index 0000000000..f3a48f72f8 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/redox/redox1.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/redox/redox2.png b/src/resources/assets/miscutils/textures/blocks/redox/redox2.png new file mode 100644 index 0000000000..0456dbe20b Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/redox/redox2.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/redox/redox3.png b/src/resources/assets/miscutils/textures/blocks/redox/redox3.png new file mode 100644 index 0000000000..ab2b3b27e9 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/redox/redox3.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/redox/redox4.png b/src/resources/assets/miscutils/textures/blocks/redox/redox4.png new file mode 100644 index 0000000000..b925ffc26b Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/redox/redox4.png differ -- cgit