From 9d740e1e37b3d3e2e6a89defe8d150a020e2ca88 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Wed, 23 Dec 2020 15:39:04 +0100 Subject: [PATCH] Rebrand power infinite as power source (#4088) --- core/assets/bundles/bundle.properties | 2 +- core/src/mindustry/content/Blocks.java | 1 + core/src/mindustry/world/blocks/sandbox/PowerSource.java | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 0c6ea87497..ea7bd28dd1 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1166,7 +1166,7 @@ block.item-void.name = Item Void block.liquid-source.name = Liquid Source block.liquid-void.name = Liquid Void block.power-void.name = Power Void -block.power-source.name = Power Infinite +block.power-source.name = Power Source block.unloader.name = Unloader block.vault.name = Vault block.wave.name = Wave diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index eecae2782a..7bc2e18679 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1992,6 +1992,7 @@ public class Blocks implements ContentList{ powerSource = new PowerSource("power-source"){{ requirements(Category.power, BuildVisibility.sandboxOnly, with()); + powerProduction = 10000f / 60f; alwaysUnlocked = true; }}; diff --git a/core/src/mindustry/world/blocks/sandbox/PowerSource.java b/core/src/mindustry/world/blocks/sandbox/PowerSource.java index fbc24f5ea7..b392ce8813 100644 --- a/core/src/mindustry/world/blocks/sandbox/PowerSource.java +++ b/core/src/mindustry/world/blocks/sandbox/PowerSource.java @@ -4,6 +4,8 @@ import mindustry.world.blocks.power.*; public class PowerSource extends PowerNode{ + public float powerProduction = 10000f; + public PowerSource(String name){ super(name); maxNodes = 100; @@ -14,7 +16,7 @@ public class PowerSource extends PowerNode{ public class PowerSourceBuild extends PowerNodeBuild{ @Override public float getPowerProduction(){ - return enabled ? 10000f : 0f; + return enabled ? powerProduction : 0f; } }