From da9a91a48bd4323d1600c32e0dedd25abbd8d3cf Mon Sep 17 00:00:00 2001
From: Mark Lemming <lemming@quirkyqatz.com>
Date: Sun, 11 Aug 2013 21:28:49 -0600
Subject: [PATCH] Reversed tag order since it takes first tag only in emails.

---
 bin/tick_fissures.pl                          | 12 ++++++------
 lib/Lacuna/RPC/Building/BlackHoleGenerator.pm |  2 +-
 lib/Lacuna/Role/Ship/Arrive/SealFissure.pm    |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bin/tick_fissures.pl b/bin/tick_fissures.pl
index e4c3e46f..aaa3db87 100644
--- a/bin/tick_fissures.pl
+++ b/bin/tick_fissures.pl
@@ -174,21 +174,21 @@ sub fissure_alert {
             $already{$eid} = 1;
             if ($type eq "spawn") {
                 $to_alert->empire->send_predefined_message(
-                    tags        => ['Alert', 'Fissure'],
+                    tags        => ['Fissure', 'Alert'],
                     filename    => 'fissure_alert_spawn.txt',
                     params      => [$body->x, $body->y, $body->name],
                 );
             }
             elsif ($type eq "level") {
                 $to_alert->empire->send_predefined_message(
-                    tags        => ['Alert', 'Fissure'],
+                    tags        => ['Fissure', 'Alert'],
                     filename    => 'fissure_alert_level.txt',
                     params      => [$body->x, $body->y, $body->name],
                 );
             }
             elsif ($type eq "critical") {
                 $to_alert->empire->send_predefined_message(
-                    tags        => ['Alert', 'Fissure'],
+                    tags        => ['Fissure', 'Alert'],
                     filename    => 'fissure_alert_critical.txt',
                     params      => [$body->x, $body->y, $body->name],
                 );
@@ -234,7 +234,7 @@ sub fissure_spawn {
         out("    Converted building ".$building->class." into a level $fissure_level Fissure!");
         if ($body->empire_id) {
             $body->empire->send_predefined_message(
-                tags        => ['Alert', 'Fissure'],
+                tags        => ['Fissure', 'Alert'],
                 filename    => 'fissure_replaced_energy.txt',
                 params      => [$body->name, $building->x,$building->y, $fissure_level],
             );
@@ -269,7 +269,7 @@ sub fissure_spawn {
 # send email to empire and N19 news
         if ($body->empire_id) {
             $body->empire->send_predefined_message(
-                tags        => ['Alert', 'Fissure'],
+                tags        => ['Fissure', 'Alert'],
                 filename    => 'fissure_spawned.txt',
                 params      => [$body->name],
             );
@@ -298,7 +298,7 @@ sub fissure_level {
     }
     if ($body->empire_id) {
         $body->empire->send_predefined_message(
-            tags        => ['Alert', 'Fissure'],
+            tags        => ['Fissure', 'Alert'],
             filename    => 'fissure_damaged_energy.txt',
             params      => [$body->name, $fissure->x,$fissure->y, $fissure->level],
         );
diff --git a/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm b/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm
index 4e240efa..7e8922ac 100644
--- a/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm
+++ b/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm
@@ -1478,7 +1478,7 @@ sub bhg_random_fissure {
                 unless ($already{$eid} == 1) {
                     $already{$eid} = 1;
                     $to_alert->empire->send_predefined_message(
-                        tags        => ['Alert', 'Fissure'],
+                        tags        => ['Fissure', 'Alert'],
                         filename    => 'fissure_alert_spawn.txt',
                         params      => [$target->x, $target->y, $target->name],
                     );
diff --git a/lib/Lacuna/Role/Ship/Arrive/SealFissure.pm b/lib/Lacuna/Role/Ship/Arrive/SealFissure.pm
index 1936c9e8..5b66a8ff 100644
--- a/lib/Lacuna/Role/Ship/Arrive/SealFissure.pm
+++ b/lib/Lacuna/Role/Ship/Arrive/SealFissure.pm
@@ -20,7 +20,7 @@ after handle_arrival_procedures => sub {
     # Turn around if occupied
     if ($self->foreign_body->empire_id) {
         $self->body->empire->send_predefined_message(
-            tags        => ['Alert', 'Fissure'],
+            tags        => ['Fissure', 'Alert'],
             filename    => 'occupied_fissure.txt',
             params      => [$self->type_formatted, $body_hit->x, $body_hit->y, $body_hit->name ],
         );
@@ -32,7 +32,7 @@ after handle_arrival_procedures => sub {
     my ($fissure) = grep {$_->class eq 'Lacuna::DB::Result::Building::Permanent::Fissure'} @{$body_hit->building_cache};
     if (not defined($fissure)) {
         $self->body->empire->send_predefined_message(
-            tags        => ['Alert', 'Fissure'],
+            tags        => ['Fissure', 'Alert'],
             filename    => 'no_fissure_found.txt',
             params      => [$self->type_formatted, $body_hit->x, $body_hit->y, $body_hit->name ],
         );
@@ -66,7 +66,7 @@ after handle_arrival_procedures => sub {
         if ($curr_lev < 1) {
             $fissure->delete;
             $self->body->empire->send_predefined_message(
-                tags        => ['Alert', 'Fissure'],
+                tags        => ['Fissure', 'Alert'],
                 filename    => 'we_destroyed_a_fissure.txt',
                 params      => [$self->type_formatted, $body_hit->x, $body_hit->y, $body_hit->name ],
             );
@@ -76,7 +76,7 @@ after handle_arrival_procedures => sub {
             $fissure->efficiency($curr_eff);
             $fissure->update;
             $self->body->empire->send_predefined_message(
-                tags        => ['Alert', 'Fissure'],
+                tags        => ['Fissure', 'Alert'],
                 filename    => 'our_ship_hit_fissure.txt',
                 params      => [$self->type_formatted, $body_hit->x, $body_hit->y, $body_hit->name, $curr_lev, $curr_eff ],
             );
-- 
2.51.2