diff --git a/python/guilds/guild_dues.py b/python/guilds/guild_dues.py index b28e774a8..fffef1257 100644 --- a/python/guilds/guild_dues.py +++ b/python/guilds/guild_dues.py @@ -17,7 +17,6 @@ # author:Avion temitchell@sourceforge.net import Crossfire,CFGuilds,CFItemBroker,random,string,sys,CFBank,CFMail,CFLog - log = CFLog.CFLog() priceMailScroll = 5 priceFactor = 50 @@ -194,14 +193,19 @@ if whoami.Name=='Jack': ClearanceApproved = (text1[5]) - if ClearanceApproved=="GuildMaster": - ClearanceAproved=5 + whoami.Say(repr(ClearanceApproved)) + if ClearanceApproved=="'GuildMaster',": + ClearanceApproved=5 + whoami.Say("Welcome Guild Master") + elif ClearanceApproved=="'Master',": + ClearanceApproved=4 + else: + ClearanceApproved=0 else: ClearanceApproved=0 - - if ClearanceApproved<5: + if ClearanceApproved<4: - message="Only guild masters and GMs can withdraw funds from the guild." + message="Only guild masters, masters, and GMs can withdraw funds from the guild." else: try: Amount=int(text[1]) @@ -270,4 +274,4 @@ else: bank.deposit(accountname,1) - \ No newline at end of file + diff --git a/python/guilds/guild_entry.py b/python/guilds/guild_entry.py index 3e2269f11..afbebfa1e 100644 --- a/python/guilds/guild_entry.py +++ b/python/guilds/guild_entry.py @@ -41,9 +41,7 @@ if (guildname): guild = CFGuilds.CFGuild(guildname) text = Crossfire.WhatIsMessage().split() guildrecord = CFGuilds.CFGuildHouses().info(guildname) - whoami.Say(str(type(guildrecord))) found = 0 - whoami.Say(guildrecord['Status']) if text[0] == 'enter' or text[0] == 'Enter': if guildrecord['Status'] == 'inactive':