Author: cycholka
Date: Sat Jul  5 09:38:24 2008
New Revision: 27743

URL: http://svn.gna.org/viewcvs/wesnoth?rev=27743&view=rev
Log:
Reintroduce the old ford as requested by Doc (hopefully with all transitions as 
they were) and rename new ford as reef introduced as completely new terrain 
(with some arbitrary unbalanced values) to all default movetypes.

Added:
    trunk/data/core/images/terrain/water/ford-n.png   (with props)
    trunk/data/core/images/terrain/water/ford-ne.png   (with props)
    trunk/data/core/images/terrain/water/ford-nw.png   (with props)
    trunk/data/core/images/terrain/water/ford-s.png   (with props)
    trunk/data/core/images/terrain/water/ford-se.png   (with props)
    trunk/data/core/images/terrain/water/ford-sw.png   (with props)
    trunk/data/core/images/terrain/water/reef.png   (with props)
    trunk/data/core/images/terrain/water/reef2.png   (with props)
    trunk/data/core/images/terrain/water/reef3.png   (with props)
Removed:
    trunk/data/core/images/terrain/water/ford3.png
Modified:
    trunk/data/core/images/terrain/water/ford.png
    trunk/data/core/images/terrain/water/ford2.png
    trunk/data/core/terrain-graphics.cfg
    trunk/data/core/terrain.cfg
    trunk/data/core/units.cfg

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

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

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

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

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

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

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

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

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

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

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

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

Modified: trunk/data/core/images/terrain/water/ford.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/water/ford.png?rev=27743&r1=27742&r2=27743&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/data/core/images/terrain/water/ford2.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/water/ford2.png?rev=27743&r1=27742&r2=27743&view=diff
==============================================================================
Binary files - no diff available.

Removed: trunk/data/core/images/terrain/water/ford3.png
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/water/ford3.png?rev=27742&view=auto
==============================================================================
Binary file - no diff available.

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

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

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

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

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

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

Modified: trunk/data/core/terrain-graphics.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics.cfg?rev=27743&r1=27742&r2=27743&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics.cfg (original)
+++ trunk/data/core/terrain-graphics.cfg Sat Jul  5 09:38:24 2008
@@ -252,6 +252,7 @@
 {TERRAIN_BASE            Ww                                                    
    water/coast}
 
 {TERRAIN_BASE_RANDOM     Wwf                                                   
    water/ford}
+{TERRAIN_BASE_RANDOM     Wwr                                                   
    water/reef}
 
 #8% 8% 8% 8% 23% 23% 23%
 {TERRAIN_BASE_P          Ss                                     8              
    swamp/water-flowers1}
@@ -452,7 +453,8 @@
 
 # Water Transitions below everything else
 
-{TRANSITION_BASE_L     (Ww,Wwf)         (!,Ww,Wwf,Mm)              -900        
        water/coast}
+{TRANSITION_BASE_L     (Ww,Wwr)         (!,Ww,Wwr,Mm,Wwf)              -900    
            water/coast}
+{TRANSITION_BASE_L             Wwf                             (Ww,Wo,Wwr)     
                                -490                            water/ford}
 {TRANSITION_BASE_L     Wo               (!,Wo)                     -900        
        water/ocean}
 {TRANSITION_BASE_LF    Chw              (Ch,Chr)                   -490  
transition2   castle/sunken-ruin}
 {TRANSITION_BASE_LF    Chs              (Ch,Chr)                   -490  
transition2   swamp/water}

Modified: trunk/data/core/terrain.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain.cfg?rev=27743&r1=27742&r2=27743&view=diff
==============================================================================
--- trunk/data/core/terrain.cfg (original)
+++ trunk/data/core/terrain.cfg Sat Jul  5 09:38:24 2008
@@ -944,6 +944,16 @@
     editor_group=water
 [/terrain]
 
+[terrain]
+       symbol_image=water/reef
+       id=reef
+       name= _ "Coastal Reef"
+       string=Wwr
+       submerge=0.3
+       unit_height_adjust=-3
+       editor_group=water
+[/terrain]
+
 #
 # Impassable
 #

Modified: trunk/data/core/units.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units.cfg?rev=27743&r1=27742&r2=27743&view=diff
==============================================================================
--- trunk/data/core/units.cfg (original)
+++ trunk/data/core/units.cfg Sat Jul  5 09:38:24 2008
@@ -266,6 +266,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=3
+                       reef=3
             swamp_water=3
             flat=1
             sand=2
@@ -284,6 +285,7 @@
         [defense]
             deep_water=80
             shallow_water=80
+                       reef=60
             swamp_water=80
             flat=60
             sand=70
@@ -314,6 +316,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=3
+                       reef=3
             swamp_water=3
             flat=1
             sand=2
@@ -332,6 +335,7 @@
         [defense]
             deep_water=80
             shallow_water=80
+                       reef=60
             swamp_water=70
             flat=60
             sand=70
@@ -362,6 +366,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=2
+                       reef=2
             swamp_water=2
             flat=1
             sand=2
@@ -380,6 +385,7 @@
         [defense]
             deep_water=80
             shallow_water=80
+                       reef=60
             swamp_water=80
             flat=70
             sand=70
@@ -410,6 +416,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=4
+                       reef=4
             swamp_water=4
             flat=1
             sand=2
@@ -428,6 +435,7 @@
         [defense]
             deep_water=80
             shallow_water=90
+                       reef=70
             swamp_water=90
             flat=70
             sand=80
@@ -458,6 +466,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=2
+                       reef=2
             swamp_water=2
             flat=1
             sand=2
@@ -476,6 +485,7 @@
         [defense]
             deep_water=70
             shallow_water=60
+                       reef=40
             swamp_water=60
             flat=40
             sand=60
@@ -506,6 +516,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=4
+                       reef=4
             swamp_water=4
             flat=1
             sand=2
@@ -524,6 +535,7 @@
         [defense]
             deep_water=80
             shallow_water=80
+                       reef=60
             swamp_water=80
             flat=60
             sand=70
@@ -554,6 +566,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=3
+                       reef=3
             swamp_water=2
             flat=1
             sand=2
@@ -572,6 +585,7 @@
         [defense]
             deep_water=80
             shallow_water=80
+                       reef=60
             swamp_water=70
             flat=60
             sand=70
@@ -603,6 +617,7 @@
         [movement_costs]
             deep_water=2
             shallow_water=1
+                       reef=1
             swamp_water=1
             flat=1
             sand=1
@@ -621,6 +636,7 @@
         [defense]
             deep_water=70
             shallow_water=60
+                       reef=40
             swamp_water=60
             flat=50
             sand=60
@@ -651,6 +667,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=2
+                       reef=2
             swamp_water=2
             flat=1
             sand=2
@@ -669,6 +686,7 @@
         [defense]
             deep_water=90
             shallow_water=80
+                       reef=60
             swamp_water=70
             flat=80
             sand=80
@@ -700,6 +718,7 @@
         [movement_costs]
             deep_water=1
             shallow_water=1
+                       reef=1
             swamp_water=1
             flat=1
             sand=1
@@ -718,6 +737,7 @@
         [defense]
             deep_water=50
             shallow_water=50
+                       reef=50
             swamp_water=50
             flat=50
             sand=50
@@ -749,6 +769,7 @@
         [movement_costs]
             deep_water=1
             shallow_water=1
+                       reef=1
             swamp_water=1
             flat=1
             sand=1
@@ -767,6 +788,7 @@
         [defense]
             deep_water=40
             shallow_water=40
+                       reef=40
             swamp_water=40
             flat=40
             sand=40
@@ -797,6 +819,7 @@
         [movement_costs]
             deep_water=1
             shallow_water=2
+                       reef=2
             swamp_water=2
             flat=4
             sand=4
@@ -815,6 +838,7 @@
         [defense]
             deep_water=40
             shallow_water=50
+                       reef=50
             swamp_water=40
             flat=70
             sand=70
@@ -845,6 +869,7 @@
         [movement_costs]
             deep_water=1
             shallow_water=1
+                       reef=1
             swamp_water=1
             flat=2
             sand=2
@@ -863,6 +888,7 @@
         [defense]
             deep_water=50
             shallow_water=40
+                       reef=50
             swamp_water=40
             flat=70
             sand=70
@@ -893,6 +919,7 @@
         [movement_costs]
             deep_water=1
             shallow_water=1
+                       reef=1
             swamp_water=1
             flat=2
             sand=1
@@ -911,6 +938,7 @@
         [defense]
             deep_water=50
             shallow_water=40
+                       reef=50
             swamp_water=40
             flat=70
             sand=60
@@ -942,6 +970,7 @@
         [movement_costs]
             deep_water=1
             shallow_water=1
+                       reef=1
             swamp_water=2
             flat=99
             sand=99
@@ -960,6 +989,7 @@
         [defense]
             deep_water=50
             shallow_water=50
+                       reef=50
             swamp_water=60
             flat=50
             sand=50
@@ -990,6 +1020,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=3
+                       reef=3
             swamp_water=3
             flat=1
             sand=1
@@ -1008,6 +1039,7 @@
         [defense]
             deep_water=80
             shallow_water=80
+                       reef=60
             swamp_water=80
             flat=70
             sand=70
@@ -1038,6 +1070,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=3
+                       reef=3
             swamp_water=3
             flat=1
             sand=1
@@ -1056,6 +1089,7 @@
         [defense]
             deep_water=80
             shallow_water=80
+                       reef=60
             swamp_water=80
             flat=70
             sand=70
@@ -1086,6 +1120,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=3
+                       reef=3
             swamp_water=2
             flat=1
             sand=2
@@ -1104,6 +1139,7 @@
         [defense]
             deep_water=90
             shallow_water=80
+                       reef=60
             swamp_water=70
             flat=60
             sand=70
@@ -1134,6 +1170,7 @@
         [movement_costs]
             deep_water=3
             shallow_water=2
+                       reef=2
             swamp_water=2
             flat=1
             sand=2
@@ -1152,6 +1189,7 @@
         [defense]
             deep_water=90
             shallow_water=80
+                       reef=60
             swamp_water=70
             flat=60
             sand=70
@@ -1183,6 +1221,7 @@
         [movement_costs]
             deep_water=1
             shallow_water=1
+                       reef=1
             swamp_water=1
             flat=1
             sand=1
@@ -1201,6 +1240,7 @@
         [defense]
             deep_water=50
             shallow_water=50
+                       reef=50
             swamp_water=50
             flat=50
             sand=50
@@ -1232,6 +1272,7 @@
         [movement_costs]
             deep_water=2
             shallow_water=2
+                       reef=2
             swamp_water=1
             flat=1
             sand=1
@@ -1250,6 +1291,7 @@
         [defense]
             deep_water=50
             shallow_water=50
+                       reef=50
             swamp_water=50
             flat=50
             sand=50
@@ -1281,6 +1323,7 @@
         [movement_costs]
             deep_water=4
             shallow_water=3
+                       reef=3
             swamp_water=1
             flat=1
             sand=1
@@ -1299,6 +1342,7 @@
         [defense]
             deep_water=50
             shallow_water=50
+                       reef=50
             swamp_water=50
             flat=50
             sand=50
@@ -1330,6 +1374,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=3
+                       reef=3
             swamp_water=1
             flat=1
             sand=1
@@ -1348,6 +1393,7 @@
         [defense]
             deep_water=80
             shallow_water=60
+                       reef=50
             swamp_water=40
             flat=60
             sand=40
@@ -1379,6 +1425,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=99
+                       reef=99
             swamp_water=99
             flat=99
             sand=99
@@ -1397,6 +1444,7 @@
         [defense]
             deep_water=50
             shallow_water=50
+                       reef=50
             swamp_water=50
             flat=50
             sand=50
@@ -1428,6 +1476,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=3
+                       reef=3
             swamp_water=2
             flat=1
             sand=2
@@ -1446,6 +1495,7 @@
         [defense]
             deep_water=80
             shallow_water=70
+                       reef=50
             swamp_water=60
             flat=60
             sand=60
@@ -1481,6 +1531,7 @@
         [movement_costs]
             deep_water=2
             shallow_water=1
+                       reef=1
             swamp_water=1
             flat=1
             sand=1
@@ -1499,6 +1550,7 @@
         [defense]
             deep_water=80
             shallow_water=80
+                       reef=60
             swamp_water=70
             flat=70
             sand=60
@@ -1532,6 +1584,7 @@
         [movement_costs]
             deep_water=99
             shallow_water=3
+                       reef=3
             swamp_water=3
             flat=1
             sand=1
@@ -1550,6 +1603,7 @@
         [defense]
             deep_water=90
             shallow_water=80
+                       reef=60
             swamp_water=80
             flat=70
             sand=60


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to