BH eyes now see GM invis

src/engine/gameManager/PowersManager.java

@@ -27,6 +27,7 @@ import engine.net.client.ClientConnection;
 import engine.net.client.msg.*;
 import engine.objects.*;
 import engine.powers.*;
+import engine.powers.effectmodifiers.SeeInvisibleEffectModifier;
 import engine.powers.poweractions.AbstractPowerAction;
 import engine.powers.poweractions.TrackPowerAction;
 import engine.server.MBServerStatics;
@@ -318,7 +319,13 @@ public enum PowersManager {
 
         // get numTrains for power
         int trains = msg.getNumTrains();
-
+        int token = pb.token;
+        int overrideTrains = 0;
+        int overrideRecycle = 0;
+        if(token == 429420458){
+            overrideTrains = 40;
+            overrideRecycle = 300000;
+        }
         // can't go over the max trains for the power, unless CSR
         if (trains > pb.getMaxTrains() && !playerCharacter.isCSR()) {
             trains = pb.getMaxTrains();
@@ -337,19 +344,13 @@ public enum PowersManager {
                 }
             }
         }
+        if(overrideTrains > 0)
+            msg.setNumTrains(overrideTrains);
         // get recycle time in ms
         int time = pb.getRecycleTime(trains);
 
-        // verify player is in correct mode (combat/nonCombat)
-        //if (playerCharacter.isCombat()) {
-        //    if (!pb.allowedInCombat())
-                // ChatManager.chatPowerError(pc,
-                // "This power is not allowed in combat mode.");
-       //        return true;
-        //} else if (!pb.allowedOutOfCombat())
-            // ChatManager.chatPowerError(pc,
-            // "You must be in combat mode to use this power.");
-        //    return true;
+        if(overrideRecycle > 0)
+            time = overrideRecycle;
 
         // verify player is not stunned or prohibited from casting
         PlayerBonuses bonus = playerCharacter.getBonuses();

src/engine/net/client/handlers/MerchantMsgHandler.java

@@ -147,8 +147,8 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
         Building shrineBuilding;
         Shrine shrine;
 
-        //if (npc.getGuild().getNation() != player.getGuild().getNation())
-        //    return;
+        if (npc.getGuild().getNation() != player.getGuild().getNation())
+            return;
 
         shrineBuilding = npc.getBuilding();