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

added bridges over swamp and over deep water, also moved a few item images.

Browse source
This commit is contained in:
J.W. Bjerk 2007-01-27 21:47:47 +00:00
parent bc1a36b560
commit 72011f59b1
11 changed files with 82 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -33,6 +33,7 @@ Version 1.3-svn:
* item graphic improvements including animate-able campfire.
* terrain
* added peaks to the impassable mountains
* added bridges crossing swamp and deep water
* unit art
* added a recruit animation for Skeleton
* added death animations for Orcish Assassin and Grunt, and Undead Ghoul

46
data/terrain-graphics.cfg
View file

@ -450,11 +450,11 @@
#8% 8% 8% 8% 23% 23% 23%
{TERRAIN_BASE_PROB Ss swampwater-flowers1 8}
{TERRAIN_BASE_PROB Ss swampwater-flowers2 9}
{TERRAIN_BASE_PROB Ss swampwater-plant1 10}
{TERRAIN_BASE_PROB Ss swampwater-plant2 11}
{TERRAIN_BASE_PROB Ss swampwater2 33}
{TERRAIN_BASE_PROB Ss swampwater3 50}
{TERRAIN_BASE Ss swampwater}
{TERRAIN_BASE_PROB (Ss,Bss*) swampwater-plant1 10}
{TERRAIN_BASE_PROB (Ss,Bss*) swampwater-plant2 11}
{TERRAIN_BASE_PROB (Ss,Bss*) swampwater2 33}
{TERRAIN_BASE_PROB (Ss,Bss*) swampwater3 50}
{TERRAIN_BASE (Ss,Bss*) swampwater}
#10% 10% 10% 10% 25% 35%
{TERRAIN_BASE_PROB Ai ice2 10}
@ -470,9 +470,9 @@
{TERRAIN_BASE Wwf ford}
#30% 30% 40%
{TERRAIN_BASE_PROB Wo ocean3 30}
{TERRAIN_BASE_PROB Wo ocean2 43}
{TERRAIN_BASE Wo ocean}
{TERRAIN_BASE_PROB (Wo,Bwo*) ocean3 30}
{TERRAIN_BASE_PROB (Wo,Bwo*) ocean2 43}
{TERRAIN_BASE (Wo,Bwo*) ocean}
#30% 30% 40%
{TERRAIN_BASE_PROB (Ww,Bww*) coast3 30}
@ -490,6 +490,8 @@
#{CANYON X canyon}
#added ruins
{BRIDGE Bww\ Bww| Bww/ (W*,Ss) (C*,K*,_K,F*) bridge}
{BRIDGE Bwo\ Bwo| Bwo/ (W*,Ss) (C*,K*,_K,F*) bridge}
{BRIDGE Bss\ Bss| Bss/ (W*,Ss) (C*,K*,_K,F*) bridge}
#
@ -890,33 +892,33 @@
{TERRAIN_ADJACENT -140 (Mm,Hh,Ha,Ff,Fa,Fet) Chr grassland}
{TERRAIN_ADJACENT_CUSTOM -150 (Mm,Vhm,Xm) (Ha,Aa,Hd,Vud,W*,Bww*,Vwm,Vs,Ss) mountains transition2}
{TERRAIN_ADJACENT_CUSTOM -150 (Mm,Vhm,Xm) (Ha,Aa,Hd,Vud,W*,B*,Vwm,Vs,Ss) mountains transition2}
{TERRAIN_ADJACENT_CUSTOM -151 (Mm,Vhm,Xm) (!,Mm,Vhm,Qxu,Hh,C*,K*,_K,Xu) mountains transition2}
{TERRAIN_ADJACENT -160 Md (!,Md,Qxu) desert-mountains}
{TERRAIN_ADJACENT -170 (Ha,Vhha) (W*,Bww*,Vwm,Vs,Ss) snow-hills-to-water}
{TERRAIN_ADJACENT -170 (Ha,Vhha) (W*,B*,Vwm,Vs,Ss) snow-hills-to-water}
{TERRAIN_ADJACENT -171 (Ha,Vhha) (Hh,Vhh) snow-hills-to-hills}
{TERRAIN_ADJACENT -172 (Ha,Vhha) (!,Ha,Vhha,Qxu) snow-hills}
{TERRAIN_ADJACENT -180 Hd (!,Hd,Qxu) desert-hills}
{TERRAIN_ADJACENT -190 (Hh,Vhh) (!,Hh,Vhh,W*,Bww*,Vwm,Vs,Ss) hills}
{TERRAIN_ADJACENT_CUSTOM -191 (Hh,Vhh) (W*,Bww*,Vwm,Vs,Ss) hills transition2}
{TERRAIN_ADJACENT -190 (Hh,Vhh) (!,Hh,Vhh,W*,B*,Vwm,Vs,Ss) hills}
{TERRAIN_ADJACENT_CUSTOM -191 (Hh,Vhh) (W*,B*,Vwm,Vs,Ss) hills transition2}
{TERRAIN_ADJACENT -200 Uh (!,Uh) cave-hills}
{TERRAIN_ADJACENT -210 (U*,Vu*) (!,U*,Vu*) cave-floor}
{TERRAIN_ADJACENT -220 Ql (!,Ql,Qxu,Xu) lava}
{TERRAIN_ADJACENT -230 (Fa,Aa,Vha,Vea) (W*,Bww*,Vwm,Vs,Ss) snow-to-water}
{TERRAIN_ADJACENT -230 (Fa,Aa,Vha,Vea) (W*,B*,Vwm,Vs,Ss) snow-to-water}
{TERRAIN_ADJACENT -240 (Fa,Aa,Vha,Vea) (!,Fa,Aa,Vha,Vea,Qxu) snow}
{TERRAIN_ADJACENT -260 (Ft,Gs,Vht) (W*,Bww*,Vwm) savanna-to-water}
{TERRAIN_ADJACENT -260 (Ft,Gs,Vht) (W*,B*,Vwm) savanna-to-water}
{TERRAIN_ADJACENT -250 (Ss,Vs,Chs) (!,Ss,Vss,Chs,H*,M*,Vhh*,Vhm,Xm) swampwater}
{TERRAIN_ADJACENT -250 (Ss,Vs,Chs,Bss*) (!,Ss,Vss,Chs,H*,M*,Vhh*,Vhm,Xm,Bss*) swampwater}
# These two work in conjunction with the mountain and hill transitions to create
# a smooth coastline between grassland, hills and mountains.
{TERRAIN_ADJACENT -270 (Ff,Gg,Veg,Vhg,Fet,Qxu) (!,Ff,Gg,Veg,Vhg,Fet,Qxu,Mm,Vhm,Xm,Hh,Vha,W*,Bww*,Vwm,Vss,Ss) grassland}
{TERRAIN_ADJACENT -319 (Ff,Gg,Veg,Vhg,Fet,Qxu,Mm,Vhm,Hh,Vhh,Xm) (W*,Bww*,Vwm) grassland-to-water}
{TERRAIN_ADJACENT -270 (Ff,Gg,Veg,Vhg,Fet,Qxu) (!,Ff,Gg,Veg,Vhg,Fet,Qxu,Mm,Vhm,Xm,Hh,Vha,W*,B*,Vwm,Vss,Ss) grassland}
{TERRAIN_ADJACENT -319 (Ff,Gg,Veg,Vhg,Fet,Qxu,Mm,Vhm,Hh,Vhh,Xm) (W*,B*,Vwm) grassland-to-water}
{TERRAIN_ADJACENT -280 (Gs,Ft,Vht) (!,Gs,Ft,Vht,Qxu) savanna}
{TERRAIN_ADJACENT -290 Rr (!,Rr) road}
@ -932,15 +934,15 @@
# Water Transitions draw below everything else
{SET_ADJACENT_FLAG (Chs,Chr) _K (W*,Bww*,Vwm,Vs) transition2}
{TERRAIN_ADJACENT_CUSTOM -500 (Ch,Ce,Chr,Cud,Kh,Ke,Khr,Kud,_K) (Ai,W*,Bww*,Vwm) castle-to-ice transition3}
{TERRAIN_ADJACENT_CUSTOM -505 (Ch,Ce,Chr,Cud,Kh,Ke,Khr,Kud,_K) (W*,Bww*,Vwm) castle-to-water transition2}
{TERRAIN_ADJACENT_CUSTOM -510 Ai (W*,Bww*,Vwm,Vs,Ss) ice-to-water submerged_part}
{SET_ADJACENT_FLAG (Chs,Chr) _K (W*,B*,Vwm,Vs) transition2}
{TERRAIN_ADJACENT_CUSTOM -500 (Ch,Ce,Chr,Cud,Kh,Ke,Khr,Kud,_K) (Ai,W*,B*,Vwm) castle-to-ice transition3}
{TERRAIN_ADJACENT_CUSTOM -505 (Ch,Ce,Chr,Cud,Kh,Ke,Khr,Kud,_K) (W*,B*,Vwm) castle-to-water transition2}
{TERRAIN_ADJACENT_CUSTOM -510 Ai (W*,B*,Vwm,Vs,Ss) ice-to-water submerged_part}
{TERRAIN_ADJACENT -503 Ai (!,Ai,Qxu) ice}
{TERRAIN_ADJACENT -520 (Ww,Vwm,Bww*) (!,Ww,Vwm,Bww*,Mm) coast}
{TERRAIN_ADJACENT -530 Wwf (!,Wwf) ford}
{TERRAIN_ADJACENT -540 Wo (!,Wo) ocean}
{TERRAIN_ADJACENT -540 (Wo,Bwo*) (!,Wo,Bwo*) ocean}
{TERRAIN_ADJACENT_CUSTOM -550 Chw (Ch,Chr) sunken-ruin transition2}
{TERRAIN_ADJACENT_CUSTOM -550 Chs (Ch,Chr) swampwater transition2}
{TERRAIN_ADJACENT -560 Chw (!,Chw,Chr) coast}

57
data/terrain.cfg
View file

@ -52,6 +52,8 @@ char=S
#
# Bridges
#
# Shallow Water Bridge
[terrain]
symbol_image=bridge-n-s-tile
id=bridge
@ -79,6 +81,61 @@ string=Bww\
aliasof=Gg, Ww
[/terrain]
# Deep Water Bridge
[terrain]
symbol_image=bridge-deep-n-s-tile
id=bridgedeep
name= _ "Bridge"
#char=|
string=Bwo|
aliasof=Gg, Wo
[/terrain]
[terrain]
symbol_image=bridge-deep-ne-sw-tile
id=bridgedeepdiag1
name= _ "Bridge"
#char=/
string=Bwo/
aliasof=Gg, Wo
[/terrain]
[terrain]
symbol_image=bridge-deep-se-nw-tile
id=bridgedeepdiag2
name= _ "Bridge"
#char=\
string=Bwo\
aliasof=Gg, Wo
[/terrain]
# Swamp Water Bridge
[terrain]
symbol_image=bridge-swamp-n-s-tile
id=bridgeswamp
name= _ "Bridge"
#char=|
string=Bss|
aliasof=Gg, Ss
[/terrain]
[terrain]
symbol_image=bridge-swamp-ne-sw-tile
id=bridgeswampdiag1
name= _ "Bridge"
#char=/
string=Bss/
aliasof=Gg, Ss
[/terrain]
[terrain]
symbol_image=bridge-swamp-se-nw-tile
id=bridgeswampdiag2
name= _ "Bridge"
#char=\
string=Bss\
aliasof=Gg, Ss
[/terrain]
#
# Castles
#

0
images/items/trapdoor-closed.png → images/terrain-objects/trapdoor-closed.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

0
images/items/wreck.png → images/terrain-objects/wreck.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
images/terrain/bridge-deep-n-s-tile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
images/terrain/bridge-deep-ne-sw-tile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
images/terrain/bridge-deep-se-nw-tile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
images/terrain/bridge-swamp-n-s-tile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
images/terrain/bridge-swamp-ne-sw-tile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
images/terrain/bridge-swamp-se-nw-tile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB