Update UtBS todo, add some music to scenario 4.

data/campaigns/Under_the_Burning_Suns/TODO

@@ -1,38 +1,17 @@
-Main issues with UtBS were identified by fabi in 
-https://mail.gna.org/public/wesnoth-dev/2008-11/msg00007.html
-I have attached to each one a proposed disposition.
-
 - In scenario 2 units take damage from dehydration during daytime,
   strange behaviour of this have been reported.  loonycyborg
   clarified that dehydration interacts badly with poison.
 
-  Disposition: I will fix this, if necessary by reverting to the
-  old 1.4 behavior of dehydration, which worked.
-
 - The masked assassin (the brother of Kaleh) can appear in place of
   the players characters and they die (even campaign critical ones).
 
-  Disposition: I will fix it.
-
 - A magical berserker creature the player can get during the campaign
   (scenario 4) dies too easily.
 
-  Disposition: I will fix it.  I don't experct this to be difficult.
-
-- The frost sword doesn't work like expected (I had no look at this,
-  maybe the player who reported this had no idea about Wesnoth's
-  damage types)
-
-  Disposition: I will investigate and fix if necessary.
-
 - Choosing the trolls as allies is too hard.
 
-  Disposition: I will fix it.
-
 - The whole campaign seems to be unbalanced by being too easy in general.
 
-  Disposition: I will investigate and fix as necessary.
-
 - The unit graphics of the desert elves are very outdated. They are
   based on the mainline elves found in Wesnoth 1.0 and lack the team
   colourisation. They look strange compared to the enemies that have
@@ -46,6 +25,5 @@ I have attached to each one a proposed disposition.
   Quenoth elves is almost an asset. I encourage Jetrel to finish the
   TC pass on them he was planning.
 
-- Many more wml bugs.
-
-  Disposition: I will investigate during playtesting.
+- Need to investigate the two versions of scenario 3, decide which to keep,
+  and junk the other.

data/campaigns/Under_the_Burning_Suns/scenarios/04_Descending_into_Darkness.cfg

@@ -5,32 +5,20 @@
     id="4_Descending_into_Darkness"
     name= _ "Descending into Darkness"
     label= _ "Descending into Darkness"\
-    map_data="{campaigns/Under_the_Burning_Suns/maps/04_Descending_into_Darkness.map}"
-
-    {STORY_DESCENDING_INTO_DARKNESS}
-
-    [music]
-        name=northerners.ogg
-    [/music]
-
     next_scenario=5_A_Subterranean_Struggle
-
+    map_data="{campaigns/Under_the_Burning_Suns/maps/04_Descending_into_Darkness.map}"
+    victory_when_enemies_defeated=no
     #don't display snapshot of map in saved games?
     snapshot="no"
 
-    #max turns in scenario varies depending on difficulty
-#ifdef EASY
-    turns="50"
-#endif
-#ifdef NORMAL
-    turns="48"
-#endif
-#ifdef HARD
-    turns="46"
-#endif
-    victory_when_enemies_defeated=no
-
     {TWO_SUNS_DEFAULT_SCHEDULE}
+    {TURNS 50 48 46}
+
+    {INTRO_AND_SCENARIO_MUSIC("elf-land.off" "northerners.ogg"}
+    {EXTRA_SCENARIO_MUSIC "vengeful.ogg"}
+    {EXTRA_SCENARIO_MUSIC "frantic.ogg"}
+
+    {STORY_DESCENDING_INTO_DARKNESS}
 
     [side]
         side=1
@@ -73,11 +61,9 @@
 #ifdef EASY
         recruit=Orcish Grunt, Wolf Rider, Goblin Spearman, Orcish Archer
 #endif
-
 #ifdef NORMAL
         recruit=Orcish Grunt, Wolf Rider, Goblin Impaler, Orcish Archer, Goblin Knight
 #endif
-
 #ifdef HARD
         recruit=Orcish Warrior, Wolf Rider, Goblin Impaler, Orcish Crossbowman, Goblin Knight
 #endif