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

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

This commit is contained in:
Enno Rehling 2017-06-24 14:51:48 +02:00
parent 3ceeb54006 0ebb9dfcce
commit 5f2d1347ae
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/keywords.json
View File

@ -1,7 +1,8 @@
{ {
"keywords": { "keywords": {
"en" : { "en" : {
"grow": [ "GROW", "BREED", "PLANT" ], "plant": "PLANT",
"grow": [ "GROW", "BREED" ],
"promote": ["PROMOTE", "PROMOTION" ], "promote": ["PROMOTE", "PROMOTION" ],
"combat": [ "COMBAT", "FIGHT" ] "combat": [ "COMBAT", "FIGHT" ]
}, },
@ -53,7 +54,8 @@
"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", "PFLANZE", "ZÜCHTEN", "PFLANZEN"], "grow": ["ZÜCHTE", "ZÜCHTEN"],
"plant": ["PFLANZE", "PFLANZEN"],
"default": "DEFAULT", "default": "DEFAULT",
"origin": "URSPRUNG", "origin": "URSPRUNG",
"email": "EMAIL", "email": "EMAIL",

3
src/economy.c
View File

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

9
src/kernel/order.c
View File

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

1
src/keyword.c
View File

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

3
src/keyword.h
View File

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