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

improved error message for learning skills with bonus=-99

This commit is contained in:
Enno Rehling 2009-07-14 21:26:58 +00:00
parent 6c3d9bbfd8
commit 53d1ea0f93
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/gamecode/study.c
View File

@ -540,19 +540,19 @@ learn_cmd(unit * u, order * ord)
return 0;
}
if (SkillCap(sk) && SkillCap(sk) <= effskill(u, sk)) {
cmistake(u, ord, 77, MSG_EVENT);
cmistake(u, ord, 771, MSG_EVENT);
return 0;
}
/* Hack: Talente mit Malus -99 können nicht gelernt werden */
if (u->race->bonus[sk] == -99) {
cmistake(u, ord, 77, MSG_EVENT);
cmistake(u, ord, 771, MSG_EVENT);
return 0;
}
if (learn_newskills==0) {
skill * sv = get_skill(u, sk);
if (sv==NULL) {
/* we can only learn skills we already have */
cmistake(u, ord, 77, MSG_EVENT);
cmistake(u, ord, 771, MSG_EVENT);
return 0;
}
}

20
src/res/messages.xml
View File

@ -6070,7 +6070,6 @@
<arg name="command" type="order"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Ein Fluch verhindert die Übergabe."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - A curse prevented the transfer from happening."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - A curse prevented the transfer from happening."</text>
</message>
<message name="error77" section="errors">
@ -6080,9 +6079,17 @@
<arg name="command" type="order"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Dieses Talent wurde nicht erkannt."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - The skill could not be recognized."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - The skill could not be recognized."</text>
</message>
<message name="error771" 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)' - Dieses Talent kann die Einheit nicht lernen."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - The unit cannot learn this skill."</text>
</message>
<message name="error76" section="errors">
<type>
<arg name="unit" type="unit"/>
@ -6090,7 +6097,6 @@
<arg name="command" type="order"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Diesen Gegenstand kann man nicht benutzen."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - This item cannot be used."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - This item cannot be used."</text>
</message>
<message name="error75" section="errors">
@ -6100,7 +6106,6 @@
<arg name="command" type="order"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Die Einheit nimmt niemanden an."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - This unit does not take anybody."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - This unit does not take anybody."</text>
</message>
<message name="error73" section="errors">
@ -6110,7 +6115,6 @@
<arg name="command" type="order"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Eine hungernde Einheit kann niemanden weggeben."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - Hungry units cannot give anybody away."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - Hungry units cannot give anybody away."</text>
</message>
<message name="error74" section="errors">
@ -6120,7 +6124,6 @@
<arg name="command" type="order"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Diese Einheit kann niemanden weggeben."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - This unit cannot give anybody away."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - This unit cannot give anybody away."</text>
</message>
@ -6153,7 +6156,6 @@
<arg name="target" type="unit"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - $unit($target) hat keinen Kontakt mit uns aufgenommen und widersteht dem Zauber."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - $unit($target) did not contact us, and resists the spell."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - $unit($target) did not contact us, and resists the spell."</text>
</message>
<message name="feedback_no_contact_no_resist" section="errors">
@ -6164,7 +6166,6 @@
<arg name="target" type="unit"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - $unit($target) hat keinen Kontakt mit uns aufgenommen, aber widersteht dem Zauber nicht."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - $unit($target) did not contact us, but cannot resist the spell."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - $unit($target) did not contact us, but cannot resist the spell."</text>
</message>
<message name="error71" section="errors">
@ -6174,7 +6175,6 @@
<arg name="command" type="order"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Die Richtung wurde nicht erkannt."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - Direction was not recognized."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - Direction was not recognized."</text>
</message>
<message name="unknowndirection" section="errors">
@ -6185,7 +6185,6 @@
<arg name="dirname" type="string"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Die Richtung '$dirname' wurde nicht erkannt."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - Direction '$dirname' was not recognized."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - Direction '$dirname' was not recognized."</text>
</message>
<message name="error70" section="errors">
@ -6195,7 +6194,6 @@
<arg name="command" type="order"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Die Region wird von Nichtalliierten bewacht."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - This region is guarded by a non allied faction."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - This region is guarded by a non allied faction."</text>
</message>
<message name="region_guarded" section="errors">