Author: eleazar
Date: Sun Oct 17 23:13:08 2010
New Revision: 47078
URL: http://svn.gna.org/viewcvs/wesnoth?rev=47078&view=rev
Log:
Waves... monstruously ugly ones from only 1 direction
Added:
trunk/data/core/images/terrain/water/waves-convex-A01-tl.png (with props)
trunk/data/core/images/terrain/water/waves-convex-A02-tl.png (with props)
trunk/data/core/images/terrain/water/waves-convex-A03-tl.png (with props)
trunk/data/core/images/terrain/water/waves-convex-A04-tl.png (with props)
trunk/data/core/images/terrain/water/waves-convex-A05-tl.png (with props)
trunk/data/core/images/terrain/water/waves-convex-A06-tl.png (with props)
Modified:
trunk/data/core/terrain-graphics.cfg
trunk/data/core/terrain-graphics/builder.cfg
Added: trunk/data/core/images/terrain/water/waves-convex-A01-tl.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/water/waves-convex-A01-tl.png?rev=47078&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/water/waves-convex-A01-tl.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/water/waves-convex-A02-tl.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/water/waves-convex-A02-tl.png?rev=47078&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/water/waves-convex-A02-tl.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/water/waves-convex-A03-tl.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/water/waves-convex-A03-tl.png?rev=47078&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/water/waves-convex-A03-tl.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/water/waves-convex-A04-tl.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/water/waves-convex-A04-tl.png?rev=47078&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/water/waves-convex-A04-tl.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/water/waves-convex-A05-tl.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/water/waves-convex-A05-tl.png?rev=47078&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/water/waves-convex-A05-tl.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: trunk/data/core/images/terrain/water/waves-convex-A06-tl.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/water/waves-convex-A06-tl.png?rev=47078&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/data/core/images/terrain/water/waves-convex-A06-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=47078&r1=47077&r2=47078&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics.cfg (original)
+++ trunk/data/core/terrain-graphics.cfg Sun Oct 17 23:13:08 2010
@@ -728,6 +728,9 @@
# To test the new beach macro, uncomment this and then comment out the other
# ones underneath it...
+# A rule for corner-based beach waves...
+{WALL_TRANSITION_LB W* D*
-499 WAVES water/waves}
+
{NEW:BEACH D*,Hd W*
sand/shore}
# Special sand to water transitions
@@ -737,8 +740,7 @@
#{TRANSITION_COMPLETE_L D*,Hd (W*,Ss)
-493 sand/sand-out}
{TRANSITION_COMPLETE_L Hd (!,Hd,Qx*,W*,Ss)
-510 hills/desert}
-# A rule for corner-based beach waves...
-#{WALL_TRANSITION_LB W* D*
-500 ANIMATION_10 water/waves}
+
{TRANSITION_COMPLETE_L Rr (!,Rr,W*,Ai)
-320 flat/road}
{TRANSITION_COMPLETE_L Rrc (!,Rr,W*,Ai)
-321 flat/road-clean}
Modified: trunk/data/core/terrain-graphics/builder.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/builder.cfg?rev=47078&r1=47077&r2=47078&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/builder.cfg (original)
+++ trunk/data/core/terrain-graphics/builder.cfg Sun Oct 17 23:13:08 2010
@@ -64,5 +64,8 @@
#define ANIMATION_18_70 IMAGESTEM POSTFIX
{ANIMATION_18_INTERNAL {IMAGESTEM} {POSTFIX}.png 130}#enddef
+#define WAVES IMAGESTEM POSTFIX
+{ANIMATION_06_INTERNAL {IMAGESTEM} {POSTFIX}.png 150}#enddef
+
#define BUILD_IMAGE BUILDER IMAGESTEM POSTFIX
{{BUILDER} {IMAGESTEM} {POSTFIX}}#enddef
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
