Hello Goswin,

Thanks for testing the patch. Here only a short answer; more later ...

At the moment the freeciv development is really fast. So there seems to be
some changes which require an update of the patch. I tested the entire
patch set (see patch #1235; https://gna.org/patch/?1235; file #6879:
cityradius.diff) before I updated it. I will check for compile errors and
update it today in the evening.

To use variable city radii you need some changes to the ruleset. You could
try my experimental ruleset (patch #1236; https://gna.org/patch/?1236).
Within this ruleset the following city radii are defined (see
effects.ruleset and also ./doc/README.ruleset_experimental):

>- Activate variable city radii:
>    radius 1: start
>    radius 2: city size 3
>    radius 3: city size 10 + Railroad
>    radius 4: city size 30 + Railroad + Mass Transit + Super Highway
>  The vision range of the city is adapted accordingly.

To get all the new things listed in this file some additional patches are
needed (settings patch series for game settings in the game.ruleset file).

Changing the definition to use radius_sq should be possible and would also
be consistend with the use of radius_sq for borders and vision range. I
will check this.

The 'lot of black' in the city window is a known problem. I don't know how
to code for the (gtk) client. Ideally there would be a 5x5 map (default
size) and scrolling bars. After opening, this window should be centered on
the city.

Please use the bug / patch tracker for comments. It helps to follow the
discussion(s).

Matthias


> Hi,
>
> I tried your patch for variable city radii and did run into some
> problems:
>
> 1) The patch series does not apply. Fixing some rejects it then does
> not compile. There seem to be patches missing. Or I got the wrong
> files where multiple files are attached to a bug.
>
> 2) The file#6879 single patch fails to compile:
>
> Index: trunk/client/gui-sdl/citydlg.c
> ===================================================================
> --- trunk.orig/client/gui-sdl/citydlg.c 2009-10-07 03:45:38.000000000
> +0200
> +++ trunk/client/gui-sdl/citydlg.c      2009-10-07 03:46:25.000000000
> +0200
> @@ -1577,7 +1577,7 @@
>    if (Main.event.button.button == SDL_BUTTON_LEFT) {
>      int col, row;
>
> -    if (canvas_to_city_pos(&col, &row, city_map_radius(pdialog->pcity),
> +    if (canvas_to_city_pos(&col, &row, city_map_radius(pCityDlg->pCity),
>        1/city_map_zoom * (Main.event.motion.x - pMap->dst->dest_rect.x
>                           - pMap->size.x),
>        1/city_map_zoom * (Main.event.motion.y - pMap->dst->dest_rect.y
> Index: trunk/client/gui-xaw/citydlg.c
> ===================================================================
> --- trunk.orig/client/gui-xaw/citydlg.c 2009-10-07 03:51:41.000000000
> +0200
> +++ trunk/client/gui-xaw/citydlg.c      2009-10-07 03:52:10.000000000
> +0200
> @@ -1879,7 +1879,7 @@
>        int xtile, ytile;
>
>        if (canvas_to_city_pos(&xtile, &ytile,
> -                             city_map_radius(pdialog->pcity), ev->x,
> ev->y)) {
> +                             city_map_radius(pcity), ev->x, ev->y)) {
>          city_toggle_worker(pcity, xtile, ytile);
>        }
>      }
>
>
>
>
> After that it seems to work, except it has no effect to the city
> radius. It looks to me like nothing is using the effect to increase
> the city radius. Shouldn't you include a ruleset where maybe Aqueduct
> and Sewer System increase the city radius? Seems like good candidates
> for this. Alternatively the techs that start  a new era and change the
> city pixmap. Do you have an example ruleset for this?
>
>
> I tried editing a save game to increase the city radius, setting the
> saved value to 2,3,4,5 (one city per size) but the only effect that
> had was a warning from the server when loading the game that the
> worker tiles didn't fit. Is that normal? The gtk client still showed
> the normal radius 2 (surrounded by lots of black now).
>
> As a side node I would like to use the following city sizes:
>
>           X    XXX
>  X  XXX  XXX  XXXXX
> X#X X#X XX#XX XX#XX ...
>  X  XXX  XXX  XXXXX
>           X    XXX
>
>  1   2    4     5   <-- radius squared
>
> Using the radius squared gives a finer control of the size. Do you
> think that would be possible to change to?
>
> MfG
>         Goswin
>
>


-- 
Matthias Pfafferodt - http://www.mapfa.de
Matthias.Pfafferodt <at> mapfa.de


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

Reply via email to