Updated defcall

[NDIRC.git] / Commands / Def.pm

diff --git a/Commands/Def.pm b/Commands/Def.pm
index ae206309ceb6bc8333c4375761cc4501bf0aeb68..c50f864b1dda054eefed8293b97302fcef8dca5e 100644 (file)
--- a/Commands/Def.pm
+++ b/Commands/Def.pm
@@ -58,9 +58,8 @@ ORDER BY c.landing_tick;
                                return;
                        }
                }
-               $c->message(notice => $c->disp->targets->{members}, "DEFENSE REQUIRED!! WAKE UP!!");
-               $c->message(privmsg => $c->disp->targets->{members}, "DEFENSE REQUIRED "
-                       ."$mess $callinfo MSG ".$c->nick." TO RESPOND");
+               $c->bot->toTarget(members => "DEFENSE REQUIRED "
+                       ."$mess $callinfo RESPOND TO ".$c->username);
        }
 };
 
@@ -222,7 +221,7 @@ command report_incs => {
        use Try::Tiny;
        method execute($c,$msg) {
 
-               $msg =~ /(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)\s+([^:]*\S+)\s+(?:Ter|Cat|Xan|Zik|Etd)\s+([\d,]+)\s+Attack\s+(\d+)/
+               $msg =~ /(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)\s+([^:]*\S+)\s+(?:Ter|Cat|Xan|Zik|Etd)\s+([\d,]+)\s+(?:Attack\s+)?(\d+)/
                || $msg =~ /(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)\s+\((?:Ter|Cat|Xan|Zik|Etd)\)\s+([^,]*\S+)\s+([\d,]+)\s+(\d+)\s+\(\d+\)/
                        or return;
                my $dbh = $c->model;