Author: alarantalara
Date: Thu Oct 20 01:25:24 2011
New Revision: 51547
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51547&view=rev
Log:
Simplify forest terrain handling
All forest now aliased to base,forest (and snow if appropriate)
Best defense, worst movement
mounted move_type has forest defense capped at 30%
-> maintains old behaviour for mounted units over flat terrain
-> mounted units now have 30% defense on forested hills
-> naga myrmidons now have 50% defines on flat forest
-> all other units/terrains appear unaffected
fixes bug #18216
Modified:
trunk/changelog
trunk/data/core/terrain.cfg
trunk/data/core/units.cfg
trunk/players_changelog
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=51547&r1=51546&r2=51547&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Thu Oct 20 01:25:24 2011
@@ -27,6 +27,11 @@
* The side metatable provides also the side number
(like wesnoth.sides[i].side, which would be i)
* add function wesnoth.debug
+ * Unit changes and Balancing
+ * All mounted units now have forest defines capped at 30%. This reduces
their
+ defense on forested hills from 40% to 30%
+ * Forests now give best defense and worst movement on all terrain,
+ not just hills - fixes bug #18216
* User interface
* Removed waypoints UI feature
* Added an option to disable the "loading save from a different version"
Modified: trunk/data/core/terrain.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain.cfg?rev=51547&r1=51546&r2=51547&view=diff
==============================================================================
--- trunk/data/core/terrain.cfg (original)
+++ trunk/data/core/terrain.cfg Thu Oct 20 01:25:24 2011
@@ -451,7 +451,8 @@
editor_name= _ "Great Tree"
string=^Fet
default_base=Gg
- aliasof=^Fp
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest
[/terrain_type]
@@ -462,7 +463,8 @@
editor_name= _ "Dead Great Tree"
string=^Fetd
default_base=Gd
- aliasof=^Fp
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest
[/terrain_type]
@@ -473,16 +475,19 @@
editor_name= _ "Tropical Forest"
string=^Ft
default_base=Gs
- aliasof=^Fp
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest
[/terrain_type]
[terrain_type]
symbol_image=forest/pine-tile
- id=forest
+ id=pine_forest
name= _ "Forest"
editor_name= _ "Pine Forest"
string=^Fp
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
default_base=Gll
editor_group=forest
[/terrain_type]
@@ -494,8 +499,8 @@
editor_name= _ "Snowy Pine Forest"
string=^Fpa
default_base=Aa
- aliasof=At,^Fp
- mvt_alias=-,At,^Fp
+ aliasof=_bas,At,Ft
+ mvt_alias=-,_bas,At,Ft
editor_group=frozen, forest
[/terrain_type]
@@ -506,7 +511,8 @@
editor_name= _ "Summer Deciduous Forest"
string=^Fds
default_base=Gs
- aliasof=^Fp
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest
[/terrain_type]
@@ -517,7 +523,8 @@
editor_name= _ "Fall Deciduous Forest"
string=^Fdf
default_base=Gd
- aliasof=^Fp
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest
[/terrain_type]
@@ -528,7 +535,8 @@
editor_name= _ "Winter Deciduous Forest"
string=^Fdw
default_base=Gs
- aliasof=^Fp
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest
[/terrain_type]
@@ -539,8 +547,8 @@
editor_name= _ "Snowy Deciduous Forest"
string=^Fda
default_base=Aa
- aliasof=At,^Fp
- mvt_alias=-,At,^Fp
+ aliasof=_bas,At,Ft
+ mvt_alias=-,_bas,At,Ft
editor_group=frozen, forest
[/terrain_type]
@@ -551,7 +559,8 @@
editor_name= _ "Summer Mixed Forest"
string=^Fms
default_base=Gs
- aliasof=^Fp
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest
[/terrain_type]
@@ -562,7 +571,8 @@
editor_name= _ "Fall Mixed Forest"
string=^Fmf
default_base=Gll
- aliasof=^Fp
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest
[/terrain_type]
@@ -573,7 +583,8 @@
editor_name= _ "Winter Mixed Forest"
string=^Fmw
default_base=Gd
- aliasof=^Fp
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest
[/terrain_type]
@@ -584,8 +595,8 @@
editor_name= _ "Snowy Mixed Forest"
string=^Fma
default_base=Aa
- aliasof=At,^Fp
- mvt_alias=-,At,^Fp
+ aliasof=_bas,At,Ft
+ mvt_alias=-,_bas,At,Ft
editor_group=frozen, forest
[/terrain_type]
@@ -675,9 +686,10 @@
id=forested_hills
name= _ "Hills"
editor_name= _ "Forested Hills"
- string=Hh^Fp
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
+ default_base=Hh
+ string=^Fp
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest, rough
[/terrain_type]
@@ -686,9 +698,10 @@
id=forested_snow_hills
name= _ "Hills"
editor_name= _ "Forested Snow Hills"
- string=Ha^Fpa
- aliasof=Ha,^Fp
- mvt_alias=-,Ha,^Fp
+ default_base=Ha
+ string=^Fpa
+ aliasof=_bas,At,Ft
+ mvt_alias=-,_bas,At,Ft
editor_group=forest, rough, frozen
[/terrain_type]
@@ -697,9 +710,10 @@
id=deciduous_forest_summer_hills
name= _ "Hills"
editor_name= _ "Summer Deciduous Forested Hills"
- string=Hh^Fds
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
+ default_base=Hh
+ string=^Fds
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest, rough
[/terrain_type]
@@ -708,9 +722,10 @@
id=deciduous_forest_fall_hills
name= _ "Hills"
editor_name= _ "Fall Deciduous Forested Hills"
- string=Hhd^Fdf
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
+ default_base=Hhd
+ string=^Fdf
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest, rough
[/terrain_type]
@@ -719,9 +734,10 @@
id=deciduous_forest_winter_hills
name= _ "Hills"
editor_name= _ "Winter Deciduous Forested Hills"
- string=Hhd^Fdw
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
+ default_base=Hhd
+ string=^Fdw
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest, rough
[/terrain_type]
@@ -730,9 +746,10 @@
id=deciduous_forest_winter_snow_hills
name= _ "Hills"
editor_name= _ "Snowy Deciduous Forested Hills"
- string=Ha^Fda
- aliasof=Ha,^Fp
- mvt_alias=-,Ha,^Fp
+ default_base=Ha
+ string=^Fda
+ aliasof=_bas,At,Ft
+ mvt_alias=-,_bas,At,Ft
editor_group=frozen, forest, rough
[/terrain_type]
@@ -741,9 +758,10 @@
id=mixed_forest_summer_hills
name= _ "Hills"
editor_name= _ "Summer Mixed Forested Hills"
- string=Hh^Fms
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
+ default_base=Hh
+ string=^Fms
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest, rough
[/terrain_type]
@@ -752,9 +770,10 @@
id=mixed_forest_fall_hills
name= _ "Hills"
editor_name= _ "Fall Mixed Forested Hills"
- string=Hhd^Fmf
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
+ default_base=Hhd
+ string=^Fmf
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest, rough
[/terrain_type]
@@ -763,9 +782,10 @@
id=mixed_forest_winter_hills
name= _ "Hills"
editor_name= _ "Winter Mixed Forested Hills"
- string=Hhd^Fmw
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
+ default_base=Hhd
+ string=^Fmw
+ aliasof=_bas,Ft
+ mvt_alias=-,_bas,Ft
editor_group=forest, rough
[/terrain_type]
@@ -774,134 +794,11 @@
id=mixed_forest_winter_snow_hills
name= _ "Hills"
editor_name= _ "Snowy Mixed Forested Hills"
- string=Ha^Fma
- aliasof=Ha,^Fp
- mvt_alias=-,Ha,^Fp
+ string=^Fma
+ default_base=Ha
+ aliasof=_bas,At,Ft
+ mvt_alias=-,_bas,At,Ft
editor_group=frozen, forest, rough
-[/terrain_type]
-
-# The purpose of these hidden terrains is to make aliasing work correctly
-# regardless of which type of hill the trees are placed on. This is an
-# unfortunate hack; ideally we'd want to be able to use something like
-# string=H*^Fds instead.
-[terrain_type]
- symbol_image=forest/forested-hills-tile
- id=forested_hills
- name= _ "Hills"
- editor_name= _ "Forested Hills"
- string=Hhd^Fp
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
- editor_group=forest, rough
- hidden=yes
-[/terrain_type]
-[terrain_type]
- symbol_image=forest/forested-deciduous-summer-hills-tile
- name= _ "Hills"
- editor_name= _ "Summer Deciduous Forested Hills"
- string=Hhd^Fds
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
- hidden=yes
-[/terrain_type]
-[terrain_type]
- symbol_image=forest/forested-deciduous-fall-hills-tile
- name= _ "Hills"
- editor_name= _ "Fall Deciduous Forested Hills"
- string=Hh^Fdf
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
- hidden=yes
-[/terrain_type]
-[terrain_type]
- symbol_image=forest/forested-deciduous-winter-hills-tile
- name= _ "Hills"
- editor_name= _ "Winter Deciduous Forested Hills"
- string=Hh^Fdw
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
- hidden=yes
-[/terrain_type]
-[terrain_type]
- symbol_image=forest/forested-deciduous-winter-hills-tile
- name= _ "Hills"
- editor_name= _ "Winter Deciduous Forested Hills"
- string=Ha^Fdw
- aliasof=Ha,^Fp
- mvt_alias=-,Ha,^Fp
- hidden=yes
-[/terrain_type]
-[terrain_type]
- symbol_image=forest/forested-deciduous-winter-snow-hills-tile
- name= _ "Hills"
- editor_name= _ "Snowy Deciduous Forested Hills"
- string=Hh^Fda
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
- hidden=yes
-[/terrain_type]
-[terrain_type]
- symbol_image=forest/forested-deciduous-winter-snow-hills-tile
- name= _ "Hills"
- editor_name= _ "Snowy Deciduous Forested Hills"
- string=Hhd^Fda
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
- hidden=yes
-[/terrain_type]
-[terrain_type]
- symbol_image=forest/forested-mixed-summer-hills-tile
- name= _ "Hills"
- editor_name= _ "Summer Mixed Forested Hills"
- string=Hhd^Fms
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
- hidden=yes
-[/terrain_type]
-[terrain_type]
- symbol_image=forest/forested-mixed-fall-hills-tile
- name= _ "Hills"
- editor_name= _ "Fall Mixed Forested Hills"
- string=Hh^Fmf
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
- hidden=yes
-[/terrain_type]
-[terrain_type]
- symbol_image=forest/forested-mixed-winter-hills-tile
- name= _ "Hills"
- editor_name= _ "Winter Mixed Forested Hills"
- string=Hh^Fmw
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
- hidden=yes
-[/terrain_type]
-[terrain_type]
- symbol_image=forest/forested-mixed-winter-hills-tile
- name= _ "Hills"
- editor_name= _ "Winter Mixed Forested Hills"
- string=Ha^Fmw
- aliasof=Ha,^Fp
- mvt_alias=-,Ha,^Fp
- hidden=yes
-[/terrain_type]
-[terrain_type]
- symbol_image=forest/forested-mixed-winter-snow-hills-tile
- name= _ "Hills"
- editor_name= _ "Snowy Mixed Forested Hills"
- string=Hh^Fma
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
- hidden=yes
-[/terrain_type]
-[terrain_type]
- symbol_image=forest/forested-mixed-winter-snow-hills-tile
- name= _ "Hills"
- editor_name= _ "Snowy Mixed Forested Hills"
- string=Hhd^Fma
- aliasof=Hh,^Fp
- mvt_alias=-,Hh,^Fp
- hidden=yes
[/terrain_type]
#
@@ -2223,6 +2120,13 @@
[/terrain_type]
[terrain_type]
symbol_image=void/void
+ id=forest
+ name= _ "Forest"
+ string=Ft # wmllint: ignore
+ hidden=yes
+[/terrain_type]
+[terrain_type]
+ symbol_image=void/void
id=frozen
name= _ "Frozen"
string=At # wmllint: ignore
Modified: trunk/data/core/units.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units.cfg?rev=51547&r1=51546&r2=51547&view=diff
==============================================================================
--- trunk/data/core/units.cfg (original)
+++ trunk/data/core/units.cfg Thu Oct 20 01:25:24 2011
@@ -585,7 +585,7 @@
swamp_water=80
flat=60
sand=70
- forest=70
+ forest=-70
hills=60
village=60
castle=60
Modified: trunk/players_changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/players_changelog?rev=51547&r1=51546&r2=51547&view=diff
==============================================================================
--- trunk/players_changelog (original)
+++ trunk/players_changelog Thu Oct 20 01:25:24 2011
@@ -28,6 +28,12 @@
* Updated translations: British English, Czech, Dutch, Galician, Indonesian,
Italian, Japanese, Korean, Latin, Lithuanian, Old English,
Portuguese (Brazil), Russian, Slovak, Swedish.
+
+ * Unit changes and Balancing
+ * All mounted units now have forest defense capped at 30%. This reduces
their
+ defense on forested hills from 40% to 30%
+ * Forests now give best defense and worst movement on all terrain,
+ not just hills - fixes bug #18216.
* User interface:
* Removed waypoints UI feature ('w' key) since the whiteboard provides
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
