From 8e13641e483d0ef0e9555b0b3ba2869f44caef36 Mon Sep 17 00:00:00 2001 From: Simon Forsyth Date: Sun, 15 Jul 2012 02:28:50 +0000 Subject: [PATCH] Allow desert elves to look over deep water and walkable terrain. Allows removal of commented out blob of WML in Domain of the Dwarves --- .../06b_In_the_Domain_of_Dwarves.cfg | 70 ------------------ .../units/elves/Desert_Shyde.cfg | 17 +---- .../units/elves/Desert_Star.cfg | 17 +---- .../Under_the_Burning_Suns/units/units.cfg | 73 +++++++++++++++++++ 4 files changed, 75 insertions(+), 102 deletions(-) diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg index 4a80d474020..e583374b4b7 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg @@ -1260,76 +1260,6 @@ {CLEAR_VARIABLE speaking_unit} [/event] - # allow units around lake to look out over deep water - # artificially increase sight for units walking around lake - # TODO/FIXME: commented out because it invalidates undo on every move there. - # [event] - # name=moveto - # first_time_only=no - # - # [filter] - # x=19-41 - # y=3-22 - # side=1 - # [/filter] - # - # [set_variable] - # name=x_left - # value=$x1 - # [/set_variable] - # - # [set_variable] - # name=x_left - # sub=4 - # [/set_variable] - # - # [set_variable] - # name=x_right - # value=$x1 - # [/set_variable] - # - # [set_variable] - # name=x_right - # add=4 - # [/set_variable] - # - # [set_variable] - # name=y_up - # value=$y1 - # [/set_variable] - # - # [set_variable] - # name=y_up - # sub=3 - # [/set_variable] - # - # [set_variable] - # name=y_down - # value=$y1 - # [/set_variable] - # - # [set_variable] - # name=y_down - # add=3 - # [/set_variable] - # - # [set_variable] - # name=lake_x - # value=$x_left-$x_right - # [/set_variable] - # - # [set_variable] - # name=lake_y - # value=$y_up-$y_down - # [/set_variable] - # - # [remove_shroud] - # x=$lake_x - # y=$lake_y - # side=1 - # [/remove_shroud] - # [/event] - # Event 6: Tentacles attack # (2-3 level 1 tentacles appear every turn that player diff --git a/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shyde.cfg b/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shyde.cfg index d2a8e500563..dafee0a6102 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shyde.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shyde.cfg @@ -7,22 +7,7 @@ image=units/elves-desert/shyde.png {MAGENTA_IS_THE_TEAM_COLOR} hitpoints=46 - movement_type=woodlandfloat - #desert elves move fast across the sands, but are not used to forests - #they are also a bit faster in caves - [movement_costs] - sand=1 - forest=2 - cave=1 - unwalkable=2 - frozen=2 - deep_water=100 - [/movement_costs] - [defense] - sand=40 - forest=50 - unwalkable=70 - [/defense] + movement_type=desert_float [resistance] impact=100 [/resistance] diff --git a/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Star.cfg b/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Star.cfg index cb3d1286fa7..cc1a23c00b5 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Star.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Star.cfg @@ -8,22 +8,7 @@ {MAGENTA_IS_THE_TEAM_COLOR} halo=halo/illuminates-aura.png hitpoints=46 - movement_type=woodlandfloat - #desert elves move fast across the sands, but are not used to forests - #they are also a bit faster in caves - [movement_costs] - sand=1 - forest=2 - cave=1 - unwalkable=2 - frozen=2 - deep_water=100 - [/movement_costs] - [defense] - sand=40 - forest=50 - unwalkable=70 - [/defense] + movement_type=desert_float [resistance] blade=90 pierce=90 diff --git a/data/campaigns/Under_the_Burning_Suns/units/units.cfg b/data/campaigns/Under_the_Burning_Suns/units/units.cfg index d18cebe4e35..7c5e411cdf4 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/units.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/units.cfg @@ -17,6 +17,23 @@ frozen=3 fungus=2 [/movement_costs] + [vision_costs] + shallow_water=2 + deep_water=2 + reef=2 + swamp_water=2 + flat=1 + sand=1 + forest=2 + hills=2 + mountains=3 + village=1 + castle=1 + cave=2 + frozen=2 + fungus=2 + unwalkable=2 + [/vision_costs] [defense] shallow_water=80 reef=70 @@ -34,3 +51,59 @@ [/defense] {WOODLAND_RESISTANCE} [/movetype] +[movetype] + name=desert_float + flies=true + [movement_costs] + deep_water=100 + shallow_water=1 + reef=1 + swamp_water=1 + flat=1 + sand=1 + forest=2 + hills=1 + mountains=2 + village=1 + castle=1 + cave=2 + unwalkable=2 + frozen=2 + fungus=2 + [/movement_costs] + [vision_costs] + shallow_water=1 + deep_water=1 + reef=1 + swamp_water=1 + flat=1 + sand=1 + forest=2 + hills=1 + mountains=2 + village=1 + castle=1 + cave=1 + frozen=2 + fungus=2 + unwalkable=2 + [/vision_costs] + [defense] + deep_water=70 + shallow_water=60 + reef=50 + swamp_water=60 + flat=50 + sand=40 + forest=50 + hills=50 + mountains=40 + village=40 + castle=40 + cave=70 + frozen=60 + fungus=50 + unwalkable=70 + [/defense] + {WOODLAND_RESISTANCE} +[/movetype]