Move the Quenoth Elves to core

wesnoth · Oct 24, 2018 · d0efef8 · d0efef8
1 parent fa12518
commit d0efef8
Show file tree

Hide file tree

Showing 145 changed files with 949 additions and 774 deletions.
diff --git a/data/campaigns/Under_the_Burning_Suns/_main.cfg b/data/campaigns/Under_the_Burning_Suns/_main.cfg
@@ -207,7 +207,7 @@
 
     {DISCARD_RECRUIT_COST_HELPER_UNITS "Quenoth Fighter"}
     {DISCARD_RECRUIT_COST_HELPER_UNITS "Quenoth Scout"}
-    {DISCARD_RECRUIT_COST_HELPER_UNITS "Quenoth Mystic"}
+    {DISCARD_RECRUIT_COST_HELPER_UNITS "UtBS Quenoth Mystic"}
     {DISCARD_RECRUIT_COST_HELPER_UNITS "Tauroch Rider"}
 [/campaign]
 
@@ -223,7 +223,7 @@
 
     [hide_help]
         # wmllint: markcheck off
-        type_adv_tree=Elvish Fighter,Elvish Shaman,Elvish Archer,Elvish Scout,Elvish Lord,Wose
+        type_adv_tree=Elvish Fighter,Elvish Shaman,Elvish Archer,Elvish Scout,Elvish Lord,Wose,Quenoth Mystic
         # wmllint: markcheck on
         type=Elvish Lady
     [/hide_help]

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
@@ -689,9 +689,9 @@
                 x,y=31,27
             [/unit]
 #ifndef HARD
-            {NAMED_GENERIC_UNIT 1 "Quenoth Mystic" 30 27 "Ryoko" ( _ "Ryoko")}
+            {NAMED_GENERIC_UNIT 1 "UtBS Quenoth Mystic" 30 27 "Ryoko" ( _ "Ryoko")}
 #endif
-            {NAMED_GENERIC_UNIT 1 "Quenoth Mystic" 32 27 "Yuni" ( _ "Yuni")}
+            {NAMED_GENERIC_UNIT 1 "UtBS Quenoth Mystic" 32 27 "Yuni" ( _ "Yuni")}
 
             [message]
                 speaker=Zhul

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
@@ -27,7 +27,7 @@
         gold=200
         {INCOME 17 14 11}
         controller=human
-        recruit=Quenoth Fighter,Tauroch Rider,Quenoth Scout,Quenoth Mystic
+        recruit=Quenoth Fighter,Tauroch Rider,Quenoth Scout,UtBS Quenoth Mystic
         shroud=yes
         fog=yes
         {FLAG_VARIANT long}

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
@@ -38,7 +38,7 @@
         type=Quenoth Youth
         canrecruit=yes
         controller=human
-        recruit=Quenoth Fighter,Tauroch Rider,Quenoth Scout,Quenoth Mystic
+        recruit=Quenoth Fighter,Tauroch Rider,Quenoth Scout,UtBS Quenoth Mystic
         gold=200
         {INCOME 4 2 0}
         {FLAG_VARIANT long}

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
@@ -827,7 +827,7 @@ _ "These undead trolls fight again in death as they did in life, except this tim
             [filter]
                 side=1,3,4
                 [not]
-                    type=Quenoth Sun Sylph,Quenoth Shyde,Dust Devil
+                    type=UtBS Quenoth Sun Sylph,UtBS Quenoth Shyde,Dust Devil
                 [/not]
                 [filter_location]
                     terrain=*^Yl

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
@@ -1557,7 +1557,7 @@
 
         [filter]
             [not]
-                type=Quenoth Sun Sylph,Quenoth Shyde
+                type=UtBS Quenoth Sun Sylph,UtBS Quenoth Shyde
             [/not]
             x=17-21
             y=8-11

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
@@ -4343,7 +4343,7 @@
         {UNIT 1 (Quenoth Scout) 65 3 (id,upkeep,generate_name=Dummy Unit3,free,no)}
         {UNIT 1 (Quenoth Scout) 59 2 (id,upkeep,generate_name=Dummy Unit4,free,no)}
         {UNIT 1 (Quenoth Scout) 58 5 (id,upkeep,generate_name=Dummy Unit5,free,no)}
-        {UNIT 1 (Quenoth Mystic) 62 2 (id,upkeep,generate_name=Dummy Unit6,free,no)}
+        {UNIT 1 (UtBS Quenoth Mystic) 62 2 (id,upkeep,generate_name=Dummy Unit6,free,no)}
 
         [scroll_to_unit]
             id=Kaleh

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
@@ -1721,7 +1721,7 @@
         [/message]
         #TODO: add better role-based speaker selection
         [message]
-            type_adv_tree=Quenoth Mystic
+            type_adv_tree=UtBS Quenoth Mystic
             [not]
                 id=Zhul
             [/not]
@@ -1746,7 +1746,7 @@
             message= _ "I come to you with dire news: one of you has betrayed me, and is a traitor to your cause."
         [/message]
         [message]
-            type_adv_tree=Quenoth Mystic
+            type_adv_tree=UtBS Quenoth Mystic
             [not]
                 id=Zhul
             [/not]

diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Quenoth_Core.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Quenoth_Core.cfg
@@ -0,0 +1,164 @@
+
+[unit_type]
+	id=UtBS Quenoth Druid
+	[base_unit]
+		id=Quenoth Druid
+	[/base_unit]
+	advances_to=UtBS Quenoth Shyde
+	[abilities]
+		{UTBS_ABILITY_CURES}
+	[/abilities]
+[/unit_type]
+
+[unit_type]
+	id=UtBS Quenoth Mystic
+	[base_unit]
+		id=Quenoth Mystic
+	[/base_unit]
+	advances_to=UtBS Quenoth Shaman,UtBS Quenoth Sun Singer
+	[abilities]
+		{UTBS_ABILITY_HEALS}
+	[/abilities]
+[/unit_type]
+
+[unit_type]
+	id=UtBS Quenoth Shaman
+	[base_unit]
+		id=Quenoth Shaman
+	[/base_unit]
+	advances_to=UtBS Quenoth Druid
+	[abilities]
+		{UTBS_ABILITY_CURES}
+	[/abilities]
+[/unit_type]
+
+[unit_type]
+	id=UtBS Quenoth Shyde
+	[base_unit]
+		id=Quenoth Shyde
+	[/base_unit]
+	[abilities]
+		{UTBS_ABILITY_CURES}
+	[/abilities]
+[/unit_type]
+
+[unit_type]
+	id=UtBS Quenoth Sun Singer
+	[base_unit]
+		id=Quenoth Sun Singer
+	[/base_unit]
+	advances_to=UtBS Quenoth Sun Sylph
+	[abilities]
+		{UTBS_ABILITY_Heals}
+	[/abilities]
+[/unit_type]
+
+[unit_type]
+	id=UtBS Quenoth Sun Sylph
+	[base_unit]
+		id=Quenoth Sun Sylph
+	[/base_unit]
+	[abilities]
+		{UTBS_ABILITY_HEALS}
+	[/abilities]
+[/unit_type]
+
+#define QUENOTH_FIGHTER_VARIANT SUFFIX_NUMBER COST
+[unit_type]
+	id=Quenoth Fighter{SUFFIX_NUMBER}
+	[base_unit]
+		id=Quenoth Fighter
+	[/base_unit]
+	hide_help=yes
+	do_not_list=yes
+	cost={COST}
+[/unit_type]
+#enddef
+
+{QUENOTH_FIGHTER_VARIANT  1 16}
+{QUENOTH_FIGHTER_VARIANT  2 17}
+{QUENOTH_FIGHTER_VARIANT  3 18}
+{QUENOTH_FIGHTER_VARIANT  4 19}
+{QUENOTH_FIGHTER_VARIANT  5 20}
+{QUENOTH_FIGHTER_VARIANT  6 21}
+{QUENOTH_FIGHTER_VARIANT  7 22}
+{QUENOTH_FIGHTER_VARIANT  8 23}
+{QUENOTH_FIGHTER_VARIANT  9 24}
+{QUENOTH_FIGHTER_VARIANT 10 25}
+
+#undef QUENOTH_FIGHTER_VARIANT
+
+#define QUENOTH_MYSTIC_VARIANT SUFFIX_NUMBER COST
+    [unit_type]
+        id=UtBS Quenoth Mystic{SUFFIX_NUMBER}
+        [base_unit]
+            id=UtBS Quenoth Mystic
+        [/base_unit]
+        hide_help=yes
+        do_not_list=yes
+        cost={COST}
+    [/unit_type]
+#enddef
+
+{QUENOTH_MYSTIC_VARIANT  1 19}
+{QUENOTH_MYSTIC_VARIANT  2 20}
+{QUENOTH_MYSTIC_VARIANT  3 21}
+{QUENOTH_MYSTIC_VARIANT  4 22}
+{QUENOTH_MYSTIC_VARIANT  5 23}
+{QUENOTH_MYSTIC_VARIANT  6 24}
+{QUENOTH_MYSTIC_VARIANT  7 25}
+{QUENOTH_MYSTIC_VARIANT  8 26}
+{QUENOTH_MYSTIC_VARIANT  9 27}
+{QUENOTH_MYSTIC_VARIANT 10 28}
+
+#undef QUENOTH_MYSTIC_VARIANT
+
+#define QUENOTH_RIDER_VARIANT SUFFIX_NUMBER COST
+[unit_type]
+	id=Tauroch Rider{SUFFIX_NUMBER}
+	[base_unit]
+		id=Tauroch Rider
+	[/base_unit]
+	hide_help=yes
+	do_not_list=yes
+	cost={COST}
+[/unit_type]
+#enddef
+
+{QUENOTH_RIDER_VARIANT  1 21}
+{QUENOTH_RIDER_VARIANT  2 22}
+{QUENOTH_RIDER_VARIANT  3 23}
+{QUENOTH_RIDER_VARIANT  4 24}
+{QUENOTH_RIDER_VARIANT  5 25}
+{QUENOTH_RIDER_VARIANT  6 26}
+{QUENOTH_RIDER_VARIANT  7 27}
+{QUENOTH_RIDER_VARIANT  8 28}
+{QUENOTH_RIDER_VARIANT  9 29}
+{QUENOTH_RIDER_VARIANT 10 30}
+
+#undef QUENOTH_RIDER_VARIANT
+
+#define QUENOTH_SCOUT_VARIANT SUFFIX_NUMBER COST
+[unit_type]
+	id=Quenoth Scout{SUFFIX_NUMBER}
+	[base_unit]
+		id=Quenoth Scout
+	[/base_unit]
+	hide_help=yes
+	do_not_list=yes
+	cost={COST}
+[/unit_type]
+#enddef
+
+{QUENOTH_SCOUT_VARIANT  1 18}
+{QUENOTH_SCOUT_VARIANT  2 19}
+{QUENOTH_SCOUT_VARIANT  3 20}
+{QUENOTH_SCOUT_VARIANT  4 21}
+{QUENOTH_SCOUT_VARIANT  5 22}
+{QUENOTH_SCOUT_VARIANT  6 23}
+{QUENOTH_SCOUT_VARIANT  7 24}
+{QUENOTH_SCOUT_VARIANT  8 25}
+{QUENOTH_SCOUT_VARIANT  9 26}
+{QUENOTH_SCOUT_VARIANT 10 27}
+
+#undef QUENOTH_SCOUT_VARIANT