Author: eleazar
Date: Fri Oct 15 03:55:33 2010
New Revision: 47051
URL: http://svn.gna.org/viewcvs/wesnoth?rev=47051&view=rev
Log:
updating shore transitions to proper naming convention.
Added:
trunk/data/core/images/terrain/sand/shore-convex-bl-br.png (with props)
trunk/data/core/images/terrain/sand/shore-convex-bl-l.png (with props)
trunk/data/core/images/terrain/sand/shore-convex-br-bl.png (with props)
trunk/data/core/images/terrain/sand/shore-convex-br-r.png (with props)
trunk/data/core/images/terrain/sand/shore-convex-l-bl.png (with props)
trunk/data/core/images/terrain/sand/shore-convex-l-tl.png (with props)
trunk/data/core/images/terrain/sand/shore-convex-r-br.png (with props)
trunk/data/core/images/terrain/sand/shore-convex-r-tr.png (with props)
trunk/data/core/images/terrain/sand/shore-convex-tl-l.png (with props)
trunk/data/core/images/terrain/sand/shore-convex-tl-tr.png (with props)
trunk/data/core/images/terrain/sand/shore-convex-tr-r.png (with props)
trunk/data/core/images/terrain/sand/shore-convex-tr-tl.png (with props)
Removed:
trunk/data/core/images/terrain/sand/shore-convex-BL.png
trunk/data/core/images/terrain/sand/shore-convex-BLL.png
trunk/data/core/images/terrain/sand/shore-convex-BR.png
trunk/data/core/images/terrain/sand/shore-convex-BRR.png
trunk/data/core/images/terrain/sand/shore-convex-LB.png
trunk/data/core/images/terrain/sand/shore-convex-LT.png
trunk/data/core/images/terrain/sand/shore-convex-RB.png
trunk/data/core/images/terrain/sand/shore-convex-RT.png
trunk/data/core/images/terrain/sand/shore-convex-TL.png
trunk/data/core/images/terrain/sand/shore-convex-TLL.png
trunk/data/core/images/terrain/sand/shore-convex-TR.png
trunk/data/core/images/terrain/sand/shore-convex-TRR.png
Modified:
trunk/data/core/terrain-graphics.cfg
Removed: trunk/data/core/images/terrain/sand/shore-convex-BL.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-BL.png?rev=47050&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/terrain/sand/shore-convex-BLL.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-BLL.png?rev=47050&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/terrain/sand/shore-convex-BR.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-BR.png?rev=47050&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/terrain/sand/shore-convex-BRR.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-BRR.png?rev=47050&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/terrain/sand/shore-convex-LB.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-LB.png?rev=47050&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/terrain/sand/shore-convex-LT.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-LT.png?rev=47050&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/terrain/sand/shore-convex-RB.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-RB.png?rev=47050&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/terrain/sand/shore-convex-RT.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-RT.png?rev=47050&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/terrain/sand/shore-convex-TL.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-TL.png?rev=47050&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/terrain/sand/shore-convex-TLL.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-TLL.png?rev=47050&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/terrain/sand/shore-convex-TR.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-TR.png?rev=47050&view=auto
==============================================================================
Binary file - no diff available.
Removed: trunk/data/core/images/terrain/sand/shore-convex-TRR.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-TRR.png?rev=47050&view=auto
==============================================================================
Binary file - no diff available.
Added: trunk/data/core/images/terrain/sand/shore-convex-bl-br.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-bl-br.png?rev=47051&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/sand/shore-convex-bl-br.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/sand/shore-convex-bl-l.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-bl-l.png?rev=47051&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/sand/shore-convex-bl-l.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/sand/shore-convex-br-bl.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-br-bl.png?rev=47051&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/sand/shore-convex-br-bl.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/sand/shore-convex-br-r.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-br-r.png?rev=47051&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/sand/shore-convex-br-r.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/sand/shore-convex-l-bl.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-l-bl.png?rev=47051&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/sand/shore-convex-l-bl.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/sand/shore-convex-l-tl.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-l-tl.png?rev=47051&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/sand/shore-convex-l-tl.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/sand/shore-convex-r-br.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-r-br.png?rev=47051&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/sand/shore-convex-r-br.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/sand/shore-convex-r-tr.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-r-tr.png?rev=47051&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/sand/shore-convex-r-tr.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/sand/shore-convex-tl-l.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-tl-l.png?rev=47051&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/sand/shore-convex-tl-l.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/sand/shore-convex-tl-tr.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-tl-tr.png?rev=47051&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/sand/shore-convex-tl-tr.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/sand/shore-convex-tr-r.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-tr-r.png?rev=47051&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/sand/shore-convex-tr-r.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/sand/shore-convex-tr-tl.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand/shore-convex-tr-tl.png?rev=47051&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/sand/shore-convex-tr-tl.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: trunk/data/core/terrain-graphics.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics.cfg?rev=47051&r1=47050&r2=47051&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics.cfg (original)
+++ trunk/data/core/terrain-graphics.cfg Fri Oct 15 03:55:33 2010
@@ -727,12 +727,12 @@
# To test the new beach macro, uncomment this and then comment out the other
# ones underneath it...
-#{NEW:BEACH W* D*
sand/shore}
+{NEW:BEACH W* D*
sand/shore}
# Special sand to water transitions
-{TRANSITION_COMPLETE_LF Dd,Ds,Hd (W*,Ss)
-490 double sand/sand-out}
-{TRANSITION_COMPLETE_LF W*,Ss (Dd,Ds,Hd)
-491 double sand/sand-in}
-{TRANSITION_COMPLETE_L W*,Ss (Dd,Ds,Hd)
-492 sand/sand-in}
-{TRANSITION_COMPLETE_L Dd,Ds,Hd (W*,Ss)
-493 sand/sand-out}
+#{TRANSITION_COMPLETE_LF D*,Hd (W*,Ss)
-490 double sand/sand-out}
+#{TRANSITION_COMPLETE_LF (W*,Ss) (Dd,Ds,Hd)
-491 double sand/sand-in}
+#{TRANSITION_COMPLETE_L (W*,Ss) (Dd,Ds,Hd)
-492 sand/sand-in}
+#{TRANSITION_COMPLETE_L D*,Hd (W*,Ss)
-493 sand/sand-out}
{TRANSITION_COMPLETE_L Hd (!,Hd,Qx*,W*,Ss)
-499 hills/desert}
@@ -750,7 +750,7 @@
# Dirt transitions are double sided
{TRANSITION_COMPLETE_LF (!,Rd,Rr*,Hh*,M*,Q*) Rd
-370 inside flat/desert-road}
-{TRANSITION_COMPLETE_L Rd (!,Rd,,W*,Ai,Q*)
-371 flat/desert-road}
+{TRANSITION_COMPLETE_L Rd (!,Rd,W*,Ai,Q*)
-371 flat/desert-road}
{TRANSITION_COMPLETE_LF (!,Re,Rr*,Hh*,M*,Q*) Re
-379 inside flat/dirt}
{TRANSITION_COMPLETE_L Re (!,Re,Rr*,W*,Ai,Q*)
-380 flat/dirt}
@@ -782,7 +782,8 @@
# The same transition is repeated here because the non-submerged parts are
different, so multiple lines are needed to make the submerged part line up
{TRANSITION_COMPLETE_LF (Mm,Hh) W* -511
submerged flat/bank-to-water}
{TRANSITION_COMPLETE_LF (Md,Hhd,Mv) W* -511
submerged flat/bank-to-water}
-{TRANSITION_COMPLETE_LF (R*,G*) W* -511
submerged sand/sand-to-water}
+{TRANSITION_COMPLETE_LF (R*,G*) W* -511
submerged flat/bank-to-water}
+{TRANSITION_COMPLETE_LF (R*,G*,Mm,Md,Mv,H*) W* -511
deeper-submerged flat/bank-out}
{TRANSITION_COMPLETE_LF (U*,Xu*,Ql*) W* -512
submerged cave/bank-to-water}
@@ -859,9 +860,9 @@
{TRANSITION_COMPLETE_LF Qxua Xv,_off^_usr
-601 depths chasm/abyss-base}
# ugly fillups for missing transitions
-{TRANSITION_COMPLETE_L Ai Xv,_off^_usr -800
frozen/ice}
-
-{TRANSITION_COMPLETE_L Xv _off^_usr -810
void/void}
+{TRANSITION_COMPLETE_L Ai Xv,_off^_usr -800
frozen/ice}
+
+{TRANSITION_COMPLETE_L Xv _off^_usr -810
void/void}
# Default terrain
{TERRAIN_BASE _s void/void}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
