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

Commiting new graphics tilesets:

Browse source 
* Cave walls
* Dwarven castles
* Cave floors

Updated scenarios to use dwarven castles in caves. Scenario designers,
please review my changes!
This commit is contained in:
Philippe Plantier 2004-08-15 13:07:14 +00:00
parent 2244de4729
commit 7c45cc7649
98 changed files with 1574 additions and 190 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/maps/Eastern_Invasion/Captured
View file

@ -4,11 +4,11 @@ WuuuWWWWWuuuuuWWWWWWWWWWWWWWWDDDWWWWmmhhgggg
WWuWWuuuWuuuuuWWWWWWWWWWWWWuWWDWWWWWmWmmhggg
WWWuWuuuWuuuuuWWWWWWWWWWWuuWWWWWWWWWWWWWhggg
WuuuWWuWWWuuuWuuWWWuWWWuuWWWWWWWWWWWWWWWg1gh
WuuuWWWWWWWWWWWWWuuuuuWWWWWWWWWWWWWWWWWuCghm
WuuuWWWWWWWWWWWWWuuuuuWWWWWWWWWWWWWWWWWuoghm
WuuuWuuuWWWWWWWuuuuuuuuuWWWWWWWWWuWWWuuWWWWm
WuuuWuuuWWWWWWuuuuuCuuuuuWWWWWWWuuuuuWWWWWWm
WuuuWWuWWuuuuWuuuuC2CuuuuuWWWWWWuuuWWWWWWWWm
WuuuWWWWWuuuWWuuuuCCCuuuuuWuuuuWuuuWWWWWWWWm
WuuuWuuuWWWWWWuuuuuouuuuuWWWWWWWuuuuuWWWWWWm
WuuuWWuWWuuuuWuuuuo2ouuuuuWWWWWWuuuWWWWWWWWm
WuuuWWWWWuuuWWuuuuooouuuuuWuuuuWuuuWWWWWWWWm
WuuuWuuuWWuWWWuuuuuuuuuuuWWWWWWWuuuWWWWWWWWm
WuuuWuuuWWWWWWuuuuuuuuuuuWWWWWWWuuuWWWWWWWWm
WuuuWWuWWWWuuWWWuuuuuuuWWWWWWWWWuuuWWWWWWWWm

12
data/maps/Eastern_Invasion/The_Arena
View file

@ -1,6 +1,6 @@
rrrrrrrrrrrrrrrrrrrrrrrrrWWCWW
rrCrrWWWWWWWWWWWWWWWWWWWrWC2CW
rrrWWhhhhhhhhhhhhhhhhrhhWrCCCW
rrrrrrrrrrrrrrrrrrrrrrrrrWWoWW
rrorrWWWWWWWWWWWWWWWWWWWrWo2oW
rrrWWhhhhhhhhhhhhhhhhrhhWroooW
rWWhhrrwwwwwwwwwwwwww/rrrrrhWW
rWhrrrrrwdwwwddddww//wrwwwrhWr
rWhgggrrrddwwwdww//wwwwwwwrhWr
@ -15,6 +15,6 @@ rWhrrggggfffgggggfgfrgrrwrrhWr
rWhrggggffffggggffffgggrrrrhWr
rWhgrggfffffggggffffffffrhhWWr
rWhrrhggfgfgggggggfffffhhWWrrr
WCCChWhhhhhhhhhhhhhhhhhWWrrrrr
WC1CWrWWWWWWWWWWWWWWWWWrrrrCrr
WWCWWrrrrrrrrrrrrrrrrrrrrrrrrr
WooohWhhhhhhhhhhhhhhhhhWWrrrrr
Wo1oWrWWWWWWWWWWWWWWWWWrrrrorr
WWoWWrrrrrrrrrrrrrrrrrrrrrrrrr

18
data/maps/Eastern_Invasion/The_Escape_Tunnel
View file

@ -1,12 +1,12 @@
vggvggvWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW
gCCCgvWWWrrruWWWWWWWWWWWWWWWWWWWWWWWWWW
vC3CWWWWWDrruuWWWWWuuuuuuuWWWWWWWWWWWWW
WWWWWWWWWWWuuWWWWWDuuCuuuuuWWWWWWWWWWWW
WWuuuWWWWWWWurWWWWuuC2CuDuWuWWWWWrruurW
WuuCuuurruuuuurruuuuuCuuuuuuDuWuurWWWWg
WuC1CuDuuurrrDruuuuDuuuuuuWWWWuuWWWWWWW
WuuCuuWWWWWWuuuWWWWWuuuuWWWuurrWWuurWWW
WWDuuWWWWWWWWruWWC4CWWWWWruruWWWuuurWWD
WWWWWWWWWWWWWWruWuCuurWuurWuuuruuuruWWW
gooogvWWWrrruWWWWWWWWWWWWWWWWWWWWWWWWWW
vo3oWWWWWDrruuWWWWWuuuuuuuWWWWWWWWWWWWW
WWWWWWWWWWWuuWWWWWDuuouuuuuWWWWWWWWWWWW
WWuuuWWWWWWWurWWWWuuo2ouDuWuWWWWWrruurW
WuuouuurruuuuurruuuuuouuuuuuDuWuurWWWWg
Wuo1ouDuuurrrDruuuuDuuuuuuWWWWuuWWWWWWW
WuuouuWWWWWWuuuWWWWWuuuuWWWuurrWWuurWWW
WWDuuWWWWWWWWruWWo4oWWWWWruruWWWuuurWWD
WWWWWWWWWWWWWWruWuouurWuurWuuuruuuruWWW
WWWWWWWWWWWWWWWuuDuurururWWWWWWWWWWWWDD
WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW

28
data/maps/Eastern_Invasion/Throne_Room
View file

@ -3,18 +3,18 @@ WRRRWRWRWWWRWRWRWRWW
WRRRRRRRRWRRRRRRRRRW
WRRRRRRRRWRRRRRRRRRW
WRRRRRRRRWRRRRRRRRRW
WRRRRRRWWCWWRRRRRRRW
WRRRRRWCC2CCWRRRRRRW
WRRWWRC1CCC3CRWWRRRW
WWWRRRCCCCCCCRRRWWRW
WCRRRRRRrrrRRRRRRRWW
WCRRRRRRrrrRRRRRRRCW
WCRRRRRRrrrRRRRRRRCW
WCRRRRRRrrrRRRRRRRCW
WCRRRRRRrrrRRRRRRRCW
WCRRRRRRrrrRRRRRRRCW
WCRRRRRRrrrRRRRRRRCW
WCRRRRRRrrrRRRRRRRCW
WCRCRCRRrrrRRCRCRCCW
WWCWCWCRrrrRCWCWCWWW
WRRRRRRWWoWWRRRRRRRW
WRRRRRWoo2ooWRRRRRRW
WRRWWRo1ooo3oRWWRRRW
WWWRRRoooooooRRRWWRW
WoRRRRRRrrrRRRRRRRWW
WoRRRRRRrrrRRRRRRRoW
WoRRRRRRrrrRRRRRRRoW
WoRRRRRRrrrRRRRRRRoW
WoRRRRRRrrrRRRRRRRoW
WoRRRRRRrrrRRRRRRRoW
WoRRRRRRrrrRRRRRRRoW
WoRRRRRRrrrRRRRRRRoW
WoRoRoRRrrrRRoRoRooW
WWoWoWoRrrrRoWoWoWWW
WWWWWWWRrrrRWWWWWWWW

18
data/maps/Eastern_Invasion/loyalistmap11
View file

@ -2,17 +2,17 @@ mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmWmmmmmmmmmmmmmm
mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmWWmmmmmmmmmmmmm
mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmWmmmmmmmmmmmmm
mhmhmhmhmhmhmmmhmmmmmmmhmhmmmhmhmhmmmmmWmmmmmmmmmmmmm
hhhhhghghghghhhmhhhmmhhghghhhhhghgmmmWWCWWmmmmmhmhmmm
hggghghggggggghmmhhghghghghgggggggggmWCKCWmmmghhhghhh
ggggggggggggghhhmhgggggggghmggggggggmWCCCWmggggghgggh
gggCgrrrrrgggggghggggggggghhhgghhggggWgWWmmwggggggggg
grCKCgggggrrgggggggrrrgrgggggggggggggWgWwwwwgggggrrrg
ggCCCgggggggrrgrrrrhggrgrrgrgggggggggWgWwwwwggrrrgggr
hhhhhghghghghhhmhhhmmhhghghhhhhghgmmmWWoWWmmmmmhmhmmm
hggghghggggggghmmhhghghghghgggggggggmWoKoWmmmghhhghhh
ggggggggggggghhhmhgggggggghmggggggggmWoooWmggggghgggh
gggogrrrrrgggggghggggggggghhhgghhggggWgWWmmwggggggggg
groKogggggrrgggggggrrrgrgggggggggggggWgWwwwwgggggrrrg
ggooogggggggrrgrrrrhggrgrrgrgggggggggWgWwwwwggrrrgggr
ggggggggggghggrgghhmhgggggrrgrgrgrrrrWgW\\wggrrgggggr
gggggggggghmhgggghmmhggghgggrgrgrggmgWgWww\rrgggggggg
ggghhhghghhhhggghmmhhhghhggggggggmmWWCgWmwwwggggggggg
ghhmmmhmhmhhggghhmmmhmhhggghhhhhhmmWCKCWmmwgggghggggg
hmmmmmmmmmmmhhhhmmmmhmmmhhhmhmmmmmmWCCCWmmmmghhhghghh
ggghhhghghhhhggghmmhhhghhggggggggmmWWogWmwwwggggggggg
ghhmmmhmhmhhggghhmmmhmhhggghhhhhhmmWoKoWmmwgggghggggg
hmmmmmmmmmmmhhhhmmmmhmmmhhhmhmmmmmmWoooWmmmmghhhghghh
mmmmmmmmmmmmmmhmmmmmmmmmmmmmmmmmmmmmWWWmmmmmmmmmmmmmm
mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmWmmmmmmmmmmmmmmm
mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmWmmmmmmmmmmmmmmm

14
data/maps/Heir_To_The_Throne/Hasty_Alliance
View file

@ -1,9 +1,9 @@
uuWWWWuWuuWWuWWWWWW
uWWDWWuWWuWuWuWuWWW
uWWWuuWuuuuuuuuuuWW
uWWWuuuuuCuuuuuuuWW
uWuuuuuuC3CuuuDuuWW
WWuuuWWuCCCuuuuuuuW
uWWWuuuuuouuuuuuuWW
uWuuuuuuo3ouuuDuuWW
WWuuuWWuooouuuuuuuW
WWuuuWuuuuuuuWWuuuW
WWWuWuuWuWWWuWWuuuW
WuuDuuWWWWWWuuWuDuW
@ -13,8 +13,8 @@ WWuWuWuWuuWuuWuuuuW
WWuuWWWuWWuuuuuDuuW
WWuuuuuuuWWWuuuuuuW
WWuuuuuuuuWWuuuuuuW
WuuuuuuCuuuuuuuuuWW
WuuuuuC1CuuCuuuuuWW
WWuuuuCuuuC2CuuuuuW
WWuuuuuuuuCWuuuWuuu
WuuuuuuouuuuuuuuuWW
Wuuuuuo1ouuouuuuuWW
WWuuuuouuuo2ouuuuuW
WWuuuuuuuuoWuuuWuuu
WWWWWWuuuWWWWWWWWWW

22
data/maps/Heir_To_The_Throne/Plunging_Into_the_Darkness
View file

@ -1,6 +1,6 @@
uuuuuuuuuuuCuuuuuuuuuuuuuuuuuuu
uuuuuuuuuuuC2Cuuuuuuuuuuuuuuuuu
uuuuuuuuuuuuCuuuuuuuuuuuuuuuuuu
uuuuuuuuuuuouuuuuuuuuuuuuuuuuuu
uuuuuuuuuuuo2ouuuuuuuuuuuuuuuuu
uuuuuuuuuuuuouuuuuuuuuuuuuuuuuu
uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
@ -12,14 +12,14 @@ uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
uuuuuuuWWWWWuuuuuuuuuuuuuuuuuuu
uuuuuWWuuuWuWWWWuuuuuuuuuuuuuuu
uuuuuWuCuuuCuuuuWWuuuuuuuuuuuuu
uuuuWuCCCCCCCCCCCuWuuuuuuuuuuuu
uuuuWuCCCCCCCCCCCuWWuuuuuuuuuuu
uuuuWWuCCCCCCCCCCuuWuuuuuuuuuuu
uuuuWWuCCCC3CCCCCuuWuuuuuuuuuuu
uuuuuWuCCCCCCCCCCcWuuuuuuuuuuuu
uuuuWWuCCuuCCucccWWuuuuuuuuuuuu
uuuuuWuuuCCuuuCWcWuuuuuuuuuuuuu
uuuuuWuouuuouuuuWWuuuuuuuuuuuuu
uuuuWuooooooooooouWuuuuuuuuuuuu
uuuuWuooooooooooouWWuuuuuuuuuuu
uuuuWWuoooooooooouuWuuuuuuuuuuu
uuuuWWuoooo3ooooouuWuuuuuuuuuuu
uuuuuWuoooooooooocWuuuuuuuuuuuu
uuuuWWuoouuooucccWWuuuuuuuuuuuu
uuuuuWuuuoouuuoWcWuuuuuuuuuuuuu
uuuuuuWWWWuuuuuWWuuuuuuuuuuuuuu
uuuuuuuuWWWuuuuWWuuuuuuuuuuuuuu
uuuuuuuuuuWWuuuuWWuuuuuuuuuuuuu

24
data/maps/Heir_To_The_Throne/Sceptre
View file

@ -1,9 +1,9 @@
uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
uWWWWWuWuuuuuuuuuuuuuuuuuuuuuuuuuuuWWWuu
uWWuWuWuWWuuuWuWuWWWWWWWWWuWWWWWWWWuWWWW
uWuuuCuuuWWWWuWuWuuuuuuuuuWuWuuuuuuuuCWW
uWuuC4CuuuuuuuuuuuuuuuuuuuuuuuuuuDuuC5CW
uWuuCCCuuuuWuuuuuWuuuuuuuuuWuWuWuuuuCCCW
uWuuuouuuWWWWuWuWuuuuuuuuuWuWuuuuuuuuoWW
uWuuo4ouuuuuuuuuuuuuuuuuuuuuuuuuuDuuo5oW
uWuuooouuuuWuuuuuWuuuuuuuuuWuWuWuuuuoooW
uWWWuuuDWWWWWWWWuWWWuWuWuWWWWuWWWWuuuuuW
uuuWuuuWWuuuuuWuWuuuWuWuWuuuuuuuWWuuDuWW
uuuWuuuWuuuuuuuuuuuuuuuuuuuuuuuWWuuuuuuW
@ -22,8 +22,8 @@ uuuWuuWuuuuuuuuuuWWuuuWWWuuuWuWuuuuWuuuW
uuWuuuWWuWuuuWuWWuuWuWWuuuuuuuuuuuWuuuuW
uWWuuuuuWuWWuWWuuWuuWuWWuuuuuuuuuuWuuuWu
WuuuDuuuuuuuWuuWWuWWuuuuWWuuuuuuuWWuuuWu
WWC2CuuuuuuuuWWuWuuuWWuuuWuuuuuuuWWuDWWu
uWuCuuuDuuuuuuWuuuuuuuWWuuWWuuuWWuuuuWuu
WWo2ouuuuuuuuWWuWuuuWWuuuWuuuuuuuWWuDWWu
uWuouuuDuuuuuuWuuuuuuuWWuuWWuuuWWuuuuWuu
uWuuuuuuuuuuuuWuuuuuuuuuWWuWuWWuuuuuuuWu
uuWWuuuuuuuuuWWuuuuuuuuWWWuWuWWuuuuuuWWu
uuuuWWuuuuuuuWuuuWWWWWWuuuuWWuuuuDuuuWuu
@ -37,12 +37,12 @@ uuuuuWuDuuuuuWuuuuuuuuWuuuuuuWuuuWuuuuuu
uuuuuuWuWWWuuWuuuuuuuuWuuuuuuuWWWWWWuuuu
uuuuuuWuWWWuuWuuuuuuuuWuuuuDuWWuuuuWWWWu
uuuuuuWWuuWuuWuuuuuuuuWuuuuuuuuuuuuuuWWu
uuuuuuuuWuuuWuuuuuuuuuWWuuuuuuDuuuuCuWWu
uuuuuuuuWWDuWWuuuuuuuWWuuWuWuuuuuuC3CWWu
uuuuuuuuuWWWuuWWuuuWWuuWWWWWWWuuDuCCCuWu
uuuuuuuuWuuuWuuuuuuuuuWWuuuuuuDuuuuouWWu
uuuuuuuuWWDuWWuuuuuuuWWuuWuWuuuuuuo3oWWu
uuuuuuuuuWWWuuWWuuuWWuuWWWWWWWuuDuooouWu
uuuuuuuuuuWWuDuuWWWuuuDWWuuuuuWWuuuuuWWu
uuuuuuuuuuuWWuuCuCuuuWWuuuuuuuuuWWuuuWuu
uuuuuuuuuuuuWWuCCCuWWuuuuuuuuuuuWuWWWuuu
uuuuuuuuuuuuuWuC1CuWuuuuuuuuuuuuuuuuuuuu
uuuuuuuuuuuuuuWuCuuWuuuuuuuuuuuuuuuuuuuu
uuuuuuuuuuuWWuuououuuWWuuuuuuuuuWWuuuWuu
uuuuuuuuuuuuWWuooouWWuuuuuuuuuuuWuWWWuuu
uuuuuuuuuuuuuWuo1ouWuuuuuuuuuuuuuuuuuuuu
uuuuuuuuuuuuuuWuouuWuuuuuuuuuuuuuuuuuuuu
6uuuuuuuuuuuuuWWWWWuuuuuuuuuuuuuuuuuuuuu

20
data/maps/Heir_To_The_Throne/The_Lost_General
View file

@ -1,6 +1,6 @@
WWWWWWWWWWWWWWuuWWWWWWWWWWWWWWWWWWWWWW
WWWWWWWWWWWWWC2uWWWWWWWWWWWWWWWWWWWWWW
WWWWWWWWWWWWWCCCuDWWWWWWWWWWWWWWWWWWWW
WWWWWWWWWWWWWo2uWWWWWWWWWWWWWWWWWWWWWW
WWWWWWWWWWWWWooouDWWWWWWWWWWWWWWWWWWWW
WWWWWWWWWWWWWurrrWWWWWWWuuuuWWWWWWWWWW
WWuuuWWWWWWWWuruuuWWWWWWuuuuuuWWWWWWWW
uuuuuWWWWWWDuruuuWWWWWWuruuuuuWWWWWWWW
@ -8,11 +8,11 @@ uuuWuuWWWWWWrruuuWWWWWWuruWWuruWWWWWWW
uuWWuuWWWWWuruuuWWWWWWuruWWWuruWWWWWWW
uuDWWuuuWWDuruWuuWWWWDuruWWWWuuuuuWWWW
uuWWWuuDWWrruWWuuWWWWuuuWWWWWuruuuWWWW
uuuWuuuWWWWruWWuuWWuuuuWWWWWWDuruCCuuu
uuuWuuWWWWWuuuWuuWuuuuuWWWWWWuurC1Crrr
CCuWuuWWWWWWuuuuuuuuWuuWWWWWWWuruCCuuu
CCuuruWWWWuuuuurruuWWuuWWWuuuuruuuWWWW
3CuuuruWWWuuuuuuruWWWWuuWWuuuuuuuuWWWW
uuuWuuuWWWWruWWuuWWuuuuWWWWWWDuruoouuu
uuuWuuWWWWWuuuWuuWuuuuuWWWWWWuuro1orrr
oouWuuWWWWWWuuuuuuuuWuuWWWWWWWuruoouuu
oouuruWWWWuuuuurruuWWuuWWWuuuuruuuWWWW
3ouuuruWWWuuuuuuruWWWWuuWWuuuuuuuuWWWW
WWWWuruWWuruWWWuuWWWWWuuWuuWWuuuuWWWWW
WWWWWuruuuruWWWWuuWWWWuuWWuuWWDuWWWWWW
WWWWWuuuuruWWWWuuWWWWWuuWuuWWWWWWWWWWW
@ -25,6 +25,6 @@ WWWWWWWWWWsccccWDWWWWWWWWruuuuWWWWWWWW
WWWWWWWWuuucccccWWWWWWWWWWuuuuWWWWWWWW
WWWWWWWuDuWssWWWWWWWWWWWuWWWWWWWWWWWWW
WWWWWWDrruuWWWWuuuuuWuuuruuWWWWWWWWWWW
WWWWWWurrrWWWWWuuuuuunnruWWWWWWWWWWWWW
WWWWWWWDuuDWWWWWWWWuun4nuWWWWWWWWWWWWW
WWWWWWWWWWWWWWWWWWWWunnuWWWWWWWWWWWWWW
WWWWWWurrrWWWWWuuuuuuooruWWWWWWWWWWWWW
WWWWWWWDuuDWWWWWWWWuuo4ouWWWWWWWWWWWWW
WWWWWWWWWWWWWWWWWWWWuoouWWWWWWWWWWWWWW

8
data/maps/The_Dark_Hordes/Underground_Pool
View file

@ -1,6 +1,6 @@
C2WWWWWcWWccWWWWWWWW
CCCWWuWW\u/WWWW3WWWW
uWuWWuWWWuWWWWCCCuWW
o2WWWWWcWWccWWWWWWWW
oooWWuWW\u/WWWW3WWWW
uWuWWuWWWuWWWWooouWW
uWuuuuWWWuWWWWuuuuWW
uWWWDuWuuuWWuuWWuuWW
uuWWWuuWWuWWuuWWWWDW
@ -17,4 +17,4 @@ uWWuWuWWuuuWWuWuWuWu
uWDWWuWDuWuuWuWWuWWu
uWWWWuWWuuWWuWuWWWWu
uDuWWuuWW1WWuWWuuuWu
WWuWDuDWCgCWuuuWuWuW
WWuWDuDWogoWuuuWuWuW

3
data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg
View file

@ -50,6 +50,7 @@ Defeat:
side=2
canrecruit=1
team_name=undead
flag=terrain/undead-flag-1.png,terrain/undead-flag-2.png,terrain/undead-flag-3.png,terrain/undead-flag-4.png
{VOD_AI_PARMS}
{GOLD 200 300 500}
@ -90,6 +91,7 @@ Defeat:
team_name=undead
canrecruit=1
recruit=Wraith,Walking Corpse
flag=terrain/undead-flag-1.png,terrain/undead-flag-2.png,terrain/undead-flag-3.png,terrain/undead-flag-4.png
{VOD_AI_PARMS}
{GOLD 200 500 500}
[ai]
@ -117,6 +119,7 @@ Defeat:
description=Selda-Mana
side=4
canrecruit=1
flag=terrain/undead-flag-1.png,terrain/undead-flag-2.png,terrain/undead-flag-3.png,terrain/undead-flag-4.png
{VOD_AI_PARMS}
{GOLD 150 300 500}

66
data/terrain-graphics.cfg
View file

@ -32,7 +32,10 @@
# Attachs graphics to each known terrain types
#
{TERRAIN_BASE u cave}
{TERRAIN_BASE_PROBABILITY u cave-floor4 10}
{TERRAIN_BASE_PROBABILITY u cave-floor3 2}
{TERRAIN_BASE_PROBABILITY u cave-floor2 10}
{TERRAIN_BASE u cave-floor1}
{TERRAIN_BASE W cavewall}
{TERRAIN_BASE F snow-forest}
{TERRAIN_BASE_PROBABILITY f forest2 10}
@ -58,8 +61,6 @@
{TERRAIN_BASE_PROBABILITY S snow2 30}
{TERRAIN_BASE_PROBABILITY S snow3 30}
{TERRAIN_BASE S snow}
#{TERRAIN_BASE_PROBABILITY g grassland-rocks 4}
#{TERRAIN_BASE_PROBABILITY g grassland-flowers 8}
{TERRAIN_BASE_PROBABILITY g grassland-rocks1 2}
{TERRAIN_BASE_PROBABILITY g grassland-rocks2 2}
{TERRAIN_BASE_PROBABILITY g grassland-flowers1 3}
@ -93,15 +94,15 @@
{TERRAIN_BASE Y swampwater}
{TERRAIN_BASE V snow}
{TERRAIN_BASE Z coast}
{TERRAIN_BASE v grassland}
{TERRAIN_BASE D cave}
{TERRAIN_BASE t grassland}
{TERRAIN_BASE v grassland-r1}
{TERRAIN_BASE D cave-floor1}
{TERRAIN_BASE t grassland-r1}
{BUILDING Y ({IMG -100 village-swampwater })}
{BUILDING V ({IMG -100 village-snow })}
{BUILDING Z ({IMG -100 village-coast })}
{BUILDING v ({IMG -100 village-human })}
{BUILDING D ({IMG -100 village-cave })}
{BUILDING D ({IMG -100 dwarven-village })}
{BUILDING t ({IMG_NIGHT -100 village village-dusk,village-dusk2,village-dusk3,village-dusk4})}
#
@ -116,19 +117,30 @@
# Flags the keep, they must be flagged to be recognized by the
# {CASTLE_AND_foo_KEEP} macros
{FLAG_IF_ADJACENT K C keep-of-C keep-flag}
{FLAG_IF_ADJACENT K n keep-of-n keep-flag}
{FLAG_IF_ADJACENT K o keep-of-o keep-flag}
{FLAG_REMAINING K keep-of-C keep-flag}
#
# Castles base terrains
#
{TERRAIN_BASE C castle}
{TERRAIN_BASE o dwarven-castle-floor}
{TERRAIN_BASE n dirt}
{TERRAIN_BASE_FLAG K keep-of-C castle}
{TERRAIN_BASE_FLAG K keep-of-o dwarven-keep-floor}
{TERRAIN_BASE_FLAG K keep-of-n dirt}
{CASTLE_AND_COMPOSED_KEEP C K castle keep}
#{CASTLE_AND_SIMPLE_KEEP C K gravewall}
{CASTLE_AND_SIMPLE_KEEP n K encampment}
# Castle decorations and castle floors. Those must always be after the castles
# are defined.
{BUILDING_FLAG K ({IMG -100 tent}) keep-of-n}
{CASTLE_FLOOR C K castle}
{CASTLE_FLOOR n K dirt}
{BUILDING_FLAG K ({IMG -100 dwarven-keep}) keep-of-o}
# Forest, hills and mountains should always overlay on northern sides
{TERRAIN_ADJACENT_NORTH -80 m !m mountains}
@ -136,21 +148,35 @@
{TERRAIN_ADJACENT_NORTH -80 h !hm hills} # No adj-north between hills and mountains
{TERRAIN_ADJACENT_NORTH -80 F !F snow-forest}
# Then, standard transitions
{TERRAIN_ADJACENT_1234 -186 uD !uD cave}
# Cave and dwarven castles
{DISABLE_TRANSITIONS W}
{DISABLE_TRANSITIONS o}
{TERRAIN_ADJACENT_CORNER -185 W !WoK !WoK cavewall-convex}
{TERRAIN_ADJACENT_CORNER -185 !WoK W W cavewall-concave}
{TERRAIN_ADJACENT_CORNER -185 o !WoK !WoK dwarven-castle-convex}
{TERRAIN_ADJACENT_CORNER -185 !WoK o o dwarven-castle-concave}
{TERRAIN_ADJACENT_CORNER_FLAG1 -185 K !WoK !WoK keep-of-o dwarven-castle-convex}
{TERRAIN_ADJACENT_CORNER_FLAG2 -185 !WoK K o keep-of-o dwarven-castle-concave}
{TERRAIN_ADJACENT_CORNER_FLAG3 -185 !WoK o K keep-of-o dwarven-castle-concave}
{TERRAIN_ADJACENT_CORNER -185 oK W W dwarven-castle-wall-convex}
{TERRAIN_ADJACENT_CORNER -185 W oK oK dwarven-castle-wall-concave}
{TERRAIN_ADJACENT_CORNER -185 oK W !WoK dwarven-castle-wall-cw}
{TERRAIN_ADJACENT_CORNER -185 oK !WoK W dwarven-castle-wall-ccw}
# forest-to-water transitions. Place before forest-to-any.
{TERRAIN_ADJACENT_123 -187 f cZp\|/ forest-to-water}
{TERRAIN_ADJACENT_123 -187 f s forest-to-water}
{TERRAIN_ADJACENT_123 -186 f cZp\|/ forest-to-water}
{TERRAIN_ADJACENT_123 -186 f s forest-to-water}
# use forest-to-water for forest-to-dirt and forest-to-desert too
#{TERRAIN_ADJACENT_123 -187 f r forest-to-water}
{TERRAIN_ADJACENT_123 -187 f d forest-to-water}
{TERRAIN_ADJACENT_123 -186 f d forest-to-water}
{TERRAIN_ADJACENT_123 -187 f !f forest}
{TERRAIN_ADJACENT_1 -188 F !F snow-forest}
{TERRAIN_ADJACENT_1 -189 m !m mountains}
{TERRAIN_ADJACENT_12 -190 H !H snow-hills}
{TERRAIN_ADJACENT_12 -191 h !h hills}
{TERRAIN_ADJACENT_123 -186 f !f forest}
{TERRAIN_ADJACENT_1 -187 F !F snow-forest}
{TERRAIN_ADJACENT_1 -188 m !m mountains}
{TERRAIN_ADJACENT_12 -189 H !H snow-hills}
{TERRAIN_ADJACENT_12 -190 h !h hills}
{TERRAIN_ADJACENT_1234 -191 uD !uD cave-floor}
{TERRAIN_ADJACENT_1234 -192 SV !SV snow}
{TERRAIN_ADJACENT_1234 -193 tgvX !tgvX grassland}
{TERRAIN_ADJACENT_1 -194 r !r dirt}

17
data/terrain-graphics/base.cfg
View file

@ -1,4 +1,21 @@
#define TERRAIN_BASE_FLAG LETTER FLAG IMAGE
[terrain_graphics]
[tile]
x=0
y=0
type="{LETTER}"
has_flag={FLAG}
[image]
layer=-1000
name={IMAGE}
[/image]
[/tile]
no_flag="terrain-base"
set_flag="terrain-base"
[/terrain_graphics]
#enddef
# Attachs an image to a single terrain tile, with a given probability.
# example: {TERRAIN_BASE_PROBABILITY g grassland-rocks 20}

140
data/terrain-graphics/castles.cfg
View file

@ -56,36 +56,6 @@
[/terrain_graphics]
#enddef
#define CASTLE_FLOOR CASTLE KEEP IMAGE
[terrain_graphics]
[tile]
x=0
y=0
type={CASTLE}
no_flag=terrain-base
set_flag=terrain-base
[image]
layer=-1000
name={IMAGE}
[/image]
[/tile]
[/terrain_graphics]
[terrain_graphics]
[tile]
x=0
y=0
type={KEEP}
no_flag=terrain-base
set_flag=terrain-base
has_flag=keep-of-{CASTLE}
[image]
layer=-1000
name={IMAGE}
[/image]
[/tile]
[/terrain_graphics]
#enddef
# Defines the given terrain will behave like the walls of a castles, with added
# dynamically-drawn keeps.
# Follows the "composed keep" model, to be documented.
@ -299,3 +269,113 @@
#enddef
#define TERRAIN_ADJACENT_CORNER LAYER TERRAIN1 TERRAIN2 TERRAIN3 IMAGE
[terrain_graphics]
map="
3
2
1"
[tile]
pos=1
type={TERRAIN1}
[/tile]
[tile]
pos=2
type={TERRAIN2}
[/tile]
[tile]
pos=3
type={TERRAIN3}
[/tile]
[image]
layer={LAYER}
name={IMAGE}-@R0
[/image]
rotations=ne,e,se,sw,w,nw
[/terrain_graphics]
#enddef
#define TERRAIN_ADJACENT_CORNER_FLAG1 LAYER TERRAIN1 TERRAIN2 TERRAIN3 FLAG IMAGE
[terrain_graphics]
map="
3
2
1"
[tile]
pos=1
type={TERRAIN1}
has_flag={FLAG}
[/tile]
[tile]
pos=2
type={TERRAIN2}
[/tile]
[tile]
pos=3
type={TERRAIN3}
[/tile]
[image]
layer={LAYER}
name={IMAGE}-@R0
[/image]
rotations=ne,e,se,sw,w,nw
[/terrain_graphics]
#enddef
#define TERRAIN_ADJACENT_CORNER_FLAG2 LAYER TERRAIN1 TERRAIN2 TERRAIN3 FLAG IMAGE
[terrain_graphics]
map="
3
2
1"
[tile]
pos=1
type={TERRAIN1}
[/tile]
[tile]
pos=2
type={TERRAIN2}
has_flag={FLAG}
[/tile]
[tile]
pos=3
type={TERRAIN3}
[/tile]
[image]
layer={LAYER}
name={IMAGE}-@R0
[/image]
rotations=ne,e,se,sw,w,nw
[/terrain_graphics]
#enddef
#define TERRAIN_ADJACENT_CORNER_FLAG3 LAYER TERRAIN1 TERRAIN2 TERRAIN3 FLAG IMAGE
[terrain_graphics]
map="
3
2
1"
[tile]
pos=1
type={TERRAIN1}
[/tile]
[tile]
pos=2
type={TERRAIN2}
[/tile]
[tile]
pos=3
type={TERRAIN3}
has_flag={FLAG}
[/tile]
[image]
layer={LAYER}
name={IMAGE}-@R0
[/image]
rotations=ne,e,se,sw,w,nw
[/terrain_graphics]
#enddef

13
data/terrain.cfg
View file

@ -123,7 +123,7 @@ aliasof=g
#grassland should contain mostly plain grassland, but occasionally
#a few rocks
[terrain]
image=grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland,grassland-flowers,grassland-flowers,grassland-rocks
image=grassland-r1
name=grassland
char=g
[/terrain]
@ -209,7 +209,7 @@ light=true
[/terrain]
[terrain]
image=cave
image=cave-floor1
name=cave
char=u
[/terrain]
@ -242,6 +242,15 @@ unit_height_adjust=3
recruit_onto=true
[/terrain]
[terrain]
image=cave-floor1
name=dwarven castle
char=o
aliasof=C
unit_height_adjust=0
recruit_onto=true
[/terrain]
[terrain]
image=keep
name=keep

33
data/tools/exploder/castle-wall-concave.cfg Normal file
View file

@ -0,0 +1,33 @@
{tools/exploder/models/castle.cfg}
[part]
name=castle-wall-concave-nw
pos=36,36
[/part]
[part]
name=castle-wall-concave-ne
pos=72,36
[/part]
[part]
name=castle-wall-concave-e
pos=90,72
[/part]
[part]
name=castle-wall-concave-se
pos=72,108
[/part]
[part]
name=castle-wall-concave-sw
pos=36,108
[/part]
[part]
name=castle-wall-concave-w
pos=18,72
[/part]

33
data/tools/exploder/castle-wall-convex.cfg Normal file
View file

@ -0,0 +1,33 @@
{tools/exploder/models/castle.cfg}
[part]
name=castle-wall-convex-nw
pos=36,36
[/part]
[part]
name=castle-wall-convex-ne
pos=72,36
[/part]
[part]
name=castle-wall-convex-e
pos=90,72
[/part]
[part]
name=castle-wall-convex-se
pos=72,108
[/part]
[part]
name=castle-wall-convex-sw
pos=36,108
[/part]
[part]
name=castle-wall-convex-w
pos=18,72
[/part]

208
data/tools/exploder/castle-wall-exploded-concave.cfg Normal file
View file

@ -0,0 +1,208 @@
{tools/exploder/models/castle.cfg}
# *
# _
# _/ \_
# / \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=castle-wall-concave-nw
pos=90,36
[/part]
[part]
name=castle-wall-concave-ne
pos=126,36
[/part]
#
# _
# _/ \_
# / \ *
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=castle-wall-concave-ne
pos=180,72
[/part]
[part]
name=castle-wall-concave-e
pos=198,108
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_ _/ *
# \_/
#
[part]
name=castle-wall-concave-e
pos=198,180
[/part]
[part]
name=castle-wall-concave-se
pos=180,216
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_ _/
# \_/
# *
[part]
name=castle-wall-concave-se
pos=126,252
[/part]
[part]
name=castle-wall-concave-sw
pos=90,252
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# * \_ _/
# \_/
#
[part]
name=castle-wall-concave-sw
pos=36,216
[/part]
[part]
name=castle-wall-concave-w
pos=18,180
[/part]
#
# _
# _/ \_
# * / \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=castle-wall-concave-w
pos=18,108
[/part]
[part]
name=castle-wall-concave-nw
pos=36,72
[/part]
#
# _
# _/ \_
# / * \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=castle-wall-convex-sw
pos=144,72
[/part]
#
# _
# _/ \_
# / \
# \ /
# / *\
# \_ _/
# \_/
#
[part]
name=castle-wall-convex-w
pos=180,144
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_ *_/
# \_/
#
[part]
name=castle-wall-convex-nw
pos=144,216
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_* _/
# \_/
#
[part]
name=castle-wall-convex-ne
pos=72,216
[/part]
#
# _
# _/ \_
# / \
# \ /
# /* \
# \_ _/
# \_/
#
[part]
name=castle-wall-convex-e
pos=36,144
[/part]
#
# _
# _/ \_
# / * \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=castle-wall-convex-se
pos=72,72
[/part]

208
data/tools/exploder/castle-wall-exploded-convex.cfg Normal file
View file

@ -0,0 +1,208 @@
{tools/exploder/models/castle.cfg}
# *
# _
# _/ \_
# / \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=castle-wall-convex-nw
pos=90,36
[/part]
[part]
name=castle-wall-convex-ne
pos=126,36
[/part]
#
# _
# _/ \_
# / \ *
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=castle-wall-convex-ne
pos=180,72
[/part]
[part]
name=castle-wall-convex-e
pos=198,108
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_ _/ *
# \_/
#
[part]
name=castle-wall-convex-e
pos=198,180
[/part]
[part]
name=castle-wall-convex-se
pos=180,216
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_ _/
# \_/
# *
[part]
name=castle-wall-convex-se
pos=126,252
[/part]
[part]
name=castle-wall-convex-sw
pos=90,252
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# * \_ _/
# \_/
#
[part]
name=castle-wall-convex-sw
pos=36,216
[/part]
[part]
name=castle-wall-convex-w
pos=18,180
[/part]
#
# _
# _/ \_
# * / \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=castle-wall-convex-w
pos=18,108
[/part]
[part]
name=castle-wall-convex-nw
pos=36,72
[/part]
#
# _
# _/ \_
# / * \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=castle-wall-concave-sw
pos=144,72
[/part]
#
# _
# _/ \_
# / \
# \ /
# / *\
# \_ _/
# \_/
#
[part]
name=castle-wall-concave-w
pos=180,144
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_ *_/
# \_/
#
[part]
name=castle-wall-concave-nw
pos=144,216
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_* _/
# \_/
#
[part]
name=castle-wall-concave-ne
pos=72,216
[/part]
#
# _
# _/ \_
# / \
# \ /
# /* \
# \_ _/
# \_/
#
[part]
name=castle-wall-concave-e
pos=36,144
[/part]
#
# _
# _/ \_
# / * \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=castle-wall-concave-se
pos=72,72
[/part]

40
data/tools/exploder/castle-wall-trans-n-s.cfg Normal file
View file

@ -0,0 +1,40 @@
{tools/exploder/models/castle.cfg}
[part]
name=castle-convex-nw
pos=72,72
[/part]
[part]
name=castle-convex-ne
pos=108,72
[/part]
[part]
name=castle-wall-cw-e
pos=126,108
[/part]
[part]
name=castle-wall-convex-se
pos=108,144
[/part]
[part]
name=castle-wall-convex-sw
pos=72,144
[/part]
[part]
name=castle-wall-ccw-w
pos=54,108
[/part]
[part]
name=wall-convex-nw
pos=18,108
[/part]
[part]
name=wall-convex-ne
pos=162,108
[/part]

40
data/tools/exploder/castle-wall-trans-ne-sw.cfg Normal file
View file

@ -0,0 +1,40 @@
{tools/exploder/models/castle.cfg}
[part]
name=castle-wall-ccw-nw
pos=72,72
[/part]
[part]
name=castle-convex-ne
pos=108,72
[/part]
[part]
name=castle-convex-e
pos=126,108
[/part]
[part]
name=castle-wall-cw-se
pos=108,144
[/part]
[part]
name=castle-wall-convex-sw
pos=72,144
[/part]
[part]
name=castle-wall-convex-w
pos=54,108
[/part]
[part]
name=wall-convex-ne
pos=54,36
[/part]
[part]
name=wall-convex-e
pos=126,180
[/part]

40
data/tools/exploder/castle-wall-trans-nw-se.cfg Normal file
View file

@ -0,0 +1,40 @@
{tools/exploder/models/castle.cfg}
[part]
name=castle-convex-nw
pos=72,72
[/part]
[part]
name=castle-wall-cw-ne
pos=108,72
[/part]
[part]
name=castle-wall-convex-e
pos=126,108
[/part]
[part]
name=castle-wall-convex-se
pos=108,144
[/part]
[part]
name=castle-wall-ccw-sw
pos=72,144
[/part]
[part]
name=castle-convex-w
pos=54,108
[/part]
[part]
name=wall-convex-w
pos=54,180
[/part]
[part]
name=wall-convex-nw
pos=126,36
[/part]

40
data/tools/exploder/castle-wall-trans-s-n.cfg Normal file
View file

@ -0,0 +1,40 @@
{tools/exploder/models/castle.cfg}
[part]
name=castle-wall-convex-nw
pos=72,72
[/part]
[part]
name=castle-wall-convex-ne
pos=108,72
[/part]
[part]
name=castle-wall-ccw-e
pos=126,108
[/part]
[part]
name=castle-convex-se
pos=108,144
[/part]
[part]
name=castle-convex-sw
pos=72,144
[/part]
[part]
name=castle-wall-cw-w
pos=54,108
[/part]
[part]
name=wall-convex-sw
pos=18,108
[/part]
[part]
name=wall-convex-se
pos=162,108
[/part]

40
data/tools/exploder/castle-wall-trans-se-nw.cfg Normal file
View file

@ -0,0 +1,40 @@
{tools/exploder/models/castle.cfg}
[part]
name=castle-wall-convex-nw
pos=72,72
[/part]
[part]
name=castle-wall-ccw-ne
pos=108,72
[/part]
[part]
name=castle-convex-e
pos=126,108
[/part]
[part]
name=castle-convex-se
pos=108,144
[/part]
[part]
name=castle-wall-cw-sw
pos=72,144
[/part]
[part]
name=castle-wall-convex-w
pos=54,108
[/part]
[part]
name=wall-convex-se
pos=54,180
[/part]
[part]
name=wall-convex-e
pos=126,36
[/part]

40
data/tools/exploder/castle-wall-trans-sw-ne.cfg Normal file
View file

@ -0,0 +1,40 @@
{tools/exploder/models/castle.cfg}
[part]
name=castle-wall-cw-nw
pos=72,72
[/part]
[part]
name=castle-wall-convex-ne
pos=108,72
[/part]
[part]
name=castle-wall-convex-e
pos=126,108
[/part]
[part]
name=castle-wall-ccw-se
pos=108,144
[/part]
[part]
name=castle-convex-sw
pos=72,144
[/part]
[part]
name=castle-convex-w
pos=54,108
[/part]
[part]
name=wall-convex-w
pos=54,36
[/part]
[part]
name=wall-convex-sw
pos=126,180
[/part]

65
data/tools/exploder/models/castle.cfg
View file

@ -9,90 +9,57 @@ cut=54,72,126,144
cut=72,108,126,180
#enddef
#define CASTLE_MASKS NAME
[mask]
name=castle-convex-ne
name={NAME}-ne
image=mask-castle-ne.png
shift=18,36
{EVEN}
[/mask]
[mask]
name=castle-convex-e
name={NAME}-e
image=mask-castle-e.png
shift=36,24
{ODD}
[/mask]
[mask]
name=castle-convex-se
name={NAME}-se
image=mask-castle-se.png
shift=18,24
{EVEN}
[/mask]
[mask]
name=castle-convex-sw
name={NAME}-sw
image=mask-castle-sw.png
shift=36,24
{ODD}
[/mask]
[mask]
name=castle-convex-w
name={NAME}-w
image=mask-castle-w.png
shift=18,24
{EVEN}
[/mask]
[mask]
name=castle-convex-nw
name={NAME}-nw
image=mask-castle-nw.png
shift=36,36
{ODD}
[/mask]
#enddef
{CASTLE_MASKS castle-convex}
{CASTLE_MASKS castle-concave}
{CASTLE_MASKS wall-convex}
{CASTLE_MASKS wall-concave}
# Concave castle images
[mask]
name=castle-concave-ne
image=mask-castle-ne.png
shift=18,36
{EVEN}
[/mask]
[mask]
name=castle-concave-e
image=mask-castle-e.png
shift=36,24
{ODD}
[/mask]
[mask]
name=castle-concave-se
image=mask-castle-se.png
shift=18,24
{EVEN}
[/mask]
[mask]
name=castle-concave-sw
image=mask-castle-sw.png
shift=36,24
{ODD}
[/mask]
[mask]
name=castle-concave-w
image=mask-castle-w.png
shift=18,24
{EVEN}
[/mask]
[mask]
name=castle-concave-nw
image=mask-castle-nw.png
shift=36,36
{ODD}
[/mask]
{CASTLE_MASKS castle-wall-convex}
{CASTLE_MASKS castle-wall-concave}
{CASTLE_MASKS castle-wall-cw}
{CASTLE_MASKS castle-wall-ccw}

78
data/tools/exploder/models/castle.cfg~ Normal file
View file

@ -0,0 +1,78 @@
# Convex castle images
[mask]
name=castle-convex-ne
image=mask-castle-ne.png
shift=-18,-45
[/mask]
[mask]
name=castle-convex-e
image=mask-castle-e.png
shift=-36,-24
[/mask]
[mask]
name=castle-convex-se
image=mask-castle-se.png
shift=-18,-24
[/mask]
[mask]
name=castle-convex-sw
image=mask-castle-sw.png
shift=-36,-24
[/mask]
[mask]
name=castle-convex-w
image=mask-castle-w.png
shift=-18,-24
[/mask]
[mask]
name=castle-convex-nw
image=mask-castle-nw.png
shift=-36,-45
[/mask]
# Concave castle images
[mask]
name=castle-concave-ne
image=mask-castle-ne.png
shift=-18,-45
[/mask]
[mask]
name=castle-concave-e
image=mask-castle-e.png
shift=-36,-24
[/mask]
[mask]
name=castle-concave-se
image=mask-castle-se.png
shift=-18,-24
[/mask]
[mask]
name=castle-concave-sw
image=mask-castle-sw.png
shift=-36,-24
[/mask]
[mask]
name=castle-concave-w
image=mask-castle-w.png
shift=-18,-24
[/mask]
[mask]
name=castle-concave-nw
image=mask-castle-nw.png
shift=-36,-45
[/mask]

33
data/tools/exploder/wall-concave.cfg Normal file
View file

@ -0,0 +1,33 @@
{tools/exploder/models/castle.cfg}
[part]
name=wall-concave-nw
pos=36,36
[/part]
[part]
name=wall-concave-ne
pos=72,36
[/part]
[part]
name=wall-concave-e
pos=90,72
[/part]
[part]
name=wall-concave-se
pos=72,108
[/part]
[part]
name=wall-concave-sw
pos=36,108
[/part]
[part]
name=wall-concave-w
pos=18,72
[/part]

33
data/tools/exploder/wall-convex.cfg Normal file
View file

@ -0,0 +1,33 @@
{tools/exploder/models/castle.cfg}
[part]
name=wall-convex-nw
pos=36,36
[/part]
[part]
name=wall-convex-ne
pos=72,36
[/part]
[part]
name=wall-convex-e
pos=90,72
[/part]
[part]
name=wall-convex-se
pos=72,108
[/part]
[part]
name=wall-convex-sw
pos=36,108
[/part]
[part]
name=wall-convex-w
pos=18,72
[/part]

208
data/tools/exploder/wall-exploded-concave.cfg Normal file
View file

@ -0,0 +1,208 @@
{tools/exploder/models/castle.cfg}
# *
# _
# _/ \_
# / \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=wall-concave-nw
pos=90,36
[/part]
[part]
name=wall-concave-ne
pos=126,36
[/part]
#
# _
# _/ \_
# / \ *
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=wall-concave-ne
pos=180,72
[/part]
[part]
name=wall-concave-e
pos=198,108
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_ _/ *
# \_/
#
[part]
name=wall-concave-e
pos=198,180
[/part]
[part]
name=wall-concave-se
pos=180,216
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_ _/
# \_/
# *
[part]
name=wall-concave-se
pos=126,252
[/part]
[part]
name=wall-concave-sw
pos=90,252
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# * \_ _/
# \_/
#
[part]
name=wall-concave-sw
pos=36,216
[/part]
[part]
name=wall-concave-w
pos=18,180
[/part]
#
# _
# _/ \_
# * / \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=wall-concave-w
pos=18,108
[/part]
[part]
name=wall-concave-nw
pos=36,72
[/part]
#
# _
# _/ \_
# / * \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=wall-convex-sw
pos=144,72
[/part]
#
# _
# _/ \_
# / \
# \ /
# / *\
# \_ _/
# \_/
#
[part]
name=wall-convex-w
pos=180,144
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_ *_/
# \_/
#
[part]
name=wall-convex-nw
pos=144,216
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_* _/
# \_/
#
[part]
name=wall-convex-ne
pos=72,216
[/part]
#
# _
# _/ \_
# / \
# \ /
# /* \
# \_ _/
# \_/
#
[part]
name=wall-convex-e
pos=36,144
[/part]
#
# _
# _/ \_
# / * \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=wall-convex-se
pos=72,72
[/part]

208
data/tools/exploder/wall-exploded-convex.cfg Normal file
View file

@ -0,0 +1,208 @@
{tools/exploder/models/castle.cfg}
# *
# _
# _/ \_
# / \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=wall-convex-nw
pos=90,36
[/part]
[part]
name=wall-convex-ne
pos=126,36
[/part]
#
# _
# _/ \_
# / \ *
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=wall-convex-ne
pos=180,72
[/part]
[part]
name=wall-convex-e
pos=198,108
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_ _/ *
# \_/
#
[part]
name=wall-convex-e
pos=198,180
[/part]
[part]
name=wall-convex-se
pos=180,216
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_ _/
# \_/
# *
[part]
name=wall-convex-se
pos=126,252
[/part]
[part]
name=wall-convex-sw
pos=90,252
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# * \_ _/
# \_/
#
[part]
name=wall-convex-sw
pos=36,216
[/part]
[part]
name=wall-convex-w
pos=18,180
[/part]
#
# _
# _/ \_
# * / \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=wall-convex-w
pos=18,108
[/part]
[part]
name=wall-convex-nw
pos=36,72
[/part]
#
# _
# _/ \_
# / * \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=wall-concave-sw
pos=144,72
[/part]
#
# _
# _/ \_
# / \
# \ /
# / *\
# \_ _/
# \_/
#
[part]
name=wall-concave-w
pos=180,144
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_ *_/
# \_/
#
[part]
name=wall-concave-nw
pos=144,216
[/part]
#
# _
# _/ \_
# / \
# \ /
# / \
# \_* _/
# \_/
#
[part]
name=wall-concave-ne
pos=72,216
[/part]
#
# _
# _/ \_
# / \
# \ /
# /* \
# \_ _/
# \_/
#
[part]
name=wall-concave-e
pos=36,144
[/part]
#
# _
# _/ \_
# / * \
# \ /
# / \
# \_ _/
# \_/
#
[part]
name=wall-concave-se
pos=72,72
[/part]

4
data/units/Dwarvish_Fighter.cfg
View file

@ -28,9 +28,9 @@ get_hit_sound=groan.wav
damage=8
number=3
[frame]
begin=-100
begin=-400
end=100
image=dwarf-fighter-attack.png
image=dwarf-fighter-attack-mace.png
[/frame]
[sound]

BIN
images/terrain/cave-floor-n-ne-se-s.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

BIN
images/terrain/cave-floor-n-ne-se.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
images/terrain/cave-floor-n-ne.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
images/terrain/cave-floor-n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 735 B

BIN
images/terrain/cave-floor-ne-se-s.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
images/terrain/cave-floor-ne-se.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
images/terrain/cave-floor-ne.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
images/terrain/cave-floor-nw-n-ne.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
images/terrain/cave-floor-nw-n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
images/terrain/cave-floor-nw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
images/terrain/cave-floor-s-sw-nw-n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
images/terrain/cave-floor-s-sw-nw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
images/terrain/cave-floor-s-sw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
images/terrain/cave-floor-s.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 721 B

BIN
images/terrain/cave-floor-se-s-sw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
images/terrain/cave-floor-se-s.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
images/terrain/cave-floor-se.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
images/terrain/cave-floor-sw-nw-n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
images/terrain/cave-floor-sw-nw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
images/terrain/cave-floor-sw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 948 B

BIN
images/terrain/cave-floor.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
images/terrain/cave-floor1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
images/terrain/cave-floor2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
images/terrain/cave-floor3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
images/terrain/cave-floor4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
images/terrain/cavewall.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
images/terrain/dwarven-castle-concave-e.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
images/terrain/dwarven-castle-concave-ne.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
images/terrain/dwarven-castle-concave-nw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
images/terrain/dwarven-castle-concave-se.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
images/terrain/dwarven-castle-concave-sw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
images/terrain/dwarven-castle-concave-w.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
images/terrain/dwarven-castle-convex-e.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
images/terrain/dwarven-castle-convex-ne.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
images/terrain/dwarven-castle-convex-nw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
images/terrain/dwarven-castle-convex-se.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
images/terrain/dwarven-castle-convex-sw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
images/terrain/dwarven-castle-convex-w.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
images/terrain/dwarven-castle-floor.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
images/terrain/dwarven-castle-wall-ccw-e.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
images/terrain/dwarven-castle-wall-ccw-ne.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
images/terrain/dwarven-castle-wall-ccw-nw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
images/terrain/dwarven-castle-wall-ccw-se.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5 KiB

BIN
images/terrain/dwarven-castle-wall-ccw-sw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
images/terrain/dwarven-castle-wall-ccw-w.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
images/terrain/dwarven-castle-wall-concave-e.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
images/terrain/dwarven-castle-wall-concave-ne.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
images/terrain/dwarven-castle-wall-concave-nw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
images/terrain/dwarven-castle-wall-concave-se.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
images/terrain/dwarven-castle-wall-concave-sw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
images/terrain/dwarven-castle-wall-concave-w.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
images/terrain/dwarven-castle-wall-convex-e.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
images/terrain/dwarven-castle-wall-convex-ne.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
images/terrain/dwarven-castle-wall-convex-nw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
images/terrain/dwarven-castle-wall-convex-se.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
images/terrain/dwarven-castle-wall-convex-sw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
images/terrain/dwarven-castle-wall-convex-w.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
images/terrain/dwarven-castle-wall-cw-e.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
images/terrain/dwarven-castle-wall-cw-ne.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
images/terrain/dwarven-castle-wall-cw-nw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
images/terrain/dwarven-castle-wall-cw-se.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
images/terrain/dwarven-castle-wall-cw-sw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
images/terrain/dwarven-castle-wall-cw-w.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
images/terrain/dwarven-keep-floor.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
images/terrain/dwarven-village.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

2
src/cavegen.cpp
View file

@ -2,7 +2,7 @@
#include "pathfind.hpp"
#include "util.hpp"
cave_map_generator::cave_map_generator(const config* cfg) : wall_('W'), clear_('u'), village_('D'), castle_('C'),
cave_map_generator::cave_map_generator(const config* cfg) : wall_('W'), clear_('u'), village_('D'), castle_('o'),
cfg_(cfg), width_(50), height_(50), village_density_(0),
flipx_(false), flipy_(false)
{