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

Tranksbenutzung übersetzt und in Events (statt Errors) verschoben. Meldung für Benutzung von Bluttrank.

This commit is contained in:
Enno Rehling 2002-02-10 08:54:24 +00:00
parent a0fe319b4b
commit 46b5df42dc
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/kernel/alchemy.c
View File

@ -69,7 +69,7 @@ herbsearch(region * r, unit * u, int max)
rsetherbs(r, rherbs(r)-herbsfound); rsetherbs(r, rherbs(r)-herbsfound);
if (herbsfound) { if (herbsfound) {
change_skill(u, SK_HERBALISM, PRODUCEEXP * u->number); produceexp(u, SK_HERBALISM, u->number);
i_change(&u->items, whichherb->itype, herbsfound); i_change(&u->items, whichherb->itype, herbsfound);
add_message(&u->faction->msgs, new_message(u->faction, add_message(&u->faction->msgs, new_message(u->faction,
"herbfound%u:unit%r:region%i:amount%X:herb", u, r, herbsfound, "herbfound%u:unit%r:region%i:amount%X:herb", u, r, herbsfound,
@ -146,8 +146,8 @@ use_potion(unit * u, const item_type * itype, const char * cmd)
new_use_pooled(u, ptype->itype->rtype, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, 1); new_use_pooled(u, ptype->itype->rtype, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, 1);
usetpotionuse(u, ptype); usetpotionuse(u, ptype);
add_message(&u->faction->msgs, new_message(u->faction, ADDMSG(&u->faction->msgs, msg_message("usepotion",
"usepotion%u:unit%X:potion", u, ptype->itype->rtype)); "unit potion", u, ptype->itype->rtype));
return 0; return 0;
} }

5
src/common/kernel/item.c
View File

@ -1887,7 +1887,8 @@ use_warmthpotion(struct unit *u, const struct potion_type *ptype, const char *cm
assert(ptype==oldpotiontype[P_WARMTH]); assert(ptype==oldpotiontype[P_WARMTH]);
if (old_race(u->faction->race) == RC_INSECT) { if (old_race(u->faction->race) == RC_INSECT) {
fset(u, FL_WARMTH); fset(u, FL_WARMTH);
cmistake(u, cmd, 164, MSG_EVENT); ADDMSG(&u->faction->msgs, msg_message("usepotion",
"unit potion", u, ptype->itype->rtype));
} else { } else {
/* nur für insekten: */ /* nur für insekten: */
cmistake(u, cmd, 163, MSG_EVENT); cmistake(u, cmd, 163, MSG_EVENT);
@ -1906,6 +1907,8 @@ use_bloodpotion(struct unit *u, const struct potion_type *ptype, const char *cmd
attrib * a = (attrib*)a_find(u->attribs, &at_bauernblut); attrib * a = (attrib*)a_find(u->attribs, &at_bauernblut);
if (!a) a = a_add(&u->attribs, a_new(&at_bauernblut)); if (!a) a = a_add(&u->attribs, a_new(&at_bauernblut));
a->data.i += 100; a->data.i += 100;
ADDMSG(&u->faction->msgs, msg_message("usepotion",
"unit potion", u, ptype->itype->rtype));
} else { } else {
/* bekommt nicht: */ /* bekommt nicht: */
cmistake(u, cmd, 165, MSG_EVENT); cmistake(u, cmd, 165, MSG_EVENT);

15
src/res/de/messages.xml
View File

@ -57,7 +57,7 @@
</type> </type>
<locale name="de"> <locale name="de">
<nr section="events"> <nr section="events">
<text>"$unit($unit) benutzt einen $resource($potion,1)."</text> <text>"$unit($unit) benutzt einen $resource($potion,1)trank."</text>
</nr> </nr>
</locale> </locale>
</message> </message>
@ -2414,19 +2414,6 @@
</locale> </locale>
</message> </message>
<message name="error164">
<type>
<arg name="unit" type="unit"></arg>
<arg name="region" type="region"></arg>
<arg name="command" type="string"></arg>
</type>
<locale name="de">
<nr section="errors">
<text>"$unit($unit) in $region($region): '$command' - Die Einheit benutzte einen Nestwärmetrank."</text>
</nr>
</locale>
</message>
<message name="error165"> <message name="error165">
<type> <type>
<arg name="unit" type="unit"></arg> <arg name="unit" type="unit"></arg>

2
src/res/en/messages.xml
View File

@ -3277,7 +3277,7 @@
</type> </type>
<locale name="en"> <locale name="en">
<nr section="none"> <nr section="none">
<text>"$unit($unit) uses a $resource($potion,1)."</text> <text>"$unit($unit) uses a $resource($potion,1) potion."</text>
</nr> </nr>
</locale> </locale>
</message> </message>