Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Campaign completion text in bundle

Browse Source
This commit is contained in:
Anuken
2022-11-08 21:44:47 -05:00
parent 464feaa80e
commit c3d9a501c6
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/assets/bundles/bundle.properties
View File

@@ -681,6 +681,9 @@ weather.sandstorm.name = Sandstorm
weather.sporestorm.name = Sporestorm weather.sporestorm.name = Sporestorm
weather.fog.name = Fog weather.fog.name = Fog
campaign.playtime = \uF129 [lightgray]Sector Playtime: {0}
campaign.complete = [accent]Congratulations.\n\nThe enemy on {0} has been defeated.\n[lightgray]The final sector has been conquered.
sectorlist = Sectors sectorlist = Sectors
sectorlist.attacked = {0} under attack sectorlist.attacked = {0} under attack
sectors.unexplored = [lightgray]Unexplored sectors.unexplored = [lightgray]Unexplored

14
core/src/mindustry/ui/dialogs/CampaignCompleteDialog.java
View File

@@ -1,10 +1,15 @@
package mindustry.ui.dialogs; package mindustry.ui.dialogs;
import arc.*;
import arc.math.*;
import arc.scene.actions.*;
import mindustry.*; import mindustry.*;
import mindustry.core.*; import mindustry.core.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.type.*; import mindustry.type.*;
import static arc.scene.actions.Actions.*;
public class CampaignCompleteDialog extends BaseDialog{ public class CampaignCompleteDialog extends BaseDialog{
public CampaignCompleteDialog(){ public CampaignCompleteDialog(){
@@ -26,13 +31,16 @@ public class CampaignCompleteDialog extends BaseDialog{
//TODO obviously needs different text. //TODO obviously needs different text.
cont.clear(); cont.clear();
cont.add("[accent]Congratulations.\nThe enemy on " + planet.localizedName + " has been defeated.\n\nThe final sector has been conquered.").row(); cont.add(Core.bundle.format("campaign.complete", "[#" + planet.iconColor + "]" + planet.localizedName + "[]")).row();
float playtime = planet.sectors.sumf(s -> s.hasSave() ? s.save.meta.timePlayed : 0) / 1000f; float playtime = planet.sectors.sumf(s -> s.hasSave() ? s.save.meta.timePlayed : 0) / 1000f;
//TODO needs more info //TODO needs more info
cont.add("Total Playtime: " + UI.formatTime(playtime)).left().row(); cont.add(Core.bundle.format("campaign.playtime", UI.formatTime(playtime))).left().row();
show(); setTranslation(0f, -Core.graphics.getHeight());
color.a = 0f;
show(Core.scene, Actions.sequence(parallel(fadeIn(1.1f, Interp.fade), translateBy(0f, Core.graphics.getHeight(), 6f, Interp.pow5Out))));
} }
} }

2
gradle.properties
View File

@@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=2b9b7c4a1d archash=c8ce6b0a76