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

Added two new macros to internal-generic.cfg...

Browse source 
...for creating IPF-capable animated water terrains and transitions,
changed all water transitions to use them and added two new
colour-shifted water variant terrains.
This commit is contained in:
Lari Nieminen 2010-09-19 10:28:56 +00:00
parent be3bb4bbfc
commit 2bb50e539b
3 changed files with 98 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -437,12 +437,14 @@
# experimental macro using 1-hex rule to optimize water animation
{GENERIC_SINGLEHEX_PLFB (Wo) 100 -1000 base ANIMATION_15_SLOW water/ocean}
{GENERIC_SINGLEHEX_PLFB (Wot) 100 -1000 base ANIMATION_15_SLOW water/ocean-tropical}
{GENERIC_SINGLEHEX_PLFB (Ww,Wwr) 100 -1000 base ANIMATION_15 water/coast}
{GENERIC_SINGLEHEX_PLFB (Ww,Wwr) 100 -1000 base ANIMATION_15 water/coast}
{ANIMATED_WATER_15 (Wwm) "~CS(45,-5,-50)" 110 water/coast-tropical}
{ANIMATED_WATER_15 (Wwg) "~CS(70,-15,-85)" 110 water/coast-tropical}
# water animation under ford is not really visible, so we disable it for now
{GENERIC_SINGLEHEX_PLFB (Wwf) 100 -1000 base ANIMATION_01 water/coast}
{GENERIC_SINGLEHEX_PLFB (Wwt) 100 -1000 base ANIMATION_15 water/coast-tropical}
{GENERIC_SINGLEHEX_PLFB (Wwf) 100 -1000 base ANIMATION_01 water/coast}
{GENERIC_SINGLEHEX_PLFB (Wwt) 100 -1000 base ANIMATION_15 water/coast-tropical}
# water animation under swamp is not really visible, so we disable it for now
{GENERIC_SINGLEHEX_PLFB (S*) 100 -1000 base ANIMATION_01 swamp/water}
{GENERIC_SINGLEHEX_PLFB (S*) 100 -1000 base ANIMATION_01 swamp/water}
#temporary disabled normal multihex macro
#{TERRAIN_BASE_B Wo ANIMATION_15 water/ocean}
@ -783,19 +785,20 @@
# to reanimate them comment these lines out, and un-comment the following chunk
{TRANSITION_COMPLETE_LF Dd,Ds,Hd (!,D*,Hd,!,W*,S*) -550 double sand/sand-to-water}
{TRANSITION_COMPLETE_LFB Wo (!,Wo,!,W*,S*,D*,Hd) -551 double ANIMATION_01 water/ocean-blend}
{TRANSITION_COMPLETE_LFB Wot (!,Wot,!,W*,S*,D*,Hd) -551 double ANIMATION_01 water/ocean-tropical-blend}
{TRANSITION_COMPLETE_LFB Ww,Wwf,Wwr (!,Ww,Wwf,Wwr,!,W*,S*,D*,Hd) -552 double ANIMATION_01 water/coast-long}
{TRANSITION_COMPLETE_LFB Wwt (!,Wwt,!,W*,S*,D*,Hd) -553 double ANIMATION_01 water/coast-tropical-long}
{TRANSITION_COMPLETE_LFB Ss (!,Ss,!,W*,D*,Hd) -554 double ANIMATION_01 swamp/water-long}
{TRANSITION_COMPLETE_LB Ss (!,Ss,!,W*,D*,Hd) -555 ANIMATION_01 swamp/water-long}
{TRANSITION_COMPLETE_LB Wwt (!,Wwt,!,W*,S*,D*,Hd) -556 ANIMATION_01 water/coast-tropical-long}
{TRANSITION_COMPLETE_LB Ww,Wwf,Wwr (!,Ww,Wwf,Wwr,!,W*,S*,D*,Hd) -557 ANIMATION_01 water/coast-long}
{TRANSITION_COMPLETE_LB Wot (!,Wot,!,W*,S*,D*,Hd) -558 ANIMATION_01 water/ocean-tropical-blend}
{TRANSITION_COMPLETE_LB Wo (!,Wo,!,W*,S*,D*,Hd) -558 ANIMATION_01 water/ocean-blend}
{TRANSITION_COMPLETE_L Dd,Ds,Hd (!,D*,Hd,!,W*,Ss) -559 sand/sand-to-water}
{TRANSITION_COMPLETE_LF Dd,Ds,Hd (!,D*,Hd,!,W*,S*) -550 double sand/sand-to-water}
{ANIMATED_WATER_15_TRANSITION Wo (!,Wo,!,W*,S*,D*,Hd) -551 () 110 water/ocean-blend}
{ANIMATED_WATER_15_TRANSITION Wot (!,Wot,!,W*,S*,D*,Hd) -551 () 110 water/ocean-tropical-blend}
{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr (!,Ww,Wwf,Wwr,!,W*,S*,D*,Hd) -552 () 110 water/coast-long}
{ANIMATED_WATER_15_TRANSITION Wwm (!,Wwm,!,W*,S*,D*,Hd) -552 "~CS(45,-5,-50)" 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Wwg (!,Wwg,!,W*,S*,D*,Hd) -552 "~CS(70,-15,-85)" 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Wwt (!,Wwt,!,W*,S*,D*,Hd) -553 () 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Ss (!,Ss,!,W*,D*,Hd) -554 () 110 swamp/water-long}
{ANIMATED_WATER_15_TRANSITION Ss (!,Ss,!,W*,D*,Hd) -555 () 110 swamp/water-long}
{ANIMATED_WATER_15_TRANSITION Wwt (!,Wwt,!,W*,S*,D*,Hd) -556 () 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr (!,Ww,Wwf,Wwr,!,W*,S*,D*,Hd) -557 () 110 water/coast-long}
{ANIMATED_WATER_15_TRANSITION Wot (!,Wot,!,W*,S*,D*,Hd) -558 () 110 water/ocean-tropical-blend}
{ANIMATED_WATER_15_TRANSITION Wo (!,Wo,!,W*,S*,D*,Hd) -558 () 110 water/ocean-blend}
{TRANSITION_COMPLETE_L Dd,Ds,Hd (!,D*,Hd,!,W*,Ss) -559 sand/sand-to-water}
# {TRANSITION_COMPLETE_LF Dd,Ds (!,D*,!,W*,S*) -550 transition3 sand/sand-to-water}
# {TRANSITION_COMPLETE_LFB Wo (!,Wo,!,W*,S*,D*) -551 transition3 ANIMATION_15_SLOW water/ocean-blend}

56
data/core/terrain-graphics/internal-generic.cfg
View file

@ -344,3 +344,59 @@
{GENERIC_RESTRICTED3_N_SE_SW_PLFB ({TERRAIN}) ({ADJACENT}) {PROB} {LAYER} {FLAG} {BUILDER} {IMAGESTEM} {ROTATION}}
#enddef
# Simplified macro for defining ImagePathFunction-using variations of water
# terrains. Assumes 15 frames, sets flag to "base" and layer to "-1000".
#define ANIMATED_WATER_15 TERRAIN IPF TIME IMAGESTEM
[terrain_graphics]
map="
, *
* , *
, 1
* , *
, *"
[tile]
pos=1
type={TERRAIN}
set_no_flag=base
[/tile]
[image]
name={IMAGESTEM}-A01.png{IPF}:{TIME},{IMAGESTEM}-A02.png{IPF}:{TIME},{IMAGESTEM}-A03.png{IPF}:{TIME},{IMAGESTEM}-A04.png{IPF}:{TIME},{IMAGESTEM}-A05.png{IPF}:{TIME},{IMAGESTEM}-A06.png{IPF}:{TIME},{IMAGESTEM}-A07.png{IPF}:{TIME},{IMAGESTEM}-A08.png{IPF}:{TIME},{IMAGESTEM}-A09.png{IPF}:{TIME},{IMAGESTEM}-A10.png{IPF}:{TIME},{IMAGESTEM}-A11.png{IPF}:{TIME},{IMAGESTEM}-A12.png{IPF}:{TIME},{IMAGESTEM}-A13.png{IPF}:{TIME},{IMAGESTEM}-A14.png{IPF}:{TIME},{IMAGESTEM}-A15.png{IPF}:{TIME}
layer=-1000
base=90,144
center=90,144
[/image]
[/terrain_graphics]
#enddef
# Simplified macro for defining ImagePathFunction-using water transitions.
# Note: the animations are disabled for now.
#define ANIMATED_WATER_15_TRANSITION TERRAIN ADJACENT LAYER IPF TIME IMAGESTEM
[terrain_graphics]
map="
, 2
* , *
, 1
* , *
, *"
[tile]
pos=1
type={ADJACENT}
set_no_flag=transition-@R0
[/tile]
[tile]
pos=2
type={TERRAIN}
[/tile]
rotations=n,ne,se,s,sw,nw
[image]
name={IMAGESTEM}-A01-@R0.png{IPF}
#name={IMAGESTEM}-A01-@R0.png{IPF}:{TIME}#,{IMAGESTEM}-A02-@R0.png{IPF}:{TIME},{IMAGESTEM}-A03-@R0.png{IPF}:{TIME},{IMAGESTEM}-A04-@R0.png{IPF}:{TIME},{IMAGESTEM}-A05-@R0.png{IPF}:{TIME},{IMAGESTEM}-A06-@R0.png{IPF}:{TIME},{IMAGESTEM}-A07-@R0.png{IPF}:{TIME},{IMAGESTEM}-A08-@R0.png{IPF}:{TIME},{IMAGESTEM}-A09-@R0.png{IPF}:{TIME},{IMAGESTEM}-A10-@R0.png{IPF}:{TIME},{IMAGESTEM}-A11-@R0.png{IPF}:{TIME},{IMAGESTEM}-A12-@R0.png{IPF}:{TIME},{IMAGESTEM}-A13-@R0.png{IPF}:{TIME},{IMAGESTEM}-A14-@R0.png{IPF}:{TIME},{IMAGESTEM}-A15-@R0.png{IPF}:{TIME}
layer={LAYER}
center=90,144
[/image]
[/terrain_graphics]
#enddef

22
data/core/terrain.cfg
View file

@ -43,6 +43,28 @@
editor_group=water
[/terrain_type]
[terrain_type]
symbol_image=water/coast-tropical
id=medium_tropical_water
# name= _ "Medium Shallow Water"
# editor_name= _ "Medium Tropical Shallow Water"
string=Wwm
aliasof=Ww
submerge=0.4
editor_group=water
[/terrain_type]
[terrain_type]
symbol_image=water/coast-tropical
id=gray_tropical_water
# name= _ "Gray Tropical Shallow Water"
# editor_name= _ "Gray Tropical Shallow Water"
string=Wwg
aliasof=Ww
submerge=0.4
editor_group=water
[/terrain_type]
[terrain_type]
symbol_image=water/coast-tropical
id=tropical_water