BREED/PLANT/GROW are technically the same command, merge them.

The new parser makes this easy.
This commit is contained in:
Enno Rehling 2015-01-04 15:11:49 +01:00
parent 0aa002a6d2
commit 90dd700487
6 changed files with 2 additions and 14 deletions

View File

@ -1,6 +1,7 @@
{
"keywords": {
"en" : {
"grow": [ "GROW", "BREED", "PLANT" ],
"combat": [ "COMBAT", "FIGHT" ]
},
"de": {
@ -51,7 +52,7 @@
"cast": ["ZAUBERE", "ZAUBERN"],
"show": ["ZEIGE", "ZEIGEN"],
"destroy": ["ZERSTÖRE", "ZERSTÖREN"],
"grow": ["ZÜCHTE", "ZÜCHTEN"],
"grow": ["ZÜCHTE", "PFLANZE", "ZÜCHTEN", "PFLANZEN"],
"default": "DEFAULT",
"origin": "URSPRUNG",
"email": "EMAIL",
@ -59,7 +60,6 @@
"group": "GRUPPE",
"sort": ["SORTIERE", "SORTIEREN"],
"prefix": "PRÄFIX",
"plant": ["PFLANZE", "PFLANZEN"],
"alliance": "ALLIANZ",
"claim": ["BEANSPRUCHE", "BEANSPRUCHEN"],
"promote": ["BEFÖRDERE", "BEFÖRDERUNG"],

View File

@ -1496,9 +1496,6 @@
<string name="pay">
<text locale="en">PAY</text>
</string>
<string name="plant">
<text locale="en">PLANT</text>
</string>
<string name="piracy">
<text locale="en">PIRACY</text>
</string>
@ -1568,9 +1565,6 @@
<string name="destroy">
<text locale="en">DESTROY</text>
</string>
<string name="grow">
<text locale="en">GROW</text>
</string>
<string name="loot">
<text locale="en">loot</text>
</string>

View File

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

View File

@ -408,7 +408,6 @@ bool is_repeated(const order * ord)
case K_TEACH:
case K_BREED:
case K_PIRACY:
case K_PLANT:
case K_MAKE:
case K_LOOT:
case K_DESTROY:
@ -450,7 +449,6 @@ bool is_exclusive(const order * ord)
case K_TEACH:
case K_BREED:
case K_PIRACY:
case K_PLANT:
case K_MAKE:
case K_LOOT:
case K_DESTROY:
@ -495,7 +493,6 @@ bool is_long(const order * ord)
case K_TEACH:
case K_BREED:
case K_PIRACY:
case K_PLANT:
case K_MAKE:
case K_LOOT:
case K_DESTROY:

View File

@ -138,7 +138,6 @@ const char *keywords[MAXKEYWORDS] = {
"group",
"sort",
"prefix",
"plant",
"alliance",
"claim",
"promote",

View File

@ -64,7 +64,6 @@ typedef enum {
K_GROUP,
K_SORT,
K_PREFIX,
K_PLANT,
K_ALLIANCE,
K_CLAIM,
K_PROMOTION,