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

Even more astral spell messages getting proper translations.

This commit is contained in:
Enno Rehling 2007-02-10 21:10:42 +00:00
parent ce99e6c6b9
commit 7494c64082
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/common/spells/spells.c
View File

@ -5687,16 +5687,10 @@ sp_enterastral(castorder *co)
if (!ucontact(u, mage)) {
if (power > 10 && !is_magic_resistant(mage, u, 0) && can_survive(u, rt)) {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "feedback_no_contact_no_resist", "target", u));
sprintf(buf, "%s wird von %s in eine andere Welt geschleudert.",
unitname(u),
cansee(u->faction, r, mage, 0)?unitname(mage):"jemandem");
addmessage(r, u->faction, buf, MSG_MAGIC, ML_WARN);
ADDMSG(&u->faction->msgs, msg_message("send_astral", "unit target", mage, u));
} else {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "feedback_no_contact_resist", "target", u));
sprintf(buf, "%s versucht, %s in eine andere Welt zu schleudern.",
cansee(u->faction, r, mage, 0)?unitname(mage):"Jemand",
unitname(u));
addmessage(r, u->faction, buf, MSG_EVENT, ML_WARN);
ADDMSG(&u->faction->msgs, msg_message("try_astral", "unit target", mage, u));
continue;
}
}
@ -5809,16 +5803,10 @@ sp_pullastral(castorder *co)
if (!ucontact(u, mage)) {
if (power > 12 && pa->param[n]->flag != TARGET_RESISTS && can_survive(u, rt)) {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "feedback_no_contact_no_resist", "target", u));
sprintf(buf, "%s wird von %s in eine andere Welt geschleudert.",
unitname(u),
cansee(u->faction, r, mage, 0)?unitname(mage):"jemandem");
addmessage(r, u->faction, buf, MSG_MAGIC, ML_WARN);
ADDMSG(&u->faction->msgs, msg_message("send_astral", "unit target", mage, u));
} else {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "feedback_no_contact_resist", "target", u));
sprintf(buf, "%s versucht, %s in eine andere Welt zu schleudern.",
cansee(u->faction, r, mage, 0)?unitname(mage):"Jemand",
unitname(u));
addmessage(r, u->faction, buf, MSG_EVENT, ML_WARN);
ADDMSG(&u->faction->msgs, msg_message("try_astral", "unit target", mage, u));
continue;
}
}
@ -5925,16 +5913,10 @@ sp_leaveastral(castorder *co)
if (!ucontact(u, mage)) {
if (power > 10 && !pa->param[n]->flag == TARGET_RESISTS && can_survive(u, rt)) {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "feedback_no_contact_no_resist", "target", u));
sprintf(buf, "%s wird von %s in eine andere Welt geschleudert.",
unitname(u),
cansee(u->faction, r, mage, 0)?unitname(mage):"jemandem");
addmessage(r, u->faction, buf, MSG_EVENT, ML_WARN);
ADDMSG(&u->faction->msgs, msg_message("send_astral", "unit target", mage, u));
} else {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "feedback_no_contact_resist", "target", u));
sprintf(buf, "%s versucht, %s in eine andere Welt zu schleudern.",
cansee(u->faction, r, mage, 0)?unitname(mage):"Jemand",
unitname(u));
addmessage(r, u->faction, buf, MSG_EVENT, ML_WARN);
ADDMSG(&u->faction->msgs, msg_message("try_astral", "unit target", mage, u));
continue;
}
}
@ -6056,14 +6038,10 @@ sp_fetchastral(castorder *co)
if (!ucontact(u, mage)) {
if (power>12 && !(pa->param[n]->flag & TARGET_RESISTS)) {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "feedback_no_contact_no_resist", "target", u));
sprintf(buf, "%s wird von %s in eine andere Welt geschleudert.",
unitname(u), unitname(mage));
addmessage(ro, u->faction, buf, MSG_EVENT, ML_WARN);
ADDMSG(&u->faction->msgs, msg_message("send_astral", "unit target", mage, u));
} else {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "feedback_no_contact_resist", "target", u));
sprintf(buf, "%s versucht, %s in eine andere Welt zu schleudern.",
unitname(mage), unitname(u));
addmessage(ro, u->faction, buf, MSG_EVENT, ML_WARN);
ADDMSG(&u->faction->msgs, msg_message("try_astral", "unit target", mage, u));
continue;
}
}

20
src/res/messages.xml
View File

@ -6722,4 +6722,24 @@
<text locale="fr">"$unit($unit) is sent from the astral plain to $region($region)."</text>
</message>
<message name="send_astral" section="magic">
<type>
<arg name="unit" type="unit"/>
<arg name="target" type="unit"/>
</type>
<text locale="de">"$unit($target) wird von $unit($unit) in eine andere Welt geschleudert."</text>
<text locale="en">"$unit($unit) sends $unit($target) to another world."</text>
<text locale="fr">"$unit($unit) sends $unit($target) to another world."</text>
</message>
<message name="try_astral" section="magic">
<type>
<arg name="unit" type="unit"/>
<arg name="target" type="unit"/>
</type>
<text locale="de">"$unit($unit) versuchte erfolglos, $unit($target) in eine andere Welt zu schleudern."</text>
<text locale="en">"$unit($unit) tried but failed to send $unit($target) to another world."</text>
<text locale="fr">"$unit($unit) tried but failed to send $unit($target) to another world."</text>
</message>
</messages>