upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-19 21:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed some castle and keep mixing glitches,

Browse Source 
...and generally cleaned up terrain-graphics.cfg to make it more readable.
This commit is contained in:
J.W. Bjerk 2010-09-17 18:20:23 +00:00
parent 53793fa55b
commit 93478613a6
1 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
data/core/terrain-graphics.cfg
View File

@ -489,18 +489,18 @@
{WALL_TRANSITION Co,Cv (!,C*,K*) castle/orcish/fort}
{WALL_TRANSITION2 Ko,Kv C*,Ke* (!,C*,K*) castle/orcish/keep-fort}
{WALL_TRANSITION Ko,Kv (!,Ko) castle/orcish/keep}
{WALL_TRANSITION Ko (!,Ko*) castle/orcish/keep}
{WALL_TRANSITION (Co*,Cv) (!,C*,K*) castle/winter-orcish/fort}
{WALL_TRANSITION2 (Ko*,Kv) C*,Ke* (!,C*,K*) castle/winter-orcish/keep-fort}
{WALL_TRANSITION (Ko*,Kv) (!,Ko*) castle/winter-orcish/keep}
{WALL_TRANSITION (Ko*) (!,Ko*) castle/winter-orcish/keep}
# Desert castle
{WALL_TRANSITION Cd,Cv,Co* (!,C*,K*) castle/sand/castle}
{WALL_TRANSITION2 Kd,Kv,Ko* C*,Ke* (!,C*,K*) castle/sand/keep-castle}
{WALL_TRANSITION Kd,Kv,Ko* (!,Kd) castle/sand/keep}
{WALL_TRANSITION Kd (!,Kd) castle/sand/keep}
#
# Human castle
@ -508,13 +508,13 @@
{WALL_TRANSITION Ch,Cv,Co,Cd (!,C*,K*) castle/castle}
{WALL_TRANSITION2 Kh,Kv,Ko,Kd C*,Ke* (!,C*,K*) castle/keep-castle}
{WALL_TRANSITION Kh,Kv,Ko,Kd (!,Kh*) castle/keep}
{WALL_TRANSITION Kh (!,Kh*) castle/keep}
# Snowy castle
{WALL_TRANSITION (Ch,Cha,Coa) (!,C*,K*) castle/snowy/castle}
{WALL_TRANSITION2 (Kh,Kha,Koa) C*,Ke* (!,C*,K*) castle/snowy/keep-castle}
{WALL_TRANSITION (Kh,Kha,Koa) (!,Kh*) castle/snowy/keep}
{WALL_TRANSITION Ch,Cha,Coa (!,C*,K*) castle/snowy/castle}
{WALL_TRANSITION2 Kh,Kha,Koa C*,Ke* (!,C*,K*) castle/snowy/keep-castle}
{WALL_TRANSITION Kh,Kha (!,Kh*) castle/snowy/keep}
# sunken/swamp ruins (submerged part)
@ -543,11 +543,11 @@
# There are no more human castles left, so we can just use Ch* here, which makes sure
# that all ruin<->non-ruin transitions are drawn
#17% 17% 17% 17% 17% 17%
{WALL_TRANSITION_P !,Ce*,!,C* (!,C*,K*) 17 castle/ruin5}
{WALL_TRANSITION_P !,Ce*,!,C* (!,C*,K*) 20 castle/ruin4}
{WALL_TRANSITION_P !,Ce*,!,C* (!,C*,K*) 25 castle/ruin3}
{WALL_TRANSITION_P !,Ce*,!,C* (!,C*,K*) 33 castle/ruin2}
{WALL_TRANSITION_P !,Ce*,!,C* (!,C*,K*) 50 castle/ruin1}
{WALL_TRANSITION_P Ch* (!,C*,K*) 17 castle/ruin5}
{WALL_TRANSITION_P Ch* (!,C*,K*) 20 castle/ruin4}
{WALL_TRANSITION_P Ch* (!,C*,K*) 25 castle/ruin3}
{WALL_TRANSITION_P Ch* (!,C*,K*) 33 castle/ruin2}
{WALL_TRANSITION_P Ch* (!,C*,K*) 50 castle/ruin1}
{WALL_TRANSITION !,Ce*,!,C* (!,C*,K*) castle/castle}
{WALL_TRANSITION2_P (Khr,Khw,Khs) (C*) (!,Ch*,Kh*) 75 castle/ruinkeep1-castle}
@ -567,14 +567,14 @@
{TRANSITION_COMPLETE_L Ch,Chr,Cha (!,Ch,Chr,Cha,Q*) -300 flat/road}
{TRANSITION_COMPLETE_LF Cd,Kd Ce*,Ke* -360 transition3 flat/desert-road}
{TRANSITION_COMPLETE_L Ce*,Ke* Cd,Kd -360 flat/desert-road}
{TRANSITION_COMPLETE_LF Cd Ce*,Ke*,Co*,Cv,Chw,Chs,Khw,Khs -360 inside flat/desert-road}
{TRANSITION_COMPLETE_L Ce*,Ke*,Co*,Cv,Chw,Chs,Khw,Khs Cd,Kd -360 flat/desert-road}
{TRANSITION_COMPLETE_LF (!,Ce*,Ke*,Q*) Ce*,Ke* -374 transition3 flat/dirt}
{TRANSITION_COMPLETE_LF (!,Ce*,Ke*,Q*) Ce*,Ke* -374 inside flat/dirt}
{TRANSITION_COMPLETE_L Ce*,Ke* (!,Ce*,Ke*,Q*) -378 flat/dirt}
{TRANSITION_COMPLETE_LF (!,Co*,Ko*,Q*) Co*,Ko* -384 transition3 flat/dirt-dark}
{TRANSITION_COMPLETE_L Co*,Ko* (!,Co*,Ko*,Q*) -388 flat/dirt-dark}
{TRANSITION_COMPLETE_LF (!,Co*,Q*) Co* -384 inside flat/dirt-dark}
{TRANSITION_COMPLETE_L Co* (!,Co*,Q*) -388 flat/dirt-dark}
#
@ -656,7 +656,7 @@
{TRANSITION_COMPLETE_L Qlf (!,Ql,Qlf,Qx*,X*,_off^_usr) -210 unwalkable/lava}
{TRANSITION_COMPLETE_L (Uu,Uh) (!,Uu,Uh,W*,Ai) -220 cave/floor}
{TRANSITION_COMPLETE_L Ur (!,Ur,W*,Ai) -221 cave/floor}
#{TRANSITION_COMPLETE_LF (!,Ur) Ur -222 transition2 cave/floor}
#{TRANSITION_COMPLETE_LF (!,Ur) Ur -222 inside cave/floor}
{TRANSITION_COMPLETE_L (Uue) (!,Uue,W*,Ai) -223 cave/earthy-floor}
{TRANSITION_COMPLETE_L Urb (!,Urb,W*,Ai) -224 cave/flagstones-dark}
@ -668,27 +668,27 @@
# Crazy Test Terrains
#{TRANSITION_COMPLETE_LF Jm Jb,Jy -240 transition3 test/m} # inside
#{TRANSITION_COMPLETE_LF Jy Jb,Jm -241 transition3 test/y} # inside
#{TRANSITION_COMPLETE_LF Jb Jy,Jm -242 transition3 test/b} # inside
#{TRANSITION_COMPLETE_LF Jm Jb,Jy -240 inside test/m} # inside
#{TRANSITION_COMPLETE_LF Jy Jb,Jm -241 inside test/y} # inside
#{TRANSITION_COMPLETE_LF Jb Jy,Jm -242 inside test/b} # inside
#{TRANSITION_COMPLETE_L Jb (!,Jb) -343 test/b} # outside
#{TRANSITION_COMPLETE_L Jy (!,Jy) -344 test/y} # outside
#{TRANSITION_COMPLETE_L Jm (!,Jm) -345 test/m} # outside
{TRANSITION_COMPLETE_LF *^Efm G* -240 transition4 embellishments/flowers-mixed} # inside
{TRANSITION_COMPLETE_LF *^Efm G* -240 transition4 embellishments/flowers-mixed}
# New Super-cool gradual Grass blending
{TRANSITION_COMPLETE_LF Gs Gg,Gd,Gll,Re,Rb,Rd,Rp -250 transition3 grass/semi-dry-long} # inside
{TRANSITION_COMPLETE_LF Gg Gs,Gd,Gll,Re,Rb,Rd,Rp -251 transition3 grass/green-long} # inside
{TRANSITION_COMPLETE_LF Gd Gg,Gs,Gll,Re,Rb,Rd,Rp -252 transition3 grass/dry-long} # inside
{TRANSITION_COMPLETE_LF Gll Gg,Gs,Gd,Re,Rb,Rd,Rp -253 transition3 grass/leaf-litter-long} # inside
{TRANSITION_COMPLETE_LF Gs Gg,Gd,Gll,Re,Rb,Rd,Rp -250 inside grass/semi-dry-long}
{TRANSITION_COMPLETE_LF Gg Gs,Gd,Gll,Re,Rb,Rd,Rp -251 inside grass/green-long}
{TRANSITION_COMPLETE_LF Gd Gg,Gs,Gll,Re,Rb,Rd,Rp -252 inside grass/dry-long}
{TRANSITION_COMPLETE_LF Gll Gg,Gs,Gd,Re,Rb,Rd,Rp -253 inside grass/leaf-litter-long}
{TRANSITION_COMPLETE_L Gll Gg,Gs,Gd -254 grass/leaf-litter-long} # outside
{TRANSITION_COMPLETE_L Gd Gg,Gs,Gll -255 grass/dry-long} # outside
{TRANSITION_COMPLETE_L Gg Gs,Gd,Gll -256 grass/green-long} # outside
{TRANSITION_COMPLETE_L Gs Gg,Gd,Gll -257 grass/semi-dry-long} # outside
{TRANSITION_COMPLETE_L Gll Gg,Gs,Gd -254 grass/leaf-litter-long}
{TRANSITION_COMPLETE_L Gd Gg,Gs,Gll -255 grass/dry-long}
{TRANSITION_COMPLETE_L Gg Gs,Gd,Gll -256 grass/green-long}
{TRANSITION_COMPLETE_L Gs Gg,Gd,Gll -257 grass/semi-dry-long}
{TRANSITION_COMPLETE_L Gs (Rr*,D*,Aa) -260 grass/semi-dry-medium}
@ -712,8 +712,6 @@
{TRANSITION_COMPLETE_L (W*,Ai) (!,Rb,!,R*,Gll) -298 flat/bank}
#{TRANSITION_COMPLETE_LF (!,Re) (Rr,Re,Rd,Rp) -297 transition3 flat/dirt}
{TRANSITION_COMPLETE_L Rr (!,Rr,W*,Ai) -300 flat/road}
{TRANSITION_COMPLETE_L Rrc (!,Rr,W*,Ai) -301 flat/road-clean}
{TRANSITION_COMPLETE_L Rp (!,Rp,W*,Ai) -310 flat/stone-path}
@ -728,13 +726,13 @@
{TRANSITION_COMPLETE_L Dd R* -361 sand/desert}
# Dirt transitions are double sided
{TRANSITION_COMPLETE_LF (!,Rd,Rr*,Hh*,M*,Q*) Rd -370 transition3 flat/desert-road}
{TRANSITION_COMPLETE_LF (!,Rd,Rr*,Hh*,M*,Q*) Rd -370 inside flat/desert-road}
{TRANSITION_COMPLETE_L Rd (!,Rd,,W*,Ai,Q*) -371 flat/desert-road}
{TRANSITION_COMPLETE_LF (!,Re,Rr*,Hh*,M*,Q*) Re -379 transition3 flat/dirt}
{TRANSITION_COMPLETE_LF (!,Re,Rr*,Hh*,M*,Q*) Re -379 inside flat/dirt}
{TRANSITION_COMPLETE_L Re (!,Re,Rr*,W*,Ai,Q*) -380 flat/dirt}
{TRANSITION_COMPLETE_LF (!,Rb,Rr*,W*,Ai,Q*) Rb -384 transition3 flat/dirt-dark}
{TRANSITION_COMPLETE_LF (!,Rb,Rr*,W*,Ai,Q*) Rb -384 inside flat/dirt-dark}
{TRANSITION_COMPLETE_L Rb (!,Rb,Rr*,W*,Ai,Q*) -388 flat/dirt-dark}
@ -820,8 +818,8 @@
#{TRANSITION_COMPLETE_L Chw (!,Chw,Chr) -570 water/coast}
# chasm to abyss ecetera transition
{TRANSITION_COMPLETE_LF Qxu,Qxe Qxua,Xv,_off^_usr -600 transition2 chasm/depths}
{TRANSITION_COMPLETE_LF Qxua Xv,_off^_usr -601 transition2 chasm/abyss-base}
{TRANSITION_COMPLETE_LF Qxu,Qxe Qxua,Xv,_off^_usr -600 depths chasm/depths}
{TRANSITION_COMPLETE_LF Qxua Xv,_off^_usr -601 depths chasm/abyss-base}
# ugly fillups for missing transitions
{TRANSITION_COMPLETE_L Ai Xv,_off^_usr -800 frozen/ice}