Terrain type revamp step #1:

Use some proper terrain type names:

- "grassland" becomes "flat"

- "tundra" (which was displayed as "snow") becomes "frozen" (not sure
  it's the optimal name here - can be changed if we find a bettter
  name)

- "canyon" (which was displayed as "chasm") becomes "unwalkable"

- "cavewall" becomes "impassable"

- The renamings of the wml key used in the stats will probably stay.

- The 4 added "virtual" terrains will be axed by the next step, once
  we get proper terrain type support.

- The labels might be changed (Noy had some ideas about it, it will be
  easier when we have terrain types)
This commit is contained in:
Benoît Timbert 2008-03-07 20:50:06 +00:00
parent 6eb2d786b9
commit 7fa20f7c84
55 changed files with 361 additions and 324 deletions

View file

@ -8,7 +8,7 @@
hitpoints=1
movement_type=fly
[movement_costs]
cavewall=1
impassable=1
[/movement_costs]
movement=5
experience=100

View file

@ -19,7 +19,7 @@
deep_water=1
shallow_water=1
swamp_water=1
grassland=1
flat=1
sand=1
forest=1
hills=1
@ -27,9 +27,9 @@
village=1
castle=1
cave=1
tundra=1
canyon=1
cavewall=1
frozen=1
unwalkable=1
impassable=1
fungus=1
[/defense]
[resistance]

View file

@ -517,7 +517,7 @@
replace=yes
[movement_costs]
cave=99
grassland=99
flat=99
[/movement_costs]
[/effect]
[/object]
@ -543,7 +543,7 @@
replace=yes
[movement_costs]
cave=99
grassland=99
flat=99
[/movement_costs]
[/effect]
[/object]
@ -1822,7 +1822,7 @@
replace=yes
[movement_costs]
cave=99
grassland=99
flat=99
[/movement_costs]
[/effect]
[/object]
@ -1868,7 +1868,7 @@
replace=yes
[movement_costs]
cave=99
grassland=99
flat=99
[/movement_costs]
[/effect]
[/object]

View file

@ -10,7 +10,7 @@
movement_type=smallfoot
[movement_costs]
cave=99
grassland=99
flat=99
[/movement_costs]
[resistance]
blade=0

View file

@ -11,7 +11,7 @@
movement_type=smallfoot
[movement_costs]
cave=99
grassland=99
flat=99
[/movement_costs]
[resistance]
blade=110

View file

@ -12,7 +12,7 @@
movement_type=smallfoot
[movement_costs]
cave=99
grassland=99
flat=99
[/movement_costs]
[resistance]
blade=110

View file

@ -10,7 +10,7 @@
movement_type=smallfoot
[movement_costs]
cave=99
grassland=99
flat=99
[/movement_costs]
[defense]
cave=50

View file

@ -26,7 +26,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -24,7 +24,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
shallow_water=2
mountains=2
[/movement_costs]

View file

@ -27,7 +27,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -23,7 +23,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -13,7 +13,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
deep_water=100
[/movement_costs]
[defense]

View file

@ -25,7 +25,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -23,7 +23,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -18,7 +18,7 @@
[movement_costs]
sand=1
forest=2
tundra=4
frozen=4
[/movement_costs]
#mostly like a foot Elf, but they
#are bad at defending in villages

View file

@ -15,7 +15,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -12,7 +12,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -27,7 +27,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -18,7 +18,7 @@
[movement_costs]
sand=1
forest=2
tundra=4
frozen=4
[/movement_costs]
#mostly like a foot Elf, but they
#aren't good at defending in villages

View file

@ -13,7 +13,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -13,7 +13,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
shallow_water=2
mountains=2
[/movement_costs]

View file

@ -18,7 +18,7 @@
[movement_costs]
sand=1
forest=2
tundra=4
frozen=4
[/movement_costs]
#mostly like a foot Elf, but they
#aren't good at defending in villages

View file

@ -20,7 +20,7 @@
[movement_costs]
sand=1
forest=2
tundra=4
frozen=4
[/movement_costs]
#mostly like a foot Elf, but they are bad at defending in villages
[defense]

View file

@ -13,7 +13,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -15,7 +15,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -12,7 +12,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -13,8 +13,8 @@
sand=1
forest=2
cave=1
canyon=2
tundra=2
unwalkable=2
frozen=2
deep_water=100
[/movement_costs]
[defense]

View file

@ -14,8 +14,8 @@
sand=1
forest=2
cave=1
canyon=2
tundra=2
unwalkable=2
frozen=2
deep_water=100
[/movement_costs]
[defense]

View file

@ -12,12 +12,12 @@
swamp_water=3
cave=2
fungus=2
canyon=2
unwalkable=2
[/movement_costs]
[defense]
sand=40
cave=50
cavewall=50
impassable=50
[/defense]
[resistance]
blade=70

View file

@ -9,7 +9,7 @@
movement_type=dwarvishfoot
#keep dwarves from racing across lava
[movement_costs]
tundra=3
frozen=3
[/movement_costs]
movement=6
experience=150

View file

@ -9,7 +9,7 @@
movement_type=dwarvishfoot
#keep dwarves from racing across lava
[movement_costs]
tundra=3
frozen=3
[/movement_costs]
movement=6
experience=60

View file

@ -9,7 +9,7 @@
movement_type=dwarvishfoot
#keep dwarves from racing across lava
[movement_costs]
tundra=3
frozen=3
[/movement_costs]
movement=6
experience=30

View file

@ -6,10 +6,10 @@
id=EGhost
name= _ "Ethereal Ghost"
[movement_costs]
cavewall=1
impassable=1
[/movement_costs]
[defense]
cavewall=50
impassable=50
[/defense]
experience=30
advanceto=EWraith,EShadow

View file

@ -6,10 +6,10 @@
id=ENightgaunt
name= _ "Ethereal Nightgaunt"
[movement_costs]
cavewall=1
impassable=1
[/movement_costs]
[defense]
cavewall=50
impassable=50
[/defense]
unit_description= _ "The purpose of the masks that these creatures wear is unknown, as is the countenance that they obscure. These terrible forms are rarely seen by the living, and those who live to speak of them had no leisure to study their foe."+{SPECIAL_NOTES}+{SPECIAL_NOTES_BACKSTAB}+{SPECIAL_NOTES_SPIRIT}+_"SPECIAL_NOTE^ This unit is able to move through solid stone walls."+_"SPECIAL_NOTE^ Unlike normal Nightgaunts, Ethereal Nightgaunts cannot hide at night."

View file

@ -6,10 +6,10 @@
id=EShadow
name= _ "Ethereal Shadow"
[movement_costs]
cavewall=1
impassable=1
[/movement_costs]
[defense]
cavewall=50
impassable=50
[/defense]
advanceto=ENightgaunt
unit_description= _ "When light came into the world and gave form to the unknown, fear was forced to retreat into darkness. Since that day, the shadows of the world have held terror for humanity, though it knows not why.

View file

@ -6,10 +6,10 @@
id=ESpectre
name= _ "Ethereal Spectre"
[movement_costs]
cavewall=1
impassable=1
[/movement_costs]
[defense]
cavewall=50
impassable=50
[/defense]
unit_description= _ "Sometimes called the 'hollow men', spectres form the right arm of their master's power. These abominations are a rightful terror to the living, and keep a sleepless vigil over their master's domain.

View file

@ -6,10 +6,10 @@
id=EWraith
name= _ "Ethereal Wraith"
[movement_costs]
cavewall=1
impassable=1
[/movement_costs]
[defense]
cavewall=50
impassable=50
[/defense]
advanceto=ESpectre
unit_description= _ "These tortured forms of what were once warriors are among the most terrifying things a necromancer can create, for a sword will cleave right through them, as through air itself. What inspires such fear is the thought that these beasts are invincible, a belief that is actually far from the truth.

View file

@ -8,7 +8,7 @@
name= _ "Haunt"
[movement_costs]
cave=99
grassland=99
flat=99
[/movement_costs]
experience=30
unit_description= _ "Haunts are the tortured souls of those who have died suddenly and never been laid to rest. Paralyzed by the shock of their death, they are cursed to forever haunt the place of their death and relive their final moments over and over and over."+{SPECIAL_NOTES}+{SPECIAL_NOTES_DRAIN}+{SPECIAL_NOTES_SPIRIT}+{SPECIAL_NOTES_ARCANE}

View file

@ -115,7 +115,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -8,7 +8,7 @@
hitpoints=20
movement_type=drakefly
[defense]
tundra=40
frozen=40
[/defense]
[resistance]
blade=100

View file

@ -8,7 +8,7 @@
hitpoints=23
movement_type=drakefly
[defense]
tundra=50
frozen=50
[/defense]
[resistance]
blade=100

View file

@ -8,7 +8,7 @@
hitpoints=26
movement_type=drakefly
[defense]
tundra=60
frozen=60
[/defense]
[resistance]
blade=100

View file

@ -14,7 +14,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -14,7 +14,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -14,7 +14,7 @@
sand=1
forest=2
cave=2
tundra=3
frozen=3
[/movement_costs]
[defense]
sand=40

View file

@ -65,7 +65,7 @@
[section]
id=terrains
title= _ "Terrains"
topics=..terrains,terrain_castle,terrain_village,terrain_water_village,terrain_deep_water,terrain_shallow_water,terrain_swamp_water,terrain_ford,terrain_bridge,terrain_sand,terrain_desert,terrain_savanna,terrain_grassland,terrain_road,terrain_forest,terrain_canyon,terrain_cave,terrain_cavewall,terrain_rockbound_cave,terrain_illuminated_cave,terrain_fungus,terrain_lava,terrain_hills,terrain_mountains,terrain_tundra,terrain_ice,terrain_impassable_mountain
topics=..terrains,terrain_castle,terrain_village,terrain_water_village,terrain_deep_water,terrain_shallow_water,terrain_swamp_water,terrain_ford,terrain_bridge,terrain_sand,terrain_desert,terrain_savanna,terrain_grassland,terrain_road,terrain_forest,terrain_canyon,terrain_cave,terrain_cavewall,terrain_rockbound_cave,terrain_illuminated_cave,terrain_fungus,terrain_lava,terrain_hills,terrain_mountains,terrain_snow,terrain_ice,terrain_impassable_mountain
sort_topics=yes
[/section]
@ -499,7 +499,7 @@ Mermen and Naga both receive 50% defense in deep water, with full movement."
[/topic]
[topic]
id=terrain_tundra
id=terrain_snow
title= _ "Snow"
text= "<img>src=terrain/snow.png align=left box=no</img>
@ -513,7 +513,7 @@ Most units have 20 to 40% defense in snow."
title= _ "Ice"
text= "<img>src=terrain/ice.png align=left box=no</img>
" + _ "Ice represents any body of frozen water. For gameplay purposes, it is identical to <ref>dst=terrain_tundra text=Snow</ref>. Note that swimming units, even those who can breathe underwater, cannot swim underneath ice."
" + _ "Ice represents any body of frozen water. For gameplay purposes, it is identical to <ref>dst=terrain_snow text=Snow</ref>. Note that swimming units, even those who can breathe underwater, cannot swim underneath ice."
[/topic]
[topic]

View file

@ -28,6 +28,7 @@
string=_f # wmllint: ignore
[/terrain]
#
# Frozen
#
@ -38,15 +39,16 @@
name= _ "Ice"
string=Ai
unit_height_adjust=-2
aliasof=Aa
aliasof=At
editor_group=frozen
[/terrain]
[terrain]
symbol_image=snow
id=tundra
id=snow
name= _ "Snow"
string=Aa
aliasof=At
editor_group=frozen
[/terrain]
@ -60,7 +62,7 @@
id=bridge
name= _ "Bridge"
string=Ww^Bw|
aliasof=Gg, Ww
aliasof=Gt, Ww
editor_group=bridge, water
[/terrain]
@ -69,7 +71,7 @@
id=bridgediag1
name= _ "Bridge"
string=Ww^Bw/
aliasof=Gg, Ww
aliasof=Gt, Ww
editor_group=bridge, water
[/terrain]
@ -78,7 +80,7 @@
id=bridgediag2
name= _ "Bridge"
string=Ww^Bw\
aliasof=Gg, Ww
aliasof=Gt, Ww
editor_group=bridge, water
[/terrain]
@ -88,7 +90,7 @@
id=bridgedeep
name= _ "Bridge"
string=Wo^Bw|
aliasof=Gg, Wo
aliasof=Gt, Wo
editor_group=bridge, water
[/terrain]
@ -97,7 +99,7 @@
id=bridgedeepdiag1
name= _ "Bridge"
string=Wo^Bw/
aliasof=Gg, Wo
aliasof=Gt, Wo
editor_group=bridge, water
[/terrain]
@ -106,7 +108,7 @@
id=bridgedeepdiag2
name= _ "Bridge"
string=Wo^Bw\
aliasof=Gg, Wo
aliasof=Gt, Wo
editor_group=bridge, water
[/terrain]
@ -116,7 +118,7 @@
id=bridgeswamp
name= _ "Bridge"
string=Ss^Bw|
aliasof=Gg, Ss
aliasof=Gt, Ss
editor_group=bridge, water
[/terrain]
@ -125,7 +127,7 @@
id=bridgeswampdiag1
name= _ "Bridge"
string=Ss^Bw/
aliasof=Gg, Ss
aliasof=Gt, Ss
editor_group=bridge, water
[/terrain]
@ -134,7 +136,7 @@
id=bridgeswampdiag2
name= _ "Bridge"
string=Ss^Bw\
aliasof=Gg, Ss
aliasof=Gt, Ss
editor_group=bridge, water
[/terrain]
@ -145,7 +147,7 @@
id=bridgechasm
name= _ "Bridge"
string=Qxu^Bs|
aliasof=Uu,Qxu
aliasof=Uu,Qt
editor_group=bridge, cave
[/terrain]
@ -155,7 +157,7 @@
name= _ "Bridge"
unit_height_adjust=22
string=Qxu^Bs/
aliasof=Uu,Qxu
aliasof=Uu,Qt
editor_group=bridge, cave
[/terrain]
@ -165,7 +167,7 @@
name= _ "Bridge"
unit_height_adjust=22
string=Qxu^Bs\
aliasof=Uu,Qxu
aliasof=Uu,Qt
editor_group=bridge, cave
[/terrain]
@ -177,7 +179,8 @@
id=bridgelava
name= _ "Bridge"
string=Ql^Bs|
aliasof=Uu,Qlf
aliasof=Uu,Qt
light=25
editor_group=bridge, cave
[/terrain]
@ -187,7 +190,8 @@
name= _ "Bridge"
unit_height_adjust=22
string=Ql^Bs/
aliasof=Uu,Qlf
aliasof=Uu,Qt
light=25
editor_group=bridge, cave
[/terrain]
@ -197,7 +201,8 @@
name= _ "Bridge"
unit_height_adjust=22
string=Ql^Bs\
aliasof=Uu,Qlf
aliasof=Uu,Qt
light=25
editor_group=bridge, cave
[/terrain]
@ -453,8 +458,8 @@
id=snow_forest
name= _ "Snow Forest"
string=Aa^Fpa
aliasof=Aa, Gs^Fp
mvt_alias=-,Aa, Gs^Fp
aliasof=At, Gs^Fp
mvt_alias=-,At, Gs^Fp
editor_group=frozen, forest
[/terrain]
@ -493,6 +498,7 @@
id=grassland
name= _ "Grassland"
string=Gg
aliasof=Gt
editor_group=flat
[/terrain]
@ -501,7 +507,7 @@
id=grassland_flowers
name= _ "Grassland"
string=Ggf
aliasof=Gg
aliasof=Gt
editor_group=flat
[/terrain]
@ -510,7 +516,7 @@
id=windmill
name= _ "Grassland"
string=Gg^Wm
aliasof=Gg
aliasof=Gt
editor_group=flat
[/terrain]
@ -519,7 +525,7 @@
id=savanna
name= _ "Savanna"
string=Gs
aliasof=Gg
aliasof=Gt
editor_group=flat
[/terrain]
@ -532,8 +538,8 @@
id=snow_hills
name= _ "Snow Hills"
string=Ha
aliasof=Aa, Hh
mvt_alias=-,Aa, Hh
aliasof=At, Hh
mvt_alias=-,At, Hh
editor_group=frozen, rough
[/terrain]
@ -585,6 +591,7 @@
id=canyon
name= _ "Chasm"
string=Qxu
aliasof=Qt
editor_group=cave
[/terrain]
@ -593,7 +600,7 @@
id=lava_chasm
name= _ "Lava chasm"
string=Ql
aliasof=Qxu
aliasof=Qt
light=25
editor_group=cave
[/terrain]
@ -603,7 +610,7 @@
id=lava
name= _ "Lava"
string=Qlf
aliasof=Qxu
aliasof=Qt
light=25
editor_group=cave
[/terrain]
@ -617,7 +624,7 @@
id=road
name= _ "Road"
string=Rd
aliasof=Gg
aliasof=Gt
editor_group=desert, flat
[/terrain]
@ -626,7 +633,7 @@
id=dirt
name= _ "Dirt"
string=Re
aliasof=Gg
aliasof=Gt
editor_group=flat
[/terrain]
@ -635,7 +642,7 @@
id=road
name= _ "Road"
string=Rr
aliasof=Gg
aliasof=Gt
editor_group=flat
[/terrain]
@ -644,7 +651,7 @@
id=stone_path
name= _ "Road"
string=Rp
aliasof=Gg
aliasof=Gt
editor_group=flat
[/terrain]
@ -653,7 +660,7 @@
id=farm
name= _ "Farmland"
string=Re^Gvs
aliasof=Gg
aliasof=Gt
editor_group=flat
[/terrain]
@ -962,7 +969,7 @@
id=ford
name= _ "River Ford"
string=Wwf
aliasof=Gg, Ww
aliasof=Gt, Ww
submerge=0.3
unit_height_adjust=-4
editor_group=water
@ -977,7 +984,7 @@
id=cloud
name= _ "Impassable Mountains"
string=Mm^Xm
aliasof=Xu
aliasof=Xt
editor_group=rough,wall
[/terrain]
@ -986,7 +993,7 @@
id=clouddesert
name= _ "Impassable Desert Mountains"
string=Md^Xm
aliasof=Xu
aliasof=Xt
editor_group=rough,wall
[/terrain]
@ -996,6 +1003,7 @@
id=cavewall
name= _ "Cave Wall"
string=Xu
aliasof=Xt
editor_group=cave,wall
[/terrain]
@ -1005,6 +1013,35 @@
id=void
name= _ "Void"
string=Xv
aliasof=Xu
aliasof=Xt
editor_group=flat,wall
[/terrain]
#
# Terrain archetypes
#
# these are "virtual" terrain
[terrain]
symbol_image=void
id=flat
name= _ "Flat"
string=Gt # wmllint: ignore
[/terrain]
[terrain]
symbol_image=void
id=frozen
name= _ "Frozen"
string=At # wmllint: ignore
[/terrain]
[terrain]
symbol_image=void
id=impassable
name= _ "Impassable"
string=Xt # wmllint: ignore
[/terrain]
[terrain]
symbol_image=void
id=unwalkable
name= _ "Unwalkable"
string=Qt # wmllint: ignore
[/terrain]

File diff suppressed because it is too large Load diff

View file

@ -21,7 +21,7 @@
die_sound={SOUND_LIST:DWARF_DIE}
{DEFENSE_ANIM "units/dwarves/sentinel-defend.png" "units/dwarves/sentinel.png" {SOUND_LIST:DWARF_HIT} }
[defense]
grassland=60
flat=60
forest=60
sand=60
mountains=40

View file

@ -20,7 +20,7 @@
die_sound={SOUND_LIST:DWARF_DIE}
{DEFENSE_ANIM "units/dwarves/stalwart-defend.png" "units/dwarves/stalwart.png" {SOUND_LIST:DWARF_HIT} }
[defense]
grassland=60
flat=60
forest=60
sand=60
mountains=40

View file

@ -38,7 +38,7 @@ The presence of these men troubles the more authoritarian of rulers; they are an
hills=1
mountains=2
cave=2
tundra=2
frozen=2
[/movement_costs]
[attack]
name=sword

View file

@ -19,10 +19,10 @@
die_sound=yeti-die.ogg
{DEFENSE_ANIM "units/monsters/yeti-defend.png" "units/monsters/yeti.png" yeti-hit.ogg }
[movement_costs]
tundra=1
frozen=1
[/movement_costs]
[defense]
tundra=40
frozen=40
[/defense]
[resistance]
cold=50

View file

@ -21,7 +21,7 @@
die_sound=naga-die.ogg
{DEFENSE_ANIM "units/nagas/myrmidon-defend.png" "units/nagas/myrmidon.png" {SOUND_LIST:NAGA_HIT} }
[defense]
grassland=50
flat=50
sand=40
[/defense]
[attack]

View file

@ -20,7 +20,7 @@
die_sound=naga-die.ogg
{DEFENSE_ANIM "units/nagas/warrior-defend.png" "units/nagas/warrior.png" {SOUND_LIST:NAGA_HIT} }
[defense]
grassland=60
flat=60
sand=50
[/defense]
[attack]

View file

@ -77,11 +77,11 @@
apply_to=movement_costs
replace=true
[movement_costs]
grassland=1
flat=1
sand=2
forest=2
cavewall=3
canyon=3
impassable=3
unwalkable=3
deep_water=3
[/movement_costs]
[/effect]
@ -1217,7 +1217,7 @@
apply_to=movement_costs
replace=true
[movement_costs]
tundra=99
frozen=99
[/movement_costs]
[/effect]
[/object]