From 1273abb967c10a0b71daef0588918e6070b888bf Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 24 Jun 2017 13:36:18 +0200
Subject: [PATCH] Getrennte Befehle fuer PFLANZE und ZUECHTE

---
 conf/keywords.json | 6 ++++--
 src/economy.c      | 3 ++-
 src/kernel/order.c | 9 ++++++---
 src/keyword.c      | 1 +
 src/keyword.h      | 3 ++-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/conf/keywords.json b/conf/keywords.json
index 4c9fa905d..4f8f27f5b 100644
--- a/conf/keywords.json
+++ b/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",
diff --git a/src/economy.c b/src/economy.c
index 3e13f0643..df2f2ea25 100644
--- a/src/economy.c
+++ b/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;
 
diff --git a/src/kernel/order.c b/src/kernel/order.c
index 6fbb53040..d64da0131 100644
--- a/src/kernel/order.c
+++ b/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:
diff --git a/src/keyword.c b/src/keyword.c
index ba05cbe4b..cb56fe940 100644
--- a/src/keyword.c
+++ b/src/keyword.c
@@ -134,6 +134,7 @@ const char *keywords[MAXKEYWORDS] = {
     "cast",
     "show",
     "destroy",
+    "plant",
     "grow",
     "default",
     "origin",
diff --git a/src/keyword.h b/src/keyword.h
index 19e55e88f..9be7f9f4e 100644
--- a/src/keyword.h
+++ b/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,