0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced remaining TERRAIN_BASE* and KEEP_BASE calls

Browse source 
...with NEW:BASE and NEW:OVERLAY.
This commit is contained in:
ln-zookeeper 2016-12-27 11:43:14 +02:00
parent 34428485ff
commit 19d5267ee4
2 changed files with 39 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
data/core/terrain-graphics.cfg
View file

@ -479,11 +479,11 @@
{NEW:BASE Urb cave/flagstones-dark}
{NEW:BASE Uh cave/hills-variation}
{TERRAIN_BASE Xu* cave/wall-rough}
{KEEP_BASE Xo* cave/stone_walls/wall-stone-base}
{NEW:BASE Xu* cave/wall-rough}
{NEW:BASE Xo* cave/stone_walls/wall-stone-base}
{NEW:BASE Qxua chasm/abyss}
{TERRAIN_BASE Qx* chasm/depths}
{NEW:BASE Qx* chasm/depths}
{NEW:OVERLAY Wwr,Wwrt,Wwrg water/reef FLAG=reef LAYER=-320}
@ -514,7 +514,7 @@
{NEW:BASE Rd flat/desert-road}
{TERRAIN_BASE_F *^Dc overlay sand/crater}
{NEW:BASE *^Dc sand/crater FLAG=crater}
{NEW:BASE Hd hills/desert}
@ -532,10 +532,9 @@
{NEW:BASE Ha hills/snow}
# {NEW:BASE Iwr interior/wood-regular}
# raised base to get it over the chasm images
{TERRAIN_BASE_RANDOM_LF Iwr -284 raised_base interior/wood-regular}
{TERRAIN_BASE_RANDOM_LF Ior -284 raised_base interior/wood-ruined}
{NEW:BASE Iwr interior/wood-regular LAYER=-284 FLAG=raised_base}
{NEW:BASE Ior interior/wood-ruined LAYER=-284 FLAG=raised_base}
# Water base terrains
@ -558,36 +557,37 @@
{NEW:WATER_342_180_OVERLAY Wot,Wwt,Wwrt water/overlay-tropical -504}
# Castle base terrains
# Most bases get a special -2 layer to get them over the chasm images
{TERRAIN_BASE Ch,Cha flat/road}
{TERRAIN_BASE Chr flat/stone-path}
{KEEP_BASE Kh* castle/cobbles-keep}
{TERRAIN_BASE_LF Chw -520 sunken castle/sunken-ruin}
{NEW:BASE Ch,Cha flat/road}
{NEW:BASE Chr flat/stone-path}
{NEW:BASE Kh* castle/cobbles-keep LAYER=-2}
{NEW:BASE Chw castle/sunken-ruin LAYER=-520 FLAG=sunken}
# swamp castle defined along with swamp above
{TERRAIN_BASE Cv castle/elven/grounds}
{KEEP_BASE Kv castle/elven/keep}
{NEW:BASE Cv castle/elven/grounds}
{NEW:BASE Kv castle/elven/keep LAYER=-2}
{KEEP_BASE_RANDOM Ket interior/wood-tan}
{OVERLAY_RANDOM Ket interior/wood-tan-debris}
{NEW:BASE Ket interior/wood-tan LAYER=-2}
{NEW:OVERLAY Ket interior/wood-tan-debris}
{TERRAIN_BASE (Ce*,Ke*) flat/dirt}
{OVERLAY_RANDOM Ke castle/encampment/tent}
{OVERLAY_RANDOM Kea castle/encampment/tent-snow}
{NEW:BASE (Ce*,Ke*) flat/dirt}
{NEW:OVERLAY Ke castle/encampment/tent}
{NEW:OVERLAY Kea castle/encampment/tent-snow}
{TERRAIN_BASE Co* flat/dirt-dark}
{KEEP_BASE Ko castle/orcish/keep}
{KEEP_BASE Koa castle/winter-orcish/keep}
{NEW:BASE Co* flat/dirt-dark}
{NEW:BASE Ko castle/orcish/keep LAYER=-2}
{NEW:BASE Koa castle/winter-orcish/keep LAYER=-2}
{TERRAIN_BASE Cud castle/dwarven-castle-floor}
{KEEP_BASE Kud castle/dwarven-keep-floor}
{OVERLAY Kud castle/dwarven-keep}
{NEW:BASE Cud castle/dwarven-castle-floor LAYER=-2}
{NEW:BASE Kud castle/dwarven-keep-floor LAYER=-2}
{NEW:OVERLAY Kud castle/dwarven-keep}
{TERRAIN_BASE Cd castle/sand/dirt}
{KEEP_BASE Kd castle/sand/cobbles}
{NEW:BASE Cd castle/sand/dirt}
{NEW:BASE Kd castle/sand/cobbles LAYER=-2}
{NEW:BASE Cdr castle/sand/ruin-dirt}
{KEEP_BASE_RANDOM Kdr castle/sand/cobbles-ruin}
{NEW:BASE Cdr castle/sand/ruin-dirt}
{NEW:BASE Kdr castle/sand/cobbles-ruin LAYER=-2}
{NEW:OVERLAY (Cm,Km) castle/aquatic-castle/cobbles FLAG=cobbles LAYER=-350}
{NEW:OVERLAY (Cme) castle/aquatic-camp/reef FLAG=reef LAYER=-320}
@ -939,7 +939,7 @@
{TRANSITION_COMPLETE_L Xv _off^_usr -810 void/void}
# Default terrain
{TERRAIN_BASE * void/void}
{NEW:BASE * void/void}
#wmlindent: stop ignoring

12
data/core/terrain-graphics/new-macros.cfg
View file

@ -5,16 +5,24 @@
# Places {IMAGESTEM}[1-11].png as base tiles. Assumes 72x72 hex-shaped
# images.
#arg FLAG
base
#endarg
#arg LAYER
-1000
#endarg
[terrain_graphics]
[tile]
x,y=0,0
type={TERRAIN}
set_no_flag=base
set_no_flag={FLAG}
[image]
name={IMAGESTEM}@V.png
variations=";2;3;4;5;6;7;8;9;10;11"
layer=-1000
layer={LAYER}
[/image]
[/tile]
[/terrain_graphics]