Tutorial Improvements

locale/en.po

@@ -1762,13 +1762,9 @@ msgstr ""
 
 msgid "EDITOR_TUTORIAL_EDITOR_TEXT"
 msgstr ""
-"Welcome to the [b]Microbe Editor[/b].\n"
+"This early in the history of life, the biosphere is pretty simple. Later, the menus you see here will be essential to understanding the interconnected story unfolding on your alien world.\n"
 "\n"
-"Here you can review what has happened during previous generations, and then make changes to your species.\n"
-"\n"
-"The Report Screen gives you a list of changes in the patch you currently occupy. Try exploring the various tools at your disposal to learn more about events in your world!\n"
-"\n"
-"When you are ready, press the \"next\" button in the bottom right to continue to the Patch Map Screen."
+"For now, just click the \"Editor\" tab on top left to open the [b]Microbe Editor[/b]"
 
 msgid "EIGHT_TIMES"
 msgstr "8x"
@@ -3425,11 +3421,10 @@ msgstr ""
 
 msgid "MICROBE_STAGE_COLLECT_TEXT"
 msgstr ""
-"Collect [thrive:compound type=\"glucose\"][/thrive:compound] (white clouds) by moving over it.\n"
-"\n"
-"Your cell needs [thrive:compound type=\"glucose\"][/thrive:compound] in order to produce energy ([thrive:compound type=\"atp\"][/thrive:compound]) to stay alive.\n"
+"To survive, a microbe will need [thrive:compound type=\"atp\"][/thrive:compound]. For your species, that means finding [thrive:compound type=\"glucose\"][/thrive:compound].\n"
 "\n"
-"Follow the line from your cell to nearby [thrive:compound type=\"glucose\"][/thrive:compound]."
+"Follow the line from your cell to a nearby white cloud of [thrive:compound type=\"glucose\"][/thrive:compound]."
+
 
 msgid "MICROBE_STAGE_CONTROL_TEXT"
 msgstr ""
@@ -3447,9 +3442,9 @@ msgstr ""
 
 msgid "MICROBE_STAGE_DAY_NIGHT_TEXT"
 msgstr ""
-"Look out for drops in the [b]sunlight meter[/b] on the environment panel.\n"
+"You can monitor local conditions with the [b]environment panel[/b] on the left of your screen.\n"
 "\n"
-"Nighttime comes as the environment darkens.\n"
+"Eyes havn't evolved yet, but species may already rely on sunlight (or temperture) to generate food. If that's you, pay attention!\n"
 "\n"
 "Photosynthesis is ineffective during nighttime. So, any cells that rely on photosynthesis need to have enough compound storage [thrive:icon]StorageIcon[/thrive:icon] to survive the night."
 
@@ -3458,41 +3453,41 @@ msgstr ""
 "Keep an eye on your health bar next to the [thrive:compound type=\"atp\"][/thrive:compound] bar (bottom right).\n"
 "Your cell dies if it runs out of health.\n"
 "You regenerate health while you have [thrive:compound type=\"atp\"][/thrive:compound].\n"
-"Make sure to collect enough [thrive:compound type=\"glucose\"][/thrive:compound] to produce [thrive:compound type=\"atp\"][/thrive:compound]."
+"You LOSE health if you have no [thrive:compound type=\"atp\"][/thrive:compound]."
 
 msgid "MICROBE_STAGE_INITIAL"
 msgstr ""
-"On a distant alien planet, eons of volcanic activity and meteor impacts have led to the development of a new phenomenon in the universe.\n"
+"On a distant alien planet, eons of volcanic activity and meteor impacts have re-arranged matter into a remarkable new form.\n"
 "\n"
 "Life.\n"
 "\n"
-"Simple microbes reside in the deep regions of the ocean. You are the Last Universal Common Ancestor (LUCA) on this planet.\n"
+"This simple bubble has the ability to maintain a different environment inside of itself than in the water outside. In time, it may grow into a complex species that dominates the stars.\n"
 "\n"
-"To survive in this hostile world, you will need to collect any compounds that you can find and evolve across generations to compete against the other species of microbes."
+"But first, you will need to survive."
 
 msgid "MICROBE_STAGE_INITIAL_PANSPERMIA"
 msgstr ""
 "On a distant alien planet, a meteor has impacted after travelling vast astronomical distances carrying within it the seeds needed for a new phenomenon on the planet.\n"
 "\n"
 "Life.\n"
 "\n"
-"Simple microbes reside near the impact site. You are the Last Universal Common Ancestor (LUCA) on this planet.\n"
+"This microbe is generalized enough to survive in this ocean just as well as on that distant home world. Perhaps, one day, this microbe's distant decendants will find that world again.\n"
 "\n"
-"To survive in this hostile world, you will need to collect any compounds that you can find and evolve across generations to compete against the other species of microbes."
+"But first, you will need to survive."
 
 msgid "MICROBE_STAGE_INITIAL_POND"
 msgstr ""
-"On a distant alien planet, eons of chemical evolution building up to self-replicating molecules have led to the development of a new phenomenon in the universe.\n"
+"On a distant alien planet, eons of chemical evolution build up to self-replicating molecules, and the development of a new phenomenon.\n"
 "\n"
 "Life.\n"
 "\n"
-"Simple microbes reside in shallow warm ponds. You are the Last Universal Common Ancestor (LUCA) on this planet.\n"
+"This simple bubble has the ability to maintain a different environment inside of itself than in the water outside. In time, it may grow into a complex species that dominates the stars.\n"
 "\n"
-"To survive in this hostile world, you will need to collect any compounds that you can find and evolve across generations to compete against the other species of microbes."
+"But first, you will need to survive."
 
 msgid "MICROBE_STAGE_ORGANELLE_DIVISION"
 msgstr ""
-"One of your organelles has divided.\n"
+"In the process of growing enough to reproduce, each of your organelles will divide. These new organelles provide bonuses (and osmoregulation costs) just like the organelles your microbe started with.\n"
 "\n"
 "As you gain compounds, your cell uses some for reproduction.\n"
 "\n"
@@ -5823,7 +5818,7 @@ msgid "TUTORIAL_MICROBE_EDITOR_ATP_BALANCE_INTRO"
 msgstr ""
 "The ATP Production bar on the right indicates how much [thrive:compound type=\"atp\"][/thrive:compound] your cell produces compared to how much is consumed. If the top bar is shorter than the bottom one, then you are not producing enough [thrive:compound type=\"atp\"][/thrive:compound].\n"
 "\n"
-"The bottom bar contains the [b]osmoregulation[/b] [thrive:icon]OsmoIcon[/thrive:icon] cost and the [b]movement[/b] [thrive:icon]MovementIcon[/thrive:icon] cost. [b]Osmoregulation[/b] [thrive:icon]OsmoIcon[/thrive:icon] is [u]the base cost of staying alive[/u]. Every part you add increases this cost.\n"
+"The bottom bar contains the [b]osmoregulation[/b] [thrive:icon]OsmoIcon[/thrive:icon] cost and the [b]movement[/b] [thrive:icon]MovementIcon[/thrive:icon] cost. [b]Osmoregulation[/b] [thrive:icon]OsmoIcon[/thrive:icon] is [u]the base cost of staying alive[/u]. Every part you add increases this cost. You don't have to pay the [b]Mmovement cost[/b] [thrive:icon]MovementIcon[/thrive:icon] when you aren't moving. \n"
 "\n"
 "If your [thrive:compound type=\"atp\"][/thrive:compound] production is negative, be sure to increase [thrive:compound type=\"atp\"][/thrive:compound] production or add [b]storage[/b] [thrive:icon]StorageIcon[/thrive:icon] to allow movement in bursts."
 
@@ -5841,9 +5836,9 @@ msgid "TUTORIAL_MICROBE_EDITOR_CELL_TEXT"
 msgstr ""
 "This is the cell editor, where you can evolve your species by spending [b]mutation points[/b] (MP) [thrive:icon]MP[/thrive:icon]. Each generation you will always have [b]100 MP[/b] [thrive:icon]MP[/thrive:icon] to spend, so don't bother saving up!\n"
 "\n"
-"The hex in the center of your screen is your [b]cell[/b], which is composed of a single cytoplasm part.\n"
+"The hex in the center of your screen is your species.\n"
 "\n"
-"To continue, select a part from the left panel. Then left-click next to the hex to place it. You can rotate parts with [thrive:input]e_rotate_left[/thrive:input] and [thrive:input]e_rotate_right[/thrive:input]."
+"To continue, scroll down on the left panel until you find the nucleus. Click on it, then left-click next to the hex to place it. You can rotate parts with [thrive:input]e_rotate_left[/thrive:input] and [thrive:input]e_rotate_right[/thrive:input]."
 
 msgid "TUTORIAL_MICROBE_EDITOR_CHEMORECEPTOR"
 msgstr ""
@@ -5855,13 +5850,13 @@ msgstr ""
 
 msgid "TUTORIAL_MICROBE_EDITOR_ENDING_TEXT"
 msgstr ""
-"Those are the basics of editing your species. As a finishing touch, you can rename your species by clicking on the name on the bottom left and editing the text.\n"
+"Adaptation is hard. There are many sources of [thrive:compound type=\"atp\"][/thrive:compound], but not all of them are in every patch. You can use all the tabs and panels here to make the most informed choice you can, or just try something and see how it works!\n"
 "\n"
-"Try exploring the other tabs under the [b]MP [thrive:icon]MP[/thrive:icon] bar[/b] to see how else you can customize your cell.\n"
+"Just remember: [u]if you don't make  [thrive:compound type=\"atp\"][/thrive:compound] you won't survive[/u].\n"
 "\n"
-"To survive in this harsh world, you will need to find a reliable source of [thrive:compound type=\"atp\"][/thrive:compound] as natural [thrive:compound type=\"glucose\"][/thrive:compound] will [b]rapidly decline[/b].\n"
+"A lifestyle of finding [thrive:compound type=\"glucose\"][/thrive:compound] and turning it into [thrive:compound type=\"atp\"][/thrive:compound] will work for now, but naturally occuring glucose will decline every generation.\n"
 "\n"
-"Good luck!"
+"As a finishing touch, you can rename your species by clicking on the name on the bottom left and editing the text. Good luck!"
 
 msgid "TUTORIAL_MICROBE_EDITOR_FLAGELLUM"
 msgstr ""
@@ -5909,41 +5904,39 @@ msgstr ""
 
 msgid "TUTORIAL_MICROBE_EDITOR_PATCH_TEXT"
 msgstr ""
-"This is the [b]patch map[/b].\n"
-"\n"
-"Each icon represents a unique environment that you can inhabit, with the panel on your right describing the conditions of the currently selected patch.\n"
+"Life started in a small corner of this world, but it is already beginning to spread.\n"
 "\n"
-"If you select a patch connected to the one you occupy (which is highlighted with a flashing green border), you can press the \"Move to This Patch\" button on the right to move there.\n"
+"Each icon represents a unique environment that you can inhabit, with the panel on your right describing the conditions of the currently selected patch. If you select a patch connected to the one you occupy (which is highlighted with a flashing green border), you can press the \"Move to This Patch\" button on the right to move there.\n"
 "\n"
-"Try selecting a patch to continue."
+"Try selecting a patch to continue. If you choose to travel, be sure to be sure to visit the [b]tolerance[/b] tab of the [b]editor[/b]"
 
 msgid "TUTORIAL_MICROBE_EDITOR_REMOVE_ORGANELLE_TEXT"
 msgstr ""
-"Removing organelles also costs [b]MP[/b] [thrive:icon]MP[/thrive:icon] as it is a mutation to your species, [u]unless they were placed in the current editor session[/u]. \n"
+"The nucleus will unlock all manner of new possibilities for your species, but there's no way you can afford the [b]osmoregulation cost[/b] [thrive:icon]OsmoIcon[/thrive:icon] of such a large component right now.\n"
 "\n"
-"You can right click organelles to bring up the [b]organelle menu[/b] and select the delete option to remove them. \n"
+"To make a species that can actually survive, you will need to pick something better adapted to your environment and existing microbe.\n"
 "\n"
-"If you make a mistake, you can undo any change you make in the editor.\n"
+"You can right click organelles to bring up the [b]organelle menu[/b] and select the delete option to remove any organelle. You can also undo the last change you make in the editor with the undo button.\n"
 "\n"
 "Click the undo button to continue."
 
 msgid "TUTORIAL_MICROBE_EDITOR_SELECT_ORGANELLE_TEXT"
 msgstr ""
-"When selecting parts, [u]pay attention to the tooltips[/u] to understand what they do. Parts can do [u]more harm than good if you don't consider their function[/u].\n"
-"\n"
-"Each part requires maintenance (called [b]osmoregulation[/b] [thrive:icon]OsmoIcon[/thrive:icon]) and some of them run [b]processes[/b] that require certain compounds to function.\n"
-"\n"
-"Additionally, the more parts you add, the more compounds you will need to reproduce.\n"
+"If you didn't mean to undo that change, you can redo."
 "\n"
 "Press the redo button (next to the undo button) to continue."
 
 msgid "TUTORIAL_MICROBE_EDITOR_STAY_SMALL"
 msgstr ""
-"You should focus on [b]specialization[/b] to survive on one or two [thrive:compound type=\"atp\"][/thrive:compound] sources so that you don't require many different resources at once to sustain yourself.\n"
+"There are many paths up the evolutionary ladder, but here are some things to consider if you're having a hard time:\n"
+"\n"
+"Focus on [b]specialization[/b] to survive on one or two [thrive:compound type=\"atp\"][/thrive:compound] sources so that you don't require many different resources at once to sustain yourself.\n"
 "\n"
-"Also carefully consider if adding a part is truly beneficial; you don't always need to change what already works, as each part costs [thrive:compound type=\"atp\"][/thrive:compound] to maintain [thrive:icon]OsmoIcon[/thrive:icon] and requires more resources to reproduce.\n"
+"Resist the urge to grow larger as fast as possible. You don't always need to change what already works, as each part costs [thrive:compound type=\"atp\"][/thrive:compound] to maintain [thrive:icon]OsmoIcon[/thrive:icon].\n"
 "\n"
-"One possible strategy is to stay a single hex of cytoplasm and just head to the surface patches first before getting [b]photosynthesis[/b] organelles."
+"It's much easier to survive as an autotroph (such as a photosyntheizer), but eating other microbes is more exciting.\n"
+"\n"
+"Don't overthink it. Trillions of cells die before one finds a useful adaptation."
 
 msgid "TUTORIAL_MICROBE_EDITOR_TOLERANCES_TAB"
 msgstr ""
@@ -5981,9 +5974,7 @@ msgid "TUTORIAL_MICROBE_STAGE_ENGULFMENT_TEXT"
 msgstr ""
 "Engulf objects by moving over them while in engulf mode. Toggle engulf mode by pressing [thrive:input]g_toggle_engulf[/thrive:input].\n"
 "\n"
-"Stop engulfing once the object is getting pulled in.\n"
-"\n"
-"Follow the line from your cell to nearby engulfable object."
+"The line points to something you are [i]large enough[/i] to engulf, but you may not be able to actually [i]catch[/i] it."
 
 msgid "TUTORIAL_MICROBE_STAGE_HELP_MENU_AND_ZOOM"
 msgstr ""
@@ -6000,7 +5991,7 @@ msgstr ""
 
 msgid "TUTORIAL_MICROBE_STAGE_REPRODUCE_TEXT"
 msgstr ""
-"To reproduce, you must duplicate your organelles. This happens gradually as you survive, but you can speed things up by gathering [thrive:compound type=\"ammonia\"][/thrive:compound] and [thrive:compound type=\"phosphates\"][/thrive:compound].\n"
+"Life needs more molecules than just sugar. See which other kinds of clouds your microbe can collect!\n"
 "\n"
 "The orange and purple bars in the bottom right show your progress. They turn white when you’re ready to reproduce."
 

simulation_parameters/Constants.cs

@@ -1356,11 +1356,11 @@ public static class Constants
 
     public const float TIME_BEFORE_TUTORIAL_CAN_PAUSE = 0.01f;
 
-    public const float MICROBE_MOVEMENT_EXPLAIN_TUTORIAL_DELAY = 12.0f;
+    public const float MICROBE_MOVEMENT_EXPLAIN_TUTORIAL_DELAY = 3.5f;
     public const float MICROBE_MOVEMENT_EXPLAIN_TUTORIAL_DELAY_CONTROLLER = 1.0f;
-    public const float MICROBE_MOVEMENT_TUTORIAL_REQUIRE_DIRECTION_PRESS_TIME = 2.2f;
+    public const float MICROBE_MOVEMENT_TUTORIAL_REQUIRE_DIRECTION_PRESS_TIME = 1.6f;
     public const float TUTORIAL_ENTITY_POSITION_UPDATE_INTERVAL = 0.2f;
-    public const float GLUCOSE_TUTORIAL_TRIGGER_ENABLE_FREE_STORAGE_SPACE = 0.14f;
+    public const float GLUCOSE_TUTORIAL_TRIGGER_ENABLE_FREE_STORAGE_SPACE = 0.03f;
     public const float GLUCOSE_TUTORIAL_COLLECT_BEFORE_COMPLETE = 0.21f;
     public const float MICROBE_REPRODUCTION_TUTORIAL_DELAY = 10;
     public const float HIDE_MICROBE_STAYING_ALIVE_TUTORIAL_AFTER = 60;

src/general/base_stage/CreatureStageHUDBase.cs

@@ -679,6 +679,37 @@ public void ShowFossilisationDialog(FossilisationButton button)
         }
     }
 
+    /// <summary>
+    ///   Hides both the compounds panel and the environment panel for tutorial purposes
+    /// </summary>
+    public void HideEnvironmentAndCompoundPanels()
+    {
+        compoundsPanel.ShowPanel = false;
+        compoundsPanel.ShowAgents = false;
+
+        environmentPanel.ShowPanel = false;
+        bottomLeftBar.CompoundsPressed = false;
+        bottomLeftBar.EnvironmentPressed = false;
+    }
+
+    /// <summary>
+    ///   Restores the compound panel after it was closed for the tutorial
+    /// </summary>
+    public void ShowCompoundPanel()
+    {
+        compoundsPanel.ShowPanel = true;
+        bottomLeftBar.CompoundsPressed = true;
+    }
+
+    /// <summary>
+    ///   Restores the environment panel after it was closed for the tutorial
+    /// </summary>
+    public void ShowEnvironmentPanel()
+    {
+        environmentPanel.ShowPanel = true;
+        bottomLeftBar.EnvironmentPressed = true;
+    }
+
     /// <summary>
     ///   Creates and displays a fossilisation button above each on-screen organism.
     /// </summary>

src/microbe_stage/MicrobeStage.cs

@@ -51,6 +51,12 @@ public partial class MicrobeStage : CreatureStageBase<Entity, MicrobeWorldSimula
     [JsonProperty]
     private bool wonOnce;
 
+    /// <summary>
+    ///   Used to mark the first time the player turns off tutorials in game
+    /// </summary>
+    [JsonProperty]
+    private bool tutorialCanceledOnce;
+
     /// <summary>
     ///   Used to give increasing numbers to player offspring to know which is the latest
     /// </summary>
@@ -290,7 +296,7 @@ public override void _Process(double delta)
                 {
                     TutorialState.SendEvent(TutorialEventType.MicrobeCompoundsNearPlayer,
                         new EntityPositionEventArgs(Clouds.FindCompoundNearPoint(playerPosition.Position,
-                            Compound.Glucose)),
+                            Compound.Glucose), Player.Get<CompoundStorage>().Compounds, HUD),
                         this);
                 }
 
@@ -306,7 +312,7 @@ ref Player.Get<OrganelleContainer>(), ref Player.Get<WorldPosition>(),
                         WorldSimulation);
 
                     TutorialState.SendEvent(TutorialEventType.MicrobeChunksNearPlayer,
-                        new EntityPositionEventArgs(position), this);
+                        new EntityPositionEventArgs(position, Player.Get<CompoundStorage>().Compounds, HUD), this);
                 }
 
                 guidancePosition = TutorialState.GetPlayerGuidancePosition();
@@ -805,6 +811,13 @@ public override void OnReturnFromEditor()
         if (!CurrentGame.TutorialState.Enabled)
         {
             tutorialGUI.EventReceiver?.OnTutorialDisabled();
+
+            if (!tutorialCanceledOnce)
+            {
+                HUD.ShowCompoundPanel();
+                HUD.ShowEnvironmentPanel();
+                tutorialCanceledOnce = true;
+            }
         }
         else
         {
@@ -816,7 +829,8 @@ public override void OnReturnFromEditor()
 
                 if (patchSunlight > Constants.DAY_NIGHT_TUTORIAL_LIGHT_MIN)
                 {
-                    TutorialState.SendEvent(TutorialEventType.MicrobePlayerEnterSunlightPatch, EventArgs.Empty, this);
+                    TutorialState.SendEvent(TutorialEventType.MicrobePlayerEnterSunlightPatch, new HUDEventArgs(HUD),
+                        this);
                 }
             }
         }
@@ -895,10 +909,17 @@ protected override void SetupStage()
 
         ProceduralDataCache.Instance.OnEnterState(MainGameState.MicrobeStage);
 
-        // If this is a new game, place some phosphates as a learning tool
+        // If this is a new game, place some clouds as a learning tool
         if (!IsLoadedFromSave)
         {
-            Clouds.AddCloud(Compound.Phosphates, 50000.0f, new Vector3(50.0f, 0.0f, 0.0f));
+            Clouds.AddCloud(Compound.Phosphates, 50000.0f, new Vector3(40.0f, 0.0f, 0.0f));
+            Clouds.AddCloud(Compound.Glucose, 19000.0f, new Vector3(105.0f, 0.0f, 0.0f));
+
+            // If we are starting with tutorials on, disable extra panels that don't matter right now
+            if (TutorialState.Enabled)
+            {
+                HUD.HideEnvironmentAndCompoundPanels();
+            }
         }
 
         patchManager.CurrentGame = CurrentGame;