UtBS: removed old Desert Elves and accompanying scenarios and loading…

… code

[ci skip]

Also fixed the campaign icon to use the new Kaleh sprite instead of the old one.

data/campaigns/Under_the_Burning_Suns/_main.cfg

@@ -9,7 +9,7 @@
 [campaign]
     id=Under_the_Burning_Suns
     name= _ "Under the Burning Suns"
-    icon="data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh.png"
+    icon="data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh.png~RC(magenta>brown)"
     image="data/campaigns/Under_the_Burning_Suns/images/campaign_image.png"
     abbrev= _ "UtBS"
     rank=250
@@ -23,9 +23,9 @@
 
     # Old difficulty levels are not selectable anymore, but for now loading saves using them should still work.
 
-    {CAMPAIGN_DIFFICULTY EASY_NEW   "data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter.png~RC(magenta>red)" ( _ "Fighter") ( _ "Normal")}
-    {CAMPAIGN_DIFFICULTY NORMAL_NEW "data/campaigns/Under_the_Burning_Suns/images/units/quenoth/warrior.png~RC(magenta>red)" ( _ "Warrior") ( _ "Challenging")} {DEFAULT_DIFFICULTY}
-    {CAMPAIGN_DIFFICULTY HARD_NEW   "data/campaigns/Under_the_Burning_Suns/images/units/quenoth/champion.png~RC(magenta>red)" ( _ "Champion") ( _ "Nightmare")}
+    {CAMPAIGN_DIFFICULTY EASY   "data/campaigns/Under_the_Burning_Suns/images/units/quenoth/fighter.png~RC(magenta>red)" ( _ "Fighter") ( _ "Normal")}
+    {CAMPAIGN_DIFFICULTY NORMAL "data/campaigns/Under_the_Burning_Suns/images/units/quenoth/warrior.png~RC(magenta>red)" ( _ "Warrior") ( _ "Challenging")} {DEFAULT_DIFFICULTY}
+    {CAMPAIGN_DIFFICULTY HARD   "data/campaigns/Under_the_Burning_Suns/images/units/quenoth/champion.png~RC(magenta>red)" ( _ "Champion") ( _ "Nightmare")}
 
     # UTBS credits
     [about]
@@ -148,44 +148,8 @@
     [/about]
 [/campaign]
 
-#textdomain wesnoth
-[+language]
-    EASY_NEW= _ "Easy"
-    NORMAL_NEW= _ "Medium"
-    HARD_NEW= _ "Hard"
-[/language]
-#textdomain wesnoth-utbs
-
 #ifdef CAMPAIGN_UNDER_THE_BURNING_SUNS
 
-#ifdef EASY_NEW
-#define EASY
-#enddef
-#define UTBSNEW
-#enddef
-#endif
-
-#ifdef NORMAL_NEW
-#define NORMAL
-#enddef
-#define UTBSNEW
-#enddef
-#endif
-
-#ifdef HARD_NEW
-#define HARD
-#enddef
-#define UTBSNEW
-#enddef
-#endif
-
-#ifdef UTBSNEW
-
-# Need to re-load this for ON_DIFFICULTY to not break due to a missing
-# EASY/NORMAL/HARD symbol
-{core/macros/utils.cfg}
-#endif
-
 [binary_path]
     path=data/campaigns/Under_the_Burning_Suns
 [/binary_path]
@@ -203,7 +167,6 @@
 #Append utils folder
 {UTBS_INCLUDE utils}
 
-#ifdef UTBSNEW
 # Add global events
 [+campaign]
     {WEAPON_SPECIAL_DAZE_EVENTS}
@@ -248,18 +211,11 @@
     {DISCARD_RECRUIT_COST_HELPER_UNITS "Quenoth Mystic"}
     {DISCARD_RECRUIT_COST_HELPER_UNITS "Tauroch Rider"}
 [/campaign]
-#endif
 
 #Append Units
 [units]
     {UTBS_INCLUDE units/units.cfg}
-
-#ifdef UTBSNEW
     {UTBS_INCLUDE units/quenoth}
-#else
-    {UTBS_INCLUDE units/elves}
-#endif
-
     {UTBS_INCLUDE units/humans}
     {UTBS_INCLUDE units/monsters}
     {UTBS_INCLUDE units/nagas}
@@ -274,11 +230,7 @@
     [/hide_help]
 [/units]
 
-#ifdef UTBSNEW
 {UTBS_INCLUDE scenarios}
-#else
-{UTBS_INCLUDE scenarios_old}
-#endif
 
 [lua]
     code="wesnoth.require 'campaigns/Under_the_Burning_Suns/lua/theme.lua'"
@@ -290,11 +242,13 @@
 [binary_path]
     path=data/campaigns/Under_the_Burning_Suns
 [/binary_path]
+
 [editor_group]
     id=utbs
     name= _ "Under the Burning Suns"
     icon="group_mainline"
 [/editor_group]
+
 {campaigns/Under_the_Burning_Suns/utils/terrain.cfg}
 {campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg}
 #endif