From 957583071d23b240c5d5b5ae92492da6795ed7e0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 15 Feb 2021 18:42:24 -0500 Subject: [PATCH] Splash damage tweaks --- core/assets/maps/tarFields.msav | Bin 15542 -> 15543 bytes core/src/mindustry/content/UnitTypes.java | 4 ++-- core/src/mindustry/entities/Damage.java | 4 ++-- gradle.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/assets/maps/tarFields.msav b/core/assets/maps/tarFields.msav index 72230396d942886117e3fed03c912c45909588be..995db24ab1c609077a965518ff72ced3f240d380 100644 GIT binary patch literal 15543 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 diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 14767e5a7a..b7c5062164 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1366,8 +1366,8 @@ public class UnitTypes implements ContentList{ collides = false; healPercent = 15f; - splashDamage = 230f; - splashDamageRadius = 81f; + splashDamage = 220f; + splashDamageRadius = 80f; }}; }}); }}; diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java index 83639450d0..df4e5c3a35 100644 --- a/core/src/mindustry/entities/Damage.java +++ b/core/src/mindustry/entities/Damage.java @@ -380,8 +380,8 @@ public class Damage{ //why? because otherwise the building would absorb everything in one cell, which means much less damage than a nearby explosion. //this needs to be compensated if(in != null && in.team != team && in.block.size > 1 && in.health > damage){ - //deal the damage of an entire side * 2, to be equivalent with the maximum "standard" side damage + 1 - in.damage(damage * (in.block.size * 2)); + //deal the damage of an entire side + 1, to be equivalent with maximum 'standard' damage + in.damage(damage * (in.block.size + 1)); //no need to continue with the explosion return; } diff --git a/gradle.properties b/gradle.properties index caf85797e8..aef9f992ed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=477c5e7892e49a8ae1d840feae2379fec15c838c +archash=2f044212b72385c64f4f1a1e488e8c5ee62c5740