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

Merge pull request #900 from ennorehling/develop 

Develop
This commit is contained in:
Enno Rehling 2020-04-18 22:38:25 +02:00 committed by GitHub
parent a861b92524 260517f8cf
commit 9160791ce1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/translations/messages.de.po
View File

@ -2768,9 +2768,6 @@ msgstr "\"$unit($unit) in $region($region): '$order($command)' - Die Einheit geh
msgid "error322" msgid "error322"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Nur Schiffe gleicher Bauart können einen Konvoi bilden.\"" msgstr "\"$unit($unit) in $region($region): '$order($command)' - Nur Schiffe gleicher Bauart können einen Konvoi bilden.\""
msgid "error328"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Nur Schiffe an der selben Küste können einen Konvoi bilden.\""
msgid "error323" msgid "error323"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Das Schiff ist verzaubert.\"" msgstr "\"$unit($unit) in $region($region): '$order($command)' - Das Schiff ist verzaubert.\""
@ -2778,7 +2775,7 @@ msgid "error327"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - So viele Schiffe kann die Einheit nicht übergeben.\"" msgstr "\"$unit($unit) in $region($region): '$order($command)' - So viele Schiffe kann die Einheit nicht übergeben.\""
msgid "error328" msgid "error328"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Dafür müssen die Schiffe an der selben Küste liegen.\"" msgstr "\"$unit($unit) in $region($region): '$order($command)' - Dafür müssen die Schiffe an derselben Küste liegen.\""
msgid "error326" msgid "error326"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Diese Schiffe können keinen Konvoi bilden.\"" msgstr "\"$unit($unit) in $region($region): '$order($command)' - Diese Schiffe können keinen Konvoi bilden.\""

2
scripts/tests/e2/destroy.lua
View File

@ -41,8 +41,8 @@ function test_destroy_is_long()
local u = unit.create(faction.create("human", "one@example.com", "de"), r1, 10) local u = unit.create(faction.create("human", "one@example.com", "de"), r1, 10)
u.building = building.create(u.region, "castle") u.building = building.create(u.region, "castle")
u:clear_orders() u:clear_orders()
u:add_order("LERNE Unterhaltung")
u:add_order("ZERSTOERE " .. itoa36(u.building.id)) u:add_order("ZERSTOERE " .. itoa36(u.building.id))
u:add_order("LERNE Unterhaltung")
process_orders() process_orders()
assert_equal(0, u:get_skill("entertainment")) assert_equal(0, u:get_skill("entertainment"))
assert_equal(nil, u.building) assert_equal(nil, u.building)

3
src/give.c
View File

@ -796,6 +796,9 @@ static void give_all_items(unit *u, unit *u2, order *ord) {
} }
} }
} }
else {
cmistake(u, ord, 123, MSG_COMMERCE);
}
} }
} }
} }

7
src/laws.c
View File

@ -3091,14 +3091,7 @@ void update_long_order(unit * u)
} }
break; break;
default: default:
if (kwd > thiskwd) {
/* swap out thisorder for the new one */
cmistake(u, u->thisorder, 52, MSG_EVENT);
set_order(&u->thisorder, copy_order(ord));
}
else {
cmistake(u, ord, 52, MSG_EVENT); cmistake(u, ord, 52, MSG_EVENT);
}
break; break;
} }
} }