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

http://eressea.upb.de/mantis/view.php?id=1396 

"Berechnung des Belagerungsschadens merkwürdig"
- cosmetic changes to siege messages.
This commit is contained in:
Enno Rehling 2008-05-16 22:58:34 +00:00
parent d0022db79a
commit 55f6b43fbc
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/kernel/build.c
View File

@ -192,7 +192,6 @@ static void
siege_cmd(unit * u, order * ord)
{
region * r = u->region;
unit *u2;
building *b;
int d, pooled;
int bewaffnete, katapultiere = 0;
@ -262,23 +261,13 @@ siege_cmd(unit * u, order * ord)
if (d && !curse_active(get_curse(b->attribs, magicwalls_ct))) {
b->size -= d;
use_pooled(u, it_catapultammo->rtype, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, d);
d = 100 * d / b->size;
} else d = 0;
/* meldung fuer belagerer */
ADDMSG(&u->faction->msgs, msg_message("siege",
"unit building destruction", u, b, d));
for (u2 = r->units; u2; u2 = u2->next) freset(u2->faction, FFL_SELECT);
fset(u->faction, FFL_SELECT);
/* Meldung fuer Burginsassen */
for (u2 = r->units; u2; u2 = u2->next) {
if (u2->building == b && !fval(u2->faction, FFL_SELECT)) {
fset(u2->faction, FFL_SELECT);
ADDMSG(&u2->faction->msgs, msg_message("siege",
"unit building destruction", u, b, d));
}
/* send message to the entire region */
ADDMSG(&r->msgs, msg_message("siege_catapults",
"unit building destruction", u, b, d));
} else {
/* send message to the entire region */
ADDMSG(&r->msgs, msg_message("siege",
"unit building", u, b));
}
}

10
src/res/messages.xml
View File

@ -3683,7 +3683,7 @@
<text locale="fr">"$unit($unit) in $region($region) recruits $int($amount) $int($want) people."</text>
<text locale="en">"$unit($unit) in $region($region) recruits $int($amount) $int($want) people."</text>
</message>
<message name="siege" section="events">
<message name="siege_catapults" section="events">
<type>
<arg name="unit" type="unit"/>
<arg name="building" type="building"/>
@ -3693,6 +3693,14 @@
<text locale="fr">"$building($building) is under siege by $unit($unit). During siege, catapults caused $int($destruction) points destruction."</text>
<text locale="en">"$building($building) is under siege by $unit($unit). During siege, catapults caused $int($destruction) points destruction."</text>
</message>
<message name="siege" section="events">
<type>
<arg name="unit" type="unit"/>
<arg name="building" type="building"/>
</type>
<text locale="de">"$unit($unit) belagert $building($building)."</text>
<text locale="en">"$building($building) is under siege by $unit($unit)."</text>
</message>
<message name="drown_on_ship" section="events">
<type>
<arg name="unit" type="unit"/>