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=734 

"Keine Meldung bei Klaue/Spioniere"
Meldung im Falle eines fehlschlages.
This commit is contained in:
Enno Rehling 2006-07-26 19:02:55 +00:00
parent 86c3251c79
commit aadf37da9b
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2730,31 +2730,23 @@ steal_cmd(unit * u, struct order * ord, request ** stealorders)
n = eff_skill(u, SK_STEALTH, r) - wahrnehmung(r, f); n = eff_skill(u, SK_STEALTH, r) - wahrnehmung(r, f);
if (n == 0) { if (n <= 0) {
/* Wahrnehmung == Tarnung */ /* Wahrnehmung == Tarnung */
if (u->race != new_race[RC_GOBLIN] || eff_skill(u, SK_STEALTH, r) <= 3) { if (u->race != new_race[RC_GOBLIN] || eff_skill(u, SK_STEALTH, r) <= 3) {
ADDMSG(&u->faction->msgs, msg_message("stealfail", "unit target", u, u2)); ADDMSG(&u->faction->msgs, msg_message("stealfail", "unit target", u, u2));
ADDMSG(&u2->faction->msgs, msg_message("stealdetect", "unit", u2)); if (n==0) {
ADDMSG(&u2->faction->msgs, msg_message("stealdetect", "unit", u2));
} else {
ADDMSG(&u2->faction->msgs, msg_message("thiefdiscover", "unit target", u, u2));
}
return; return;
} else { } else {
ADDMSG(&u2->faction->msgs, msg_message("thiefdiscover", "unit target", u, u2));
ADDMSG(&u->faction->msgs, msg_message("stealfatal", "unit target", u, u2)); ADDMSG(&u->faction->msgs, msg_message("stealfatal", "unit target", u, u2));
ADDMSG(&u2->faction->msgs, msg_message("thiefdiscover", "unit target", u, u2));
n = 1; n = 1;
goblin = true; goblin = true;
} }
} else if (n < 0) {
/* Wahrnehmung > Tarnung */
if (u->race != new_race[RC_GOBLIN] || eff_skill(u, SK_STEALTH, r) <= 3) {
ADDMSG(&u->faction->msgs, msg_message("stealfatal", "unit target", u, u2));
ADDMSG(&u2->faction->msgs, msg_message("thiefdiscover", "unit target", u, u2));
return;
} else { /* Goblin-Spezialdiebstahl, Meldung an Beklauten */
ADDMSG(&u2->faction->msgs, msg_message("thiefdiscover", "unit target", u, u2));
n = 1;
goblin = true;
}
} }
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));
if (i > 0) { if (i > 0) {