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

More resist-messages getting proper translations.

This commit is contained in:
Enno Rehling 2007-02-10 21:00:59 +00:00
parent 085fd51d0a
commit ce99e6c6b9
3 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/modules/gmcmd.c
View File

@ -249,9 +249,9 @@ gm_teleport(const tnode * tnext, const char * str, void * data, struct order * o
if (r==NULL || p!=rplane(r)) {
mistake(u, ord, "In diese Region kann die Einheit nicht teleportieren.", 0);
} else if (to==NULL) {
mistake(u, ord, "Die Einheit wurde nicht gefunden.", 0);
cmistake(u, ord, 63, MSG_MAGIC);
} else if (rplane(to->region)!=rplane(r) && !ucontact(to, u)) {
mistake(u, ord, "Die Einheit hat uns nicht kontaktiert.", 0);
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "feedback_no_contact", "target", to));
} else {
/* checking permissions */
attrib * permissions = a_find(u->faction->attribs, &at_permissions);

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

@ -1787,7 +1787,7 @@ sp_treewalkenter(castorder *co)
}
if (!ucontact(u, mage)) {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, ord, "feedback_no_contact", "target", u));
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "feedback_no_contact", "target", u));
} else {
int w;
@ -1903,8 +1903,7 @@ sp_treewalkexit(castorder *co)
u = pa->param[n]->data.u;
if (!ucontact(u, mage)) {
sprintf(buf, "%s hat uns nicht kontaktiert.", unitname(u));
addmessage(r, mage->faction, buf, MSG_MAGIC, ML_MISTAKE);
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "feedback_no_contact", "target", u));
} else {
int w = weight(u);
if (!can_survive(u, rt)) {
@ -5686,19 +5685,14 @@ sp_enterastral(castorder *co)
u = pa->param[n]->data.u;
if (!ucontact(u, mage)) {
if (power > 10 && !is_magic_resistant(mage, u, 0)
&& can_survive(u, rt)) {
sprintf(buf, "%s hat uns nicht kontaktiert, widersteht dem "
"Zauber jedoch nicht.", unitname(u));
addmessage(r, mage->faction, buf, MSG_MAGIC, ML_INFO);
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);
} else {
sprintf(buf, "%s hat uns nicht kontaktiert und widersteht dem "
"Zauber.", unitname(u));
addmessage(r, mage->faction, buf, MSG_MAGIC, ML_MISTAKE);
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));
@ -5813,18 +5807,14 @@ sp_pullastral(castorder *co)
u = pa->param[n]->data.u;
if (!ucontact(u, mage)) {
if(power > 12 && pa->param[n]->flag != TARGET_RESISTS && can_survive(u, rt)) {
sprintf(buf, "%s hat uns nicht kontaktiert, widersteht dem "
"Zauber jedoch nicht.", unitname(u));
addmessage(r, mage->faction, buf, MSG_MAGIC, ML_INFO);
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);
} else {
sprintf(buf, "%s hat uns nicht kontaktiert und widersteht dem "
"Zauber.", unitname(u));
addmessage(r, mage->faction, buf, MSG_MAGIC, ML_MISTAKE);
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));
@ -5934,17 +5924,13 @@ sp_leaveastral(castorder *co)
if (!ucontact(u, mage)) {
if (power > 10 && !pa->param[n]->flag == TARGET_RESISTS && can_survive(u, rt)) {
sprintf(buf, "%s hat uns nicht kontaktiert, widersteht dem "
"Zauber jedoch nicht.", unitname(u));
addmessage(r, mage->faction, buf, MSG_MAGIC, ML_INFO);
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);
} else {
sprintf(buf, "%s hat uns nicht kontaktiert und widersteht dem "
"Zauber.", unitname(u));
addmessage(r, mage->faction, buf, MSG_MAGIC, ML_WARN);
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));
@ -6069,16 +6055,12 @@ sp_fetchastral(castorder *co)
if (!ucontact(u, mage)) {
if (power>12 && !(pa->param[n]->flag & TARGET_RESISTS)) {
sprintf(buf, "%s hat uns nicht kontaktiert, widersteht dem "
"Zauber jedoch nicht.", unitname(u));
addmessage(rt, mage->faction, buf, MSG_MAGIC, ML_INFO);
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);
} else {
sprintf(buf, "%s hat uns nicht kontaktiert und widersteht dem "
"Zauber.", unitname(u));
addmessage(rt, mage->faction, buf, MSG_MAGIC, ML_WARN);
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);

22
src/res/messages.xml
View File

@ -5204,6 +5204,28 @@
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - $unit($target) did not contact us."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - $unit($target) did not contact us."</text>
</message>
<message name="feedback_no_contact_resist" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
<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">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
<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">
<type>
<arg name="unit" type="unit"/>