From d02268d347a2a9e0a424e9981a61400f5ad2c77c Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 17 Jul 2020 15:25:17 -0400 Subject: [PATCH] Additional pyratite balancing --- core/src/mindustry/content/Blocks.java | 6 +++--- core/src/mindustry/content/Items.java | 2 +- core/src/mindustry/content/StatusEffects.java | 2 +- core/src/mindustry/ui/dialogs/JoinDialog.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index fff82dc5de..d18511a006 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1131,14 +1131,14 @@ public class Blocks implements ContentList{ differentialGenerator = new SingleTypeGenerator("differential-generator"){{ requirements(Category.power, with(Items.copper, 70, Items.titanium, 50, Items.lead, 100, Items.silicon, 65, Items.metaglass, 50)); - powerProduction = 16f; - itemDuration = 140f; + powerProduction = 17f; + itemDuration = 200f; hasLiquids = true; hasItems = true; size = 3; consumes.item(Items.pyratite).optional(true, false); - consumes.liquid(Liquids.cryofluid, 0.15f); + consumes.liquid(Liquids.cryofluid, 0.14f); }}; rtgGenerator = new DecayGenerator("rtg-generator"){{ diff --git a/core/src/mindustry/content/Items.java b/core/src/mindustry/content/Items.java index 08f5868b76..a671f25b57 100644 --- a/core/src/mindustry/content/Items.java +++ b/core/src/mindustry/content/Items.java @@ -84,7 +84,7 @@ public class Items implements ContentList{ }}; pyratite = new Item("pyratite", Color.valueOf("ffaa5f")){{ - flammability = 1.4f; + flammability = 1.5f; explosiveness = 0.4f; }}; } diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java index ee939c50a5..8f2c4bae71 100644 --- a/core/src/mindustry/content/StatusEffects.java +++ b/core/src/mindustry/content/StatusEffects.java @@ -17,7 +17,7 @@ public class StatusEffects implements ContentList{ none = new StatusEffect("none"); burning = new StatusEffect("burning"){{ - damage = 0.075f; + damage = 0.08f; //over 10 seconds, this would be 48 damage effect = Fx.burning; init(() -> { diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index 758b9fd464..f6a2cbc503 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -410,7 +410,7 @@ public class JoinDialog extends BaseDialog{ } float targetWidth(){ - return Math.min(Core.graphics.getWidth() / Scl.scl() * 0.9f, 500f);//Core.graphics.isPortrait() ? 350f : 500f; + return Math.min(Core.graphics.getWidth() / Scl.scl() * 0.9f, 500f); } @SuppressWarnings("unchecked")