forked from github/server
Wenn gute/schlechte Träume auf der Region liegen, kann kein LEHRE gemacht werden (der Zauber wird missbraucht)
This commit is contained in:
parent
1b62f53285
commit
343290668a
|
@ -754,7 +754,6 @@ void
|
|||
teaching(void)
|
||||
{
|
||||
region *r;
|
||||
unit *u;
|
||||
/* das sind alles befehle, die 30 tage brauchen, und die in thisorder
|
||||
* stehen! von allen 30-tage befehlen wird einfach der letzte verwendet
|
||||
* (dosetdefaults).
|
||||
|
@ -762,6 +761,7 @@ teaching(void)
|
|||
* lehren vor lernen. */
|
||||
|
||||
for (r = regions; r; r = r->next) {
|
||||
unit *u;
|
||||
|
||||
for (u = r->units; u; u = u->next) {
|
||||
|
||||
|
@ -783,6 +783,16 @@ teaching(void)
|
|||
if (attacked(u)){
|
||||
cmistake(u, u->thisorder, 52, MSG_PRODUCE);
|
||||
continue;
|
||||
} else {
|
||||
static const curse_type * gbdream_ct = NULL;
|
||||
if (gbdream_ct==0) gbdream_ct = ct_find("gbdream");
|
||||
if (gbdream_ct) {
|
||||
if (get_curse(u->region->attribs, gbdream_ct)) {
|
||||
ADDMSG(&u->faction->msgs,
|
||||
msg_feedback(u, u->thisorder, "gbdream_noteach", ""));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
teach(u, u->thisorder);
|
||||
break;
|
||||
|
|
|
@ -3359,6 +3359,16 @@
|
|||
</type>
|
||||
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Im astralen Nebel konnte niemand entdeckt werden."</text>
|
||||
</message>
|
||||
<message name="gbdream_noteach" 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)' - Ein Zauber in dieser Region verhindert das."</text>
|
||||
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - There is an active spell in this region that prevents this."</text>
|
||||
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - There is an active spell in this region that prevents this."</text>
|
||||
</message>
|
||||
<message name="error218" section="errors">
|
||||
<type>
|
||||
<arg name="unit" type="unit"/>
|
||||
|
|
Loading…
Reference in New Issue