From 5d875cb022d7edf8333ff1d5887a089efa774967 Mon Sep 17 00:00:00 2001 From: DenialMC Date: Wed, 8 Apr 2015 15:34:13 +0300 Subject: [PATCH] Exponential increase for Bank GUI --- toontown/estate/BankGUI.py | 43 +++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/toontown/estate/BankGUI.py b/toontown/estate/BankGUI.py index 19beeee4..b42a34ec 100644 --- a/toontown/estate/BankGUI.py +++ b/toontown/estate/BankGUI.py @@ -16,7 +16,7 @@ class BankGui(DirectFrame): buttons = loader.loadModel('phase_3/models/gui/dialog_box_buttons_gui') jarGui = loader.loadModel('phase_3.5/models/gui/jar_gui') arrowGui = loader.loadModel('phase_3/models/gui/create_a_toon_gui') - bankModel = loader.loadModel('phase_5.5/models/estate/jellybeanBank') + bankModel = loader.loadModel('phase_5.5/models/estate/jellybeanBank.bam') bankModel.setDepthWrite(1) bankModel.setDepthTest(1) bankModel.find('**/jellybeans').setDepthWrite(0) @@ -70,7 +70,7 @@ class BankGui(DirectFrame): jarMoney = base.localAvatar.getMoney() maxJarMoney = base.localAvatar.getMaxMoney() bankMoney = base.localAvatar.getBankMoney() - maxBankMoney = base.localAvatar.getMaxBankMoney() + maxBankMoney = ToontownGlobals.MaxBankMoney self.__transactionAmount = min(self.__transactionAmount, jarMoney) self.__transactionAmount = min(self.__transactionAmount, maxBankMoney - bankMoney) self.__transactionAmount = -min(-self.__transactionAmount, maxJarMoney - jarMoney) @@ -97,14 +97,19 @@ class BankGui(DirectFrame): def __runCounter(self, task): if task.time - task.prevTime < task.delayTime: return Task.cont - else: - task.delayTime = max(0.05, task.delayTime * 0.75) - task.prevTime = task.time - hitLimit, jar, bank, trans = self.__updateTransaction(task.delta) - if hitLimit: - return Task.done - else: - return Task.cont + + task.delayTime /= 2 + task.prevTime = task.time + + if task.delayTime < 0.005: + task.amount *= 1.1 + + hitLimit = self.__updateTransaction(int(task.amount))[0] + + if hitLimit: + return Task.done + + return Task.cont def __depositButtonUp(self, event): messenger.send('wakeup') @@ -112,11 +117,13 @@ class BankGui(DirectFrame): def __depositButtonDown(self, event): messenger.send('wakeup') + task = Task(self.__runCounter) - task.delayTime = 0.4 + task.delayTime = 0.2 task.prevTime = 0.0 - task.delta = 1 - hitLimit, jar, bank, trans = self.__updateTransaction(task.delta) + task.amount = 1.0 + hitLimit = self.__updateTransaction(int(task.amount))[0] + if not hitLimit: taskMgr.add(task, self.taskName('runCounter')) @@ -126,11 +133,13 @@ class BankGui(DirectFrame): def __withdrawButtonDown(self, event): messenger.send('wakeup') + task = Task(self.__runCounter) - task.delayTime = 0.4 + task.delayTime = 0.2 task.prevTime = 0.0 - task.delta = -1 - hitLimit, jar, bank, trans = self.__updateTransaction(task.delta) + task.amount = 1.0 + hitLimit = self.__updateTransaction(int(task.amount))[0] + if not hitLimit: taskMgr.add(task, self.taskName('runCounter')) @@ -138,4 +147,4 @@ class BankGui(DirectFrame): self.__updateTransaction(0) def __bankMoneyChange(self, bankMoney): - self.__updateTransaction(0) + self.__updateTransaction(0) \ No newline at end of file