Author: sveinung
Date: Wed Dec 31 11:13:42 2014
New Revision: 27457

URL: http://svn.gna.org/viewcvs/freeciv?rev=27457&view=rev
Log:
Move the TradeRoute unit type flag to the ruleset.

See patch #5624

Modified:
    trunk/client/helpdata.c
    trunk/common/unittype.h
    trunk/data/alien/units.ruleset
    trunk/data/civ1/units.ruleset
    trunk/data/civ2/units.ruleset
    trunk/data/civ2civ3/units.ruleset
    trunk/data/classic/units.ruleset
    trunk/data/experimental/units.ruleset
    trunk/data/multiplayer/units.ruleset
    trunk/data/stub/units.ruleset
    trunk/fc_version

Modified: trunk/client/helpdata.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=27457&r1=27456&r2=27457&view=diff
==============================================================================
--- trunk/client/helpdata.c     (original)
+++ trunk/client/helpdata.c     Wed Dec 31 11:13:42 2014
@@ -3603,10 +3603,6 @@
       astr_free(&dlist);
     }
   }
-  if (utype_has_flag(utype, UTYF_TRADE_ROUTE)) {
-    CATLSTR(buf, bufsz,
-            _("* Can establish trade routes (must travel to target city).\n"));
-  }
   if (utype_has_flag(utype, UTYF_HELP_WONDER)) {
     cat_snprintf(buf, bufsz,
                 _("* Can help build wonders (adds %d production).\n"),

Modified: trunk/common/unittype.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/unittype.h?rev=27457&r1=27456&r2=27457&view=diff
==============================================================================
--- trunk/common/unittype.h     (original)
+++ trunk/common/unittype.h     Wed Dec 31 11:13:42 2014
@@ -137,8 +137,9 @@
  * Used in the network protocol.
  */
 #define SPECENUM_NAME unit_type_flag_id
-#define SPECENUM_VALUE0 UTYF_TRADE_ROUTE
-#define SPECENUM_VALUE0NAME N_("TradeRoute")
+/* Cannot fortify even if class can */
+#define SPECENUM_VALUE0 UTYF_CANT_FORTIFY
+#define SPECENUM_VALUE0NAME N_("Cant_Fortify")
 #define SPECENUM_VALUE1 UTYF_HELP_WONDER
 #define SPECENUM_VALUE1NAME N_("HelpWonder")
 #define SPECENUM_VALUE2 UTYF_IGZOC
@@ -233,42 +234,39 @@
 /* Unit has no ZOC */
 #define SPECENUM_VALUE34 UTYF_NOZOC
 #define SPECENUM_VALUE34NAME N_("HasNoZOC")
-/* Cannot fortify even if class can */
-#define SPECENUM_VALUE35 UTYF_CANT_FORTIFY
-#define SPECENUM_VALUE35NAME N_("Cant_Fortify")
-
-#define SPECENUM_VALUE36 UTYF_USER_FLAG_1
-#define SPECENUM_VALUE37 UTYF_USER_FLAG_2
-#define SPECENUM_VALUE38 UTYF_USER_FLAG_3
-#define SPECENUM_VALUE39 UTYF_USER_FLAG_4
-#define SPECENUM_VALUE40 UTYF_USER_FLAG_5
-#define SPECENUM_VALUE41 UTYF_USER_FLAG_6
-#define SPECENUM_VALUE42 UTYF_USER_FLAG_7
-#define SPECENUM_VALUE43 UTYF_USER_FLAG_8
-#define SPECENUM_VALUE44 UTYF_USER_FLAG_9
-#define SPECENUM_VALUE45 UTYF_USER_FLAG_10
-#define SPECENUM_VALUE46 UTYF_USER_FLAG_11
-#define SPECENUM_VALUE47 UTYF_USER_FLAG_12
-#define SPECENUM_VALUE48 UTYF_USER_FLAG_13
-#define SPECENUM_VALUE49 UTYF_USER_FLAG_14
-#define SPECENUM_VALUE50 UTYF_USER_FLAG_15
-#define SPECENUM_VALUE51 UTYF_USER_FLAG_16
-#define SPECENUM_VALUE52 UTYF_USER_FLAG_17
-#define SPECENUM_VALUE53 UTYF_USER_FLAG_18
-#define SPECENUM_VALUE54 UTYF_USER_FLAG_19
-#define SPECENUM_VALUE55 UTYF_USER_FLAG_20
-#define SPECENUM_VALUE56 UTYF_USER_FLAG_21
-#define SPECENUM_VALUE57 UTYF_USER_FLAG_22
-#define SPECENUM_VALUE58 UTYF_USER_FLAG_23
-#define SPECENUM_VALUE59 UTYF_USER_FLAG_24
-#define SPECENUM_VALUE60 UTYF_USER_FLAG_25
-#define SPECENUM_VALUE61 UTYF_USER_FLAG_26
-#define SPECENUM_VALUE62 UTYF_USER_FLAG_27
-#define SPECENUM_VALUE63 UTYF_USER_FLAG_28
-#define SPECENUM_VALUE64 UTYF_USER_FLAG_29
-#define SPECENUM_VALUE65 UTYF_USER_FLAG_30
-#define SPECENUM_VALUE66 UTYF_USER_FLAG_31
-#define SPECENUM_VALUE67 UTYF_USER_FLAG_32
+
+#define SPECENUM_VALUE35 UTYF_USER_FLAG_1
+#define SPECENUM_VALUE36 UTYF_USER_FLAG_2
+#define SPECENUM_VALUE37 UTYF_USER_FLAG_3
+#define SPECENUM_VALUE38 UTYF_USER_FLAG_4
+#define SPECENUM_VALUE39 UTYF_USER_FLAG_5
+#define SPECENUM_VALUE40 UTYF_USER_FLAG_6
+#define SPECENUM_VALUE41 UTYF_USER_FLAG_7
+#define SPECENUM_VALUE42 UTYF_USER_FLAG_8
+#define SPECENUM_VALUE43 UTYF_USER_FLAG_9
+#define SPECENUM_VALUE44 UTYF_USER_FLAG_10
+#define SPECENUM_VALUE45 UTYF_USER_FLAG_11
+#define SPECENUM_VALUE46 UTYF_USER_FLAG_12
+#define SPECENUM_VALUE47 UTYF_USER_FLAG_13
+#define SPECENUM_VALUE48 UTYF_USER_FLAG_14
+#define SPECENUM_VALUE49 UTYF_USER_FLAG_15
+#define SPECENUM_VALUE50 UTYF_USER_FLAG_16
+#define SPECENUM_VALUE51 UTYF_USER_FLAG_17
+#define SPECENUM_VALUE52 UTYF_USER_FLAG_18
+#define SPECENUM_VALUE53 UTYF_USER_FLAG_19
+#define SPECENUM_VALUE54 UTYF_USER_FLAG_20
+#define SPECENUM_VALUE55 UTYF_USER_FLAG_21
+#define SPECENUM_VALUE56 UTYF_USER_FLAG_22
+#define SPECENUM_VALUE57 UTYF_USER_FLAG_23
+#define SPECENUM_VALUE58 UTYF_USER_FLAG_24
+#define SPECENUM_VALUE59 UTYF_USER_FLAG_25
+#define SPECENUM_VALUE60 UTYF_USER_FLAG_26
+#define SPECENUM_VALUE61 UTYF_USER_FLAG_27
+#define SPECENUM_VALUE62 UTYF_USER_FLAG_28
+#define SPECENUM_VALUE63 UTYF_USER_FLAG_29
+#define SPECENUM_VALUE64 UTYF_USER_FLAG_30
+#define SPECENUM_VALUE65 UTYF_USER_FLAG_31
+#define SPECENUM_VALUE66 UTYF_USER_FLAG_32
 /* Note that first role must have value next to last flag */
 
 #define UTYF_LAST_USER_FLAG UTYF_USER_FLAG_32
@@ -293,74 +291,74 @@
 
 #define SPECENUM_NAME unit_role_id
 /* is built first when city established */
-#define SPECENUM_VALUE68 L_FIRSTBUILD
-#define SPECENUM_VALUE68NAME N_("FirstBuild")
+#define SPECENUM_VALUE67 L_FIRSTBUILD
+#define SPECENUM_VALUE67NAME N_("FirstBuild")
 /* initial explorer unit */
-#define SPECENUM_VALUE69 L_EXPLORER
-#define SPECENUM_VALUE69NAME N_("Explorer")
+#define SPECENUM_VALUE68 L_EXPLORER
+#define SPECENUM_VALUE68NAME N_("Explorer")
 /* can be found in hut */
-#define SPECENUM_VALUE70 L_HUT
-#define SPECENUM_VALUE70NAME N_("Hut")
+#define SPECENUM_VALUE69 L_HUT
+#define SPECENUM_VALUE69NAME N_("Hut")
 /* can be found in hut, global tech required */
-#define SPECENUM_VALUE71 L_HUT_TECH
-#define SPECENUM_VALUE71NAME N_("HutTech")
+#define SPECENUM_VALUE70 L_HUT_TECH
+#define SPECENUM_VALUE70NAME N_("HutTech")
 /* is created in Partisan circumstances */
-#define SPECENUM_VALUE72 L_PARTISAN
-#define SPECENUM_VALUE72NAME N_("Partisan")
+#define SPECENUM_VALUE71 L_PARTISAN
+#define SPECENUM_VALUE71NAME N_("Partisan")
 /* ok on defense (AI) */
-#define SPECENUM_VALUE73 L_DEFEND_OK
-#define SPECENUM_VALUE73NAME N_("DefendOk")
+#define SPECENUM_VALUE72 L_DEFEND_OK
+#define SPECENUM_VALUE72NAME N_("DefendOk")
 /* primary purpose is defense (AI) */
-#define SPECENUM_VALUE74 L_DEFEND_GOOD
-#define SPECENUM_VALUE74NAME N_("DefendGood")
+#define SPECENUM_VALUE73 L_DEFEND_GOOD
+#define SPECENUM_VALUE73NAME N_("DefendGood")
 /* quick attacking unit (Horse..Armor) (unused)*/
-#define SPECENUM_VALUE75 L_ATTACK_FAST
-#define SPECENUM_VALUE75NAME N_("AttackFast")
+#define SPECENUM_VALUE74 L_ATTACK_FAST
+#define SPECENUM_VALUE74NAME N_("AttackFast")
 /* powerful attacking unit (Catapult..) (unused) */
-#define SPECENUM_VALUE76 L_ATTACK_STRONG
-#define SPECENUM_VALUE76NAME N_("AttackStrong")
+#define SPECENUM_VALUE75 L_ATTACK_STRONG
+#define SPECENUM_VALUE75NAME N_("AttackStrong")
 /* is useful for ferrying (AI) */
-#define SPECENUM_VALUE77 L_FERRYBOAT
-#define SPECENUM_VALUE77NAME N_("FerryBoat")
+#define SPECENUM_VALUE76 L_FERRYBOAT
+#define SPECENUM_VALUE76NAME N_("FerryBoat")
 /* barbarians unit, land only */
-#define SPECENUM_VALUE78 L_BARBARIAN
-#define SPECENUM_VALUE78NAME N_("Barbarian")
+#define SPECENUM_VALUE77 L_BARBARIAN
+#define SPECENUM_VALUE77NAME N_("Barbarian")
 /* barbarians unit, global tech required */
-#define SPECENUM_VALUE79 L_BARBARIAN_TECH
-#define SPECENUM_VALUE79NAME N_("BarbarianTech")
+#define SPECENUM_VALUE78 L_BARBARIAN_TECH
+#define SPECENUM_VALUE78NAME N_("BarbarianTech")
 /* barbarian boat */
-#define SPECENUM_VALUE80 L_BARBARIAN_BOAT
-#define SPECENUM_VALUE80NAME N_("BarbarianBoat")
+#define SPECENUM_VALUE79 L_BARBARIAN_BOAT
+#define SPECENUM_VALUE79NAME N_("BarbarianBoat")
 /* what barbarians should build */
-#define SPECENUM_VALUE81 L_BARBARIAN_BUILD
-#define SPECENUM_VALUE81NAME N_("BarbarianBuild")
+#define SPECENUM_VALUE80 L_BARBARIAN_BUILD
+#define SPECENUM_VALUE80NAME N_("BarbarianBuild")
 /* barbarians build when global tech */
-#define SPECENUM_VALUE82 L_BARBARIAN_BUILD_TECH
-#define SPECENUM_VALUE82NAME N_("BarbarianBuildTech")
+#define SPECENUM_VALUE81 L_BARBARIAN_BUILD_TECH
+#define SPECENUM_VALUE81NAME N_("BarbarianBuildTech")
 /* barbarian leader */
-#define SPECENUM_VALUE83 L_BARBARIAN_LEADER
-#define SPECENUM_VALUE83NAME N_("BarbarianLeader")
+#define SPECENUM_VALUE82 L_BARBARIAN_LEADER
+#define SPECENUM_VALUE82NAME N_("BarbarianLeader")
 /* sea raider unit */
-#define SPECENUM_VALUE84 L_BARBARIAN_SEA
-#define SPECENUM_VALUE84NAME N_("BarbarianSea")
+#define SPECENUM_VALUE83 L_BARBARIAN_SEA
+#define SPECENUM_VALUE83NAME N_("BarbarianSea")
 /* sea raider unit, global tech required */
-#define SPECENUM_VALUE85 L_BARBARIAN_SEA_TECH
-#define SPECENUM_VALUE85NAME N_("BarbarianSeaTech")
+#define SPECENUM_VALUE84 L_BARBARIAN_SEA_TECH
+#define SPECENUM_VALUE84NAME N_("BarbarianSeaTech")
 /* can found cities */
-#define SPECENUM_VALUE86 L_CITIES
-#define SPECENUM_VALUE86NAME N_("Cities")
+#define SPECENUM_VALUE85 L_CITIES
+#define SPECENUM_VALUE85NAME N_("Cities")
 /* can improve terrain */
-#define SPECENUM_VALUE87 L_SETTLERS
-#define SPECENUM_VALUE87NAME N_("Settlers")
+#define SPECENUM_VALUE86 L_SETTLERS
+#define SPECENUM_VALUE86NAME N_("Settlers")
 /* loss results in loss of game */
-#define SPECENUM_VALUE88 L_GAMELOSS
-#define SPECENUM_VALUE88NAME N_("GameLoss")
+#define SPECENUM_VALUE87 L_GAMELOSS
+#define SPECENUM_VALUE87NAME N_("GameLoss")
 /* can do diplomat actions */
-#define SPECENUM_VALUE89 L_DIPLOMAT
-#define SPECENUM_VALUE89NAME N_("Diplomat")
+#define SPECENUM_VALUE88 L_DIPLOMAT
+#define SPECENUM_VALUE88NAME N_("Diplomat")
 /* AI hunter type unit */
-#define SPECENUM_VALUE90 L_HUNTER
-#define SPECENUM_VALUE90NAME N_("Hunter")
+#define SPECENUM_VALUE89 L_HUNTER
+#define SPECENUM_VALUE89NAME N_("Hunter")
 #define L_LAST (L_HUNTER+1)
 
 #include "specenum_gen.h"

Modified: trunk/data/alien/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/units.ruleset?rev=27457&r1=27456&r2=27457&view=diff
==============================================================================
--- trunk/data/alien/units.ruleset      (original)
+++ trunk/data/alien/units.ruleset      Wed Dec 31 11:13:42 2014
@@ -9,8 +9,10 @@
 ; name          = rule name; not translateable, but may be displayed in
 ;                 some circumstances
 ; helptxt       = displayed in the help for units with this flag (optional)
-; flags =
-;   { "name", "helptxt" }
+flags =
+  { "name", "helptxt"
+    _("TradeRoute"), _("Can establish trade routes (must travel to target 
city).")
+  }
 
 [veteran_system]
 ; What are the names of the levels?
@@ -245,7 +247,6 @@
 ; ** Flags **
 ;
 ; "HelpWonder" = can help build wonders
-; "TradeRoute" = can establish trade routes
 ; "IgZOC"       = ignore Zones of Control (ZOC) even if unit class has
 ;                 "ZOC" flag
 ; "HasNoZOC"   = unit has no Zone of Control (ZOC), thus any unit can move

Modified: trunk/data/civ1/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/units.ruleset?rev=27457&r1=27456&r2=27457&view=diff
==============================================================================
--- trunk/data/civ1/units.ruleset       (original)
+++ trunk/data/civ1/units.ruleset       Wed Dec 31 11:13:42 2014
@@ -18,9 +18,10 @@
 ; name          = rule name; not translateable, but may be displayed in
 ;                 some circumstances
 ; helptxt       = displayed in the help for units with this flag (optional)
-;flags =
-;  { "name", "helptxt"
-;  }
+flags =
+  { "name", "helptxt"
+    _("TradeRoute"), _("Can establish trade routes (must travel to target 
city).")
+  }
 
 [veteran_system]
 ; What are the names of the levels?

Modified: trunk/data/civ2/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/units.ruleset?rev=27457&r1=27456&r2=27457&view=diff
==============================================================================
--- trunk/data/civ2/units.ruleset       (original)
+++ trunk/data/civ2/units.ruleset       Wed Dec 31 11:13:42 2014
@@ -25,6 +25,7 @@
     _("AirAttacker"), _("Very bad at attacking AEGIS.")
     _("Horse"), _("Attack value halved when attacking Pikemen.")
     _("Helicopter"), _("Defends very badly against Fighters.")
+    _("TradeRoute"), _("Can establish trade routes (must travel to target 
city).")
   }
 
 [veteran_system]

Modified: trunk/data/civ2civ3/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=27457&r1=27456&r2=27457&view=diff
==============================================================================
--- trunk/data/civ2civ3/units.ruleset   (original)
+++ trunk/data/civ2civ3/units.ruleset   Wed Dec 31 11:13:42 2014
@@ -29,6 +29,7 @@
     _("Transform"), _("Can transform terrain.")
     _("AirAttacker"), _("Very bad at attacking AEGIS.")
     _("Submarine"), _("Attack value halved when attacking Destroyer.")
+    _("TradeRoute"), _("Can establish trade routes (must travel to target 
city).")
   }
 
 [veteran_system]
@@ -287,7 +288,6 @@
 ; ** Flags **
 ;
 ; "HelpWonder" = can help build wonders
-; "TradeRoute" = can establish trade routes
 ; "IgZOC"       = ignore Zones of Control (ZOC) even if unit class has
 ;                 "ZOC" flag
 ; "HasNoZOC"   = unit has no Zone of Control (ZOC), thus any unit can move

Modified: trunk/data/classic/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/units.ruleset?rev=27457&r1=27456&r2=27457&view=diff
==============================================================================
--- trunk/data/classic/units.ruleset    (original)
+++ trunk/data/classic/units.ruleset    Wed Dec 31 11:13:42 2014
@@ -30,6 +30,7 @@
     _("AirAttacker"), _("Very bad at attacking AEGIS.")
     _("Horse"), _("Attack value halved when attacking Pikemen.")
     _("Helicopter"), _("Defends very badly against Fighters.")
+    _("TradeRoute"), _("Can establish trade routes (must travel to target 
city).")
   }
 
 [veteran_system]
@@ -264,7 +265,6 @@
 ; ** Flags **
 ;
 ; "HelpWonder" = can help build wonders
-; "TradeRoute" = can establish trade routes
 ; "IgZOC"       = ignore Zones of Control (ZOC) even if unit class has
 ;                 "ZOC" flag
 ; "HasNoZOC"   = unit has no Zone of Control (ZOC), thus any unit can move

Modified: trunk/data/experimental/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/units.ruleset?rev=27457&r1=27456&r2=27457&view=diff
==============================================================================
--- trunk/data/experimental/units.ruleset       (original)
+++ trunk/data/experimental/units.ruleset       Wed Dec 31 11:13:42 2014
@@ -33,6 +33,7 @@
     _("AirAttacker"), _("Very bad at attacking AEGIS.")
     _("Horse"), _("Attack value halved when attacking Pikemen.")
     _("Helicopter"), _("Defends very badly against Fighters.")
+    _("TradeRoute"), _("Can establish trade routes (must travel to target 
city).")
   }
 
 [veteran_system]
@@ -278,7 +279,6 @@
 ; ** Flags **
 ;
 ; "HelpWonder" = can help build wonders
-; "TradeRoute" = can establish trade routes
 ; "IgZOC"       = ignore Zones of Control (ZOC) even if unit class has
 ;                 "ZOC" flag
 ; "HasNoZOC"   = unit has no Zone of Control (ZOC), thus any unit can move

Modified: trunk/data/multiplayer/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/units.ruleset?rev=27457&r1=27456&r2=27457&view=diff
==============================================================================
--- trunk/data/multiplayer/units.ruleset        (original)
+++ trunk/data/multiplayer/units.ruleset        Wed Dec 31 11:13:42 2014
@@ -264,7 +264,6 @@
 ; ** Flags **
 ;
 ; "HelpWonder" = can help build wonders
-; "TradeRoute" = can establish trade routes
 ; "IgZOC"       = ignore Zones of Control (ZOC) even if unit class has
 ;                 "ZOC" flag
 ; "HasNoZOC"   = unit has no Zone of Control (ZOC), thus any unit can move

Modified: trunk/data/stub/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/stub/units.ruleset?rev=27457&r1=27456&r2=27457&view=diff
==============================================================================
--- trunk/data/stub/units.ruleset       (original)
+++ trunk/data/stub/units.ruleset       Wed Dec 31 11:13:42 2014
@@ -187,7 +187,6 @@
 ; ** Flags **
 ;
 ; "HelpWonder" = can help build wonders
-; "TradeRoute" = can establish trade routes
 ; "IgZOC"       = ignore Zones of Control (ZOC) even if unit class has
 ;                 "ZOC" flag
 ; "HasNoZOC"    = unit has no Zone of Control (ZOC), thus any unit can move

Modified: trunk/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=27457&r1=27456&r2=27457&view=diff
==============================================================================
--- trunk/fc_version    (original)
+++ trunk/fc_version    Wed Dec 31 11:13:42 2014
@@ -54,7 +54,7 @@
 #   - Avoid adding a new mandatory capability to the development branch for
 #     as long as possible.  We want to maintain network compatibility with
 #     the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2014.Dec.27"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2014.Dec.31"
 NETWORK_CAPSTRING_OPTIONAL=""
 
 FREECIV_DISTRIBUTOR=""


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to