Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/keywords.json
View File

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

6
res/core/en/strings.xml
View File

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

1
src/economy.c
View File

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

3
src/kernel/order.c
View File

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

1
src/keyword.c
View File

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

1
src/keyword.h
View File

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