diff -Nur -Xpatches/no.freeciv freeciv/server/cityturn.c my_freeciv/server/cityturn.c
--- freeciv/server/cityturn.c	Sat Dec 30 00:41:23 2000
+++ my_freeciv/server/cityturn.c	Sat Dec 30 01:32:16 2000
@@ -180,7 +180,8 @@
 **************************************************************************/
 static void citizen_happy_luxury(struct city *pcity)
 {
-  int x=pcity->luxury_total;
+  int x=MIN(pcity->luxury_total, 2*pcity->size);
+  /* luxury above 2*citysize has no effect, as in Civ2 -- Jing */
   happy_copy(pcity, 0);
   /* make people happy, content are made happy first, then unhappy content,
      etc.  each conversions costs 2 luxuries. */