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

Added an optional argument to let NEW:TRANSITION be more widely used

Browse source 
By adding an optional FLAG argument, many of the existing TRANSITION_COMPLETE_LF calls used to place normal transitions with special flags were possible to turn into NEW:TRANSITION calls.
This commit is contained in:
ln-zookeeper 2016-12-04 03:00:44 +02:00
parent 57f5ffe995
commit 8155450cfc
2 changed files with 49 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -698,13 +698,13 @@
{NEW:TRANSITION Ch,Chr,Cha !,Ch,Chr,Cha,Ket,!,Ke*,C* -300 flat/road}
{TRANSITION_COMPLETE_LF !,Ket,Cd*,!,C*,Ke* Cd* -360 inside flat/desert-road}
{NEW:TRANSITION !,Ket,Cd*,!,C*,Ke* Cd* -360 flat/desert-road FLAG=inside}
{NEW:TRANSITION Cd* !,Ket,Cd*,!,C*,Ke* -360 flat/desert-road}
{TRANSITION_COMPLETE_LF !,Ce*,Ke*,!,C* !,Ket,!,Ce*,Ke* -370 inside flat/dirt}
{NEW:TRANSITION !,Ce*,Ke*,!,C* !,Ket,!,Ce*,Ke* -370 flat/dirt FLAG=inside}
{NEW:TRANSITION !,Ket,!,Ce*,Ke* !,Ce*,Ke*,!,C* -370 flat/dirt}
{TRANSITION_COMPLETE_LF !,Ket,Co*,!,C*,Ke* Co* -380 inside flat/dirt-dark}
{NEW:TRANSITION !,Ket,Co*,!,C*,Ke* Co* -380 flat/dirt-dark FLAG=inside}
{NEW:TRANSITION Co* !,Ket,Co*,!,C*,Ke* -380 flat/dirt-dark}
@ -786,17 +786,17 @@
# > B A S E T R A N S I T I O N S. <
#
# The order mostly controls which overlap which, some
# TRANSITION_COMPLETE_Ls and varying layer numbers are used to make some
# special transitions to layer in more complex ways.
# Default layer ist -500, so anything layering above should be higher.
# The order mostly controls which overlap which, some special flags and varying
# layer numbers are used to make some special transitions to layer in more
# complex ways.
# Default layer is -500, so anything layering above should be higher.
{NEW:TRANSITION (Md,Mv) (!,Md,Hhd,Mv,W*,S*) -166 mountains/dry}
# Special mountain to dry/desert terrain trans
{TRANSITION_COMPLETE_LF (Hd,Hhd,Rb,Re,Rd,D*,Gd,Ha,A*,U*,Ql*) Mm 0 inside mountains/blend-from-dry}
{TRANSITION_COMPLETE_LF (Hd,Hhd,Rb,Re,Rd,D*,Gd,U*,Ql*) Ms 0 inside mountains/blend-from-dry}
{NEW:TRANSITION (Hd,Hhd,Rb,Re,Rd,D*,Gd,Ha,A*,U*,Ql*) Mm 0 mountains/blend-from-dry FLAG=inside}
{NEW:TRANSITION (Hd,Hhd,Rb,Re,Rd,D*,Gd,U*,Ql*) Ms 0 mountains/blend-from-dry FLAG=inside}
{NEW:TRANSITION (Mm) (Hd,Hhd,Rb,Re,Rd,D*,Gd,Ha,A*,U*,Ql*) -166 hills/dry}
{NEW:TRANSITION (Ms) (Hd,Hhd,Rb,Re,Rd,D*,Gd,U*,Ql*) -166 hills/dry}
@ -812,7 +812,7 @@
{NEW:TRANSITION (Uu,Uh) (!,Uu,Uh,W*,Ai) -220 cave/floor}
{NEW:TRANSITION (Uue) (!,Uue,W*,Ai) -221 cave/earthy-floor}
{TRANSITION_COMPLETE_LF Ai,W*,S* Ur -223 inside cave/floor}
{NEW:TRANSITION Ai,W*,S* Ur -223 cave/floor FLAG=inside}
{NEW:TRANSITION Urb (!,Urb) -224 cave/flagstones-dark}
{NEW:TRANSITION Ss (!,Ss,H*,M*,A*,Chs,K*,Q*) -230 swamp/water}
@ -820,14 +820,14 @@
#{NEW:TRANSITION Iwr G*,R*,W*,S*,D*,A*,Ur -230 interior/wood-regular}
# need to move this up higher to get over chasm walls
{TRANSITION_COMPLETE_LF *^Efm G* -240 transition4 embellishments/flowers-mixed}
{NEW:TRANSITION *^Efm G* -240 embellishments/flowers-mixed FLAG=transition4}
# New Super-cool gradual Grass blending
{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}
{NEW:TRANSITION Gs Gg,Gd,Gll,Re,Rb,Rd,Rp -250 grass/semi-dry-long FLAG=inside}
{NEW:TRANSITION Gg Gs,Gd,Gll,Re,Rb,Rd,Rp -251 grass/green-long FLAG=inside}
{NEW:TRANSITION Gd Gg,Gs,Gll,Re,Rb,Rd,Rp -252 grass/dry-long FLAG=inside}
{NEW:TRANSITION Gll Gg,Gs,Gd,Re,Rb,Rd,Rp -253 grass/leaf-litter-long FLAG=inside}
{NEW:TRANSITION Gll Gg,Gs,Gd -254 grass/leaf-litter-long}
{NEW:TRANSITION Gd Gg,Gs,Gll -255 grass/dry-long}
@ -865,37 +865,37 @@
{NEW:TRANSITION Rrc (!,Rrc,W*,Ai,Q*) -321 flat/road-clean}
{NEW:TRANSITION Rp (!,Rp,W*,Ai,Q*) -322 flat/stone-path}
{TRANSITION_COMPLETE_LF *^Gvs (!,*^Gvs,C*,K*,*^F*,M*,H*,W*,Q*) -330 transition2 embellishments/farm-veg-spring}
{TRANSITION_COMPLETE_LF *^Emf (!,*^Emf,C*,K*,*^F*,M*,H*,W*,Q*) -330 transition2 embellishments/mushroom-farm}
{NEW:TRANSITION *^Gvs (!,*^Gvs,C*,K*,*^F*,M*,H*,W*,Q*) -330 embellishments/farm-veg-spring FLAG=transition2}
{NEW:TRANSITION *^Emf (!,*^Emf,C*,K*,*^F*,M*,H*,W*,Q*) -330 embellishments/mushroom-farm FLAG=transition2}
{NEW:TRANSITION Ds (!,Ds,W*,S*,Ai,Q*) -510 sand/beach}
{NEW:TRANSITION Dd (!,R*,Dd,W*,S*,Ai,Q*) -510 sand/desert}
# Dirt transitions are double sided
{TRANSITION_COMPLETE_LF (!,Rd,Rr*,Hh*,M*,Q*,D*) Rd -370 inside flat/desert-road}
{NEW:TRANSITION (!,Rd,Rr*,Hh*,M*,Q*,D*) Rd -370 flat/desert-road FLAG=inside}
{NEW:TRANSITION Rd (!,Rd,W*,Ai,Q*,D*) -371 flat/desert-road}
{TRANSITION_COMPLETE_LF (!,Re,Rr*,Hh*,M*,Q*,D*) Re -379 inside flat/dirt}
{NEW:TRANSITION (!,Re,Rr*,Hh*,M*,Q*,D*) Re -379 flat/dirt FLAG=inside}
{NEW:TRANSITION Re (!,Re,Rr*,W*,Ai,Q*,D*) -380 flat/dirt}
{TRANSITION_COMPLETE_LF (!,Rb,Rr*,W*,Ai,Q*,D*) Rb -384 inside flat/dirt-dark}
{NEW:TRANSITION (!,Rb,Rr*,W*,Ai,Q*,D*) Rb -384 flat/dirt-dark FLAG=inside}
{NEW:TRANSITION Rb (!,Rb,Rr*,W*,Ai,Q*,D*) -388 flat/dirt-dark}
# This complicated part keeps the submerged part of ice or a bank from drawing over the above-water parts of banks or ice
{TRANSITION_COMPLETE_LF (!,Chw,Khw,Khs,!,C*,K*) (Ai,W*) -480 non_submerged castle/castle-to-ice}
{NEW:TRANSITION (!,Chw,Khw,Khs,!,C*,K*) (Ai,W*) -480 castle/castle-to-ice FLAG=non_submerged}
{TRANSITION_COMPLETE_LF (Mm,Hh) Ai,W*,S* -482 non_submerged hills/regular-to-water}
{TRANSITION_COMPLETE_LF (Md,Hhd,Mv) Ai,W*,S* -482 non_submerged hills/dry-to-water}
{TRANSITION_COMPLETE_LF (R*,G*,Uue) Ai,W* -483 non_submerged flat/bank-to-ice}
{TRANSITION_COMPLETE_LF (U*,Xu*,Ql*) Ai,W*,S* -486 non_submerged cave/bank}
{NEW:TRANSITION (Mm,Hh) Ai,W*,S* -482 hills/regular-to-water FLAG=non_submerged}
{NEW:TRANSITION (Md,Hhd,Mv) Ai,W*,S* -482 hills/dry-to-water FLAG=non_submerged}
{NEW:TRANSITION (R*,G*,Uue) Ai,W* -483 flat/bank-to-ice FLAG=non_submerged}
{NEW:TRANSITION (U*,Xu*,Ql*) Ai,W*,S* -486 cave/bank FLAG=non_submerged}
{TRANSITION_COMPLETE_LF Aa,Ai (D*) -485 non_submerged frozen/ice}
{TRANSITION_COMPLETE_LF Aa,Ha,Ms,Ai (W*,S*) -485 non_submerged frozen/ice}
{TRANSITION_COMPLETE_LF Aa,Ha,Ms,Ai (W*,S*) -505 submerged frozen/ice-to-water}
{NEW:TRANSITION Aa,Ai (D*) -485 frozen/ice FLAG=non_submerged}
{NEW:TRANSITION Aa,Ha,Ms,Ai (W*,S*) -485 frozen/ice FLAG=non_submerged}
{NEW:TRANSITION Aa,Ha,Ms,Ai (W*,S*) -505 frozen/ice-to-water FLAG=submerged}
# we just draw this again (invisible below the base layer) to set the transition flags
{NEW:TRANSITION Aa,Ha,Ms,Ai (W*,Ss) -1001 frozen/ice-to-water}
@ -910,7 +910,7 @@
{NEW:GENERIC_CORNER_TRANSITION Wwf (!,Wwf,!,W*,Sm) -515 water/ford masks/long "~O(0.48)"}
# Double-sided animated transitions for water-to-water and sand-to-water
{TRANSITION_COMPLETE_LF Sm (!,Sm,!,W*,D*) -556 transition3 swamp/mud-long}
{NEW:TRANSITION Sm (!,Sm,!,W*,D*) -556 swamp/mud-long FLAG=transition3}
{NEW:WATER_342_180_TRANSITION Wo* (!,Wo*,!,W*,Sm) -550 "~O(50%)" water/ocean 21}
{NEW:WATER_342_180_TRANSITION Ww* (!,Ww*,!,W*,Sm) -551 "~O(50%)" water/water 17}
@ -930,8 +930,8 @@
{NEW:GENERIC_CORNER_TRANSITION _off^_usr W*,Sm -514 off-map/border masks/long ()}
# chasm to abyss ecetera transition
{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}
{NEW:TRANSITION Qxu,Qxe Qxua,Xv,_off^_usr -600 chasm/depths FLAG=depths}
{NEW:TRANSITION Qxua Xv,_off^_usr -601 chasm/abyss-base FLAG=depths}
# ugly fillups for missing transitions
{TRANSITION_COMPLETE_L Ai Xv,_off^_usr -800 frozen/ice}

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

@ -36,6 +36,10 @@
#enddef
#define NEW:TRANSITION TERRAINLIST ADJACENT LAYER IMAGESTEM
#arg FLAG
transition#endarg
[terrain_graphics]
map="
, 2
@ -46,7 +50,7 @@
[tile]
pos=1
type={ADJACENT}
set_no_flag=transition-@R0,transition-@R1,transition-@R2,transition-@R3
set_no_flag={FLAG}-@R0,{FLAG}-@R1,{FLAG}-@R2,{FLAG}-@R3
[image]
name={IMAGESTEM}-@R0-@R1-@R2-@R3.png
layer={LAYER}
@ -55,22 +59,22 @@
[tile]
pos=2
type={TERRAINLIST}
set_no_flag=transition-@R3
set_no_flag={FLAG}-@R3
[/tile]
[tile]
pos=3
type={TERRAINLIST}
set_no_flag=transition-@R4
set_no_flag={FLAG}-@R4
[/tile]
[tile]
pos=4
type={TERRAINLIST}
set_no_flag=transition-@R5
set_no_flag={FLAG}-@R5
[/tile]
[tile]
pos=5
type={TERRAINLIST}
set_no_flag=transition-@R0
set_no_flag={FLAG}-@R0
[/tile]
rotations=n,ne,se,s,sw,nw
@ -85,7 +89,7 @@
[tile]
pos=1
type={ADJACENT}
set_no_flag=transition-@R0,transition-@R1,transition-@R2
set_no_flag={FLAG}-@R0,{FLAG}-@R1,{FLAG}-@R2
[image]
name={IMAGESTEM}-@R0-@R1-@R2.png
layer={LAYER}
@ -94,17 +98,17 @@
[tile]
pos=2
type={TERRAINLIST}
set_no_flag=transition-@R3
set_no_flag={FLAG}-@R3
[/tile]
[tile]
pos=3
type={TERRAINLIST}
set_no_flag=transition-@R4
set_no_flag={FLAG}-@R4
[/tile]
[tile]
pos=4
type={TERRAINLIST}
set_no_flag=transition-@R5
set_no_flag={FLAG}-@R5
[/tile]
rotations=n,ne,se,s,sw,nw
@ -119,7 +123,7 @@
[tile]
pos=1
type={ADJACENT}
set_no_flag=transition-@R0,transition-@R1
set_no_flag={FLAG}-@R0,{FLAG}-@R1
[image]
name={IMAGESTEM}-@R0-@R1.png
layer={LAYER}
@ -128,12 +132,12 @@
[tile]
pos=2
type={TERRAINLIST}
set_no_flag=transition-@R3
set_no_flag={FLAG}-@R3
[/tile]
[tile]
pos=3
type={TERRAINLIST}
set_no_flag=transition-@R4
set_no_flag={FLAG}-@R4
[/tile]
rotations=n,ne,se,s,sw,nw
@ -148,7 +152,7 @@
[tile]
pos=1
type={ADJACENT}
set_no_flag=transition-@R0
set_no_flag={FLAG}-@R0
[image]
name={IMAGESTEM}-@R0.png
layer={LAYER}
@ -157,7 +161,7 @@
[tile]
pos=2
type={TERRAINLIST}
set_no_flag=transition-@R3
set_no_flag={FLAG}-@R3
[/tile]
rotations=n,ne,se,s,sw,nw