Improve slightly Zegas' barrel opening by adding an effect. Fix typos.

2 files changed, 5 insertions, 20 deletions

diff --git a/npc/005-3/barrel.txt b/npc/005-3/barrel.txt
index f1b0588e1..235dcbd2c 100644
--- a/npc/005-3/barrel.txt
+++ b/npc/005-3/barrel.txt
@@ -26,13 +26,14 @@ function	script	CheckBarrel	{
 
 L_BarrelTally:
     areamonster "005-3", 24, 34, 45, 42, "House Maggot", 1084, 1, "Trainer::OnKillHouseMaggot";
-    if (@barrel_count == 8)
-    {
+    if (@barrel_count == 8) {
         message strcharinfo(0), "You found the bug bomb.";
         specialeffect(14);
-        specialeffect(51);
+        specialeffect(FX_GRENADE);
         killmonster("005-3", "Trainer::OnKillHouseMaggot");
         setq CandorQuest_Barrel, 3;
+    } else {
+        specialeffect(FX_ITEM, SELF);
     }
     switch (rand2(5)) {
     case 0:
@@ -66,9 +67,7 @@ L_Empty:
     @barrel = 1;
     .@q = getq(CandorQuest_Barrel);
     if (.@q == 2)
-    {
         CheckBarrel();
-    }
     end;
 OnInit:
     // Remember: array start at zero, but barrels count start at 1. "Fixing" may break barrel 8!
@@ -82,9 +81,7 @@ OnInit:
     @barrel = 2;
     .@q = getq(CandorQuest_Barrel);
     if (.@q == 2)
-    {
         CheckBarrel();
-    }
     end;
 OnInit:
     .sex = G_OTHER;
@@ -96,9 +93,7 @@ OnInit:
     @barrel = 3;
     .@q = getq(CandorQuest_Barrel);
     if (.@q == 2)
-    {
         CheckBarrel();
-    }
     end;
 OnInit:
     .sex = G_OTHER;
@@ -109,9 +104,7 @@ OnInit:
     @barrel = 4;
     .@q = getq(CandorQuest_Barrel);
     if (.@q == 2)
-    {
         CheckBarrel();
-    }
     end;
 OnInit:
     .sex = G_OTHER;
@@ -122,9 +115,7 @@ OnInit:
     @barrel = 5;
     .@q = getq(CandorQuest_Barrel);
     if (.@q == 2)
-    {
         CheckBarrel();
-    }
     end;
 OnInit:
     .sex = G_OTHER;
@@ -135,9 +126,7 @@ OnInit:
     @barrel = 6;
     .@q = getq(CandorQuest_Barrel);
     if (.@q == 2)
-    {
         CheckBarrel();
-    }
     end;
 OnInit:
     .sex = G_OTHER;
@@ -148,9 +137,7 @@ OnInit:
     @barrel = 7;
     .@q = getq(CandorQuest_Barrel);
     if (.@q == 2)
-    {
         CheckBarrel();
-    }
     end;
 OnInit:
     .sex = G_OTHER;
@@ -161,9 +148,7 @@ OnInit:
     @barrel = 8;
     .@q = getq(CandorQuest_Barrel);
     if (.@q == 2)
-    {
         CheckBarrel();
-    }
     end;
 OnInit:
     .sex = G_OTHER;
diff --git a/npc/025-1/ctrl.c b/npc/025-1/ctrl.c
index 18e685801..881d647ef 100644
--- a/npc/025-1/ctrl.c
+++ b/npc/025-1/ctrl.c
@@ -485,7 +485,7 @@ OnConquest:
     stopnpctimer;
     // Begin Fires of Steam if needed
     if (!$FIRESOFSTEAM && $MK_TEMPVAR >= MK_FIRESOFSTEAM_START) {
-        kamibroadcast("Andrei Sakar : It has been about three months since we begun battling for control overthe Fortress Town.");
+        kamibroadcast("Andrei Sakar : It has been about three months since we begun battling for control over the Fortress Town.");
         sleep(5000);
         kamibroadcast("Andrei Sakar : Since this begun, however, we've heard nothing of Artis Town.");
         sleep(5000);