crossfire
/
maps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use CFBank.open() to avoid repeating database name

master^2
Kevin Zheng 2020-05-15 00:17:12 -07:00
parent 1ac90a9881
commit 3fddffdb70
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
python/guilds/guild_dues.py
View File

@ -42,9 +42,6 @@ CoinTypes={
# Archetypes for the 'withdraw' command # Archetypes for the 'withdraw' command
ArchType={"SILVER":"silvercoin","GOLD":"goldcoin","PLATINUM":"platinacoin","JADE":"jadecoin","AMBERIUM":"ambercoin", "IMPERIAL NOTE":"imperial","TEN IMPERIAL NOTE":"imperial10","ONE HUNDRED IMPERIAL NOTE":"imperial100"} ArchType={"SILVER":"silvercoin","GOLD":"goldcoin","PLATINUM":"platinacoin","JADE":"jadecoin","AMBERIUM":"ambercoin", "IMPERIAL NOTE":"imperial","TEN IMPERIAL NOTE":"imperial10","ONE HUNDRED IMPERIAL NOTE":"imperial100"}
# Filename for the bank
bankdatabase = "ImperialBank_DB"
remarklist = ['Excellent','Thank You','Thank You','Thank You', 'Thank You', 'Great', 'OK', 'Wonderful', 'Swell', 'Dude', 'Big Spender'] remarklist = ['Excellent','Thank You','Thank You','Thank You', 'Thank You', 'Great', 'OK', 'Wonderful', 'Swell', 'Dude', 'Big Spender']
exclaimlist = ['Hey','Hey','Hey','Hey', 'Now just a minute', 'AHEM', 'OK...Wait a minute', 'Look chowderhead'] exclaimlist = ['Hey','Hey','Hey','Hey', 'Now just a minute', 'AHEM', 'OK...Wait a minute', 'Look chowderhead']
buddylist = ['buddy','buddy','buddy','buddy','pal','friend','friend','friend','friend','dude','chum', 'sweetie'] buddylist = ['buddy','buddy','buddy','buddy','pal','friend','friend','friend','friend','dude','chum', 'sweetie']
@ -162,7 +159,7 @@ class GuildDues:
return return
Price = Items.get(item) Price = Items.get(item)
bank = CFBank.CFBank(bankdatabase) bank = CFBank.open()
balance = bank.getbalance(self.accountname) balance = bank.getbalance(self.accountname)
if Price > balance: if Price > balance:
whoami.Say("The guild does not have sufficient funds.") whoami.Say("The guild does not have sufficient funds.")
@ -219,7 +216,7 @@ class GuildDues:
def do_balance(self): def do_balance(self):
'''Handle the display of the guild's balance.''' '''Handle the display of the guild's balance.'''
bank = CFBank.CFBank(bankdatabase) bank = CFBank.open()
balance = bank.getbalance(self.accountname) balance = bank.getbalance(self.accountname)
whoami.Say("The guild currently has %s on account." %(formatted_amount(balance))) whoami.Say("The guild currently has %s on account." %(formatted_amount(balance)))
@ -243,7 +240,7 @@ class GuildDues:
guild = CFGuilds.CFGuild(self.guildname) guild = CFGuilds.CFGuild(self.guildname)
guild.pay_dues(activator.Name,total) guild.pay_dues(activator.Name,total)
whoami.Say("%s, %s %s paid to the guild." % (random.choice(remarklist), cost, currency)) whoami.Say("%s, %s %s paid to the guild." % (random.choice(remarklist), cost, currency))
bank = CFBank.CFBank(bankdatabase) bank = CFBank.open()
bank.deposit(self.accountname, total) bank.deposit(self.accountname, total)
else: else:
if total == 0: if total == 0:
@ -267,7 +264,7 @@ class GuildDues:
whoami.Say("Usage: withdraw <quantity> {cointype=silver}") whoami.Say("Usage: withdraw <quantity> {cointype=silver}")
return return
bank = CFBank.CFBank(bankdatabase) bank = CFBank.open()
balance = bank.getbalance(self.accountname) balance = bank.getbalance(self.accountname)
if len(text) > 2: if len(text) > 2:
@ -334,7 +331,7 @@ class GuildDues:
activator.Write('dues error, please notify a DM') activator.Write('dues error, please notify a DM')
return return
bank = CFBank.CFBank(bankdatabase) bank = CFBank.open()
self.accountname = self.guildname + str(self.guildname.__hash__()) self.accountname = self.guildname + str(self.guildname.__hash__())
if whoami.Name == 'Jack': if whoami.Name == 'Jack':

2
python/pshop/pshop.py
View File

@ -11,7 +11,7 @@ import CFDataBase,CFBank
CFDB=CFDataBase.CFDataBase("PShop") CFDB=CFDataBase.CFDataBase("PShop")
PicDB=CFDataBase.CFDataBase("PicDB") PicDB=CFDataBase.CFDataBase("PicDB")
PicDict=PicDB.get("Dict") PicDict=PicDB.get("Dict")
bank=CFBank.CFBank("ImperialBank_DB") bank=CFBank.open()
pshop=whoami.Map.Path.replace("/","_") pshop=whoami.Map.Path.replace("/","_")