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

fix heroes must not recruit

This commit is contained in:
Steffen Mecke 2015-02-10 18:16:39 +01:00
parent f2434346c9
commit b5f8be8a95
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
res/core/messages.xml
View File

@ -8375,4 +8375,14 @@
orders for $int($turns) turns and may be leaving the game soon."</text> orders for $int($turns) turns and may be leaving the game soon."</text>
</message> </message>
<message name="error_herorecruit" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Helden können nicht rekrutieren."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - Heroes cannot recruit."</text>
</message>
</messages> </messages>

4
src/economy.c
View File

@ -564,6 +564,10 @@ static void recruit(unit * u, struct order *ord, request ** recruitorders)
return; return;
} }
if (fval(u, UFL_HERO)) {
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "error_herorecruit", ""));
return;
}
if (has_skill(u, SK_MAGIC)) { if (has_skill(u, SK_MAGIC)) {
/* error158;de;{unit} in {region}: '{command}' - Magier arbeiten /* error158;de;{unit} in {region}: '{command}' - Magier arbeiten
* grundsätzlich nur alleine! */ * grundsätzlich nur alleine! */