[Freeciv-Dev] Re: (PR#18603) [Patch] move_type "Both" in rulesets

["Marko Lindqvist" <cazfi74@xxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=18603 >

Marko Lindqvist wrote:
> 
>   This patch just replaces "Heli" with "Both" as move_type in ruleset. 
> Simply because it's not intuitive that amphibious unit classes should 
> use move_type "Heli". Nor does move_type list "Land/Sea/Air/Heli" make 
> it clear that amphibious movement is possible at all.

  I mean this patch.


  - ML

diff -Nurd -X.diff_ignore freeciv/common/movement.c freeciv/common/movement.c
--- freeciv/common/movement.c   2006-07-14 23:29:58.500000000 +0300
+++ freeciv/common/movement.c   2006-07-15 00:14:36.328125000 +0300
@@ -31,7 +31,7 @@
 #include "terrain.h"
 
 static const char *move_type_names[] = {
-  "Air", "Land", "Sea", "Heli"
+  "Air", "Land", "Sea", "Both"
 };
 
 static bool can_unit_type_transport(const struct unit_type *transporter,
diff -Nurd -X.diff_ignore freeciv/data/civ1/units.ruleset 
freeciv/data/civ1/units.ruleset
--- freeciv/data/civ1/units.ruleset     2006-07-14 23:30:10.000000000 +0300
+++ freeciv/data/civ1/units.ruleset     2006-07-15 00:17:45.078125000 +0300
@@ -51,7 +51,8 @@
 ; ** Fields **
 ;
 ; name          = Name as used in other rulesets
-; move_type     = Where unit moves Land/Sea/Air/Heli
+; move_type     = Where unit moves; Land, Sea, Both or Air. Air is special 
value for
+;                 units which can only be attacked by units with "Fighter" flag
 ; hp_loss_pct   = Hitpoints lost each turn if unit not in city or airbase
 ; flags         = List of unit class flags
 ;
diff -Nurd -X.diff_ignore freeciv/data/civ2/units.ruleset 
freeciv/data/civ2/units.ruleset
--- freeciv/data/civ2/units.ruleset     2006-07-14 23:30:11.187500000 +0300
+++ freeciv/data/civ2/units.ruleset     2006-07-15 00:17:52.921875000 +0300
@@ -50,8 +50,9 @@
 ;
 ; ** Fields **
 ;
-; name          = Name as used in other rulesets
-; move_type     = Where unit moves Land/Sea/Air/Heli
+; name          = Name as used in other 
+; move_type     = Where unit moves; Land, Sea, Both or Air. Air is special 
value for
+;                 units which can only be attacked by units with "Fighter" flag
 ; hp_loss_pct   = Hitpoints lost each turn if unit not in city or airbase
 ; flags         = List of unit class flags
 ;
@@ -82,7 +83,7 @@
 
 [unitclass_heli]
 name          = _("Helicopter")
-move_type     = "Heli"
+move_type     = "Both"
 hp_loss_pct   = 10
 flags         = "CanOccupy"
 
diff -Nurd -X.diff_ignore freeciv/data/default/units.ruleset 
freeciv/data/default/units.ruleset
--- freeciv/data/default/units.ruleset  2006-07-14 23:30:12.781250000 +0300
+++ freeciv/data/default/units.ruleset  2006-07-15 00:17:29.734375000 +0300
@@ -57,7 +57,8 @@
 ; ** Fields **
 ;
 ; name          = Name as used in other rulesets
-; move_type     = Where unit moves Land/Sea/Air/Heli
+; move_type     = Where unit moves; Land, Sea, Both or Air. Air is special 
value for
+;                 units which can only be attacked by units with "Fighter" flag
 ; hp_loss_pct   = Hitpoints lost each turn if unit not in city or airbase
 ; flags         = List of unit class flags
 ;
@@ -88,7 +89,7 @@
 
 [unitclass_heli]
 name          = _("Helicopter")
-move_type     = "Heli"
+move_type     = "Both"
 hp_loss_pct   = 10
 flags         = "CanOccupy"