From 17940cb98f1a23280f4aefc85a9227658a6e01eb Mon Sep 17 00:00:00 2001
From: Steve Cotton <steve@octalot.co.uk>
Date: Sun, 3 Nov 2019 21:22:07 +0100
Subject: [PATCH] Replace the [tutorial] tag with [scenario]

The title screen's "tutorial" button will use the tag name from game_classification,
as would anything else that calls game_launcher::set_tutorial().
---
 data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg | 4 ++--
 data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg | 4 ++--
 data/schema/core/addons.cfg                              | 5 -----
 src/game_classification.cpp                              | 4 ++++
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg b/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
index 3281b916c40..d775275f5b1 100644
--- a/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
+++ b/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
@@ -1,6 +1,6 @@
 #textdomain wesnoth-tutorial
 
-[tutorial]
+[scenario]
     id=tutorial
     # po: Hello, translators! The tutorial is meant to be a bit funny at the start,
     # po: welcoming new players. Please keep the friendly fun feeling!
@@ -1238,4 +1238,4 @@
 
         {CLEAR_PRINT}
     [/event]
-[/tutorial]
+[/scenario]
diff --git a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
index 85d3a378ab3..4bc36a8ff3b 100644
--- a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
+++ b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
@@ -1,6 +1,6 @@
 #textdomain wesnoth-tutorial
 
-[tutorial]
+[scenario]
     id=2_Tutorial
     name= _ "Wesnoth Tutorial — Part II"
     map_file=campaigns/tutorial/maps/02_Tutorial_part_2.map
@@ -1305,4 +1305,4 @@ Please report the bug."
         {CLEAR_VARIABLE low_hp_unit_message,lhpu_msg_i}
         {CLEAR_VARIABLE spoke_about_income,spoke_about_orcs_crossing_river}
     [/event]
-[/tutorial]
+[/scenario]
diff --git a/data/schema/core/addons.cfg b/data/schema/core/addons.cfg
index c1853521ed0..a594757e14a 100644
--- a/data/schema/core/addons.cfg
+++ b/data/schema/core/addons.cfg
@@ -553,11 +553,6 @@
 	super="scenario"
 	{SIMPLE_KEY is_unit_test bool}
 [/tag]
-[tag]
-	name="tutorial"
-	max=infinite
-	super="scenario"
-[/tag]
 [tag]
 	name="multiplayer"
 	max=infinite
diff --git a/src/game_classification.cpp b/src/game_classification.cpp
index b53b1672f62..02dc0829c73 100644
--- a/src/game_classification.cpp
+++ b/src/game_classification.cpp
@@ -80,6 +80,10 @@ std::string game_classification::get_tagname() const
 		return this->campaign.empty() ? "multiplayer" : "scenario";
 	}
 
+	if(this->campaign_type == CAMPAIGN_TYPE::TUTORIAL) {
+		return "scenario";
+	}
+
 	return this->campaign_type.to_string();
 }