From cb192e3d94cff4d121236ad2a61d1de68846f5f3 Mon Sep 17 00:00:00 2001 From: "J.W. Bjerk" Date: Thu, 3 Jun 2010 21:42:06 +0000 Subject: [PATCH] adding two new editor groups, bridges and obstacles, ...and reordering most terrains in the editor to put common, simple choices at the top. --- data/core/editor/terrain-groups.cfg | 14 + data/core/terrain.cfg | 2480 +++++++++-------- .../buttons/group_bridge-active-pressed.png | Bin 371 -> 3782 bytes images/buttons/group_bridge-active.png | Bin 371 -> 3775 bytes images/buttons/group_bridge-pressed.png | Bin 371 -> 3782 bytes images/buttons/group_bridge.png | Bin 371 -> 3830 bytes .../buttons/group_obstacle-active-pressed.png | Bin 0 -> 3493 bytes images/buttons/group_obstacle-active.png | Bin 0 -> 3527 bytes images/buttons/group_obstacle-pressed.png | Bin 0 -> 3535 bytes images/buttons/group_obstacle.png | Bin 0 -> 3515 bytes 10 files changed, 1260 insertions(+), 1234 deletions(-) create mode 100644 images/buttons/group_obstacle-active-pressed.png create mode 100644 images/buttons/group_obstacle-active.png create mode 100644 images/buttons/group_obstacle-pressed.png create mode 100644 images/buttons/group_obstacle.png diff --git a/data/core/editor/terrain-groups.cfg b/data/core/editor/terrain-groups.cfg index 0a4aad5b183..52612b0727c 100644 --- a/data/core/editor/terrain-groups.cfg +++ b/data/core/editor/terrain-groups.cfg @@ -67,6 +67,13 @@ core=yes [/editor_group] +[editor_group] + id=obstacle + name= _ "obstacle" + icon="group_obstacle" + core=yes +[/editor_group] + [editor_group] id=village name= _ "village" @@ -81,6 +88,13 @@ core=yes [/editor_group] +[editor_group] + id=bridge + name= _ "bridge" + icon="group_bridge" + core=yes +[/editor_group] + [editor_group] id=special name= _ "special" diff --git a/data/core/terrain.cfg b/data/core/terrain.cfg index eeefb1607f2..8c2bcc89fd1 100644 --- a/data/core/terrain.cfg +++ b/data/core/terrain.cfg @@ -6,35 +6,202 @@ # each "[terrain] id=some_id" corresponds to "[section] id=terrain_some_id" # or "[topic] id=terrain_some_id" identifying its description in [help] +# NOTE: this list is sorted to group things comprehensibly in the editor + + + +# +# ## Water ## +# + [terrain_type] - symbol_image=void - editor_image=off-map/offmap-editor - id=off_map - name= _ "None" - string=_off^_usr # wmllint: ignore - editor_group=special + symbol_image=water/ocean-A01 + id=deep_water + name= _ "Deep Water" + string=Wo + submerge=0.5 + unit_height_adjust=-3 + editor_group=water [/terrain_type] [terrain_type] - symbol_image=void - editor_image=shroud-editor - id=shroud - name= _ "Shroud" - string=_s # wmllint: ignore - editor_group=special + symbol_image=water/coast-A01 + id=shallow_water + name= _ "Shallow Water" + string=Ww + submerge=0.4 + unit_height_adjust=-4 + editor_group=water [/terrain_type] [terrain_type] - symbol_image=fog - editor_image=fog-editor - id=fog - name= _ "Fog" - string=_f # wmllint: ignore - editor_group=special + symbol_image=water/coast-tropical-A01 + id=tropical_water + name= _ "Tropical Water" + string=Wwt + aliasof=Ww + submerge=0.4 + unit_height_adjust=-4 + editor_group=water +[/terrain_type] + +[terrain_type] + symbol_image=water/ford-tile + id=ford + name= _ "Ford" + string=Wwf + aliasof=Gt, Ww + submerge=0.3 + unit_height_adjust=-4 + editor_group=water +[/terrain_type] + +[terrain_type] + symbol_image=water/reef + id=reef + name= _ "Coastal Reef" + string=Wwr + submerge=0.3 + unit_height_adjust=-3 + editor_group=water +[/terrain_type] + +#### This one is being depreciated +[terrain_type] + symbol_image=color-hex + id=tropical_water_depreciated + name= _ "Deprecated. Use 'Wwt'" + string=Wt + aliasof=Ww + submerge=0.4 + unit_height_adjust=-4 + editor_group=water +[/terrain_type] + +# ## Swamp ## + +[terrain_type] + symbol_image=swamp/water-tile + id=swamp_water + name= _ "Swamp" + string=Ss + submerge=0.4 + unit_height_adjust=-3 + editor_group=water +[/terrain_type] + + +# +# ## Flat ## +# + +# ## Grass ## + +[terrain_type] + symbol_image=flat/grass + id=grassland + name= _ "Grassland" + string=Gg + aliasof=Gt + editor_group=flat +[/terrain_type] + +# This terrain will soon be obsolete. +[terrain_type] + symbol_image=flat/grass-flowers + id=grassland_flowers + name= _ "Grassland" + string=Ggf + aliasof=Gt + editor_group=flat +[/terrain_type] + +[terrain_type] + symbol_image=flat/savanna + id=savanna + name= _ "Savanna" + string=Gs + aliasof=Gt + editor_group=flat +[/terrain_type] + +[terrain_type] + symbol_image=flat/grass-dry + id=grass_dry + name= _ "Dry Grass" + string=Gd + aliasof=Gt + editor_group=flat +[/terrain_type] + +[terrain_type] + symbol_image=flat/leaf-litter + id=leaf_litter + name= _ "Grassland" + string=Gll + aliasof=Gt + editor_group=flat +[/terrain_type] + +# ## Roads ## + +[terrain_type] + symbol_image=flat/farm-veg-spring-icon + id=farm + name= _ "Farmland" + string=^Gvs + default_base=Re + aliasof=_bas + editor_group=flat +[/terrain_type] + +[terrain_type] + symbol_image=flat/dirt-dark + id=dirt_dark + name= _ "Dirt" + string=Rb + aliasof=Gt + editor_group=flat +[/terrain_type] + +[terrain_type] + symbol_image=flat/dirt + id=dirt + name= _ "Dirt" + string=Re + aliasof=Gt + editor_group=flat +[/terrain_type] + +[terrain_type] + symbol_image=flat/desert-road + id=road + name= _ "Dirt" + string=Rd + aliasof=Gt + editor_group=desert, flat +[/terrain_type] + +[terrain_type] + symbol_image=flat/road + id=road + name= _ "Cobbles" + string=Rr + aliasof=Gt + editor_group=flat +[/terrain_type] + +[terrain_type] + symbol_image=flat/stone-path + id=stone_path + name= _ "Cobbles" + string=Rp + aliasof=Gt + editor_group=flat [/terrain_type] # -# Frozen +# ## Frozen ## # [terrain_type] @@ -56,111 +223,510 @@ editor_group=frozen [/terrain_type] + # -# Bridges +# ## Desert ## +# + +#New desert +[terrain_type] + symbol_image=desert-tile + id=desert + name= _ "Desert" + string=Dd + aliasof=Ds + editor_group=desert +[/terrain_type] + +#Old desert +[terrain_type] + symbol_image=sand + id=sand + name= _ "Sand" + string=Ds + editor_group=desert +[/terrain_type] + +[terrain_type] + symbol_image=desert-oasis + id=oasis + name= _ "Oasis" + string=Dd^Do + aliasof=Ds + heals=8 + #gives_income=true + editor_group=desert, forest +[/terrain_type] + +#UtbS sand rubble +[terrain_type] + symbol_image=sand_rubble-tile + id=sand_rubble + name= _ "Rubble" + string=^Dr + aliasof=_bas, Hh + mvt_alias=-,_bas,Hh + editor_group=desert, rough +[/terrain_type] + +#UtbS desert crater +[terrain_type] + symbol_image=desert_crater + id=crater + name= _ "Crater" + string=Dd^Dc + aliasof=Ds + editor_group=desert +[/terrain_type] + + +# +# ## Embellishments ## # [terrain_type] - symbol_image=bridge/wood-n-s - id=bridge - name= _ "Bridge" - string=^Bw| - aliasof=_bas, Gt - submerge=0 - unit_height_adjust=22 - editor_group=bridge, water + symbol_image=embellishments/stones-small7 + id=stones_small + name= _ "Stones" + string=^Es + aliasof=_bas + editor_group=embellishments [/terrain_type] [terrain_type] - symbol_image=bridge/wood-ne-sw - id=bridgediag1 - name= _ "Bridge" - string=^Bw/ - aliasof=_bas, Gt - editor_group=bridge, water - submerge=0 - unit_height_adjust=22 + symbol_image=embellishments/mushroom + id=mushrooms_small + name= _ "Mushrooms" + string=^Em + aliasof=_bas + editor_group=embellishments [/terrain_type] [terrain_type] - symbol_image=bridge/wood-se-nw - id=bridgediag2 - name= _ "Bridge" - string=^Bw\ - aliasof=_bas, Gt - editor_group=bridge, water - submerge=0 - unit_height_adjust=22 -[/terrain_type] - -# >>>>>>>> Chasm Bridge - -[terrain_type] - symbol_image=cave/chasm-stone-bridge-s-n-tile - id=bridgechasm - name= _ "Bridge" - string=Qxu^Bs| - aliasof=Uu,Qt - editor_group=bridge, cave + symbol_image=embellishments/desert-plant + id=desert_plants + name= _ "Desert Plants" + string=^Edp + aliasof=_bas + editor_group=embellishments, desert [/terrain_type] [terrain_type] - symbol_image=cave/chasm-stone-bridge-sw-ne-tile - id=bridgechasmdiag1 - name= _ "Bridge" - unit_height_adjust=22 - string=Qxu^Bs/ - aliasof=Uu,Qt - editor_group=bridge, cave + symbol_image=windmill-tile + id=windmill + name= _ "Windmill" + string=^Wm + aliasof=_bas + editor_group=embellishments +[/terrain_type] + + +# +# ## Forests ## +# + +[terrain_type] + symbol_image=forest/great-tree-tile + id=great_tree + name= _ "Great Tree" + string=^Fet + default_base=Gg + aliasof=^Fp + editor_group=forest [/terrain_type] [terrain_type] - symbol_image=cave/chasm-stone-bridge-se-nw-tile - id=bridgechasmdiag2 - name= _ "Bridge" - unit_height_adjust=22 - string=Qxu^Bs\ - aliasof=Uu,Qt - editor_group=bridge, cave + symbol_image=forest/tropical-tile + id=tropical_forest + name= _ "Tropical Forest" + string=^Ft + default_base=Gs + aliasof=^Fp + editor_group=forest [/terrain_type] -# >>>>>>>> Lava Bridge +[terrain_type] + symbol_image=forest/pine-tile + id=forest + name= _ "Forest" + description=_ "Pine Forest" + string=^Fp + default_base=Gll + editor_group=forest +[/terrain_type] [terrain_type] - symbol_image=cave/chasm-lava-stone-bridge-s-n-tile - id=bridgelava - name= _ "Bridge" - string=Ql^Bs| - aliasof=Uu,Qt + symbol_image=forest/snow-forest-tile + id=snow_forest + name= _ "Snow Forest" + description=_ "Snowy Pine Forest" + string=^Fpa + default_base=Aa + aliasof=At,^Fp + mvt_alias=-,At,^Fp + editor_group=frozen, forest +[/terrain_type] + +[terrain_type] + symbol_image=forest/deciduous-summer-tile + id=deciduous_forest_summer + name=_ "Forest" + description=_ "Summer Deciduous Forest" + string=^Fds + default_base=Gs + aliasof=^Fp + editor_group=forest +[/terrain_type] + +[terrain_type] + symbol_image=forest/deciduous-fall-tile + id=deciduous_forest_fall + name=_ "Forest" + description=_ "Fall Deciduous Forest" + string=^Fdf + default_base=Gd + aliasof=^Fp + editor_group=forest +[/terrain_type] + +[terrain_type] + symbol_image=forest/deciduous-winter-tile + id=deciduous_forest_winter + name=_ "Forest" + description=_ "Winter Deciduous Forest" + string=^Fdw + default_base=Gs + aliasof=^Fp + editor_group=forest +[/terrain_type] + +[terrain_type] + symbol_image=forest/deciduous-winter-snow-tile + id=deciduous_forest_winter_snow + name=_ "Snow Forest" + description=_ "Snowy Deciduous Forest" + string=^Fda + default_base=Aa + aliasof=At,^Fp + mvt_alias=-,At,^Fp + editor_group=frozen, forest +[/terrain_type] + +[terrain_type] + symbol_image=forest/mixed-summer-tile + id=mixed_forest_summer + name=_ "Forest" + description=_ "Summer Mixed Forest" + string=^Fms + default_base=Gs + aliasof=^Fp + editor_group=forest +[/terrain_type] + +[terrain_type] + symbol_image=forest/mixed-fall-tile + id=mixed_forest_fall + name=_ "Forest" + description=_ "Fall Mixed Forest" + string=^Fmf + default_base=Gll + aliasof=^Fp + editor_group=forest +[/terrain_type] + +[terrain_type] + symbol_image=forest/mixed-winter-tile + id=mixed_forest_winter + name=_ "Forest" + description=_ "Winter Mixed Forest" + string=^Fmw + default_base=Gd + aliasof=^Fp + editor_group=forest +[/terrain_type] + +[terrain_type] + symbol_image=forest/mixed-winter-snow-tile + id=mixed_forest_winter_snow + name=_ "Snow Forest" + description=_ "Snowy Mixed Forest" + string=^Fma + default_base=Aa + aliasof=At,^Fp + mvt_alias=-,At,^Fp + editor_group=frozen, forest +[/terrain_type] + + +# +# ## Hills ## +# + +[terrain_type] + symbol_image=hills/regular + id=hills + name= _ "Hills" + string=Hh + editor_group=rough +[/terrain_type] + +[terrain_type] + symbol_image=hills/dry + id=hills_dry + name= _ "Hills" + string=Hhd + aliasof=Hh + editor_group=rough +[/terrain_type] + +[terrain_type] + symbol_image=desert-hills + id=desert_hills + name= _ "Dunes" + string=Hd + aliasof=Ds, Hh + mvt_alias=-,Ds,Hh + editor_group=desert, rough +[/terrain_type] + +[terrain_type] + symbol_image=snow-hills + id=snow_hills + name= _ "Snow Hills" + string=Ha + aliasof=At, Hh + mvt_alias=-,At, Hh + editor_group=frozen, rough +[/terrain_type] + +# +# ## Mountain ## +# + +[terrain_type] + symbol_image=mountain-tile + id=mountains + name= _ "Mountains" + string=Mm + editor_group=rough +[/terrain_type] + +[terrain_type] + symbol_image=desert-mountains + id=desert_mountains + name= _ "Mountains" + description=_ "Desert Mountains" + string=Md + aliasof=Mm + editor_group=rough, desert +[/terrain_type] + +[terrain_type] + symbol_image=snow-mountain-tile + id=snow_mountains + name= _ "Mountains" + description = _"Snowy Mountains" + string=Ms + aliasof=At, Mm + mvt_alias=-,At, Mm + editor_group=rough, frozen +[/terrain_type] + +# +# ## Mixed ## +# + +[terrain_type] + symbol_image=forest/forested-hills-tile + id=forested_hills + name= _ "Forested Hills" + string=Hh^Fp + aliasof=Hh,^Fp + mvt_alias=-,Hh,^Fp + editor_group=forest, rough +[/terrain_type] + +[terrain_type] + symbol_image=forest/forested-snow-hills-tile + id=forested_snow_hills + name= _ "Forested Snow Hills" + string=Ha^Fpa + aliasof=Ha,^Fp + mvt_alias=-,Ha,^Fp + editor_group=forest, rough, frozen +[/terrain_type] + +[terrain_type] + symbol_image=forest/forested-deciduous-summer-hills-tile + id=deciduous_forest_summer_hills + name=_ "Forested Hills" + description=_ "Summer Deciduous Forested Hills" + string=Hh^Fds + aliasof=Hh,^Fp + mvt_alias=-,Hh,^Fp + editor_group=forest, rough +[/terrain_type] + +[terrain_type] + symbol_image=forest/forested-deciduous-fall-hills-tile + id=deciduous_forest_fall_hills + name=_ "Forested Hills" + description=_ "Fall Deciduous Forested Hills" + string=Hh^Fdf + aliasof=Hh,^Fp + mvt_alias=-,Hh,^Fp + editor_group=forest, rough +[/terrain_type] + +[terrain_type] + symbol_image=forest/forested-deciduous-winter-hills-tile + id=deciduous_forest_winter_hills + name=_ "Forested Hills" + description=_ "Winter Deciduous Forested Hills" + string=Hh^Fdw + aliasof=Hh,^Fp + mvt_alias=-,Hh,^Fp + editor_group=forest, rough +[/terrain_type] + +[terrain_type] + symbol_image=forest/forested-deciduous-winter-snow-hills-tile + id=deciduous_forest_winter_snow_hills + name=_ "Forested Snow Hills" + description=_ "Snowy Deciduous Forested Hills" + string=Ha^Fda + aliasof=Ha,^Fp + mvt_alias=-,Ha,^Fp + editor_group=frozen, forest, rough +[/terrain_type] + +[terrain_type] + symbol_image=forest/forested-mixed-summer-hills-tile + id=mixed_forest_summer_hills + name=_ "Forested Hills" + description=_ "Summer Mixed Forested Hills" + string=Hh^Fms + aliasof=Hh,^Fp + mvt_alias=-,Hh,^Fp + editor_group=forest, rough +[/terrain_type] + +[terrain_type] + symbol_image=forest/forested-mixed-fall-hills-tile + id=mixed_forest_fall_hills + name=_ "Forested Hills" + string=Hh^Fmf + aliasof=Hh,^Fp + mvt_alias=-,Hh,^Fp + editor_group=forest, rough +[/terrain_type] + +[terrain_type] + symbol_image=forest/forested-mixed-winter-hills-tile + id=mixed_forest_winter_hills + name=_ "Forested Hills" + description=_ "Winter Mixed Forested Hills" + string=Hh^Fmw + aliasof=Hh,^Fp + mvt_alias=-,Hh,^Fp + editor_group=forest, rough +[/terrain_type] + +[terrain_type] + symbol_image=forest/forested-mixed-winter-snow-hills-tile + id=mixed_forest_winter_snow_hills + name=_ "Forested Snow Hills" + description=_ "Snowy Mixed Forested Hills" + string=Ha^Fma + aliasof=Ha,^Fp + mvt_alias=-,Ha,^Fp + editor_group=frozen, forest, rough +[/terrain_type] + + +# +# ## Underground ## +# + +[terrain_type] + symbol_image=cave/beam-tile + id=lit + name= _ "Lit" + string=^Ii + aliasof=_bas light=25 - editor_group=bridge, cave + editor_group=cave [/terrain_type] [terrain_type] - symbol_image=cave/chasm-lava-stone-bridge-sw-ne-tile - id=bridgelavadiag1 - name= _ "Bridge" - unit_height_adjust=22 - string=Ql^Bs/ - aliasof=Uu,Qt - light=25 - editor_group=bridge, cave + symbol_image=cave/floor6 + id=cave + name= _ "Cave" + string=Uu + editor_group=cave +[/terrain_type] + +# [terrain] +# symbol_image=cave/beam-tile +# id=cave_beam +# name= _ "Cave Lit" +# string=Uu^Ii +# aliasof=Uu +# light=25 +# editor_group=cave +# [/terrain] + +[terrain_type] + symbol_image=cave/path + id=cave_path + name= _ "Cave path" + string=Ur + aliasof=Gt + editor_group=cave [/terrain_type] [terrain_type] - symbol_image=cave/chasm-lava-stone-bridge-se-nw-tile - id=bridglavadiag2 - name= _ "Bridge" - unit_height_adjust=22 - string=Ql^Bs\ - aliasof=Uu,Qt - light=25 - editor_group=bridge, cave + symbol_image=forest/mushrooms-tile + id=fungus + name= _ "Mushroom Grove" + string=^Uf + default_base=Uu + editor_group=cave, forest [/terrain_type] -# -# Mine rail tracks -# +[terrain_type] + symbol_image=forest/mushrooms-beam-tile + id=fungus_beam + name= _ "Mushroom Grove Lit" + string=^Ufi + default_base=Uu + aliasof=^Uf + light=25 + editor_group=cave +[/terrain_type] + +[terrain_type] + symbol_image=cave/hills-variation + id=rocky_cave + name= _ "Rockbound Cave" + string=Uh + aliasof=Uu, Hh + mvt_alias=-,Uu, Hh + editor_group=cave, rough +[/terrain_type] + +# [terrain] +# symbol_image=cave/hills-beam-tile +# id=rocky_cave_beam +# name= _ "Rockbound Cave Lit" +# string=Uh^Ii +# aliasof=Uu, Hh +# mvt_alias=-,Uu, Hh +# light=25 +# editor_group=cave, rough +# [/terrain] + +# ## Mine rail tracks ## [terrain_type] symbol_image=cave/rails-n-s @@ -198,6 +764,497 @@ editor_group=cave [/terrain_type] + +# +# ## Unwalkable ## +# + +[terrain_type] + symbol_image=unwalkable/chasm-tile + id=canyon + name= _ "Chasm" + string=Qxu + aliasof=Qt + editor_group=cave, obstacle +[/terrain_type] + +[terrain_type] + symbol_image=unwalkable/lava-chasm-tile + id=lava_chasm + name= _ "Lava chasm" + string=Ql + aliasof=Qt + light=25 + editor_group=cave, obstacle +[/terrain_type] + +[terrain_type] + symbol_image=unwalkable/lava + id=lava + name= _ "Lava" + string=Qlf + aliasof=Qt + light=25 + editor_group=cave, obstacle +[/terrain_type] + + +# +# Impassable +# + +[terrain_type] + symbol_image=cloud-tile + id=cloud + name= _ "Impassable Mountains" + string=Mm^Xm + aliasof=Xt + editor_group=rough,obstacle +[/terrain_type] + +[terrain_type] + symbol_image=cloud-desert-tile + id=clouddesert + name= _ "Impassable Desert Mountains" + string=Md^Xm + aliasof=Xt + editor_group=rough,obstacle,desert +[/terrain_type] + +[terrain_type] + symbol_image=cloud-snow-tile + id=cloud_snow + name= _ "Impassable Mountains" + string=Ms^Xm + aliasof=Xt + editor_group=rough,obstacle,frozen +[/terrain_type] + +[terrain_type] + symbol_image=cave/wall-rough-tile + id=cavewall + name= _ "Cave Wall" + string=Xu + aliasof=Xt + editor_group=cave,obstacle +[/terrain_type] + +[terrain_type] + symbol_image=walls/wall-stone-tile + id=wall_stone + name= _ "Wall" + string=Xos + aliasof=Xu + editor_group=cave,obstacle +[/terrain_type] + +[terrain_type] + symbol_image=walls/wall-stone-tile + id=wall_stone_lit + name= _ "Wall" + string=Xol + aliasof=Xu + editor_group=cave,obstacle +[/terrain_type] + +[terrain_type] + symbol_image=void + editor_image=impassable-editor + id=impassable_overlay + name= _ "Impassable" + string=^Xo + aliasof=_bas,Xt + mvt_alias=Xt + editor_group=special +[/terrain_type] + +[terrain_type] + symbol_image=void + editor_image=void-editor + id=void + name= _ "Void" + string=Xv + aliasof=Xt + editor_group=obstacle,special +[/terrain_type] + + +# +# Villages +# + +# ## Desert + +[terrain_type] + symbol_image=village/desert-tile + id=desert_village + name= _ "Village" + string=^Vda + aliasof=Vi, Ds + default_base=Dd + heals=8 + gives_income=true + editor_group=village, desert +[/terrain_type] + +[terrain_type] + symbol_image=village/desert-camp-tile + id=desert_village + name= _ "Village" + string=^Vdt + aliasof=Vi, Ds + default_base=Dd + heals=8 + gives_income=true + editor_group=village, desert +[/terrain_type] + +# ## Orcish + +[terrain_type] + symbol_image=village/orc-snow-tile + id=orcish_snow_village + name= _ "Village" + string=^Voa + aliasof=Vi, Aa + default_base=Aa + heals=8 + gives_income=true + editor_group=village, frozen +[/terrain_type] + +[terrain_type] + symbol_image=village/orc-tile + id=orcish_village + name= _ "Village" + string=^Vo + aliasof=Vi + default_base=Gd + heals=8 + gives_income=true + editor_group=village +[/terrain_type] + +[terrain_type] + symbol_image=village/orc-snow-hills-tile + id=orcish_snow_hills_village + name= _ "Village" + string=^Voha + aliasof=Vi, Hh + default_base=Ha + heals=8 + gives_income=true + editor_group=village, frozen, rough +[/terrain_type] + +[terrain_type] + symbol_image=village/orc-hills-tile + id=orcish_hill_village + name= _ "Village" + string=^Voh + aliasof=Vi, Hh + default_base=Hh + heals=8 + gives_income=true + editor_group=village, rough +[/terrain_type] + +# ## Elven + +[terrain_type] + symbol_image=village/elven-snow-tile + id=elven_snow_village + name= _ "Village" + string=^Vea + aliasof=Vi, Aa + default_base=Aa + heals=8 + gives_income=true + editor_group=village, frozen +[/terrain_type] + +[terrain_type] + symbol_image=village/elven-tile + id=elven_village + name= _ "Village" + string=^Ve + aliasof=Vi + default_base=Gg + heals=8 + gives_income=true + editor_group=village +[/terrain_type] + +# ## Human + +[terrain_type] + symbol_image=village/snow-tile + id=snow_village + name= _ "Village" + string=^Vha + aliasof=Vi, Aa + default_base=Aa + heals=8 + gives_income=true + editor_group=village, frozen +[/terrain_type] + +[terrain_type] + symbol_image=village/human-tile + id=human_village + name= _ "Village" + string=^Vh + aliasof=Vi + default_base=Gs + heals=8 + gives_income=true + editor_group=village +[/terrain_type] + +[terrain_type] + symbol_image=village/human-city-tile + id=city_village + name= _ "Village" + string=^Vhc + aliasof=Vi + default_base=Rp + heals=8 + gives_income=true + editor_group=village +[/terrain_type] + +[terrain_type] + symbol_image=village/human-hills-tile + id=hill_village + name= _ "Village" + string=^Vhh + aliasof=Vi, Hh + default_base=Hh + heals=8 + gives_income=true + editor_group=village, rough +[/terrain_type] + +[terrain_type] + symbol_image=village/human-snow-hills-tile + id=snow-hill_village + name= _ "Village" + string=^Vhha + aliasof=Vi, Ha + default_base=Ha + heals=8 + gives_income=true + editor_group=village, frozen, rough +[/terrain_type] + +[terrain_type] + symbol_image=village/human-snow-mountain-tile + id=snow-mountain_village + name= _ "Village" + string=^Vhha + aliasof=Vi, Ms + default_base=Ms + heals=8 + gives_income=true + editor_group=village, frozen, rough +[/terrain_type] + +[terrain_type] + symbol_image=village/human-mountain-tile + id=mountain_village + name= _ "Village" + string=^Vhm + aliasof=Vi, Mm + default_base=Mm + heals=8 + gives_income=true + editor_group=village, rough +[/terrain_type] + +[terrain_type] + symbol_image=village/tropical-tile + id=tropical_forest_village + name= _ "Village" + string=^Vht + aliasof=Vi + default_base=Gs + heals=8 + gives_income=true + editor_group=village +[/terrain_type] + +[terrain_type] + symbol_image=village/camp-tile + id=camp_village + name= _ "Village" + string=^Vct + aliasof=Vi + default_base=Re + heals=8 + gives_income=true + editor_group=village +[/terrain_type] + +[terrain_type] + symbol_image=village/drake-tile + id=drake_village + name= _ "Village" + string=^Vd + aliasof=Vi + default_base=Rr + heals=8 + gives_income=true + editor_group=village +[/terrain_type] + +# ## Underground + +[terrain_type] + symbol_image=village/cave-tile + id=underground_village + name= _ "Village" + string=^Vu + aliasof=Vi, Uu + default_base=Uu + heals=8 + gives_income=true + editor_group=village, cave +[/terrain_type] + +[terrain_type] + symbol_image=village/dwarven-tile + id=dwarven_village + name= _ "Village" + string=^Vud + aliasof=Vi, Uu + default_base=Uu + heals=8 + gives_income=true + editor_group=village, cave +[/terrain_type] + +[terrain_type] + symbol_image=village/hut-tile + id=hut_village + name= _ "Village" + string=^Vc + aliasof=Vi + default_base=Gs + heals=8 + gives_income=true + editor_group=village +[/terrain_type] + +[terrain_type] + symbol_image=village/hut-snow-tile + id=hut_snow_village + name= _ "Village" + string=^Vca + aliasof=Vi, Aa + default_base=Aa + heals=8 + gives_income=true + editor_group=village, frozen +[/terrain_type] + +[terrain_type] + symbol_image=village/hut-hills-tile + id=hut_hills_village + name= _ "Village" + string=^Vch + aliasof=Vi, Hh + default_base=Hh + heals=8 + gives_income=true + editor_group=village +[/terrain_type] + +[terrain_type] + symbol_image=village/hut-snow-hills-tile + id=hut_snow_hills_village + name= _ "Village" + string=^Vcha + aliasof=Vi, Ha + default_base=Ha + heals=8 + gives_income=true + editor_group=village, frozen, rough +[/terrain_type] + +[terrain_type] + symbol_image=village/hut-mountains-tile + id=hut_mountains_village + name= _ "Village" + string=^Vcm + aliasof=Vi, Mm + default_base=Mm + heals=8 + gives_income=true + editor_group=village, rough +[/terrain_type] + +[terrain_type] + symbol_image=village/log-cabin-tile + id=logcabin_village + name= _ "Village" + string=^Vl + aliasof=Vi + default_base=Gs + heals=8 + gives_income=true + editor_group=village +[/terrain_type] + +[terrain_type] + symbol_image=village/log-cabin-snow-tile + id=logcabin_snow_village + name= _ "Village" + string=^Vla + aliasof=Vi, Aa + default_base=Aa + heals=8 + gives_income=true + editor_group=village, frozen +[/terrain_type] + +# ## Water Village + +[terrain_type] + symbol_image=village/swampwater-tile + id=swamp_village + name= _ "Village" + string=Ss^Vhs + aliasof=Vi, Ss + heals=8 + gives_income=true + editor_group=water, village +[/terrain_type] + +[terrain_type] + symbol_image=village/coast-tile + id=mermen_village + name= _ "Village" + string=Ww^Vm + aliasof=Ww + submerge=0.4 + unit_height_adjust=-4 + heals=8 + gives_income=true + editor_group=water, village +[/terrain_type] + +[terrain_type] + symbol_image=village/swamp-merfolk-tile + id=swamp_merfolk-village + name= _ "Village" + string=Ss^Vm + aliasof=Ss + heals=8 + gives_income=true + editor_group=water, village +[/terrain_type] + + # # Castles # @@ -323,6 +1380,7 @@ editor_group=castle [/terrain_type] + # # Keeps # @@ -492,1192 +1550,146 @@ [/terrain_type] - # -# Desert -# - -#New desert -[terrain_type] - symbol_image=desert-tile - id=desert - name= _ "Desert" - string=Dd - aliasof=Ds - editor_group=desert -[/terrain_type] - -#Old desert -[terrain_type] - symbol_image=sand - id=sand - name= _ "Sand" - string=Ds - editor_group=desert -[/terrain_type] - -[terrain_type] - symbol_image=desert-oasis - id=oasis - name= _ "Oasis" - string=Dd^Do - aliasof=Ds - heals=8 - #gives_income=true - editor_group=desert, forest -[/terrain_type] - -#UtbS sand rubble -[terrain_type] - symbol_image=sand_rubble-tile - id=sand_rubble - name= _ "Rubble" - string=^Dr - aliasof=_bas, Hh - mvt_alias=-,_bas,Hh - editor_group=desert, rough -[/terrain_type] - -#UtbS desert crater -[terrain_type] - symbol_image=desert_crater - id=crater - name= _ "Crater" - string=Dd^Dc - aliasof=Ds - editor_group=desert -[/terrain_type] - - -# -# Embellishments +# Bridges # [terrain_type] - symbol_image=embellishments/stones-small7 - id=stones_small - name= _ "Stones" - string=^Es - aliasof=_bas - editor_group=embellishments + symbol_image=bridge/wood-n-s + id=bridge + name= _ "Bridge" + string=^Bw| + aliasof=_bas, Gt + submerge=0 + unit_height_adjust=22 + editor_group=bridge, water [/terrain_type] [terrain_type] - symbol_image=embellishments/mushroom - id=mushrooms_small - name= _ "Mushrooms" - string=^Em - aliasof=_bas - editor_group=embellishments + symbol_image=bridge/wood-ne-sw + id=bridgediag1 + name= _ "Bridge" + string=^Bw/ + aliasof=_bas, Gt + editor_group=bridge, water + submerge=0 + unit_height_adjust=22 [/terrain_type] [terrain_type] - symbol_image=embellishments/desert-plant - id=desert_plants - name= _ "Desert Plants" - string=^Edp - aliasof=_bas - editor_group=embellishments, desert + symbol_image=bridge/wood-se-nw + id=bridgediag2 + name= _ "Bridge" + string=^Bw\ + aliasof=_bas, Gt + editor_group=bridge, water + submerge=0 + unit_height_adjust=22 +[/terrain_type] + +# ######## Chasm Bridge + +[terrain_type] + symbol_image=cave/chasm-stone-bridge-s-n-tile + id=bridgechasm + name= _ "Bridge" + string=Qxu^Bs| + aliasof=Uu,Qt + editor_group=bridge, cave [/terrain_type] [terrain_type] - symbol_image=windmill-tile - id=windmill - name= _ "Windmill" - string=^Wm - aliasof=_bas - editor_group=embellishments -[/terrain_type] - - -# -# Forests -# - -[terrain_type] - symbol_image=forest/great-tree-tile - id=great_tree - name= _ "Great Tree" - string=^Fet - default_base=Gg - aliasof=^Fp - editor_group=forest + symbol_image=cave/chasm-stone-bridge-sw-ne-tile + id=bridgechasmdiag1 + name= _ "Bridge" + unit_height_adjust=22 + string=Qxu^Bs/ + aliasof=Uu,Qt + editor_group=bridge, cave [/terrain_type] [terrain_type] - symbol_image=forest/tropical-tile - id=tropical_forest - name= _ "Tropical Forest" - string=^Ft - default_base=Gs - aliasof=^Fp - editor_group=forest + symbol_image=cave/chasm-stone-bridge-se-nw-tile + id=bridgechasmdiag2 + name= _ "Bridge" + unit_height_adjust=22 + string=Qxu^Bs\ + aliasof=Uu,Qt + editor_group=bridge, cave [/terrain_type] -[terrain_type] - symbol_image=forest/pine-tile - id=forest - name= _ "Forest" - description=_ "Pine Forest" - string=^Fp - default_base=Gll - editor_group=forest -[/terrain_type] +# ######## Lava Bridge [terrain_type] - symbol_image=forest/snow-forest-tile - id=snow_forest - name= _ "Snow Forest" - description=_ "Snowy Pine Forest" - string=^Fpa - default_base=Aa - aliasof=At,^Fp - mvt_alias=-,At,^Fp - editor_group=frozen, forest -[/terrain_type] - -[terrain_type] - symbol_image=forest/deciduous-summer-tile - id=deciduous_forest_summer - name=_ "Forest" - description=_ "Summer Deciduous Forest" - string=^Fds - default_base=Gs - aliasof=^Fp - editor_group=forest -[/terrain_type] - -[terrain_type] - symbol_image=forest/deciduous-fall-tile - id=deciduous_forest_fall - name=_ "Forest" - description=_ "Fall Deciduous Forest" - string=^Fdf - default_base=Gd - aliasof=^Fp - editor_group=forest -[/terrain_type] - -[terrain_type] - symbol_image=forest/deciduous-winter-tile - id=deciduous_forest_winter - name=_ "Forest" - description=_ "Winter Deciduous Forest" - string=^Fdw - default_base=Gs - aliasof=^Fp - editor_group=forest -[/terrain_type] - -[terrain_type] - symbol_image=forest/deciduous-winter-snow-tile - id=deciduous_forest_winter_snow - name=_ "Snow Forest" - description=_ "Snowy Deciduous Forest" - string=^Fda - default_base=Aa - aliasof=At,^Fp - mvt_alias=-,At,^Fp - editor_group=frozen, forest -[/terrain_type] - -[terrain_type] - symbol_image=forest/mixed-summer-tile - id=mixed_forest_summer - name=_ "Forest" - description=_ "Summer Mixed Forest" - string=^Fms - default_base=Gs - aliasof=^Fp - editor_group=forest -[/terrain_type] - -[terrain_type] - symbol_image=forest/mixed-fall-tile - id=mixed_forest_fall - name=_ "Forest" - description=_ "Fall Mixed Forest" - string=^Fmf - default_base=Gll - aliasof=^Fp - editor_group=forest -[/terrain_type] - -[terrain_type] - symbol_image=forest/mixed-winter-tile - id=mixed_forest_winter - name=_ "Forest" - description=_ "Winter Mixed Forest" - string=^Fmw - default_base=Gd - aliasof=^Fp - editor_group=forest -[/terrain_type] - -[terrain_type] - symbol_image=forest/mixed-winter-snow-tile - id=mixed_forest_winter_snow - name=_ "Snow Forest" - description=_ "Snowy Mixed Forest" - string=^Fma - default_base=Aa - aliasof=At,^Fp - mvt_alias=-,At,^Fp - editor_group=frozen, forest -[/terrain_type] - -# -# Mixed -# - -[terrain_type] - symbol_image=forest/forested-hills-tile - id=forested_hills - name= _ "Forested Hills" - string=Hh^Fp - aliasof=Hh,^Fp - mvt_alias=-,Hh,^Fp - editor_group=forest, rough -[/terrain_type] - -[terrain_type] - symbol_image=forest/forested-snow-hills-tile - id=forested_snow_hills - name= _ "Forested Snow Hills" - string=Ha^Fpa - aliasof=Ha,^Fp - mvt_alias=-,Ha,^Fp - editor_group=forest, rough, frozen -[/terrain_type] - -[terrain_type] - symbol_image=forest/forested-deciduous-summer-hills-tile - id=deciduous_forest_summer_hills - name=_ "Forested Hills" - description=_ "Summer Deciduous Forested Hills" - string=Hh^Fds - aliasof=Hh,^Fp - mvt_alias=-,Hh,^Fp - editor_group=forest, rough -[/terrain_type] - -[terrain_type] - symbol_image=forest/forested-deciduous-fall-hills-tile - id=deciduous_forest_fall_hills - name=_ "Forested Hills" - description=_ "Fall Deciduous Forested Hills" - string=Hh^Fdf - aliasof=Hh,^Fp - mvt_alias=-,Hh,^Fp - editor_group=forest, rough -[/terrain_type] - -[terrain_type] - symbol_image=forest/forested-deciduous-winter-hills-tile - id=deciduous_forest_winter_hills - name=_ "Forested Hills" - description=_ "Winter Deciduous Forested Hills" - string=Hh^Fdw - aliasof=Hh,^Fp - mvt_alias=-,Hh,^Fp - editor_group=forest, rough -[/terrain_type] - -[terrain_type] - symbol_image=forest/forested-deciduous-winter-snow-hills-tile - id=deciduous_forest_winter_snow_hills - name=_ "Forested Snow Hills" - description=_ "Snowy Deciduous Forested Hills" - string=Ha^Fda - aliasof=Ha,^Fp - mvt_alias=-,Ha,^Fp - editor_group=frozen, forest, rough -[/terrain_type] - -[terrain_type] - symbol_image=forest/forested-mixed-summer-hills-tile - id=mixed_forest_summer_hills - name=_ "Forested Hills" - description=_ "Summer Mixed Forested Hills" - string=Hh^Fms - aliasof=Hh,^Fp - mvt_alias=-,Hh,^Fp - editor_group=forest, rough -[/terrain_type] - -[terrain_type] - symbol_image=forest/forested-mixed-fall-hills-tile - id=mixed_forest_fall_hills - name=_ "Forested Hills" - string=Hh^Fmf - aliasof=Hh,^Fp - mvt_alias=-,Hh,^Fp - editor_group=forest, rough -[/terrain_type] - -[terrain_type] - symbol_image=forest/forested-mixed-winter-hills-tile - id=mixed_forest_winter_hills - name=_ "Forested Hills" - description=_ "Winter Mixed Forested Hills" - string=Hh^Fmw - aliasof=Hh,^Fp - mvt_alias=-,Hh,^Fp - editor_group=forest, rough -[/terrain_type] - -[terrain_type] - symbol_image=forest/forested-mixed-winter-snow-hills-tile - id=mixed_forest_winter_snow_hills - name=_ "Forested Snow Hills" - description=_ "Snowy Mixed Forested Hills" - string=Ha^Fma - aliasof=Ha,^Fp - mvt_alias=-,Ha,^Fp - editor_group=frozen, forest, rough -[/terrain_type] - -# -# Grass -# - -[terrain_type] - symbol_image=flat/grass - id=grassland - name= _ "Grassland" - string=Gg - aliasof=Gt - editor_group=flat -[/terrain_type] - -# This terrain will soon be obsolete. -[terrain_type] - symbol_image=flat/grass-flowers - id=grassland_flowers - name= _ "Grassland" - string=Ggf - aliasof=Gt - editor_group=flat -[/terrain_type] - -[terrain_type] - symbol_image=flat/savanna - id=savanna - name= _ "Savanna" - string=Gs - aliasof=Gt - editor_group=flat -[/terrain_type] - -[terrain_type] - symbol_image=flat/grass-dry - id=grass_dry - name= _ "Dry Grass" - string=Gd - aliasof=Gt - editor_group=flat -[/terrain_type] - -[terrain_type] - symbol_image=flat/leaf-litter - id=leaf_litter - name= _ "Grassland" - string=Gll - aliasof=Gt - editor_group=flat -[/terrain_type] - - -# -# Hills -# - -[terrain_type] - symbol_image=hills/regular - id=hills - name= _ "Hills" - string=Hh - editor_group=rough -[/terrain_type] - -[terrain_type] - symbol_image=hills/dry - id=hills_dry - name= _ "Hills" - string=Hhd - aliasof=Hh - editor_group=rough -[/terrain_type] - -[terrain_type] - symbol_image=desert-hills - id=desert_hills - name= _ "Dunes" - string=Hd - aliasof=Ds, Hh - mvt_alias=-,Ds,Hh - editor_group=desert, rough -[/terrain_type] - -[terrain_type] - symbol_image=snow-hills - id=snow_hills - name= _ "Snow Hills" - string=Ha - aliasof=At, Hh - mvt_alias=-,At, Hh - editor_group=frozen, rough -[/terrain_type] - -# -# Mountain -# - -[terrain_type] - symbol_image=mountain-tile - id=mountains - name= _ "Mountains" - string=Mm - editor_group=rough -[/terrain_type] - -[terrain_type] - symbol_image=desert-mountains - id=desert_mountains - name= _ "Mountains" - description=_ "Desert Mountains" - string=Md - aliasof=Mm - editor_group=rough, desert -[/terrain_type] - -[terrain_type] - symbol_image=snow-mountain-tile - id=snow_mountains - name= _ "Mountains" - description = _"Snowy Mountains" - string=Ms - aliasof=At, Mm - mvt_alias=-,At, Mm - editor_group=rough, frozen -[/terrain_type] - -# -# Unwalkable -# - -[terrain_type] - symbol_image=unwalkable/chasm-tile - id=canyon - name= _ "Chasm" - string=Qxu - aliasof=Qt - editor_group=cave -[/terrain_type] - -[terrain_type] - symbol_image=unwalkable/lava-chasm-tile - id=lava_chasm - name= _ "Lava chasm" - string=Ql - aliasof=Qt + symbol_image=cave/chasm-lava-stone-bridge-s-n-tile + id=bridgelava + name= _ "Bridge" + string=Ql^Bs| + aliasof=Uu,Qt light=25 - editor_group=cave + editor_group=bridge, cave [/terrain_type] [terrain_type] - symbol_image=unwalkable/lava - id=lava - name= _ "Lava" - string=Qlf - aliasof=Qt + symbol_image=cave/chasm-lava-stone-bridge-sw-ne-tile + id=bridgelavadiag1 + name= _ "Bridge" + unit_height_adjust=22 + string=Ql^Bs/ + aliasof=Uu,Qt light=25 - editor_group=cave -[/terrain_type] - -# -# Roads -# - -[terrain_type] - symbol_image=flat/farm-veg-spring-icon - id=farm - name= _ "Farmland" - string=^Gvs - default_base=Re - aliasof=_bas - editor_group=flat + editor_group=bridge, cave [/terrain_type] [terrain_type] - symbol_image=flat/dirt-dark - id=dirt_dark - name= _ "Dirt" - string=Rb - aliasof=Gt - editor_group=flat -[/terrain_type] - -[terrain_type] - symbol_image=flat/dirt - id=dirt - name= _ "Dirt" - string=Re - aliasof=Gt - editor_group=flat -[/terrain_type] - -[terrain_type] - symbol_image=flat/desert-road - id=road - name= _ "Dirt" - string=Rd - aliasof=Gt - editor_group=desert, flat -[/terrain_type] - -[terrain_type] - symbol_image=flat/road - id=road - name= _ "Cobbles" - string=Rr - aliasof=Gt - editor_group=flat -[/terrain_type] - -[terrain_type] - symbol_image=flat/stone-path - id=stone_path - name= _ "Cobbles" - string=Rp - aliasof=Gt - editor_group=flat -[/terrain_type] - -# -# Swamp -# - -[terrain_type] - symbol_image=swamp/water-tile - id=swamp_water - name= _ "Swamp" - string=Ss - submerge=0.4 - unit_height_adjust=-3 - editor_group=water -[/terrain_type] - -# -# Underground -# - -[terrain_type] - symbol_image=cave/beam-tile - id=lit - name= _ "Lit" - string=^Ii - aliasof=_bas + symbol_image=cave/chasm-lava-stone-bridge-se-nw-tile + id=bridglavadiag2 + name= _ "Bridge" + unit_height_adjust=22 + string=Ql^Bs\ + aliasof=Uu,Qt light=25 - editor_group=cave -[/terrain_type] - -[terrain_type] - symbol_image=cave/floor6 - id=cave - name= _ "Cave" - string=Uu - editor_group=cave -[/terrain_type] - -# [terrain] -# symbol_image=cave/beam-tile -# id=cave_beam -# name= _ "Cave Lit" -# string=Uu^Ii -# aliasof=Uu -# light=25 -# editor_group=cave -# [/terrain] - -[terrain_type] - symbol_image=cave/path - id=cave_path - name= _ "Cave path" - string=Ur - aliasof=Gt - editor_group=cave -[/terrain_type] - -[terrain_type] - symbol_image=forest/mushrooms-tile - id=fungus - name= _ "Mushroom Grove" - string=^Uf - default_base=Uu - editor_group=cave, forest -[/terrain_type] - -[terrain_type] - symbol_image=forest/mushrooms-beam-tile - id=fungus_beam - name= _ "Mushroom Grove Lit" - string=^Ufi - default_base=Uu - aliasof=^Uf - light=25 - editor_group=cave -[/terrain_type] - -[terrain_type] - symbol_image=cave/hills-variation - id=rocky_cave - name= _ "Rockbound Cave" - string=Uh - aliasof=Uu, Hh - mvt_alias=-,Uu, Hh - editor_group=cave, rough -[/terrain_type] - -# [terrain] -# symbol_image=cave/hills-beam-tile -# id=rocky_cave_beam -# name= _ "Rockbound Cave Lit" -# string=Uh^Ii -# aliasof=Uu, Hh -# mvt_alias=-,Uu, Hh -# light=25 -# editor_group=cave, rough -# [/terrain] - -# -# Villages -# - -# Desert - -[terrain_type] - symbol_image=village/desert-tile - id=desert_village - name= _ "Village" - string=^Vda - aliasof=Vi, Ds - default_base=Dd - heals=8 - gives_income=true - editor_group=village, desert -[/terrain_type] - -[terrain_type] - symbol_image=village/desert-camp-tile - id=desert_village - name= _ "Village" - string=^Vdt - aliasof=Vi, Ds - default_base=Dd - heals=8 - gives_income=true - editor_group=village, desert -[/terrain_type] - -# Orcish - -[terrain_type] - symbol_image=village/orc-snow-tile - id=orcish_snow_village - name= _ "Village" - string=^Voa - aliasof=Vi, Aa - default_base=Aa - heals=8 - gives_income=true - editor_group=village, frozen -[/terrain_type] - -[terrain_type] - symbol_image=village/orc-tile - id=orcish_village - name= _ "Village" - string=^Vo - aliasof=Vi - default_base=Gd - heals=8 - gives_income=true - editor_group=village -[/terrain_type] - -[terrain_type] - symbol_image=village/orc-snow-hills-tile - id=orcish_snow_hills_village - name= _ "Village" - string=^Voha - aliasof=Vi, Hh - default_base=Ha - heals=8 - gives_income=true - editor_group=village, frozen, rough -[/terrain_type] - -[terrain_type] - symbol_image=village/orc-hills-tile - id=orcish_hill_village - name= _ "Village" - string=^Voh - aliasof=Vi, Hh - default_base=Hh - heals=8 - gives_income=true - editor_group=village, rough -[/terrain_type] - -# Elven - -[terrain_type] - symbol_image=village/elven-snow-tile - id=elven_snow_village - name= _ "Village" - string=^Vea - aliasof=Vi, Aa - default_base=Aa - heals=8 - gives_income=true - editor_group=village, frozen -[/terrain_type] - -[terrain_type] - symbol_image=village/elven-tile - id=elven_village - name= _ "Village" - string=^Ve - aliasof=Vi - default_base=Gg - heals=8 - gives_income=true - editor_group=village -[/terrain_type] - -# Human - -[terrain_type] - symbol_image=village/snow-tile - id=snow_village - name= _ "Village" - string=^Vha - aliasof=Vi, Aa - default_base=Aa - heals=8 - gives_income=true - editor_group=village, frozen -[/terrain_type] - -[terrain_type] - symbol_image=village/human-tile - id=human_village - name= _ "Village" - string=^Vh - aliasof=Vi - default_base=Gs - heals=8 - gives_income=true - editor_group=village -[/terrain_type] - -[terrain_type] - symbol_image=village/human-city-tile - id=city_village - name= _ "Village" - string=^Vhc - aliasof=Vi - default_base=Rp - heals=8 - gives_income=true - editor_group=village -[/terrain_type] - -[terrain_type] - symbol_image=village/human-hills-tile - id=hill_village - name= _ "Village" - string=^Vhh - aliasof=Vi, Hh - default_base=Hh - heals=8 - gives_income=true - editor_group=village, rough -[/terrain_type] - -[terrain_type] - symbol_image=village/human-snow-hills-tile - id=snow-hill_village - name= _ "Village" - string=^Vhha - aliasof=Vi, Ha - default_base=Ha - heals=8 - gives_income=true - editor_group=village, frozen, rough -[/terrain_type] - -[terrain_type] - symbol_image=village/human-snow-mountain-tile - id=snow-mountain_village - name= _ "Village" - string=^Vhha - aliasof=Vi, Ms - default_base=Ms - heals=8 - gives_income=true - editor_group=village, frozen, rough -[/terrain_type] - -[terrain_type] - symbol_image=village/human-mountain-tile - id=mountain_village - name= _ "Village" - string=^Vhm - aliasof=Vi, Mm - default_base=Mm - heals=8 - gives_income=true - editor_group=village, rough -[/terrain_type] - -[terrain_type] - symbol_image=village/tropical-tile - id=tropical_forest_village - name= _ "Village" - string=^Vht - aliasof=Vi - default_base=Gs - heals=8 - gives_income=true - editor_group=village -[/terrain_type] - -[terrain_type] - symbol_image=village/camp-tile - id=camp_village - name= _ "Village" - string=^Vct - aliasof=Vi - default_base=Re - heals=8 - gives_income=true - editor_group=village -[/terrain_type] - -[terrain_type] - symbol_image=village/drake-tile - id=drake_village - name= _ "Village" - string=^Vd - aliasof=Vi - default_base=Rr - heals=8 - gives_income=true - editor_group=village -[/terrain_type] - -# Underground - -[terrain_type] - symbol_image=village/cave-tile - id=underground_village - name= _ "Village" - string=^Vu - aliasof=Vi, Uu - default_base=Uu - heals=8 - gives_income=true - editor_group=village, cave -[/terrain_type] - -[terrain_type] - symbol_image=village/dwarven-tile - id=dwarven_village - name= _ "Village" - string=^Vud - aliasof=Vi, Uu - default_base=Uu - heals=8 - gives_income=true - editor_group=village, cave -[/terrain_type] - -[terrain_type] - symbol_image=village/hut-tile - id=hut_village - name= _ "Village" - string=^Vc - aliasof=Vi - default_base=Gs - heals=8 - gives_income=true - editor_group=village -[/terrain_type] - -[terrain_type] - symbol_image=village/hut-snow-tile - id=hut_snow_village - name= _ "Village" - string=^Vca - aliasof=Vi, Aa - default_base=Aa - heals=8 - gives_income=true - editor_group=village, frozen -[/terrain_type] - -[terrain_type] - symbol_image=village/hut-hills-tile - id=hut_hills_village - name= _ "Village" - string=^Vch - aliasof=Vi, Hh - default_base=Hh - heals=8 - gives_income=true - editor_group=village -[/terrain_type] - -[terrain_type] - symbol_image=village/hut-snow-hills-tile - id=hut_snow_hills_village - name= _ "Village" - string=^Vcha - aliasof=Vi, Ha - default_base=Ha - heals=8 - gives_income=true - editor_group=village, frozen, rough -[/terrain_type] - -[terrain_type] - symbol_image=village/hut-mountains-tile - id=hut_mountains_village - name= _ "Village" - string=^Vcm - aliasof=Vi, Mm - default_base=Mm - heals=8 - gives_income=true - editor_group=village, rough -[/terrain_type] - -[terrain_type] - symbol_image=village/log-cabin-tile - id=logcabin_village - name= _ "Village" - string=^Vl - aliasof=Vi - default_base=Gs - heals=8 - gives_income=true - editor_group=village -[/terrain_type] - -[terrain_type] - symbol_image=village/log-cabin-snow-tile - id=logcabin_snow_village - name= _ "Village" - string=^Vla - aliasof=Vi, Aa - default_base=Aa - heals=8 - gives_income=true - editor_group=village, frozen -[/terrain_type] - -# Water Village - -[terrain_type] - symbol_image=village/coast-tile - id=mermen_village - name= _ "Village" - string=Ww^Vm - aliasof=Ww - submerge=0.4 - unit_height_adjust=-4 - heals=8 - gives_income=true - editor_group=water, village -[/terrain_type] - -# Swamp - -[terrain_type] - symbol_image=village/swampwater-tile - id=swamp_village - name= _ "Village" - string=Ss^Vhs - aliasof=Vi, Ss - heals=8 - gives_income=true - editor_group=water, village -[/terrain_type] - -[terrain_type] - symbol_image=village/swamp-merfolk-tile - id=swamp_merfolk-village - name= _ "Village" - string=Ss^Vm - aliasof=Ss - heals=8 - gives_income=true - editor_group=water, village -[/terrain_type] - -# -# Water -# - -[terrain_type] - symbol_image=water/ocean-A01 - id=deep_water - name= _ "Deep Water" - string=Wo - submerge=0.5 - unit_height_adjust=-3 - editor_group=water -[/terrain_type] - -[terrain_type] - symbol_image=water/coast-A01 - id=shallow_water - name= _ "Shallow Water" - string=Ww - submerge=0.4 - unit_height_adjust=-4 - editor_group=water -[/terrain_type] - -[terrain_type] - symbol_image=water/coast-tropical-A01 - id=tropical_water - name= _ "Tropical Water" - string=Wwt - aliasof=Ww - submerge=0.4 - unit_height_adjust=-4 - editor_group=water -[/terrain_type] - -[terrain_type] - symbol_image=water/ford-tile - id=ford - name= _ "Ford" - string=Wwf - aliasof=Gt, Ww - submerge=0.3 - unit_height_adjust=-4 - editor_group=water -[/terrain_type] - -[terrain_type] - symbol_image=water/reef - id=reef - name= _ "Coastal Reef" - string=Wwr - submerge=0.3 - unit_height_adjust=-3 - editor_group=water -[/terrain_type] - -#### This one is being depreciated -[terrain_type] - symbol_image=color-hex - id=tropical_water_depreciated - name= _ "Deprecated. Use 'Wwt'" - string=Wt - aliasof=Ww - submerge=0.4 - unit_height_adjust=-4 - editor_group=water + editor_group=bridge, cave [/terrain_type] # -# Impassable +# ## Special ## # -[terrain_type] - symbol_image=cloud-tile - id=cloud - name= _ "Impassable Mountains" - string=Mm^Xm - aliasof=Xt - editor_group=rough,wall -[/terrain_type] - -[terrain_type] - symbol_image=cloud-desert-tile - id=clouddesert - name= _ "Impassable Desert Mountains" - string=Md^Xm - aliasof=Xt - editor_group=rough,wall,desert -[/terrain_type] - -[terrain_type] - symbol_image=cloud-snow-tile - id=cloud_snow - name= _ "Impassable Mountains" - string=Ms^Xm - aliasof=Xt - editor_group=rough,wall,frozen -[/terrain_type] - -[terrain_type] - symbol_image=cave/wall-rough-tile - id=cavewall - name= _ "Cave Wall" - string=Xu - aliasof=Xt - editor_group=cave,wall -[/terrain_type] - -[terrain_type] - symbol_image=walls/wall-stone-tile - id=wall_stone - name= _ "Wall" - string=Xos - aliasof=Xu - editor_group=cave,wall -[/terrain_type] - -[terrain_type] - symbol_image=walls/wall-stone-tile - id=wall_stone_lit - name= _ "Wall" - string=Xol - aliasof=Xu - editor_group=cave,wall -[/terrain_type] [terrain_type] symbol_image=void - editor_image=impassable-editor - id=impassable_overlay - name= _ "Impassable" - string=^Xo - aliasof=_bas,Xt - mvt_alias=Xt + editor_image=off-map/offmap-editor + id=off_map + name= _ "None" + string=_off^_usr # wmllint: ignore editor_group=special [/terrain_type] [terrain_type] symbol_image=void - editor_image=void-editor - id=void - name= _ "Void" - string=Xv - aliasof=Xt - editor_group=flat,wall,special + editor_image=shroud-editor + id=shroud + name= _ "Shroud" + string=_s # wmllint: ignore + editor_group=special [/terrain_type] +[terrain_type] + symbol_image=fog + editor_image=fog-editor + id=fog + name= _ "Fog" + string=_f # wmllint: ignore + editor_group=special +[/terrain_type] + + # -# Terrain archetypes +# ## Terrain Archetypes ## # + # these are "virtual" terrain [terrain_type] symbol_image=void diff --git a/images/buttons/group_bridge-active-pressed.png b/images/buttons/group_bridge-active-pressed.png index 32ea6c440761b4aafe9d6451279f91f140f62c10..4add1abe4f86e6ff1a915dfa7c040371f91a71dc 100644 GIT binary patch literal 3782 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 delta 344 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 delta 344 zcmV-e0jK`I9rFT^B!32COGiWi000000Qp0^e*gdhC`m*?RCwC$mSJncFc60GVS^ze zgR<$D4JJa7q1bAh#I{p#jNDkhV2ZA@KKVLP`ag z@jkimoO}sL*dr7k$s)`*=O`AQlLeS(EplcFX>pgOFKG;P<0dnoR;@a%f6-`diy qvh>$f=(pUwUgpTf*z36<_#XhmonEM`kdR;i0000P000>X1^@s6#OZ}&00009a7bBm000XU z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000B=Nkl`R=?Iv_ABh)!7S?tg)g!2?U5i~CcY*(O7<+Bpg3=StLp7=}uV zEV%^1;p4Enf?Yvy_#sFN`&dUy3H=14BRDpD5t46km!!XY5~fU$Tre|L`$$f#TtTn1 zrNGs%qET|;#>+O`dt1QwH+%5QZ41B?UjEuYM z7JT=v8DG66;G0b|e%K`;OYbyJ^W<04+&qp*j<8Kc@kQKJb?;_%0CzV5{R zcLaRBVaENd0^VGZFr8Hp9`r+W2f3wp8mD>g$NVYIrZh<`b}u7ww@4a|f}vz4@5KWa zNaa{zK~A6gkM*Z{@*{tWBSp=Uc?>0#zqz}1m3*=)@-It|d;im7lRw36zuwzM;_h5{ zl_|M%HHw|6dynS3xlZ{BT${3!_tSp;*HOq;M~Ty zhEIF)y*_+=pAvRKrqABQ`rSVHxpLM7eWK!to?08qPJCqO}gpEMG=-VHLIcODNC1g2L_1*^tqJ|4Mtm3__QS(2Jii+H-|+fEklBq*&4fXs z6UAad)XP!U;zSL55UTkxj2;~_Y&!zsqueSU6?$$H^+kH0RAW8Xbg5wUPD6 wD@B|v7cpBc^L~rQ^T#vXm!9|bTzcR2H)z_TW}`MRkN^Mx07*qoM6N<$g79M^#sB~S delta 344 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 delta 344 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 JPDHLkV1gtWlEwf4 literal 0 HcmV?d00001 diff --git a/images/buttons/group_obstacle.png b/images/buttons/group_obstacle.png new file mode 100644 index 0000000000000000000000000000000000000000..e4fb6df64242ec3bbe853b3d430b022d3bfefca7 GIT binary patch literal 3515 zcmV;s4Mg&ZP)P000>X1^@s6#OZ}&00009a7bBm000XU z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0008!Nkldy#u%dELT`No zU&JTzRlL(X<175`wacDEr&Q2-@pnyU_FiAt+G|#q1VB1D*ac~@-@|^Vg-)Z6PJJ7_ zRujAJ7Pni~4Ro6gbVJW}*mav-H)@+`Zq@ib@*^yX{7ZC$G^2T_KCrMiu)H zk6xpD@)ifD@6bQH!rIucC}tYETb!t$SLgWk{sQ06ALGZ1LwtKy<)UXwI?tTv zAX}NCv;@vBKLwG{hsNlW0OagzX=bdx%**~d%l5eL8P44xlK`V2A7Z*u2$h*`*{}+$ ze+3AGc-okBGe{Tt=MW{Ck3sGN5c)i;LURj|NH}CLXb&UFF7RslSIB52@ef{Mkr=r$hfF(N{=qA(w&{iYACTbS8N|p<2SR&ekRV-4tTkkP2$ker z0JL5lysTT%bWv~Nkz|*7{|Q$ZZMqFC4B!yMzJ|D=-bInH5>}F41acdY0QfyD5{Vm% zgf&QmbyV48-8hwxz4_mH4wWmo|C2Zw2$^H_97IgjMBqSa3=II=SV2H5+v1`ip2kW z1R_Amq>8os!-+)L+fFM&vSxET!(hUx^^&4x^qp?Mdqcs2k002ovPDHLkV1gbymu>(6 literal 0 HcmV?d00001