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

Bessere BEKLAUE Meldung

This commit is contained in:
Enno Rehling 2003-03-09 13:29:01 +00:00
parent a98d538cc0
commit 16dacfcc2a
3 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/gamecode/economy.c
View File

@ -804,9 +804,7 @@ dogive(region * r, unit * u, strlist * S, boolean liefere, int mode)
char *s; char *s;
int i, n; int i, n;
const item_type * itype; const item_type * itype;
int notfound_error = 64; int notfound_error = 63;
if (liefere) notfound_error = 63;
u2 = getunit(r, u->faction); u2 = getunit(r, u->faction);
@ -2520,6 +2518,7 @@ expandstealing(region * r, request * stealorders)
use_all(u, R_SILVER, n); use_all(u, R_SILVER, n);
oa[i].unit->n = n; oa[i].unit->n = n;
change_money(oa[i].unit, n); change_money(oa[i].unit, n);
add_message(&u->faction->msgs, msg_message("stealeffect", "unit region amount", u, u->region, n));
} }
add_income(oa[i].unit, IC_STEAL, oa[i].unit->wants, oa[i].unit->n); add_income(oa[i].unit, IC_STEAL, oa[i].unit->wants, oa[i].unit->n);
} }
@ -2980,9 +2979,6 @@ steal(region * r, unit * u, request ** stealorders)
goblin = true; goblin = true;
} }
} }
add_message(&u2->faction->msgs, new_message(u2->faction,
"stealeffect%u:unit%r:region", u2, u2->region));
n = max(0, n); n = max(0, n);
i = min(u->number, get_item(u,I_RING_OF_NIMBLEFINGER)); i = min(u->number, get_item(u,I_RING_OF_NIMBLEFINGER));

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

@ -4776,16 +4776,14 @@
</locale> </locale>
</message> </message>
<message name="stealeffect"> <message name="stealeffect" section="events">
<type> <type>
<arg name="unit" type="unit"></arg> <arg name="unit" type="unit"></arg>
<arg name="region" type="region"></arg> <arg name="region" type="region"></arg>
<arg name="amount" type="int"></arg>
</type> </type>
<locale name="de"> <text locale="de">"$unit($unit) wurden in $region($region) $int($amount) Silberstücke geklaut."</text>
<nr section="events"> <text locale="en">"In $region($region), thieves stole $int($amount) silver from $unit($unit)."</text>
<text>"$unit($unit) wurde in $region($region) beklaut."</text>
</nr>
</locale>
</message> </message>
<message name="newbie_immunity_error"> <message name="newbie_immunity_error">

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

@ -3372,18 +3372,6 @@
</locale> </locale>
</message> </message>
<message name="stealeffect">
<type>
<arg name="unit" type="unit"></arg>
<arg name="region" type="region"></arg>
</type>
<locale name="en">
<nr section="none">
<text>"$unit($unit) was robbed in $region($region)."</text>
</nr>
</locale>
</message>
<message name="newbieimmunity"> <message name="newbieimmunity">
<type> <type>
<arg name="turns" type="int"></arg> <arg name="turns" type="int"></arg>