From 301387fb32f11915c8b475351dd9e2dcaab55943 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 17 Aug 2019 15:39:41 -0400 Subject: [PATCH] Fixed low rank on attack map completion --- core/src/io/anuke/mindustry/game/Stats.java | 6 ++++-- .../anuke/mindustry/ui/dialogs/GameOverDialog.java | 12 ++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/core/src/io/anuke/mindustry/game/Stats.java b/core/src/io/anuke/mindustry/game/Stats.java index ebaa62dfc6..afdd5c0706 100644 --- a/core/src/io/anuke/mindustry/game/Stats.java +++ b/core/src/io/anuke/mindustry/game/Stats.java @@ -26,8 +26,10 @@ public class Stats{ public RankResult calculateRank(Zone zone, boolean launched){ float score = 0; - //each new launch period adds onto the rank 'points' - if(wavesLasted >= zone.conditionWave){ + if(launched && zone.getRules().attackMode){ + score += 3f; + }else if(wavesLasted >= zone.conditionWave){ + //each new launch period adds onto the rank 'points' score += (float)((wavesLasted - zone.conditionWave) / zone.launchPeriod + 1) * 1.2f; } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java index ca7cdcf5d7..3078c01d56 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java @@ -1,11 +1,11 @@ package io.anuke.mindustry.ui.dialogs; -import io.anuke.arc.Core; -import io.anuke.mindustry.core.GameState.State; -import io.anuke.mindustry.game.Stats.RankResult; -import io.anuke.mindustry.game.Team; -import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.type.Item.Icon; +import io.anuke.arc.*; +import io.anuke.mindustry.core.GameState.*; +import io.anuke.mindustry.game.Stats.*; +import io.anuke.mindustry.game.*; +import io.anuke.mindustry.type.*; +import io.anuke.mindustry.type.Item.*; import static io.anuke.mindustry.Vars.*;