2X merit multiplier for factories

toontown/ai/PromotionManagerAI.py

@@ -15,12 +15,12 @@ class PromotionManagerAI:
     def getPercentChance(self):
         return 100.0
 
-    def recoverMerits(self, av, cogList, zoneId, multiplier = 1, extraMerits = None):
+    def recoverMerits(self, av, cogList, zoneId, multiplier = 1, extraMerits = None, addInvasion = True):
         avId = av.getDoId()
         meritsRecovered = [0, 0, 0, 0]
         if extraMerits is None:
             extraMerits = [0, 0, 0, 0]
-        if self.air.suitInvasionManager.getInvading():
+        if addInvasion and self.air.suitInvasionManager.getInvading():
             multiplier *= getInvasionMultiplier()
         for i in xrange(len(extraMerits)):
             if CogDisguiseGlobals.isSuitComplete(av.getCogParts(), i):

toontown/building/DistributedBuildingMgrAI.py

@@ -1,6 +1,5 @@
 from direct.directnotify.DirectNotifyGlobal import *
 import cPickle
-from pymongo.errors import AutoReconnect
 
 from otp.ai.AIBaseGlobal import *
 from toontown.building import DistributedBuildingAI
@@ -193,7 +192,7 @@ class DistributedBuildingMgrAI:
                                                         {'$setOnInsert': street,
                                                         '$set': {'buildings': buildings}},
                                                         upsert=True)
-            except AutoReconnect: # Something happened to our DB, but we can reconnect and retry.
+            except: # Something happened to our DB, but we can reconnect and retry.
                 taskMgr.doMethodLater(config.GetInt('mongodb-retry-time', 2), self.save, 'retrySave', extraArgs=[])
         
         else:
@@ -219,7 +218,7 @@ class DistributedBuildingMgrAI:
             street = {'ai': self.air.districtId, 'branch': self.branchId}
             try:
                 doc = self.air.dbGlobalCursor.streets.find_one(street)
-            except AutoReconnect: # We're failing over - normally we'd wait to retry, but this is on AI startup so we might want to retry (or refactor the bldgMgr so we can sanely retry).
+            except: # We're failing over - normally we'd wait to retry, but this is on AI startup so we might want to retry (or refactor the bldgMgr so we can sanely retry).
                 return blocks
 
             if not doc:

toontown/coghq/DistributedBattleFactoryAI.py

@@ -29,7 +29,7 @@ class DistributedBattleFactoryAI(DistributedLevelBattleAI.DistributedLevelBattle
             self.toonItems[toon.doId][1].extend(notRecovered)
             meritArray = self.air.promotionMgr.recoverMerits(
                 toon, self.suitsKilled, self.getTaskZoneId(),
-                getFactoryMeritMultiplier(self.getTaskZoneId()))
+                getFactoryMeritMultiplier(self.getTaskZoneId()) * 2.0, addInvasion=False)
             if toon.doId in self.helpfulToons:
                 self.toonMerits[toon.doId] = addListsByValue(self.toonMerits[toon.doId], meritArray)
             else:

toontown/coghq/DistributedCountryClubBattleAI.py

@@ -34,7 +34,7 @@ class DistributedCountryClubBattleAI(DistributedLevelBattleAI.DistributedLevelBa
             recovered, notRecovered = self.air.questManager.recoverItems(toon, self.suitsKilled, self.getTaskZoneId())
             self.toonItems[toon.doId][0].extend(recovered)
             self.toonItems[toon.doId][1].extend(notRecovered)
-            meritArray = self.air.promotionMgr.recoverMerits(toon, self.suitsKilled, self.getTaskZoneId(), getCountryClubCreditMultiplier(self.getTaskZoneId()), extraMerits=extraMerits)
+            meritArray = self.air.promotionMgr.recoverMerits(toon, self.suitsKilled, self.getTaskZoneId(), getCountryClubCreditMultiplier(self.getTaskZoneId()) * 2.0, extraMerits=extraMerits, addInvasion=False)
             if toon.doId in self.helpfulToons:
                 self.toonMerits[toon.doId] = addListsByValue(self.toonMerits[toon.doId], meritArray)
             else:

toontown/coghq/DistributedMintBattleAI.py

@@ -33,7 +33,7 @@ class DistributedMintBattleAI(DistributedLevelBattleAI.DistributedLevelBattleAI)
             recovered, notRecovered = self.air.questManager.recoverItems(toon, self.suitsKilled, self.getTaskZoneId())
             self.toonItems[toon.doId][0].extend(recovered)
             self.toonItems[toon.doId][1].extend(notRecovered)
-            meritArray = self.air.promotionMgr.recoverMerits(toon, self.suitsKilled, self.getTaskZoneId(), getMintCreditMultiplier(self.getTaskZoneId()), extraMerits=extraMerits)
+            meritArray = self.air.promotionMgr.recoverMerits(toon, self.suitsKilled, self.getTaskZoneId(), getMintCreditMultiplier(self.getTaskZoneId()) * 2.0, extraMerits=extraMerits, addInvasion=False)
             if toon.doId in self.helpfulToons:
                 self.toonMerits[toon.doId] = addListsByValue(self.toonMerits[toon.doId], meritArray)
             else:

toontown/coghq/DistributedStageBattleAI.py

@@ -41,7 +41,7 @@ class DistributedStageBattleAI(DistributedLevelBattleAI.DistributedLevelBattleAI
             recovered, notRecovered = self.air.questManager.recoverItems(toon, self.suitsKilled, self.getTaskZoneId())
             self.toonItems[toon.doId][0].extend(recovered)
             self.toonItems[toon.doId][1].extend(notRecovered)
-            meritArray = self.air.promotionMgr.recoverMerits(toon, self.suitsKilled, self.getTaskZoneId(), getStageCreditMultiplier(self.level.getFloorNum()), extraMerits=extraMerits)
+            meritArray = self.air.promotionMgr.recoverMerits(toon, self.suitsKilled, self.getTaskZoneId(), getStageCreditMultiplier(self.level.getFloorNum()) * 2.0, extraMerits=extraMerits, addInvasion=False)
             if toon.doId in self.helpfulToons:
                 self.toonMerits[toon.doId] = addListsByValue(self.toonMerits[toon.doId], meritArray)
             else: