Author: esr
Date: Wed Apr 25 02:53:31 2007
New Revision: 17064
URL: http://svn.gna.org/viewcvs/wesnoth?rev=17064&view=rev
Log:
Fix the 1.3.1 conversion bug.
Modified:
trunk/data/tools/upconvert
Modified: trunk/data/tools/upconvert
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/upconvert?rev=17064&r1=17063&r2=17064&view=diff
==============================================================================
--- trunk/data/tools/upconvert (original)
+++ trunk/data/tools/upconvert Wed Apr 25 02:53:31 2007
@@ -243,36 +243,36 @@
# 1.3.1 -> 1.3.2 terrain conversions
conversion2 = {
- re.compile(r"Bww([|/\\])\b") : "Ww^Bw\\1",
- re.compile(r"Bwo([|/\\])\b") : "Wo^Bw\\1",
- re.compile(r"Bss([|/\\])\b") : "Ss^Bw\\1",
- re.compile(r"Dc\b") : "Dd^Dc",
- re.compile(r"Dr\b") : "Dd^Dr",
- re.compile(r"Do\b") : "Dd^Do",
- re.compile(r"Fa\b") : "Aa^Fpa",
- re.compile(r"Fet\b") : "Gg^Fet",
- re.compile(r"Ff\b") : "Gs^Fp",
- re.compile(r"Ft\b") : "Gs^Ft",
- re.compile(r"Rfvs\b") : "Re^Gvs",
- re.compile(r"Uf\b") : "Uu^Uf",
- re.compile(r"Uui\b") : "Uu^Ii",
- re.compile(r"Uhi\b") : "Uh^Ii",
- re.compile(r"Vda\b") : "Dd^Vda",
- re.compile(r"Vdt\b") : "Dd^Vdt",
- re.compile(r"Vea\b") : "Aa^Vea",
- re.compile(r"Veg\b") : "Gg^Ve",
- re.compile(r"Vha\b") : "Aa^Vha",
- re.compile(r"Vhg\b") : "Gg^Vh",
- re.compile(r"Vhh\b") : "Hh^Vhh",
- re.compile(r"Vhha\b") : "Ha^Vhha",
- re.compile(r"Vhm\b") : "Mm^Vhh",
- re.compile(r"Vht\b") : "Gs^Vht",
- re.compile(r"Vu\b") : "Uu^Vu",
- re.compile(r"Vud\b") : "Uu^Vud",
- re.compile(r"Vwm\b") : "Ww^Vm",
- re.compile(r"Vs\b") : "Ss^Vhs",
- re.compile(r"Vsm\b") : "Ss^Vm",
- re.compile(r"Xm\b") : "Mm^Xm",
+ re.compile(r"(?<!\^)Bww([|/\\])\b") : "Ww^Bw\\1",
+ re.compile(r"(?<!\^)Bwo([|/\\])\b") : "Wo^Bw\\1",
+ re.compile(r"(?<!\^)Bss([|/\\])\b") : "Ss^Bw\\1",
+ re.compile(r"(?<!\^)Dc\b") : "Dd^Dc",
+ re.compile(r"(?<!\^)Dr\b") : "Dd^Dr",
+ re.compile(r"(?<!\^)Do\b") : "Dd^Do",
+ re.compile(r"(?<!\^)Fa\b") : "Aa^Fpa",
+ re.compile(r"(?<!\^)Fet\b") : "Gg^Fet",
+ re.compile(r"(?<!\^)Ff\b") : "Gs^Fp",
+ re.compile(r"(?<!\^)Ft\b") : "Gs^Ft",
+ re.compile(r"(?<!\^)Rfvs\b") : "Re^Gvs",
+ re.compile(r"(?<!\^)Uf\b") : "Uu^Uf",
+ re.compile(r"(?<!\^)Uui\b") : "Uu^Ii",
+ re.compile(r"(?<!\^)Uhi\b") : "Uh^Ii",
+ re.compile(r"(?<!\^)Vda\b") : "Dd^Vda",
+ re.compile(r"(?<!\^)Vdt\b") : "Dd^Vdt",
+ re.compile(r"(?<!\^)Vea\b") : "Aa^Vea",
+ re.compile(r"(?<!\^)Veg\b") : "Gg^Ve",
+ re.compile(r"(?<!\^)Vha\b") : "Aa^Vha",
+ re.compile(r"(?<!\^)Vhg\b") : "Gg^Vh",
+ re.compile(r"(?<!\^)Vhh\b") : "Hh^Vhh",
+ re.compile(r"(?<!\^)Vhha\b") : "Ha^Vhha",
+ re.compile(r"(?<!\^)Vhm\b") : "Mm^Vhh",
+ re.compile(r"(?<!\^)Vht\b") : "Gs^Vht",
+ re.compile(r"(?<!\^)Vu\b") : "Uu^Vu",
+ re.compile(r"(?<!\^)Vud\b") : "Uu^Vud",
+ re.compile(r"(?<!\^)Vwm\b") : "Ww^Vm",
+ re.compile(r"(?<!\^)Vs\b") : "Ss^Vhs",
+ re.compile(r"(?<!\^)Vsm\b") : "Ss^Vm",
+ re.compile(r"(?<!\^)Xm\b") : "Mm^Xm",
}
def maptransform2(input, baseline, inmap, y):
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
