diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 3918354878..a85c617d6a 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1279,6 +1279,8 @@ hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a pay hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires. hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[]. hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down. +hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a  [accent]Foundation[] core over the  [accent]Shard[] core. Make sure it is free from nearby obstructions. +hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[]. item.copper.description = Used in all types of construction and ammunition. item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced. diff --git a/core/src/mindustry/ui/fragments/HintsFragment.java b/core/src/mindustry/ui/fragments/HintsFragment.java index 14329c89ce..da0d6a05d2 100644 --- a/core/src/mindustry/ui/fragments/HintsFragment.java +++ b/core/src/mindustry/ui/fragments/HintsFragment.java @@ -162,6 +162,16 @@ public class HintsFragment extends Fragment{ waveFire(() -> Groups.fire.size() > 0 && Blocks.wave.unlockedNow(), () -> indexer.getAllied(state.rules.defaultTeam, BlockFlag.extinguisher).size() > 0), generator(() -> control.input.block == Blocks.combustionGenerator, () -> ui.hints.placedBlocks.contains(Blocks.combustionGenerator)), guardian(() -> state.boss() != null && state.boss().armor >= 4, () -> state.boss() == null), + coreUpgrade(() -> state.isCampaign() && Blocks.coreFoundation.unlocked() + && state.rules.defaultTeam.core() != null + && state.rules.defaultTeam.core().block == Blocks.coreShard + && state.rules.defaultTeam.core().items.has(Blocks.coreFoundation.requirements), + () -> ui.hints.placedBlocks.contains(Blocks.coreFoundation)), + presetLaunch(() -> state.isCampaign() + && state.getSector().preset == null + && SectorPresets.frozenForest.unlocked() + && SectorPresets.frozenForest.sector.save == null, + () -> state.isCampaign() && state.getSector().preset == SectorPresets.frozenForest), ; @Nullable diff --git a/core/src/mindustry/ui/fragments/LoadingFragment.java b/core/src/mindustry/ui/fragments/LoadingFragment.java index 17d07f502f..348783fe05 100644 --- a/core/src/mindustry/ui/fragments/LoadingFragment.java +++ b/core/src/mindustry/ui/fragments/LoadingFragment.java @@ -3,6 +3,7 @@ package mindustry.ui.fragments; import arc.*; import arc.func.*; import arc.graphics.*; +import arc.graphics.g2d.*; import arc.scene.*; import arc.scene.actions.*; import arc.scene.event.*; @@ -22,6 +23,7 @@ public class LoadingFragment extends Fragment{ parent.fill(t -> { //rect must fill screen completely. t.rect((x, y, w, h) -> { + Draw.alpha(t.color.a); Styles.black8.draw(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight()); }); t.visible = false; diff --git a/gradle.properties b/gradle.properties index a0137eb65e..72f9fedde0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=585978a8258bc1db3d844670dabb305ed7881b14 +archash=a381f3a1704ed28b79e1224b51081cb1b790d504 diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml index 7fbb619038..cb3c6c3604 100644 --- a/ios/Info.plist.xml +++ b/ios/Info.plist.xml @@ -11,7 +11,7 @@ CFBundleIdentifier ${app.id} CFBundleInfoDictionaryVersion - 6.0 + 6.0.120.3 MinimumOSVersion 9.0.0 CFBundleName