mail[Wesnoth-commits] r24660 - in /trunk/data: campaigns/Liberty/scenarios/08_Glory.cfg campaigns/tutorial/scenarios/1_Tutorial.cfg tools/wmllint


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by esr on March 15, 2008 - 08:08:
Author: esr
Date: Sat Mar 15 08:08:07 2008
New Revision: 24660

URL: http://svn.gna.org/viewcvs/wesnoth?rev=24660&view=rev
Log:
No need for the speaker canomicalizatuin any more.

Modified:
    trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg
    trunk/data/campaigns/tutorial/scenarios/1_Tutorial.cfg
    trunk/data/tools/wmllint

Modified: trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg?rev=24660&r1=24659&r2=24660&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg Sat Mar 15 08:08:07 
2008
@@ -779,10 +779,9 @@
                             #
                             [terrain_mask]
                                 x,y=15,11
-usage=mask
+                                map_data="usage=mask
 border=0
 
-map_data="
 Re          , Mm^Xm       , Re          , Ww          , Rr          , Ww^Bw| 
     , Rr          , Rr          , Gs^Fp       , Mm^Xm       , Gs^Fp
 Mm          , Chr         , Mm^Xm       , Re          , Uh          , Uu     
     , Uh          , Uh          , Mm^Xm       , Uu          , Mm^Xm
 Uu          , Uu          , Qxu         , Uu          , Re          , Qxu    
     , Re          , Qxu         , Chr         , Rr          , Chr

Modified: trunk/data/campaigns/tutorial/scenarios/1_Tutorial.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/tutorial/scenarios/1_Tutorial.cfg?rev=24660&r1=24659&r2=24660&view=diff
==============================================================================
--- trunk/data/campaigns/tutorial/scenarios/1_Tutorial.cfg (original)
+++ trunk/data/campaigns/tutorial/scenarios/1_Tutorial.cfg Sat Mar 15 
08:08:07 2008
@@ -45,14 +45,10 @@
     id=tutorial
     translator_comment=_ "Hello translators! Tutorial is meant to be a 
little funny at the start, welcoming new players. Please keep friendly fun 
feeling! Any questions email rusty@xxxxxxxxxxxxxxx!"
     name=_ "Wesnoth Tutorial"
-usage=map
+    map_data="usage=map
 border_size=1
 
-border_size=1
-usage=map
-
-map_data="
-    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gg,    Gg,   
 Ww,    Ww,   Gg,    Gg,    Gg,    Gg,    Gg,    Gg,    Gg,    Gs^Fp,    
Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp
+Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gg,    Gg,    
Ww,    Ww,   Gg,    Gg,    Gg,    Gg,    Gg,    Gg,    Gg,    Gs^Fp,    
Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp
     Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gg,    Gg,   
 Ww,    Ww,   Gg,    Gg,    Gg,    Gg,    Gg,    Gg,    Gg,    Gs^Fp,    
Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp
     Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gg,    Gg,   
 Ww,    Ww,   Gg^Ve,    Gg,    Gg,    Gg,    Gg,    Gg,    Gg,    Gs^Fp,    
Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp
     Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gg,    Gg,    Gg,    Gg,    Gg,  
  Ww,    Ww,    Gg,    Gg,    Gg,    Gg,    Gg,    Gg,    Gg,    Gg,    
Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp,    Gs^Fp

Modified: trunk/data/tools/wmllint
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wmllint?rev=24660&r1=24659&r2=24660&view=diff
==============================================================================
--- trunk/data/tools/wmllint (original)
+++ trunk/data/tools/wmllint Sat Mar 15 08:08:07 2008
@@ -1004,9 +1004,6 @@
         precomment = lines[i].split("#")[0]
         if '[message]' in precomment:
             in_message = True
-        elif in_message and re.search("[^_]description=", precomment):
-            lines[i] = lines[i].replace("description=", "speaker=")
-            modcount += 1
         if "speaker=narrator" in precomment:
             need_image = True
         elif precomment.strip().startswith("image"):
@@ -2152,8 +2149,7 @@
                    under("side") or \
                    re.search("{[A-Z]+.*description=.*}", line):
                 transformed = re.sub(r"\bdescription\s*=", "id=", line)
-                transformed = re.sub(r"user_description\s*=", 
"description=", line)
-            # 
+                transformed = re.sub(r"user_description\s*=", 
"description=", line)        
         # Report the changes
         if verbose > 0 and transformed != line:
             msg = "%s, line %d: %s -> %s" % \




Related Messages


Powered by MHonArc, Updated Sat Mar 15 09:20:57 2008