Author: mog
Date: Wed May 21 20:22:10 2008
New Revision: 26754
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26754&view=rev
Log:
Convert forests, farmland and rubble to overlay terrains
Removed:
trunk/data/core/images/terrain/forest/mushrooms-above-tile.png
Modified:
trunk/data/core/images/terrain/flat/farm-veg-spring-icon.png
trunk/data/core/images/terrain/forest/great-tree-tile.png
trunk/data/core/images/terrain/forest/mushrooms-beam-tile.png
trunk/data/core/images/terrain/forest/mushrooms-tile.png
trunk/data/core/images/terrain/forest/pine-tile.png
trunk/data/core/images/terrain/forest/snow-forest-tile.png
trunk/data/core/images/terrain/forest/tropical-tile.png
trunk/data/core/images/terrain/sand_rubble-tile.png
trunk/data/core/terrain.cfg
Modified: trunk/data/core/images/terrain/flat/farm-veg-spring-icon.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/flat/farm-veg-spring-icon.png?rev=26754&r1=26753&r2=26754&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/terrain/forest/great-tree-tile.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/forest/great-tree-tile.png?rev=26754&r1=26753&r2=26754&view=diff
==============================================================================
Binary files - no diff available.
Removed: trunk/data/core/images/terrain/forest/mushrooms-above-tile.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/forest/mushrooms-above-tile.png?rev=26753&view=auto
==============================================================================
Binary file - no diff available.
Modified: trunk/data/core/images/terrain/forest/mushrooms-beam-tile.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/forest/mushrooms-beam-tile.png?rev=26754&r1=26753&r2=26754&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/terrain/forest/mushrooms-tile.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/forest/mushrooms-tile.png?rev=26754&r1=26753&r2=26754&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/terrain/forest/pine-tile.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/forest/pine-tile.png?rev=26754&r1=26753&r2=26754&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/terrain/forest/snow-forest-tile.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/forest/snow-forest-tile.png?rev=26754&r1=26753&r2=26754&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/terrain/forest/tropical-tile.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/forest/tropical-tile.png?rev=26754&r1=26753&r2=26754&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/images/terrain/sand_rubble-tile.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/images/terrain/sand_rubble-tile.png?rev=26754&r1=26753&r2=26754&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/data/core/terrain.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain.cfg?rev=26754&r1=26753&r2=26754&view=diff
==============================================================================
--- trunk/data/core/terrain.cfg (original)
+++ trunk/data/core/terrain.cfg Wed May 21 20:22:10 2008
@@ -81,92 +81,6 @@
aliasof=_bas, Gt
editor_group=bridge, water
[/terrain]
-
-
-# >>>>>>>> Shallow Water Bridge
-# [terrain]
-# symbol_image=bridge-n-s-tile
-# id=bridge
-# name= _ "Bridge"
-# string=Ww^Bw|
-# aliasof=Gt, Ww
-# editor_group=bridge, water
-# [/terrain]
-
-# [terrain]
-# symbol_image=bridge-ne-sw-tile
-# id=bridgediag1
-# name= _ "Bridge"
-# string=Ww^Bw/
-# aliasof=Gt, Ww
-# editor_group=bridge, water
-# [/terrain]
-
-# [terrain]
-# symbol_image=bridge-se-nw-tile
-# id=bridgediag2
-# name= _ "Bridge"
-# string=Ww^Bw\
-# aliasof=Gt, Ww
-# editor_group=bridge, water
-# [/terrain]
-
-
-# >>>>>>>> Deep Water Bridge
-#[terrain]
-# symbol_image=bridge-deep-n-s-tile
-# id=bridgedeep
-# name= _ "Bridge"
-# string=Wo^Bw|
-# aliasof=Gt, Wo
-# editor_group=bridge, water
-#[/terrain]
-#
-#[terrain]
-# symbol_image=bridge-deep-ne-sw-tile
-# id=bridgedeepdiag1
-# name= _ "Bridge"
-# string=Wo^Bw/
-# aliasof=Gt, Wo
-# editor_group=bridge, water
-#[/terrain]
-
-# [terrain]
-# symbol_image=bridge-deep-se-nw-tile
-# id=bridgedeepdiag2
-# name= _ "Bridge"
-# string=Wo^Bw\
-# aliasof=Gt, Wo
-# editor_group=bridge, water
-# [/terrain]
-
-# # >>>>>>>> Swamp Water Bridge
-# [terrain]
-# symbol_image=bridge-swamp-n-s-tile
-# id=bridgeswamp
-# name= _ "Bridge"
-# string=Ss^Bw|
-# aliasof=Gt, Ss
-# editor_group=bridge, water
-# [/terrain]
-
-# [terrain]
-# symbol_image=bridge-swamp-ne-sw-tile
-# id=bridgeswampdiag1
-# name= _ "Bridge"
-# string=Ss^Bw/
-# aliasof=Gt, Ss
-# editor_group=bridge, water
-# [/terrain]
-
-# [terrain]
-# symbol_image=bridge-swamp-se-nw-tile
-# id=bridgeswampdiag2
-# name= _ "Bridge"
-# string=Ss^Bw\
-# aliasof=Gt, Ss
-# editor_group=bridge, water
-# [/terrain]
# >>>>>>>> Chasm Bridge
@@ -450,9 +364,10 @@
symbol_image=sand_rubble-tile
id=sand_rubble
name= _ "Rubble"
- string=Dd^Dr
- aliasof=Hh
- editor_group=desert
+ string=^Dr
+ aliasof=_bas, Hh
+ mvt_alias=-,_bas,Hh
+ editor_group=desert, rough
[/terrain]
#Old desert
@@ -483,9 +398,10 @@
symbol_image=forest/snow-forest-tile
id=snow_forest
name= _ "Snow Forest"
- string=Aa^Fpa
- aliasof=At, Gs^Fp
- mvt_alias=-,At, Gs^Fp
+ string=^Fpa
+ default_base=Aa
+ aliasof=At, ^Fp
+ mvt_alias=-,At, ^Fp
editor_group=frozen, forest
[/terrain]
@@ -493,8 +409,9 @@
symbol_image=forest/great-tree-tile
id=great_tree
name= _ "Great Tree"
- string=Gg^Fet
- aliasof=Gs^Fp
+ string=^Fet
+ default_base=Gg
+ aliasof=^Fp
editor_group=forest
[/terrain]
@@ -502,7 +419,8 @@
symbol_image=forest/pine-tile
id=forest
name= _ "Forest"
- string=Gs^Fp
+ string=^Fp
+ default_base=Gs
editor_group=forest
[/terrain]
@@ -510,8 +428,9 @@
symbol_image=forest/tropical-tile
id=tropical_forest
name= _ "Tropical Forest"
- string=Gs^Ft
- aliasof=Gs^Fp
+ string=^Ft
+ default_base=Gs
+ aliasof=^Fp
editor_group=forest
[/terrain]
@@ -685,8 +604,9 @@
symbol_image=flat/farm-veg-spring-icon
id=farm
name= _ "Farmland"
- string=Re^Gvs
- aliasof=Gt
+ string=^Gvs
+ default_base=Re
+ aliasof=_bas
editor_group=flat
[/terrain]
@@ -749,25 +669,18 @@
symbol_image=forest/mushrooms-tile
id=fungus
name= _ "Mushroom Grove"
- string=Uu^Uf
- editor_group=cave
-[/terrain]
-
-[terrain]
- symbol_image=forest/mushrooms-above-tile
- id=fungusabove
- name= _ "Mushroom Grove"
- string=Re^Uf
- aliasof=Uu^Uf
- editor_group=forest
+ string=^Uf
+ default_base=Uu
+ editor_group=cave, forest
[/terrain]
[terrain]
symbol_image=forest/mushrooms-beam-tile
id=fungus_beam
name= _ "Mushroom Grove Lit"
- string=Uu^Ufi
- aliasof=Uu^Uf
+ string=^Ufi
+ default_base=Uu
+ aliasof=^Uf
light=25
editor_group=cave
[/terrain]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
