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

Pepeto _ wrote:
> In the default/ ruleset, teams are numbered 0-31, in civ1/ and civ2/
> they are numbered 1-32. This is quite illogical.
> 
For some odd reason, Per didn't update civ1/2 at the same time as default.

(PR#39343) 2.1.0-beta4 team numbers


> One idea more (for future): what about set team name as a format string,
> like "Team %d", then it shouldn't have this kind of problems.
> Translations and maximum of team number changes wouldn't make problems.
> And specific teams name like "Red", "Blue", "Yellow" and "Green"
> wouldn't crash the server.
> 
That was the old way.  The change to fixed strings came from the
desire to have translatable team's names for scenarios.

(PR#13145) completely new design for teams
(PR#13689) put team names in the ruleset

As for "crashing" the server, please submit a separate bug report.

Index: data/civ1/game.ruleset
===================================================================
--- data/civ1/game.ruleset      (revision 13773)
+++ data/civ1/game.ruleset      (working copy)
@@ -48,10 +48,10 @@
 
 ; Parameters used to generalize the calculation of city granary size:
 ;   if city_size <= num_inis:
-;     city_granary_size = (granary_food_ini[city_size] * foodbox)
+;     city_granary_size = (granary_food_ini[city_size] * foodbox / 100)
 ;   if city_size > num_inis;
-;     city_granary_size = (granary_food_ini[num_inis] * foodbox) +
-;        (granary_food_inc * (city_size - num_inis)) * foodbox / 100
+;     city_granary_size = (granary_food_ini[num_inis] +
+;        granary_food_inc * (city_size - num_inis)) * foodbox / 100
 granary_food_ini       = 20
 granary_food_inc       = 10
 
@@ -80,7 +80,7 @@
 
 ; city_incite_cost = 
 ; total_factor * (city_size) *
-; (base + (units_cost) * unit_factor + 
+; (base_incite_cost + (units_cost) * unit_factor + 
 ;   (improvements_cost) * improvement_factor) 
 ;  / (distance * 100)
 ; See city_incite_cost() for more details
@@ -98,6 +98,7 @@
 
 [teams]
 names =
+ _("Team 0"),
  _("Team 1"),
  _("Team 2"),
  _("Team 3"),
@@ -128,5 +129,4 @@
  _("Team 28"),
  _("Team 29"),
  _("Team 30"),
- _("Team 31"),
- _("Team 32")
+ _("Team 31")
Index: data/civ2/game.ruleset
===================================================================
--- data/civ2/game.ruleset      (revision 13773)
+++ data/civ2/game.ruleset      (working copy)
@@ -48,10 +48,10 @@
 
 ; Parameters used to generalize the calculation of city granary size:
 ;   if city_size <= num_inis:
-;     city_granary_size = (granary_food_ini[city_size] * foodbox)
+;     city_granary_size = (granary_food_ini[city_size] * foodbox / 100)
 ;   if city_size > num_inis;
-;     city_granary_size = (granary_food_ini[num_inis] * foodbox) +
-;        (granary_food_inc * (city_size - num_inis)) * foodbox / 100
+;     city_granary_size = (granary_food_ini[num_inis] +
+;        granary_food_inc * (city_size - num_inis)) * foodbox / 100
 granary_food_ini       = 20
 granary_food_inc       = 10
 
@@ -80,7 +80,7 @@
 
 ; city_incite_cost = 
 ; total_factor * (city_size) *
-; (base + (units_cost) * unit_factor + 
+; (base_incite_cost + (units_cost) * unit_factor + 
 ;   (improvements_cost) * improvement_factor) 
 ;  / (distance * 100)
 ; See city_incite_cost() for more details
@@ -98,6 +98,7 @@
 
 [teams]
 names =
+ _("Team 0"),
  _("Team 1"),
  _("Team 2"),
  _("Team 3"),
@@ -128,5 +129,4 @@
  _("Team 28"),
  _("Team 29"),
  _("Team 30"),
- _("Team 31"),
- _("Team 32")
+ _("Team 31")
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to