From aadf37da9b3c9a58615314d945b5ce259df906d6 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 26 Jul 2006 19:02:55 +0000 Subject: [PATCH] http://eressea.upb.de/mantis/view.php?id=734 "Keine Meldung bei Klaue/Spioniere" Meldung im Falle eines fehlschlages. --- src/common/gamecode/economy.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c index 355bf437e..ddd14f87e 100644 --- a/src/common/gamecode/economy.c +++ b/src/common/gamecode/economy.c @@ -2730,31 +2730,23 @@ steal_cmd(unit * u, struct order * ord, request ** stealorders) n = eff_skill(u, SK_STEALTH, r) - wahrnehmung(r, f); - if (n == 0) { + 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("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; } else { - ADDMSG(&u2->faction->msgs, msg_message("thiefdiscover", "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; 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)); if (i > 0) {