Author: mog
Date: Sun May 18 23:45:34 2008
New Revision: 26713
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26713&view=rev
Log:
Port UtBS terrains to new terrain macros.
Removed:
trunk/data/campaigns/Under_the_Burning_Suns/utils/adjacent_custom.cfg
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg
trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg
Removed: trunk/data/campaigns/Under_the_Burning_Suns/utils/adjacent_custom.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/utils/adjacent_custom.cfg?rev=26712&view=auto
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/utils/adjacent_custom.cfg
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/utils/adjacent_custom.cfg
(removed)
@@ -1,195 +1,0 @@
-#textdomain wesnoth-utbs
-
-# Defines a terrain that has a transition image of the form:
"void-n-ne-se-s.png"
-# example: {TERRAIN_ADJACENT_4 gt !gt grassland}
-# This will add 4-tile transitions from terrains of type g or t to terrains of
-# any other type, using the filename grassland-x-x-x-x.png
-
-#define TERRAIN_ADJACENT_PREC_4_FL LAYER TERRAIN ADJACENT IMAGE FLAG
- [terrain_graphics]
- map="
-, 2
-., 3
-, 1
-., 4
-, 5
-"
- [tile]
- pos=1
- type={ADJACENT}
-
- [EMAIL PROTECTED],[EMAIL PROTECTED],[EMAIL PROTECTED],[EMAIL
PROTECTED]
- [EMAIL PROTECTED],[EMAIL PROTECTED],[EMAIL PROTECTED],[EMAIL
PROTECTED]
-
- [image]
- layer={LAYER}
- [EMAIL PROTECTED]@[EMAIL PROTECTED]@R3
- [/image]
- [/tile]
- [tile]
- pos=2
- type={TERRAIN}
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [/tile]
- [tile]
- pos=3
- type={TERRAIN}
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [/tile]
- [tile]
- pos=4
- type={TERRAIN}
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [/tile]
- [tile]
- pos=5
- type={TERRAIN}
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [/tile]
-
- precedence=-100
- rotations=n,ne,se,s,sw,nw
- [/terrain_graphics]
-#enddef
-
-# Same as above, but for 3-tile transitions.
-
-#define TERRAIN_ADJACENT_PREC_3_FL LAYER TERRAIN ADJACENT IMAGE FLAG
- [terrain_graphics]
- map="
-, 2
-., 3
-, 1
-., 4
-, .
-"
- [tile]
- pos=1
- type={ADJACENT}
-
- [EMAIL PROTECTED],[EMAIL PROTECTED],[EMAIL PROTECTED]
- [EMAIL PROTECTED],[EMAIL PROTECTED],[EMAIL PROTECTED]
-
- [image]
- layer={LAYER}
- [EMAIL PROTECTED]@[EMAIL PROTECTED]
- [/image]
- [/tile]
- [tile]
- pos=2
- type={TERRAIN}
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [/tile]
- [tile]
- pos=3
- type={TERRAIN}
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [/tile]
- [tile]
- pos=4
- type={TERRAIN}
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [/tile]
-
- precedence=-100
- rotations=n,ne,se,s,sw,nw
- [/terrain_graphics]
-#enddef
-
-# Same as above, but for 2-tile transitions.
-
-#define TERRAIN_ADJACENT_PREC_2_FL LAYER TERRAIN ADJACENT IMAGE FLAG
- [terrain_graphics]
- map="
-, 2
-., 3
-, 1
-., .
-, .
-"
- [tile]
- pos=1
- type={ADJACENT}
-
- [EMAIL PROTECTED],[EMAIL PROTECTED]
- [EMAIL PROTECTED],[EMAIL PROTECTED]
-
- [image]
- layer={LAYER}
- [EMAIL PROTECTED]@R1
- [/image]
- [/tile]
- [tile]
- pos=2
- type={TERRAIN}
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [/tile]
- [tile]
- pos=3
- type={TERRAIN}
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [/tile]
-
- precedence=-100
- rotations=n,ne,se,s,sw,nw
- [/terrain_graphics]
-#enddef
-
-# Same as above, but for 1-tile (simple) transitions.
-
-#define TERRAIN_ADJACENT_PREC_1_FL LAYER TERRAIN ADJACENT IMAGE FLAG
- [terrain_graphics]
- map="
-, 2
-., .
-, 1
-., .
-, .
-"
- [tile]
- pos=1
- type={ADJACENT}
-
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
-
- [image]
- layer={LAYER}
- [EMAIL PROTECTED]
- [/image]
- [/tile]
- [tile]
- pos=2
- type={TERRAIN}
- [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- [/tile]
-
- precedence=-100
- rotations=n,ne,se,s,sw,nw
- [/terrain_graphics]
-#enddef
-
-# Defines a terrain that could have 4-tile, 3-tile, 2-tile, or 1-tile
-# transitions to other terrains. The larger transitions have greater priority
-# and go first.
-
-#define TERRAIN_ADJACENT_PREC_FL LAYER TERRAIN ADJACENT IMAGESTEM FLAG
- {TERRAIN_ADJACENT_PREC_4_FL ({LAYER}) ({TERRAIN}) ({ADJACENT}) {IMAGESTEM}
{FLAG}}
- {TERRAIN_ADJACENT_PREC_3_FL ({LAYER}) ({TERRAIN}) ({ADJACENT}) {IMAGESTEM}
{FLAG}}
- {TERRAIN_ADJACENT_PREC_2_FL ({LAYER}) ({TERRAIN}) ({ADJACENT}) {IMAGESTEM}
{FLAG}}
- {TERRAIN_ADJACENT_PREC_1_FL ({LAYER}) ({TERRAIN}) ({ADJACENT}) {IMAGESTEM}
{FLAG}}
-#enddef
-
-#define TERRAIN_ADJACENT_PREC LAYER TERRAIN ADJACENT IMAGESTEM
- {TERRAIN_ADJACENT_PREC_FL ({LAYER}) ({TERRAIN}) ({ADJACENT}) {IMAGESTEM}
transition}
-#enddef
Modified: trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg?rev=26713&r1=26712&r2=26713&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg (original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg Sun May 18
23:45:34 2008
@@ -14,9 +14,6 @@
editor_group=utbs
[/terrain]
-{TERRAIN_BASE_PROB Ryd dark_tile1 50}
-{TERRAIN_BASE_PROB Ryd dark_tile2 33}
-{TERRAIN_BASE Ryd dark_tile3}
# custom lava terrain
# similar to normal lava except that I allow units to walk across lava
@@ -34,7 +31,6 @@
editor_group=utbs
[/terrain]
-{TERRAIN_BASE Yl lava}
# stone bridge over chasm (currently not used)
@@ -62,7 +58,6 @@
editor_group=utbs
[/terrain]
-{TERRAIN_BASE Wyc coast}
# desert campfire terrain
[terrain]
@@ -76,7 +71,6 @@
editor_group=utbs
[/terrain]
-{TERRAIN_OVERLAY_PROB Dd^Fi "" 100%
../scenery/fire1:200,../scenery/fire2:200,../scenery/fire3:200,../scenery/fire4:200,../scenery/fire5:200,../scenery/fire6:200,../scenery/fire7:200,../scenery/fire8:200}
# phantom castle
[terrain]
@@ -106,10 +100,3 @@
no_overlay=true
editor_group=utbs
[/terrain]
-
-{DISABLE_TRANSITIONS (Dd^Cd,Dd^Kd)}
-{TERRAIN_ADJACENT_CORNER_BOTH (Dd^Cd,Dd^Kd) (!,Xu,Qxu,Ql,Dd^Cd,Dd^Kd)
castle/dwarven-castle}
-{TERRAIN_ADJACENT_CORNER (Dd^Cd,Dd^Kd) (!,Dd^Cd,Dd^Kd,Xu) Xu
54,68 castle/dwarven-castle-wall-ccw}
-{TERRAIN_OVERLAY_PROB Dd^Cd "" 100% darkcastle}
-{TERRAIN_OVERLAY_PROB Dd^Kd "" 100% darkcastle}
-{TERRAIN_OVERLAY_PROB Dd^Kd "" 100% castle/dwarven-keep}
Modified: trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg?rev=26713&r1=26712&r2=26713&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg Sun
May 18 23:45:34 2008
@@ -2,100 +2,23 @@
# A supplementary terrain-graphics file
# which is supposed to help with transitions
-{./adjacent_custom.cfg}
+{DISABLE_TRANSITIONS (Dd^Cd,Dd^Kd)}
-# These three take care that no transitions of dirt, road etc are drawn over
the
-# custom lava (so that we can then draw some lava transitions over those
-# terrains).
+{TERRAIN_BASE Dd^Cd darkcastle}
+{TERRAIN_BASE Dd^Kd darkcastle}
+{OVERLAY Dd^Kd castle/dwarven-keep}
-[terrain_graphics]
- map="
-, 2
-., .
-, 1
-., .
-, .
-"
- [tile]
- pos=1
- type=!, Yl
- [/tile]
- [tile]
- pos=2
- type=Yl
+{WALL_TRANSITION2 (Dd^Cd,Dd^Kd) Xu (!,Dd^Cd,Dd^Kd,Xu)
castle/dwarven-castle-wall}
+{WALL_TRANSITION (Dd^Cd,Dd^Kd) (!,Xu,Qxu,Ql,Dd^Cd,Dd^Kd)
castle/dwarven-castle}
- [image]
- layer=-50
- name=lava
- [/image]
+{OVERLAY Dd^Fi
../scenery/fire1:200,../scenery/fire2:200,../scenery/fire3:200,../scenery/fire4:200,../scenery/fire5:200,../scenery/fire6:200,../scenery/fire7:200,../scenery/fire8:200}
- no_flag=custom_lava
- set_flag=custom_lava
- [/tile]
+{TERRAIN_BASE_P Ryd 33 dark_tile1}
+{TERRAIN_BASE_P Ryd 40 dark_tile2}
+{TERRAIN_BASE Ryd dark_tile3}
- probability=33
- rotations=n,ne,se,s,sw,nw
-[/terrain_graphics]
+{TERRAIN_BASE Yl lava}
+{TERRAIN_BASE Wyc coast}
-[terrain_graphics]
- map="
-, 2
-., .
-, 1
-., .
-, .
-"
- [tile]
- pos=1
- type=!, Yl
- [/tile]
- [tile]
- pos=2
- type=Yl
+{TRANSITION_BASE Yl (!, Yl, Xu) lava}
- [image]
- layer=-50
- name=lava2
- [/image]
-
- no_flag=custom_lava
- set_flag=custom_lava
- [/tile]
-
- probability=50
- rotations=n,ne,se,s,sw,nw
-[/terrain_graphics]
-
-[terrain_graphics]
- map="
-, 2
-., .
-, 1
-., .
-, .
-"
- [tile]
- pos=1
- type=!, Yl
- [/tile]
- [tile]
- pos=2
- type=Yl
-
- [image]
- layer=-50
- name=lava3
- [/image]
-
- no_flag=custom_lava
- set_flag=custom_lava
- [/tile]
-
- probability=100
- rotations=n,ne,se,s,sw,nw
-[/terrain_graphics]
-
-{TERRAIN_ADJACENT_CUSTOM -400 Yl (!, Yl, Xu) lava custom_lava}
-
-#{TERRAIN_ADJACENT_PREC -182 ^ !^&ur cave-floor1}
-{TERRAIN_ADJACENT_PREC -150 Ryd (!, Ryd, Uu, Re)
cave-floor1}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
