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

Textänderung Monsterfrass.

This commit is contained in:
Enno Rehling 2005-05-10 19:17:56 +00:00
parent 434540fd9e
commit 498afe2ff2
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/gamecode/monster.c
View File

@ -561,14 +561,12 @@ eaten_by_monster(unit * u)
if (n > 0) { if (n > 0) {
deathcounts(u->region, n); deathcounts(u->region, n);
rsetpeasants(u->region, rpeasants(u->region) - n); rsetpeasants(u->region, rpeasants(u->region) - n);
add_message(&u->region->msgs, new_message(NULL, ADDMSG(&u->region->msgs, msg_message("eatpeasants", "unit amount", u, n));
"eatpeasants%u:unit%i:amount", u, n));
} }
} }
if (horse > 0) { if (horse > 0) {
set_item(u, I_HORSE, 0); set_item(u, I_HORSE, 0);
add_message(&u->region->msgs, new_message(NULL, ADDMSG(&u->region->msgs, msg_message("eathorse", "unit amount", u, horse));
"eathorse%u:unit%i:amount", u, horse));
} }
} }
@ -585,11 +583,11 @@ absorbed_by_monster(unit * u)
if(n > 0) { if(n > 0) {
n = lovar(n); n = lovar(n);
n = min(rpeasants(u->region), n); n = min(rpeasants(u->region), n);
if(n > 0){ if (n > 0){
rsetpeasants(u->region, rpeasants(u->region) - n); rsetpeasants(u->region, rpeasants(u->region) - n);
scale_number(u, u->number + n); scale_number(u, u->number + n);
add_message(&u->region->msgs, new_message(NULL, ADDMSG(&u->region->msgs, msg_message("absorbpeasants",
"absorbpeasants%u:unit%i:amount", u, n)); "unit race amount", u, u->race, n));
} }
} }
} }
@ -720,13 +718,13 @@ monsters_kill_peasants(void)
for (r = regions; r; r = r->next) { for (r = regions; r; r = r->next) {
for (u = r->units; u; u = u->next) if(!fval(u, UFL_MOVED)) { for (u = r->units; u; u = u->next) if(!fval(u, UFL_MOVED)) {
if(u->race->flags & RCF_SCAREPEASANTS) { if (u->race->flags & RCF_SCAREPEASANTS) {
scared_by_monster(u); scared_by_monster(u);
} }
if(u->race->flags & RCF_KILLPEASANTS) { if (u->race->flags & RCF_KILLPEASANTS) {
eaten_by_monster(u); eaten_by_monster(u);
} }
if(u->race->flags & RCF_ABSORBPEASANTS) { if (u->race->flags & RCF_ABSORBPEASANTS) {
absorbed_by_monster(u); absorbed_by_monster(u);
} }
} }

3
src/res/messages.xml
View File

@ -2244,8 +2244,9 @@
<type> <type>
<arg name="unit" type="unit"/> <arg name="unit" type="unit"/>
<arg name="amount" type="int"/> <arg name="amount" type="int"/>
<arg name="race" type="race"/>
</type> </type>
<text locale="de">"$unit($unit) tötete $int($amount) Bauern."</text> <text locale="de">"$int($amount) Bauern werden zu $race($race,1) und schliessen sich $unit($unit) an."</text>
</message> </message>
<message name="eathorse" section="events"> <message name="eathorse" section="events">
<type> <type>