From 84f84122d6e27123f026630ad1fa78e0f00520ac Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Fri, 11 Sep 2009 19:54:20 +0200 Subject: [PATCH] Slightly changed the call reporting --- Commands/Def.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Commands/Def.pm b/Commands/Def.pm index 1762e7c..2c8e7b1 100644 --- a/Commands/Def.pm +++ b/Commands/Def.pm @@ -288,7 +288,7 @@ INSERT INTO calls (uid,landing_tick,info) VALUES(?,?,'') RETURNING call INSERT INTO incomings (call,pid,eta,amount,fleet) VALUES(?,?,?,?,?) RETURNING inc },undef,$call[0],$attacker[2],$9,$amount,$7); @attacker = map (valuecolor(0),@attacker); - if (! $threefleeter || $call[2]){ + if (! $threefleeter || $call[1] ne 'Ignored'){ $c->reply("New incoming: CallId: $call[0], IncId: $incid $1:$2:$3 ($user->{defprio}) is under Attack by $4:$5:$6, ($attacker[3]), $attacker[1]($attacker[4]) https://nd.ruin.nu/calls/edit/$call[0]"); }else{ $c->reply("Do not cover, NoDef member is under attack by $4:$5:$6, ($attacker[3]), $attacker[1]($attacker[4]) https://nd.ruin.nu/calls/edit/$call[0]"); @@ -296,11 +296,11 @@ INSERT INTO incomings (call,pid,eta,amount,fleet) VALUES(?,?,?,?,?) RETURNING in $dbh->do(q{UPDATE planets SET hit_us = hit_us + 1 WHERE pid = ?},undef,$attacker[2]); if ($call[1] eq 'Covered'){ $dbh->do(q{UPDATE calls SET status = 'Open' WHERE call = ?},undef,$call[0]); - $c->reply("Call is likely not covered anymore, please recalc! calc: $call[3]"); + $c->reply("Call is likely not covered anymore, please recalc! calc: $call[2]"); } }else{ @attacker = map (valuecolor(0),@attacker); - $c->reply("Duplicate call: Callid: $call[0], Covered: $call[1], Open: $call[2] $1:$2:$3 ($user->{defprio}) is under Attack by $4:$5:$6, ($attacker[3]), $attacker[1]($attacker[4]), landing tick: $landing_tick"); + $c->reply("Duplicate call: Callid: $call[0], Status: $call[1] $1:$2:$3 ($user->{defprio}) is under Attack by $4:$5:$6, ($attacker[3]), $attacker[1]($attacker[4]), landing tick: $landing_tick"); } my ($fleetcatch) = $dbh->selectrow_array(q{ -- 2.39.2