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

fixed bugs with guild scripts 

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13629 282e977c-c81d-0410-88c4-b93c2d0d6712
master
alestan 2010-08-16 22:55:32 +00:00
parent c41bb9c8df
commit 7bd104454a
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
python/guilds/guild_dues.py
View File

@ -17,7 +17,6 @@
# author:Avion temitchell@sourceforge.net # author:Avion temitchell@sourceforge.net
import Crossfire,CFGuilds,CFItemBroker,random,string,sys,CFBank,CFMail,CFLog import Crossfire,CFGuilds,CFItemBroker,random,string,sys,CFBank,CFMail,CFLog
log = CFLog.CFLog() log = CFLog.CFLog()
priceMailScroll = 5 priceMailScroll = 5
priceFactor = 50 priceFactor = 50
@ -194,14 +193,19 @@ if whoami.Name=='Jack':
ClearanceApproved = (text1[5]) ClearanceApproved = (text1[5])
if ClearanceApproved=="GuildMaster": whoami.Say(repr(ClearanceApproved))
ClearanceAproved=5 if ClearanceApproved=="'GuildMaster',":
ClearanceApproved=5
whoami.Say("Welcome Guild Master")
elif ClearanceApproved=="'Master',":
ClearanceApproved=4
else:
ClearanceApproved=0
else: else:
ClearanceApproved=0 ClearanceApproved=0
if ClearanceApproved<4:
if ClearanceApproved<5:
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: else:
try: try:
Amount=int(text[1]) Amount=int(text[1])
@ -270,4 +274,4 @@ else:
bank.deposit(accountname,1) bank.deposit(accountname,1)

2
python/guilds/guild_entry.py
View File

@ -41,9 +41,7 @@ if (guildname):
guild = CFGuilds.CFGuild(guildname) guild = CFGuilds.CFGuild(guildname)
text = Crossfire.WhatIsMessage().split() text = Crossfire.WhatIsMessage().split()
guildrecord = CFGuilds.CFGuildHouses().info(guildname) guildrecord = CFGuilds.CFGuildHouses().info(guildname)
whoami.Say(str(type(guildrecord)))
found = 0 found = 0
whoami.Say(guildrecord['Status'])
if text[0] == 'enter' or text[0] == 'Enter': if text[0] == 'enter' or text[0] == 'Enter':
if guildrecord['Status'] == 'inactive': if guildrecord['Status'] == 'inactive':