Consolidate January tax guidance (#8684)

src/main/resources/net/eagle0/eagle/tutorial_dialogue_text.tsv

@@ -98,12 +98,9 @@ tutorial_ready_to_join_dialogue	Sadar — there's a hero in {provinceName} who's
 tutorial_ready_to_join_instruction	<b>Visit Town</b> is a local visit within the current province, so it has no destination. Use it to enter town, then use <b>Recruit</b> to bring the hero into your service. Use <b>March</b> when you want to move between provinces.
 tutorial_in_town_dialogue	Good — we're in town, still within the same province. Visit Town has switched us from camp duties to local town business; it has not moved anyone on the strategic map. You can trade food for gold or gold for food, arm your troops with better equipment, divine what free heroes desire, or recruit those willing to join. Take your time — you can do as many of these as you like while you're here.
 tutorial_in_town_instruction	Visit Town unlocks the eligible local town commands: <b>Trade</b>, <b>Arm Troops</b>, <b>Divine</b>, <b>Recruit</b>, and <b>Manage Prisoners</b>. If none currently apply, <b>Return</b> may be the only command shown. Use Return to go back to camp — this ends your turn and advances the month.
-tutorial_taxes_collected_dialogue_1	January — the tax collectors have made their rounds, and the people came through for us. We have gold and food in the coffers. Gold pays for gifts, feasts, and bribes. Food keeps our soldiers fed and can be given as alms to win more hearts.
-tutorial_taxes_collected_dialogue_2	But one province won't win a war. Now that we have resources, it's time to grow. Take most of your heroes with you — especially those with professions — and bring most of the gold and food as well.
-tutorial_taxes_collected_dialogue_3	One warning before we march, Sadar: a province must always have one of our heroes ruling it. If every hero leaves Onmaa, we abandon the province immediately — it becomes neutral, and all our work here is lost. Leave at least one loyal hero behind.
-tutorial_taxes_collected_instruction_3	Leave at least one faction hero in Onmaa. Marching every hero out will <b>abandon the province immediately</b>.
-tutorial_taxes_collected_dialogue_4	A province ruled by an ordinary faction hero remains ours, but acts as a vassal. You can directly issue commands there only while your Warlord or a sworn sibling is present.
-tutorial_taxes_collected_instruction_2	March your Warlord and most — <b>not all</b> — of your heroes to a neighboring province. Before submitting, verify that at least one faction hero remains in Onmaa.
+tutorial_taxes_collected_dialogue_1	January — the tax collectors have made their rounds, and the people came through for us. We have gold and food in the coffers. Gold pays for gifts, feasts, and bribes. Food keeps our soldiers fed and can be given as alms to win more hearts.\n\nBut one province won't win a war. Now that we have resources, it's time to grow. Take most of your heroes with you — especially those with professions — and bring most of the gold and food as well.
+tutorial_taxes_collected_dialogue_2	One warning before we march, Sadar: a province must always have one of our heroes ruling it. If every hero leaves Onmaa, we abandon the province immediately — it becomes neutral, and all our work here is lost. Leave at least one loyal hero behind.\n\nA province ruled by an ordinary faction hero remains ours, but acts as a vassal. You can directly issue commands there only while your Warlord or a sworn sibling is present.
+tutorial_taxes_collected_instruction_2	March your Warlord and most — <b>not all</b> — of your heroes to a neighboring province. Before submitting, verify that at least one faction hero remains in Onmaa. Marching every hero out will <b>abandon the province immediately</b>.
 tutorial_new_province_development_dialogue	We've occupied {provinceName}, Sadar. Before we raise an army here, use Improve and Alms to build local support.
 tutorial_new_province_development_instruction	Raise {provinceName} to <b>40 support</b> with <b>Improve</b> and <b>Alms</b> before organizing an army.
 tutorial_attack_prepare_organize_dialogue	We've earned popular support on the border with {factionName}, Sadar. Before we invite a fight, we should make certain our own lands can withstand one. Our existing forces won't be enough — hire new soldiers and form two or three full battalions so each of our heroes can lead a force worth taking into battle.

src/main/scala/net/eagle0/eagle/model/view/action_result/TutorialDialogueContent.scala

@@ -54,9 +54,6 @@ object TutorialDialogueContent {
     "tutorial_in_town_instruction",
     "tutorial_taxes_collected_dialogue_1",
     "tutorial_taxes_collected_dialogue_2",
-    "tutorial_taxes_collected_dialogue_3",
-    "tutorial_taxes_collected_instruction_3",
-    "tutorial_taxes_collected_dialogue_4",
     "tutorial_taxes_collected_instruction_2",
     "tutorial_new_province_development_dialogue",
     "tutorial_new_province_development_instruction",
@@ -262,15 +259,9 @@ object TutorialDialogueContent {
     id = "tutorial_taxes_collected",
     steps = Vector(
       step(marekId, "tutorial_taxes_collected_dialogue_1"),
-      step(marekId, "tutorial_taxes_collected_dialogue_2"),
       step(
         marekId,
-        "tutorial_taxes_collected_dialogue_3",
-        instructionTextId = Some("tutorial_taxes_collected_instruction_3")
-      ),
-      step(
-        marekId,
-        "tutorial_taxes_collected_dialogue_4",
+        "tutorial_taxes_collected_dialogue_2",
         instructionTextId = Some("tutorial_taxes_collected_instruction_2"),
         focus = Some(TutorialFocus.Button("MarchButton"))
       )

src/test/scala/net/eagle0/eagle/library/StrategicTutorialDialogueSelectorTest.scala

@@ -408,7 +408,15 @@ class StrategicTutorialDialogueSelectorTest extends AnyFlatSpec with Matchers {
     val before = state(onmaa = ProvinceC(id = OnmaaId, rulingFactionId = Some(PlayerFactionId), gold = 10))
     val after  = state(onmaa = ProvinceC(id = OnmaaId, rulingFactionId = Some(PlayerFactionId), gold = 11))
 
-    selectedIds(before, after, ActionResultType.NewYearAction) should contain("tutorial_taxes_collected")
+    val dialogue = selectedDialogues(before, after, ActionResultType.NewYearAction)
+      .find(_.id == "tutorial_taxes_collected")
+      .getOrElse(fail("Tax guidance was not emitted"))
+    dialogue.steps.map(_.dialogueTextId) shouldBe Vector(
+      "tutorial_taxes_collected_dialogue_1",
+      "tutorial_taxes_collected_dialogue_2"
+    )
+    dialogue.steps(1).instructionTextId shouldBe Some("tutorial_taxes_collected_instruction_2")
+    dialogue.steps(1).focus shouldBe Some(TutorialFocus.Button("MarchButton"))
     selectedIds(before, after, ActionResultType.HeroStatGained) should not contain "tutorial_taxes_collected"
   }