[Freeciv-Dev] Re: (PR#4593) Diplomats

["Per I. Mathisen" <per@xxxxxxxxxxx>]

On Thu, 17 Jul 2003, Genevieve Gracian wrote:
> super-power 1: unlimited moves
>
> One thing which seems to be the bigger super-power is the ability of engaging
> an unlimited number of combats against a city regardless of the moves left for
> the attacking dip and without suffering any damage until the end of the
> contest.
...
> - raise the efficiency of defending dips in a city (for example by
> really taking a move to the attacker in a dip contest).

I've committed the increased incite cost patch now, hopefully it helps a
little. Here is another patch that makes the diplomat go idle after
winning a diplomat contest, and then loses one movement point.

Please test and comment.

  - Per

Index: server/diplomats.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/diplomats.c,v
retrieving revision 1.38
diff -u -r1.38 diplomats.c
--- server/diplomats.c  26 Jun 2003 23:03:13 -0000      1.38
+++ server/diplomats.c  18 Jul 2003 16:03:34 -0000
@@ -1112,6 +1112,8 @@
                           " %s."), unit_name(punit->type), pcity->name);
 
        wipe_unit_safe(punit, &myiter);
+        pdiplomat->moves_left = MAX(0, punit->moves_left - SINGLE_MOVE);
+        return FALSE;
       } else {
        /* Attacking Spy/Diplomat dies. */