X-Git-Url: https://ruin.nu/git/?p=NDIRC.git;a=blobdiff_plain;f=Commands%2FDef.pm;fp=Commands%2FDef.pm;h=ba077f75ca7f7b971682d936d1ef27586aab8976;hp=c50f864b1dda054eefed8293b97302fcef8dca5e;hb=e480fb7b3c0528e11d3381939d02db9a3042554b;hpb=468a4e3e07c0d9e6ed66a75c73f0d7ff2921b90a diff --git a/Commands/Def.pm b/Commands/Def.pm index c50f864..ba077f7 100644 --- a/Commands/Def.pm +++ b/Commands/Def.pm @@ -281,25 +281,25 @@ INSERT INTO incomings (call,pid,eta,amount,fleet) VALUES(?,?,?,?,?) RETURNING in },undef,$call[0],$attacker[2],$9,$amount,$7); @attacker = map ($c->valuecolor(0),@attacker); 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]"); + $c->bot->toTarget(def => "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]"); + $c->bot->toTarget(def => "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]"); } $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[2]"); + $c->bot->toTarget(def => "Call is likely not covered anymore, please recalc! calc: $call[2]"); } }else{ @attacker = map ($c->valuecolor(0),@attacker); - $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"); + $c->bot->toTarget(def => "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{ SELECT count(*) FROM launch_confirmations WHERE uid = ? AND back = ? },undef,$user->{uid},$landing_tick); if ($fleetcatch > 0){ - $c->reply("THIS IS A POSSIBLE FLEETCATCH!"); + $c->bot->toTarget(def => "THIS IS A POSSIBLE FLEETCATCH!"); } $dbh->commit; } catch { @@ -307,10 +307,10 @@ SELECT count(*) FROM launch_confirmations WHERE uid = ? AND back = ? die $_; }; }else{ - $c->reply("Didn't find any planet with coordinates $4:$5:$6 at this tick"); + $c->bot->toTarget(def => "Didn't find any planet with coordinates $4:$5:$6 at this tick"); } }else{ - $c->reply("No member registered with coordinates $1:$2:$3"); + $c->bot->toTarget(def => "No member registered with coordinates $1:$2:$3"); } } };