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

Fixed river ford transition glitches

Browse source 
This is a semi-hacky backport from how the transition works in 1.13.
This commit is contained in:
ln-zookeeper 2016-05-08 01:43:53 +03:00
parent 5b55d73192
commit f96fb2a1f8
2 changed files with 146 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -1,6 +1,8 @@
Version 1.12.5+dev:
* Language and i18n:
* Updated translations: Galician, Italian, RACV, Russian, Slovak, Swedish
* Terrains:
* Fixed glitches of river ford transitions.
* User interface:
* GUI1 comboboxes now use the thinner menu frame style.
* Miscellaneous and bug fixes:

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

@ -803,7 +803,150 @@
# Water Transitions below everything else
{TRANSITION_COMPLETE_LF Wwf (!,Wwf,!,W*,Sm,Xv,_off^_usr) -515 transition2 water/ford}
#define NICER_FORD_TRANSITION TERRAINLIST ADJACENT LAYER IMAGESTEM MASKSTEM MASKIPF
[terrain_graphics]
map="
, 2
2, 2
, 1
2, 2
, 2"
[tile]
pos=1
type={ADJACENT}
set_no_flag=ford-@R0,ford-@R1,ford-@R2,ford-@R3,ford-@R4,ford-@R5
[image]
name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-@R0.png~BLIT(terrain/{MASKSTEM}-@R1.png)~BLIT(terrain/{MASKSTEM}-@R2.png)~BLIT(terrain/{MASKSTEM}-@R3.png)~BLIT(terrain/{MASKSTEM}-@R4.png)~BLIT(terrain/{MASKSTEM}-@R5.png){MASKIPF})
layer={LAYER}
[/image]
[/tile]
[tile]
pos=2
type={TERRAINLIST}
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., 2
, 1
2, 2
, 2"
[tile]
pos=1
type={ADJACENT}
set_no_flag=ford-@R0,ford-@R1,ford-@R2,ford-@R3,ford-@R4
[image]
name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-@R0.png~BLIT(terrain/{MASKSTEM}-@R1.png)~BLIT(terrain/{MASKSTEM}-@R2.png)~BLIT(terrain/{MASKSTEM}-@R3.png)~BLIT(terrain/{MASKSTEM}-@R4.png){MASKIPF})
layer={LAYER}
[/image]
[/tile]
[tile]
pos=2
type={TERRAINLIST}
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., 2
, 1
., 2
, 2"
[tile]
pos=1
type={ADJACENT}
set_no_flag=ford-@R0,ford-@R1,ford-@R2,ford-@R3
[image]
name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-@R0.png~BLIT(terrain/{MASKSTEM}-@R1.png)~BLIT(terrain/{MASKSTEM}-@R2.png)~BLIT(terrain/{MASKSTEM}-@R3.png){MASKIPF})
layer={LAYER}
[/image]
[/tile]
[tile]
pos=2
type={TERRAINLIST}
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., 2
, 1
., 2
, ."
[tile]
pos=1
type={ADJACENT}
set_no_flag=ford-@R0,ford-@R1,ford-@R2
[image]
name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-@R0.png~BLIT(terrain/{MASKSTEM}-@R1.png)~BLIT(terrain/{MASKSTEM}-@R2.png){MASKIPF})
layer={LAYER}
[/image]
[/tile]
[tile]
pos=2
type={TERRAINLIST}
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., 2
, 1
., .
, ."
[tile]
pos=1
type={ADJACENT}
set_no_flag=ford-@R0,ford-@R1
[image]
name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-@R0.png~BLIT(terrain/{MASKSTEM}-@R1.png){MASKIPF})
layer={LAYER}
[/image]
[/tile]
[tile]
pos=2
type={TERRAINLIST}
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., .
, 1
., .
, ."
[tile]
pos=1
type={ADJACENT}
set_no_flag=ford-@R0
[image]
name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-@R0.png{MASKIPF})
layer={LAYER}
[/image]
[/tile]
[tile]
pos=2
type={TERRAINLIST}
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
#enddef
{NICER_FORD_TRANSITION Wwf (!,Wwf,!,W*,Sm,Xv,_off^_usr) -515 water/ford water/ocean-long-A01 "~O(0.48)"}
#undef NICER_FORD_TRANSITION
# Double-sided animated transitions for water-to-water and sand-to-water
{TRANSITION_COMPLETE_LF Sm (!,Sm,!,W*,D*) -556 transition3 swamp/mud-long}