[Freeciv-Dev] [Patch] (PR#9597) ?attitude:amiable, ?attitude:Friendly

["Ciaran Mac Lochlainn" <ciaran17@xxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=9597 >

On Wed 04 Aug 2004 08:33, Mateusz Stefek wrote:
> <URL: http://rt.freeciv.org/Ticket/Display.html?id=9597 >
>
> On 2004-08-03 12:11:32, Per I. Mathisen wrote:
> > > Can anyone improve graduation in love_text() in player.c ?
> >
> > Do you have any suggestions?
> >
> >   - Per
>
> I'm not native speaker. I'm not competent enough. In fact I haven't
> heard word 'amiable' before.

This patch replaces all the love_text words with (hopefully) clearer 
ones.  It also broadens the range of values covered, so that the 
neutral words are used more.

I looked at equivalents in a few other games, and I asked my wife (who 
has a degree in English) for suggestions.  We decided to keep to 
adjectives which would each fit in the same sentence.

Worshipful, Enthusiastic, Neutral, Uncooperative and Hostile are used 
in Civ2.  Belligerent is in Alpha Centauri.  Uneasy is from FreeCiv 
(was Unease).

I thought about having more than 11 words, but it's difficult to add 
more while keeping a clear progression from friendly to unfriendly.


Index: player.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/player.c,v
retrieving revision 1.144
diff -u -r1.144 player.c
--- player.c    1 Aug 2004 13:33:26 -0000       1.144
+++ player.c    8 Aug 2004 00:30:13 -0000
@@ -583,32 +583,35 @@
 
 /**************************************************************************
   Return a text describing an AI's love for you.  (Oooh, kinky!!)
+  These words should be adjectives which can fit in the sentence
+  "The x are y towards us"
+  "The Babylonians are respectful towards us"
 **************************************************************************/
 const char *love_text(const int love)
 {
-  if (love <= -51) {
-    return Q_("?attitude:Bloodfeud");
-  } else if (love >= -50 && love <= -21) {
-    return Q_("?attitude:Loathing");
-  } else if (love >= -20 && love <= -11) {
-    return Q_("?attitude:Hatred");
-  } else if (love >= -10 && love <= -5) {
-    return Q_("?attitude:Dislike");
-  } else if (love >= -4 && love <= -3) {
-    return Q_("?attitude:Unease");
-  } else if (love >= -2 && love <= 2) {
-    return Q_("?attitude:Indifferent");
-  } else if (love >= 3 && love <= 9) {
-    return Q_("?attitude:Peaceful");
-  } else if (love >= 10 && love <= 20) {
-    return Q_("?attitude:Relaxed");
-  } else if (love >= 21 && love <= 50) {
-    return Q_("?attitude:Friendly");
-  } else if (love >= 51 && love <= 70) {
-    return Q_("?attitude:Amiable");
+  if (love <= -81) {
+    return Q_("?attitude:Genocidal");
+  } else if (love >= -80 && love <= -61) {
+    return Q_("?attitude:Belligerent");
+  } else if (love >= -60 && love <= -41) {
+    return Q_("?attitude:Hostile");
+  } else if (love >= -40 && love <= -21) {
+    return Q_("?attitude:Uncooperative");
+  } else if (love >= -20 && love <= -6) {
+    return Q_("?attitude:Uneasy");
+  } else if (love >= -5 && love <= 5) {
+    return Q_("?attitude:Neutral");
+  } else if (love >= 6 && love <= 20) {
+    return Q_("?attitude:Respectful");
+  } else if (love >= 21 && love <= 40) {
+    return Q_("?attitude:Helpful");
+  } else if (love >= 41 && love <= 60) {
+    return Q_("?attitude:Enthusiastic");
+  } else if (love >= 61 && love <= 80) {
+    return Q_("?attitude:Admiring");
   } else {
-    assert(love >= 71);
-    return Q_("?attitude:Harmony");
+    assert(love >= 81);
+    return Q_("?attitude:Worshipful");
   }
 }