From 8d20c462287b802e2ae93c6798af00f424dcab28 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 22 Sep 2018 16:41:55 -0400 Subject: [PATCH] Basic tutorial text --- core/assets/bundles/bundle.properties | 26 ++++++++++++--- core/src/io/anuke/mindustry/maps/Sectors.java | 1 + .../anuke/mindustry/maps/TutorialSector.java | 33 ++++++++++--------- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 72d6cf1f24..931debd6b4 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -59,7 +59,7 @@ text.sector.locked=[scarlet][[Incomplete] text.sector.unexplored=[accent][[Unexplored] text.mission=Mission:[LIGHT_GRAY] {0} text.mission.info=Mission Info -text.mission.complete=[accent]Mission complete! +text.mission.complete=Mission complete! text.mission.complete.body=Sector {0},{1} has been conquered. text.mission.wave=Survive[accent] {0}/{1} []waves\nWave in {2} text.mission.wave.menu=Survive[accent] {0} []waves @@ -607,9 +607,9 @@ block.spirit-factory.name=Spirit Drone Factory block.phantom-factory.name=Phantom Drone Factory block.wraith-factory.name=Wraith Fighter Factory block.ghoul-factory.name=Ghoul Bomber Factory -block.dagger-factory.name=Dagger Factory -block.titan-factory.name=Titan Factory -block.revenant-factory.name=Revenant Factory +block.dagger-factory.name=Dagger Mech Factory +block.titan-factory.name=Titan Mech Factory +block.revenant-factory.name=Revenant Fighter Factory block.repair-point.name=Repair Point block.resupply-point.name=Resupply Point block.pulse-conduit.name=Pulse Conduit @@ -657,4 +657,20 @@ unit.fortress.description=A heavy artillery ground unit. unit.revenant.name=Revenant unit.revenant.description=A heavy laser platform. -tutorial.begin=Starting tutorial text \ No newline at end of file +tutorial.begin=Your mission here is to eradicate the[LIGHT_GRAY] enemy[].\n\nBegin by [accent]mining copper[] units. Tap a copper ore vein near your core to do this. +tutorial.drill=Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nPlace one on a copper vein. +tutorial.conveyor=[accent]Conveyors []are used to transport items to the core.\nMake a line of conveyors from the drill to the core. +tutorial.morecopper=More copper is required. Use drills to mine it. +tutorial.turret=Defensive structures must be built to repel the [LIGHT_GRAY]enemy[].\nBuild a duo turret near your base. +tutorial.drillturret=Duo turrets require[accent] copper ammo []to shoot.\nPlace a drill next to the turret. +tutorial.waves=The[LIGHT_GRAY] enemy[] approaches.\n\nDefend your core for 5 waves. Build more turrets. +tutorial.lead=More ores are available. Explore to your right and mine[accent] lead[].\n\nDrag from your unit to the core to transfer resources. +tutorial.smelter=Copper and lead are weak metals.\nSuperior[accent] Dense Alloy[] can be created in a smelter.\n\nBuild one. +tutorial.densealloy=Create conveyors leading copper, lead and coal from drills into the smelter.\nCreate an additional output conveyor leading to the core.\n\nUse this to create 30 dense alloy. +tutorial.siliconsmelter=Advanced weapons require[accent] silicon.\nMake a silicon smelter. +tutorial.generator=This technology requires power.\nCreate a[accent] combustion generator[] for it. +tutorial.node=Power requires transport.\nCreate a[accent] power node[] next to your combustion generator to transfer its power.\nTo link power, tap the node.\n\nLink the generator to the silicon smelter. +tutorial.silicon=Fuel the combustion generator with coal from drills.\nInput sand and coal from drills into the silicon smelter\nThis will produce silicon.\n\nMake some silicon and move it into your base. +tutorial.daggerfactory=Construct a[accent] dagger mech factory.[]\n\nThis will be used to create attack mechs. +tutorial.dagger=Supply silicon, copper and power to the factory.\nOnce requirements are met, a mech will be created.\n\nCreate more drills, generators and conveyors as necessary. +tutorial.battle=The[LIGHT_GRAY] enemy[] has revealed their core.\nDestroy it with your unit and dagger mechs. \ No newline at end of file diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java index 3afa08012c..2343362921 100644 --- a/core/src/io/anuke/mindustry/maps/Sectors.java +++ b/core/src/io/anuke/mindustry/maps/Sectors.java @@ -44,6 +44,7 @@ public class Sectors{ sector.saveID = control.getSaves().addSave("sector-" + sector.packedPosition()).index; world.sectors().save(); world.setSector(sector); + sector.currentMission().onBegin(); }else if(SaveIO.breakingVersions.contains(sector.getSave().getBuild())){ ui.showInfo("$text.save.old"); }else try{ diff --git a/core/src/io/anuke/mindustry/maps/TutorialSector.java b/core/src/io/anuke/mindustry/maps/TutorialSector.java index 477080a450..45b73dd53d 100644 --- a/core/src/io/anuke/mindustry/maps/TutorialSector.java +++ b/core/src/io/anuke/mindustry/maps/TutorialSector.java @@ -12,24 +12,25 @@ public class TutorialSector{ public static Array getMissions(){ return Array.with( new ItemMission(Items.copper, 30).setMessage("$tutorial.begin"), - new BlockMission(ProductionBlocks.mechanicalDrill).setMessage("$tutorial.begin"), - new BlockMission(DistributionBlocks.conveyor), - new ItemMission(Items.copper, 40), - new BlockMission(TurretBlocks.duo), - new WaveMission(5), + new BlockMission(ProductionBlocks.mechanicalDrill).setMessage("$tutorial.drill"), + new BlockMission(DistributionBlocks.conveyor).setMessage("$tutorial.conveyor"), + new ItemMission(Items.copper, 50).setMessage("$tutorial.morecopper"), + new BlockMission(TurretBlocks.duo).setMessage("$tutorial.turret"), + new BlockMission(ProductionBlocks.mechanicalDrill).setMessage("$tutorial.drillturret"), + new WaveMission(5).setMessage("$tutorial.waves"), new ExpandMission(1, 0), - new ItemMission(Items.lead, 30), - new ItemMission(Items.copper, 150), - new BlockMission(CraftingBlocks.smelter), - new ItemMission(Items.densealloy, 30), - new BlockMission(PowerBlocks.combustionGenerator), - new BlockMission(PowerBlocks.powerNode), - new BlockMission(CraftingBlocks.siliconsmelter), - new ItemMission(Items.silicon, 30), - new BlockMission(UnitBlocks.daggerFactory), - new UnitMission(UnitTypes.dagger), + new ItemMission(Items.lead, 30).setMessage("$tutorial.lead"), + new ItemMission(Items.copper, 150).setMessage("$tutorial.morecopper"), + new BlockMission(CraftingBlocks.smelter).setMessage("$tutorial.smelter"), + new ItemMission(Items.densealloy, 30).setMessage("$tutorial.densealloy"), + new BlockMission(CraftingBlocks.siliconsmelter).setMessage("$tutorial.siliconsmelter"), + new BlockMission(PowerBlocks.combustionGenerator).setMessage("$tutorial.generator"), + new BlockMission(PowerBlocks.powerNode).setMessage("$tutorial.node"), + new ItemMission(Items.silicon, 30).setMessage("$tutorial.silicon"), + new BlockMission(UnitBlocks.daggerFactory).setMessage("$tutorial.daggerfactory"), + new UnitMission(UnitTypes.dagger).setMessage("$tutorial.dagger"), new ExpandMission(-1, 0), - new BattleMission() + new BattleMission().setMessage("$tutorial.battle") ); } }