mail[Wesnoth-commits] r20100 - in /trunk/data/core: ./ images/terrain/ terrain-graphics/


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

Header


Content

Posted by lari . nieminen on September 04, 2007 - 18:24:
Author: zookeeper
Date: Tue Sep  4 18:23:39 2007
New Revision: 20100

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20100&view=rev
Log:
Added an alternate lava terrain (Qlf) using the old transitions, instead of 
the new chasm ones. Mainly intended to be used as the "overflowing" lava in 
scenarios where lava expands. The old chasm lava is renamed to "Lava chasm".

Added:
    trunk/data/core/images/terrain/lava-chasm-tile.png   (with props)
    trunk/data/core/images/terrain/lava-n-ne-nw-s.png   (with props)
    trunk/data/core/images/terrain/lava-n-ne-nw.png   (with props)
    trunk/data/core/images/terrain/lava-n-ne.png   (with props)
    trunk/data/core/images/terrain/lava-n.png   (with props)
    trunk/data/core/images/terrain/lava-ne-nw-s.png   (with props)
    trunk/data/core/images/terrain/lava-ne-se.png   (with props)
    trunk/data/core/images/terrain/lava-ne.png   (with props)
    trunk/data/core/images/terrain/lava-nw-n.png   (with props)
    trunk/data/core/images/terrain/lava-nw.png   (with props)
    trunk/data/core/images/terrain/lava-s-nw-ne-n.png   (with props)
    trunk/data/core/images/terrain/lava-s-sw-nw.png   (with props)
    trunk/data/core/images/terrain/lava-s-sw.png   (with props)
    trunk/data/core/images/terrain/lava-s.png   (with props)
    trunk/data/core/images/terrain/lava-se-s.png   (with props)
    trunk/data/core/images/terrain/lava-se.png   (with props)
    trunk/data/core/images/terrain/lava-sw-nw-n.png   (with props)
    trunk/data/core/images/terrain/lava-sw-nw.png   (with props)
    trunk/data/core/images/terrain/lava-sw.png   (with props)
Modified:
    trunk/data/core/terrain-graphics/_final.cfg
    trunk/data/core/terrain.cfg

Added: trunk/data/core/images/terrain/lava-chasm-tile.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-chasm-tile.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-chasm-tile.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-n-ne-nw-s.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-n-ne-nw-s.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-n-ne-nw-s.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-n-ne-nw.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-n-ne-nw.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-n-ne-nw.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-n-ne.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-n-ne.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-n-ne.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-n.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-n.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-n.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-ne-nw-s.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-ne-nw-s.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-ne-nw-s.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-ne-se.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-ne-se.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-ne-se.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-ne.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-ne.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-ne.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-nw-n.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-nw-n.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-nw-n.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-nw.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-nw.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-nw.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-s-nw-ne-n.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-s-nw-ne-n.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-s-nw-ne-n.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-s-sw-nw.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-s-sw-nw.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-s-sw-nw.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-s-sw.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-s-sw.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-s-sw.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-s.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-s.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-s.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-se-s.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-se-s.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-se-s.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-se.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-se.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-se.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-sw-nw-n.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-sw-nw-n.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-sw-nw-n.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-sw-nw.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-sw-nw.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-sw-nw.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/data/core/images/terrain/lava-sw.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/lava-sw.png?rev=20100&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/data/core/images/terrain/lava-sw.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: trunk/data/core/terrain-graphics/_final.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/_final.cfg?rev=20100&r1=20099&r2=20100&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/_final.cfg (original)
+++ trunk/data/core/terrain-graphics/_final.cfg Tue Sep  4 18:23:39 2007
@@ -422,9 +422,9 @@
 
 {TERRAIN_BASE       Qxu                 chasm}
 
-{TERRAIN_BASE_PROB  Ql                  lava                     33}
-{TERRAIN_BASE_PROB  Ql                  lava2                    50}
-{TERRAIN_BASE       Ql                  lava3}
+{TERRAIN_BASE_PROB  Ql,Qlf              lava                     33}
+{TERRAIN_BASE_PROB  Ql,Qlf              lava2                    50}
+{TERRAIN_BASE       Ql,Qlf              lava3}
 
 
 #g 2% 2% 3% 3% 9% 9% 9% 9% 9% 9% 9% 27%
@@ -777,39 +777,39 @@
 #castle-chasm transitions
 {TERRAIN_ADJACENT_CORNER_BOTH  (Cud,Kud)        Qxu                          
          chasm-dcastle}
 
-{TERRAIN_ADJACENT_CORNER     (Cud,Kud)          (!,Cud,Kud,Xu,Ql,Qxu)        
Qxu       52,76 chasm-dcastle-ccw}
-{TERRAIN_ADJACENT_CORNER     (Cud,Kud)          Qxu          
(!,Cud,Kud,Xu,Ql,Qxu)     52,76 chasm-dcastle-cw}
+{TERRAIN_ADJACENT_CORNER     (Cud,Kud)          (!,Cud,Kud,Xu,Ql,Qxu)    Qxu 
      52,76 chasm-dcastle-ccw}
+{TERRAIN_ADJACENT_CORNER     (Cud,Kud)          Qxu          
(!,Cud,Kud,Xu,Ql,Qxu) 52,76 chasm-dcastle-cw}
 
 #castle-lava transitions
 
 {TERRAIN_ADJACENT_CORNER_BOTH  (Cud,Kud)        Ql                           
          lava-dcastle}
 
-{TERRAIN_ADJACENT_CORNER     (Cud,Kud)           (!,Cud,Kud,Xu,Ql,Qxu)       
 Ql       52,76 lava-dcastle-ccw}
-{TERRAIN_ADJACENT_CORNER     (Cud,Kud)           Ql          
(!,Cud,Kud,Xu,Ql,Qxu)     52,76 lava-dcastle-cw}
+{TERRAIN_ADJACENT_CORNER     (Cud,Kud)           (!,Cud,Kud,Xu,Ql,Qxu)    Ql 
      52,76 lava-dcastle-ccw}
+{TERRAIN_ADJACENT_CORNER     (Cud,Kud)           Ql          
(!,Cud,Kud,Xu,Ql,Qxu) 52,76 lava-dcastle-cw}
 
 
 #castle-lava-chasm transitions
 
-{TERRAIN_ADJACENT_CORNER        (Cud,Kud)        Qxu            Ql           
          52,76 lava-dcastle-chasm-ccw}
-{TERRAIN_ADJACENT_CORNER        (Cud,Kud)        Ql             Qxu          
          52,76 lava-dcastle-chasm-cw}
+{TERRAIN_ADJACENT_CORNER        (Cud,Kud)        Qxu            Ql,Qlf       
      52,76 lava-dcastle-chasm-ccw}
+{TERRAIN_ADJACENT_CORNER        (Cud,Kud)        Ql,Qlf         Qxu          
      52,76 lava-dcastle-chasm-cw}
 
 # Lava
 {DISABLE_TRANSITIONS Ql}
 
-{TERRAIN_ADJACENT_CORNER_LAYER  Ql               (!,Ql,Qxu)     (!,Ql,Qxu)   
    -1 52,76 lava-convex}
-{TERRAIN_ADJACENT_CORNER_LAYER  (!,Ql,Qxu)       Ql             Ql           
    -1 52,76 lava-concave}
+{TERRAIN_ADJACENT_CORNER_LAYER  Ql               (!,Ql,Qxu)     !,Ql,Qxu)    
   -1 52,76 lava-convex}
+{TERRAIN_ADJACENT_CORNER_LAYER  (!,Ql,Qxu)       Ql             Ql           
   -1 52,76 lava-concave}
 
 # Lava-chasm
 
-{TERRAIN_ADJACENT_CORNER_LAYER  Qxu              Ql             Ql           
    -2 52,76 lava-chasm-convex}
-{TERRAIN_ADJACENT_CORNER_LAYER  Ql               Qxu            Qxu          
    -2 52,76 lava-chasm-concave}
-
-{TERRAIN_ADJACENT_CORNER_LAYER  Ql               Qxu            (!,Ql,Qxu)   
    -1 52,76 lava-chasm-ccw}
-{TERRAIN_ADJACENT_CORNER_LAYER  Ql               (!,Ql,Qxu)     Qxu          
    -1 52,76 lava-chasm-cw}
+{TERRAIN_ADJACENT_CORNER_LAYER  Qxu              Ql             Ql           
   -2 52,76 lava-chasm-convex}
+{TERRAIN_ADJACENT_CORNER_LAYER  Ql,Qlf           Qxu            Qxu          
   -2 52,76 lava-chasm-concave}
+
+{TERRAIN_ADJACENT_CORNER_LAYER  Ql               Qxu            
(!,Ql,Qlf,Qxu)  -1 52,76 lava-chasm-ccw}
+{TERRAIN_ADJACENT_CORNER_LAYER  Ql               (!,Ql,Qxu)     Qxu          
   -1 52,76 lava-chasm-cw}
 
 # Chasm
-{TERRAIN_ADJACENT_CORNER_LAYER  Qxu              (!,Ql,Qxu)     (!,Ql,Qxu)   
    -1 52,76 chasm-convex}
-{TERRAIN_ADJACENT_CORNER_LAYER  (!,Ql,Qxu)       Qxu            Qxu          
    -1 52,76 chasm-concave}
+{TERRAIN_ADJACENT_CORNER_LAYER  Qxu              (!,Ql,Qxu)     (!,Ql,Qxu)   
   -1 52,76 chasm-convex}
+{TERRAIN_ADJACENT_CORNER_LAYER  (!,Ql,Qxu)       Qxu            Qxu          
   -1 52,76 chasm-concave}
 
 
 # Castle decorations and castle floors. Those must always be after the 
castles
@@ -843,8 +843,9 @@
 {TERRAIN_ADJACENT_CUSTOM   -191    (Mm,Hh)          (W*,Ss)                  
            hills transition2}
 {TERRAIN_ADJACENT          -200    Uh               (!,Uh)                   
            cave/hills}
 
-{TERRAIN_ADJACENT          -210    U*               (!,U*)                   
            cave/floor}
-{TERRAIN_ADJACENT          -220    Ql               (!,Ql,Qxu,Xu)            
            lava}
+{TERRAIN_ADJACENT          -210    Qlf              (!,Ql,Qlf,Qxu,Xu)        
            lava}
+{TERRAIN_ADJACENT          -220    U*               (!,U*)                   
            cave/floor}
+
 
 # The snow-to-water transition here is applied both to snow and snow hills. 
The
 # custom layer numbers are used to make the submerged part of the 
ice-to-water

Modified: trunk/data/core/terrain.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain.cfg?rev=20100&r1=20099&r2=20100&view=diff
==============================================================================
--- trunk/data/core/terrain.cfg (original)
+++ trunk/data/core/terrain.cfg Tue Sep  4 18:23:39 2007
@@ -516,10 +516,20 @@
 [/terrain]
 
 [terrain]
+    symbol_image=lava-chasm-tile
+    id=lava_chasm
+    name= _ "Lava chasm"
+    string=Ql
+    aliasof=Qxu
+    light=25
+    editor_group=cave
+[/terrain]
+
+[terrain]
     symbol_image=lava
     id=lava
     name= _ "Lava"
-    string=Ql
+    string=Qlf
     aliasof=Qxu
     light=25
     editor_group=cave




Related Messages


Powered by MHonArc, Updated Tue Sep 04 19:00:32 2007