mail[Wesnoth-commits] r43719 - in /trunk/data/core: ./ images/terrain/castle/


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

Header


Content

Posted by me on June 25, 2010 - 18:06:
Author: eleazar
Date: Fri Jun 25 18:06:37 2010
New Revision: 43719

URL: http://svn.gna.org/viewcvs/wesnoth?rev=43719&view=rev
Log:
new castle-to-water transitions that match the dirt bank.

Modified:
    trunk/data/core/images/terrain/castle/castle-to-ice-n.png
    trunk/data/core/images/terrain/castle/castle-to-ice-ne.png
    trunk/data/core/images/terrain/castle/castle-to-ice-nw.png
    trunk/data/core/images/terrain/castle/castle-to-water-n.png
    trunk/data/core/images/terrain/castle/castle-to-water-ne.png
    trunk/data/core/images/terrain/castle/castle-to-water-nw.png
    trunk/data/core/terrain-graphics.cfg

Modified: trunk/data/core/images/terrain/castle/castle-to-ice-n.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/castle/castle-to-ice-n.png?rev=43719&r1=43718&r2=43719&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/data/core/images/terrain/castle/castle-to-ice-ne.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/castle/castle-to-ice-ne.png?rev=43719&r1=43718&r2=43719&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/data/core/images/terrain/castle/castle-to-ice-nw.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/castle/castle-to-ice-nw.png?rev=43719&r1=43718&r2=43719&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/data/core/images/terrain/castle/castle-to-water-n.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/castle/castle-to-water-n.png?rev=43719&r1=43718&r2=43719&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/data/core/images/terrain/castle/castle-to-water-ne.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/castle/castle-to-water-ne.png?rev=43719&r1=43718&r2=43719&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/data/core/images/terrain/castle/castle-to-water-nw.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/castle/castle-to-water-nw.png?rev=43719&r1=43718&r2=43719&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/data/core/terrain-graphics.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics.cfg?rev=43719&r1=43718&r2=43719&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics.cfg (original)
+++ trunk/data/core/terrain-graphics.cfg Fri Jun 25 18:06:37 2010
@@ -511,15 +511,15 @@
 {TRANSITION_COMPLETE_L     (Hhd)            (!,Hhd,W*,Ss)               -183 
              hills/dry}
 {TRANSITION_COMPLETE_LF    (Hhd)            (W*,Ss)                     -184 
 transition2  hills/dry}
 {TRANSITION_COMPLETE_L     Hd               (!,Hd,Qx*)                  -190 
              desert-hills}
-{TRANSITION_COMPLETE_L     Uh               (!,Uh)                      -200 
              cave/hills}
+{TRANSITION_COMPLETE_L     Uh               (!,Uh,W*,Ai)                -200 
              cave/hills}
 
 {TRANSITION_COMPLETE_L     Qlf              (!,Ql,Qlf,Qx*,X*)           -210 
              unwalkable/lava}
-{TRANSITION_COMPLETE_L     (Uu,Uh)          (!,Uu,Uh)                   -220 
              cave/floor}
-{TRANSITION_COMPLETE_L     Ur               (!,Ur)                      -221 
              cave/floor}
-{TRANSITION_COMPLETE_LF    (!,Ur)           Ur                          -222 
 transition2  cave/floor}
+{TRANSITION_COMPLETE_L     (Uu,Uh)          (!,Uu,Uh,W*,Ai)             -220 
              cave/floor}
+{TRANSITION_COMPLETE_L     Ur               (!,Ur,W*,Ai)                -221 
              cave/floor}
+#{TRANSITION_COMPLETE_LF    (!,Ur)           Ur                          
-222  transition2  cave/floor}
 
 {TRANSITION_COMPLETE_L     Aa               (W*,Ss)                     -240 
              frozen/snow-to-water}
-{TRANSITION_COMPLETE_L     Aa               (!,Aa,Qx*)                  -241 
              frozen/snow}
+{TRANSITION_COMPLETE_L     Aa               (!,Aa,Qx*,G*)               -241 
              frozen/snow}
 
 {TRANSITION_COMPLETE_L     (Ss,Chs)         (!,Ss,Chs,H*,M*,A*)         -250 
              swamp/water}
 
@@ -530,9 +530,9 @@
 #{TRANSITION_COMPLETE_L   (Gg*,Qx*,Mm,Ms,Hh*) W*                          
-260               flat/grass-to-water}
 
 # Experimental gradual grass blending
-{TRANSITION_COMPLETE_LF     Gg              (Gs,Gd,Re,Rb,Rd,Rr,Rp)           
-264   transition2     flat/grass-long}
-{TRANSITION_COMPLETE_LF     Gs              (Gd,Re,Rb,Rd,Rr,Rp)              
-265   transition2     flat/savanna-long}
-{TRANSITION_COMPLETE_LF     Gd              (Re,Rb,Rd,Rr,Rp)                 
-266   transition2     flat/grass-dry-long}
+{TRANSITION_COMPLETE_LF     Gg              (Gs,Gd,Re,Rb,Rd,Rr,Rp,Aa)        
   -264   transition2     flat/grass-long}
+{TRANSITION_COMPLETE_LF     Gs              (Gd,Re,Rb,Rd,Rr,Rp,Aa)           
   -265   transition2     flat/savanna-long}
+{TRANSITION_COMPLETE_LF     Gd              (Re,Rb,Rd,Rr,Rp,Aa)              
   -266   transition2     flat/grass-dry-long}
 
 {TRANSITION_COMPLETE_L     Gll              (Gg,Gs,Gd,Re,Rb,Rd,Rp)           
-265                   flat/leaf-litter-long}
 {TRANSITION_COMPLETE_L     Gll              (!,Gll,Qx*)                      
-269                   flat/leaf-litter}
@@ -547,12 +547,13 @@
 
 
 ### experimental water's edge
-{TRANSITION_COMPLETE_LF    (R*,G*)          W*                             
-295  transition2      flat/bank-to-water}
-{TRANSITION_COMPLETE_LF    (R*,G*)          Ai                             
-296  transition2      flat/bank-to-ice}
+
+{TRANSITION_COMPLETE_LF    (R*,G*)          W*                               
-295  transition2      flat/bank-to-water}
+{TRANSITION_COMPLETE_LF    (R*,G*)          Ai                               
-296  transition2      flat/bank-to-ice}
 {TRANSITION_COMPLETE_L     (W*,Ai)            (!,Rb,!,R*)                    
-298                   flat/bank}
 
-{TRANSITION_COMPLETE_LF    (U*,Xu)      W*                                   
-295  transition2      cave/cave-to-water}
-{TRANSITION_COMPLETE_LF    (U*,Xu)      Ai                                   
-296  transition2      cave/cave-to-ice}
+{TRANSITION_COMPLETE_LF    (U*,Xu,Ql)      W*                               
-295  transition2      cave/cave-to-water}
+{TRANSITION_COMPLETE_LF    (U*,Xu,Ql)      Ai                               
-296  transition2      cave/cave-to-ice}
 
 
 #{TRANSITION_COMPLETE_LF    (!,Re)           (Rr,Re,Rd,Rp)                   
-297  transition3      flat/dirt}
@@ -582,12 +583,13 @@
 {TRANSITION_COMPLETE_LF    (!,Rb,Rr,W*,Ai)        Rb                         
 -384  transition3  flat/dirt-dark}
 {TRANSITION_COMPLETE_L     Rb               (!,Rb,Rr,W*,Ai)                  
 -388               flat/dirt-dark}
 
-{TRANSITION_COMPLETE_LF    (!,Chw,Khw,Khs,Ce,Ke,!,C*,K*)            (Ai,W*)  
   -480 non_submerged_part castle/castle-to-ice}
+# This complicated part keeps the submerged part of ice or a bank from 
drawing over the above-water parts of banks or ice
+{TRANSITION_COMPLETE_LF    (!,Chw,Khw,Khs,!,C*,K*)            (Ai,W*)     
-480 non_submerged_part castle/castle-to-ice}
 {TRANSITION_COMPLETE_LF    Aa,Ha,Ms,Ai                        (W*,Ss)     
-490 non_submerged_part frozen/ice}
 {TRANSITION_COMPLETE_LF    Aa,Ha,Ms,Ai                        (W*,Ss)     
-505 submerged_part     frozen/ice-to-water}
 # we just draw this again (invisible below the base layer) to set the 
transition flags
 {TRANSITION_COMPLETE_L     Aa,Ha,Ms,Ai                        (W*,Ss)     
-1001                   frozen/ice-to-water}
-{TRANSITION_COMPLETE_LF    (!,Chw,Khw,Khs,Ce,Ke,!,C*,K*)            W*       
   -510 submerged_part     castle/castle-to-water}
+{TRANSITION_COMPLETE_LF    (!,Chw,Khw,Khs,!,C*,K*)            W*          
-510 submerged_part     castle/castle-to-water}
 
 # Water Transitions below everything else
 




Related Messages


Powered by MHonArc, Updated Fri Jun 25 19:00:18 2010