diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 784c0d9115..82654724eb 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -501,7 +501,6 @@ map.multiplayer = Only the host can view sectors. uncover = Uncover configure = Configure Loadout -#TODO loadout = Loadout resources = Resources bannedblocks = Banned Blocks @@ -509,12 +508,6 @@ addall = Add All launch.from = Launching From: [accent]{0} launch.destination = Destination: {0} configure.invalid = Amount must be a number between 0 and {0}. -zone.unlocked = [lightgray]{0} unlocked. -zone.requirement.complete = Requirement for {0} completed:[lightgray]\n{1} -zone.resources = [lightgray]Resources Detected: -zone.objective = [lightgray]Objective: [accent]{0} -zone.objective.survival = Survive -zone.objective.attack = Destroy Enemy Core add = Add... boss.health = Guardian Health diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 3acbc5e622..1040996109 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -551,7 +551,7 @@ sectors.rename = Переименовать сектор sectors.enemybase = [scarlet]Вражеская база sectors.vulnerable = [scarlet]Уязвим sectors.underattack = [scarlet]Атакован! [accent]{0}% повреждений -sectors.survives = [accent]Продержался {0} волн(ы) +sectors.survives = [accent]Продержиться {0} волн(ы) sector.curcapture = Сектор захвачен sector.curlost = Сектор потерян diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 4d0fc99849..cd1768b25c 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -223,7 +223,7 @@ public class Control implements ApplicationListener, Loadable{ for(TechNode node : TechTree.all){ if(!node.content.unlocked() && node.requirements.length == 0 && !node.objectives.contains(o -> !o.complete())){ - node.content.unlocked(); + node.content.unlock(); } } } diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 3304f3c69f..a7d0c837de 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -700,11 +700,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ if(sector.save != null && sector.info.resources.any()){ stable.table(t -> { t.add("@sectors.resources").padRight(4); - int idx = 0; - int max = 5; for(UnlockableContent c : sector.info.resources){ t.image(c.icon(Cicon.small)).padRight(3).size(Cicon.small.size); - //if(++idx % max == 0) t.row(); } }).padLeft(10f).fillX().row(); }