[Freeciv-Dev] (PR#14561) Spaceship scores not being added

["Brendon" <yautja@xxxxxxxxxxxxxxx>]

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

Happening in S2_0 and HEAD.

The score is not being recalculated after a spaceship has reached Alpha 
Centauri, so doesn't include the 100+ spaceship score bonus.

2 patches attached.

I'll attach a 100Kb savegame for testing.



---- Unrelated to spaceships ----

I think score should also include the net worth of all your assets.
Something like 1pt for every 500 gold and 1pt for every 250 shields 
worth of buildings and units.

The current system just counts technologys, which usually every player 
is equal within 20 score points of one another. Same with wonders, you 
can't get them all in a balanced game unless you conquer.

So the deciding factor is usually just overall population, which is 
higher and most easily increased by smallpoxers with a few turns of 
rapture. Where as largepoxers that have spent all game improving their 
cities with markets, universitys, defensive units etc get nothing for 
their efforts.

Index: server/srv_main.c
===================================================================
--- server/srv_main.c   (revision 11232)
+++ server/srv_main.c   (working copy)
@@ -1686,6 +1686,11 @@
   while (TRUE) {
     srv_loop();
 
+    /* Recalculate the scores in case of a spaceship victory */
+    players_iterate(pplayer) {
+      calc_civ_score(pplayer);
+    } players_iterate_end;
+
     send_game_state(game.est_connections, CLIENT_GAME_OVER_STATE);
     report_final_scores();
     show_map_to_all();

Index: server/srv_main.c
===================================================================
--- server/srv_main.c   (revision 11225)
+++ server/srv_main.c   (working copy)
@@ -625,6 +625,8 @@
     } players_iterate_end;
   }
 
+  check_spaceship_arrivals();
+
   /* We build scores at the beginning and end of every turn.  We have to
    * build them at the end so that the history report can be built. */
   players_iterate(pplayer) {
@@ -656,8 +658,6 @@
   freelog(LOG_DEBUG, "Updatetimeout");
   update_timeout();
 
-  check_spaceship_arrivals();
-
   freelog(LOG_DEBUG, "Sendplayerinfo");
   send_player_info(NULL, NULL);