From 84f72d0e8dfba7ef4bc67d17cd91c1d1d09613e0 Mon Sep 17 00:00:00 2001 From: bdew Date: Thu, 18 Jun 2015 14:59:44 +0300 Subject: [PATCH] Added ocean emulation upgrade - closes #99 --- .../assets/gendustry/config/upgrades.cfg | 12 ++++++++++++ resources/assets/gendustry/lang/en_US.lang | 1 + .../textures/items/upgrades/ocean.png | Bin 0 -> 972 bytes .../textures/items/upgrades/upgrades.psd | Bin 83443 -> 85487 bytes 4 files changed, 13 insertions(+) create mode 100644 resources/assets/gendustry/textures/items/upgrades/ocean.png diff --git a/resources/assets/gendustry/config/upgrades.cfg b/resources/assets/gendustry/config/upgrades.cfg index 94c9743..c55c487 100644 --- a/resources/assets/gendustry/config/upgrades.cfg +++ b/resources/assets/gendustry/config/upgrades.cfg @@ -134,6 +134,13 @@ cfg Upgrades { energy *= 1.5 biomeOverride = Taiga } + + cfg ocean { + id = 21 + max = 1 + energy *= 1.5 + biomeOverride = Ocean + } } @@ -251,6 +258,7 @@ recipes { // BIOME OVERRIDES V = B:vine G = B:grass W = B:snow + U = I:water_bucket A = OD:gearBronze @@ -278,4 +286,8 @@ recipes { // BIOME OVERRIDES ALA WXW => S:gendustry:"upgrade.winter" AEA + + ALA + UXU => S:gendustry:"upgrade.ocean" + AEA } \ No newline at end of file diff --git a/resources/assets/gendustry/lang/en_US.lang b/resources/assets/gendustry/lang/en_US.lang index 7c5be94..e639cdc 100644 --- a/resources/assets/gendustry/lang/en_US.lang +++ b/resources/assets/gendustry/lang/en_US.lang @@ -71,6 +71,7 @@ gendustry.upgrades.cooler.name=Cooler Upgrade gendustry.upgrades.desert.name=Desert Emulation Upgrade gendustry.upgrades.plains.name=Plains Emulation Upgrade gendustry.upgrades.jungle.name=Jungle Emulation Upgrade +gendustry.upgrades.ocean.name=Ocean Emulation Upgrade gendustry.upgrades.stabilizer.name=Genetic Stabilizer Upgrade # ==== GUI AND TOOLTIPS ==== diff --git a/resources/assets/gendustry/textures/items/upgrades/ocean.png b/resources/assets/gendustry/textures/items/upgrades/ocean.png new file mode 100644 index 0000000000000000000000000000000000000000..1d3bcfe3304314f2c9b7c16e01405969f95c898b GIT binary patch literal 972 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