X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;ds=sidebyside;f=Commands%2FDef.pm;h=ba077f75ca7f7b971682d936d1ef27586aab8976;hb=410507b62593ec8cc527567ce44b2be347352df7;hp=ae206309ceb6bc8333c4375761cc4501bf0aeb68;hpb=5684c48c49dfeb5f75b10f70149debed1247c596;p=NDIRC.git

diff --git a/Commands/Def.pm b/Commands/Def.pm
index ae20630..ba077f7 100644
--- 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;
@@ -282,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("<b>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]</b>");
+							$c->bot->toTarget(def => "<b>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]</b>");
 						}else{
-							$c->reply("<b>Do not cover</b>, 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 => "<b>Do not cover</b>, 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("<b>Call is likely not covered anymore, please recalc! calc: $call[2]</b>");
+							$c->bot->toTarget(def => "<b>Call is likely not covered anymore, please recalc! calc: $call[2]</b>");
 						}
 					}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("<c04>THIS IS A POSSIBLE FLEETCATCH!</c>");
+						$c->bot->toTarget(def => "<c04>THIS IS A POSSIBLE FLEETCATCH!</c>");
 					}
 					$dbh->commit;
 				} catch {
@@ -308,10 +307,10 @@ SELECT count(*) FROM launch_confirmations WHERE uid = ? AND back = ?
 					die $_;
 				};
 			}else{
-				$c->reply("<c04>Didn't find any planet with coordinates $4:$5:$6 at this tick</c>");
+				$c->bot->toTarget(def => "<c04>Didn't find any planet with coordinates $4:$5:$6 at this tick</c>");
 			}
 		}else{
-			$c->reply("<c04>No member registered with coordinates $1:$2:$3</c>");
+			$c->bot->toTarget(def => "<c04>No member registered with coordinates $1:$2:$3</c>");
 		}
 	}
 };