Merge remote-tracking branch 'upstream/develop' into develop

conf/keywords.json

@@ -1,7 +1,8 @@
 {
     "keywords": {
         "en" : {
-            "grow": [ "GROW", "BREED", "PLANT" ],
+            "plant": "PLANT",
+	    "grow": [ "GROW", "BREED" ],
             "promote": ["PROMOTE", "PROMOTION" ],
             "combat": [ "COMBAT", "FIGHT" ]
         },
@@ -53,7 +54,8 @@
             "cast": ["ZAUBERE", "ZAUBERN"],
             "show": ["ZEIGE", "ZEIGEN"],
             "destroy": ["ZERSTÖRE", "ZERSTÖREN"],
-            "grow": ["ZÜCHTE", "PFLANZE", "ZÜCHTEN", "PFLANZEN"],
+            "grow": ["ZÜCHTE", "ZÜCHTEN"],
+            "plant": ["PFLANZE", "PFLANZEN"],
             "default": "DEFAULT",
             "origin": "URSPRUNG",
             "email": "EMAIL",

src/economy.c

@@ -3098,7 +3098,8 @@ void produce(struct region *r)
             sabotage_cmd(u, u->thisorder);
             break;
 
-        case K_BREED:
+        case K_PLANT:
+        case K_GROW:
             breed_cmd(u, u->thisorder);
             break;
 

src/kernel/order.c

@@ -446,7 +446,8 @@ bool is_repeated(keyword_t kwd)
     case K_SABOTAGE:
     case K_STUDY:
     case K_TEACH:
-    case K_BREED:
+    case K_GROW:
+    case K_PLANT:
     case K_PIRACY:
     case K_MAKE:
     case K_LOOT:
@@ -485,7 +486,8 @@ bool is_exclusive(const order * ord)
     case K_SABOTAGE:
     case K_STUDY:
     case K_TEACH:
-    case K_BREED:
+    case K_GROW:
+    case K_PLANT:
     case K_PIRACY:
     case K_MAKE:
     case K_LOOT:
@@ -525,7 +527,8 @@ bool is_long(keyword_t kwd)
     case K_SABOTAGE:
     case K_STUDY:
     case K_TEACH:
-    case K_BREED:
+    case K_GROW:
+    case K_PLANT:
     case K_PIRACY:
     case K_MAKE:
     case K_LOOT:

src/keyword.c

@@ -134,6 +134,7 @@ const char *keywords[MAXKEYWORDS] = {
     "cast",
     "show",
     "destroy",
+    "plant",
     "grow",
     "default",
     "origin",

src/keyword.h

@@ -58,7 +58,8 @@ extern "C"
         K_CAST,
         K_RESHOW,
         K_DESTROY,
-        K_BREED,
+        K_PLANT,
+        K_GROW,
         K_DEFAULT,
         K_URSPRUNG,
         K_EMAIL,