[Freeciv-Dev] (PR#12120) Default CMA settings aren't good

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

Here's a patch.

- I changed the "default" parameters to 10/5/0/4/0/4.
- Min surplus gold is changed to -20.
- For the "max XXX", the min surplus of that item is changed to -20.  So
you can put your starving city on "max food".
- "Very happy" should be the default value so it's moved up to the top
(I would make a different default but that would need a new string).

-jason

? patch.diff
? win32.diff
Index: client/agents/cma_fec.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/agents/cma_fec.c,v
retrieving revision 1.26.2.1
diff -u -r1.26.2.1 cma_fec.c
--- client/agents/cma_fec.c     17 Jan 2005 18:03:10 -0000      1.26.2.1
+++ client/agents/cma_fec.c     5 Feb 2005 21:04:20 -0000
@@ -374,49 +374,53 @@
 {
  int i;
  struct cm_parameter parameters[] = {
-   { /* max food */
-     .minimal_surplus = {0, 0, 0, 0, 0, 0},
+   { /* very happy */
+     .minimal_surplus = {0, 0, 0, -20, 0, 0},
      .require_happy = FALSE,
      .allow_disorder = FALSE,
      .allow_specialists = TRUE,
-     .factor = {10, 1, 1, 1, 1, 1},
-     .happy_factor = 0
-   }, { /* max prod */
-     .minimal_surplus = {0, 0, 0, 0, 0, 0},
+     .factor = {10, 5, 0, 4, 0, 4},
+     .happy_factor = 25
+   },
+   { /* max food */
+     .minimal_surplus = {-20, 0, 0, -20, 0, 0},
      .require_happy = FALSE,
      .allow_disorder = FALSE,
      .allow_specialists = TRUE,
-     .factor = {1, 10, 1, 1, 1, 1},
+     .factor = {25, 5, 0, 4, 0, 4},
      .happy_factor = 0
-   }, { /* max gold */
-     .minimal_surplus = {0, 0, 0, 0, 0, 0},
+   },
+   { /* max prod */
+     .minimal_surplus = {0, -20, 0, -20, 0, 0},
      .require_happy = FALSE,
      .allow_disorder = FALSE,
      .allow_specialists = TRUE,
-     .factor = {1, 1, 1, 10, 1, 1},
+     .factor = {10, 25, 0, 4, 0, 4},
      .happy_factor = 0
-   }, { /* max science */
-     .minimal_surplus = {0, 0, 0, 0, 0, 0},
+   },
+   { /* max gold */
+     .minimal_surplus = {0, 0, 0, -20, 0, 0},
      .require_happy = FALSE,
      .allow_disorder = FALSE,
      .allow_specialists = TRUE,
-     .factor = {1, 1, 1, 1, 1, 10},
+     .factor = {10, 5, 0, 25, 0, 4},
      .happy_factor = 0
-   }, { /* very happy */
-     .minimal_surplus = {0, 0, 0, 0, 0, 0},
+   },
+   { /* max science */
+     .minimal_surplus = {0, 0, 0, -20, 0, 0},
      .require_happy = FALSE,
      .allow_disorder = FALSE,
      .allow_specialists = TRUE,
-     .factor = {1, 1, 1, 1, 1, 1},
-     .happy_factor = 25
-   }   
+     .factor = {10, 5, 0, 4, 0, 25},
+     .happy_factor = 0
+   }
  };
  const char* names[ARRAY_SIZE(parameters)] = {
+   N_("?cma:Very happy"),
    N_("?cma:Max food"),
    N_("?cma:Max production"),
    N_("?cma:Max gold"),
-   N_("?cma:Max science"),
-   N_("?cma:Very happy")
+   N_("?cma:Max science")
  };
 
  for (i = ARRAY_SIZE(parameters) - 1; i >= 0; i--) {