Author: esr
Date: Tue Nov 18 10:55:36 2008
New Revision: 30808

URL: http://svn.gna.org/viewcvs/wesnoth?rev=30808&view=rev
Log:
Music for UtBS 2, and quiet down wmllint.

Modified:
    trunk/data/campaigns/Under_the_Burning_Suns/TODO
    
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
    
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg

Modified: trunk/data/campaigns/Under_the_Burning_Suns/TODO
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/TODO?rev=30808&r1=30807&r2=30808&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/TODO (original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/TODO Tue Nov 18 10:55:36 2008
@@ -51,7 +51,4 @@
 
 My to-do items:
 
-- Scenario 3 needs to have a single-file versions recovered from
-  cycholka's unfortunate refactoring.
-
-- Refactor death macroa to remove tricky conditionality.
+- Refactor death macros to remove tricky conditionality.

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg?rev=30808&r1=30807&r2=30808&view=diff
==============================================================================
--- 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg 
(original)
+++ 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg 
Tue Nov 18 10:55:36 2008
@@ -1,4 +1,4 @@
-#textdomain wesnoth-utbs
+0#textdomain wesnoth-utbs
 
 # Scenario 1: The Morning After
 
@@ -404,7 +404,8 @@
             side=1
         [/filter]
 
-        # We want this village captured to allow player move trough it without 
loosing the turn
+        # We want this village captured to allow player move trough it
+        # without loosing the turn
         [capture_village]
             side=1
             x,y=36,34
@@ -412,6 +413,7 @@
 
         {ADD rescued_elves 1}
 
+        # wmllint: recognize Rocky Horror
         {NOTRAIT_UNIT 2 "Giant Mudcrawler" 34 33}
         [+unit]
             id="Rocky Horror"
@@ -739,7 +741,9 @@
             side=1
         [/filter]
 
-        # Captured stables and found a scout, if have none of the pair spawn 
Naru
+        # Captured stables and found a scout, if have none of the pair
+        # spawn Naru
+        # wmllint: recognize Naru
         [if]
             [have_unit]
                 id=Naru

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg?rev=30808&r1=30807&r2=30808&view=diff
==============================================================================
--- 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
 (original)
+++ 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
 Tue Nov 18 10:55:36 2008
@@ -13,9 +13,9 @@
 
     {TWO_SUNS_DEFAULT_SCHEDULE}
 
-    [music]
-        name=wanderer.ogg
-    [/music]
+    {INTRO_AND_SCENARIO_MUSIC "knolls.ogg" "wanderer.ogg"}
+    {EXTRA_SCENARIO_MUSIC "battle.ogg"}
+    {EXTRA_SCENARIO_MUSIC "traveling_minstrels.ogg"}
 
     {STORY_ACROSS_THE_HARSH_SANDS}
 


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to