From 5a613c916217f454d8f4fd67d76fccc37ac0e445 Mon Sep 17 00:00:00 2001 From: kstenger Date: Sun, 28 Apr 2013 22:23:28 +0000 Subject: [PATCH] Fixing python indentation git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18696 282e977c-c81d-0410-88c4-b93c2d0d6712 --- python/guilds/guildoracle.py | 246 +++++++++++++++++------------------ 1 file changed, 122 insertions(+), 124 deletions(-) diff --git a/python/guilds/guildoracle.py b/python/guilds/guildoracle.py index bbdd03572..f73b39e77 100644 --- a/python/guilds/guildoracle.py +++ b/python/guilds/guildoracle.py @@ -24,6 +24,7 @@ import CFLog import sys import string from CFGuildClearance import CheckClearance + activator=Crossfire.WhoIsActivator() activatorname=activator.Name whoami=Crossfire.WhoAmI() @@ -32,136 +33,133 @@ mymap=activator.Map log=CFLog.CFLog() guildname=Crossfire.ScriptParameters() # 6 is say eventC fi if CheckClearance([guildname,"GuildMaster"],activator): - guild=CFGuilds.CFGuild(guildname) - guildrecord=CFGuilds.CFGuildHouses().info(guildname) - - - Approved = 'Access granted' + guild=CFGuilds.CFGuild(guildname) + guildrecord=CFGuilds.CFGuildHouses().info(guildname) + Approved = 'Access granted' else: - Approved = 'Access denied' + Approved = 'Access denied' Access = 0 if (Approved == 'Access granted'): - Access = 1 - + Access = 1 else: - whoami.Say(Approved) + whoami.Say(Approved) + if (Access ==1) or (isDM == 1): - if (guildname): - guild = CFGuilds.CFGuild(guildname) - guildhouse = CFGuilds.CFGuildHouses() - text = string.split(Crossfire.WhatIsMessage()) - if guild.info(activatorname) == 0 and isDM == 0: - message = 'You don\'t belong to this guild!' - elif text[0] == 'help' or text[0] == 'yes': - if isDM: - message = '\nList of commands:\n-list\n-add \n-remove \n-info \n-promote \n-demote \n-status \n-guildstatus ' - else: - message='\nList of commands:\n-list\n-remove \n-info \n-promote \n-demote \n-status ' - elif text[0] == 'info': - if len(text)==2: - record = guild.info(text[1]) - if record: - message = 'Information for %s:\n' %text[1] - message += 'Rank: %s\n'%record['Rank'] - message += 'Status: %s\n'%record['Status'] - message += 'Join date: %s\n'%record['Join_date'] - if record['Demerits'] != '0': - message += 'Demerits: %s\n'%record['Demerits'] - if record['Dues'] != '0': - message += 'Paid dues: %s\n'%Crossfire.CostStringFromValue(long(record['Dues'])) - else: - message = '%s is not a member' %text[1] - else: - message = 'Usage "info "' - - elif text[0] == 'remove': - if len(text)==2: - if guild.info(text[1]): - message = 'Removed %s from the guild' %text[1] - guild.remove_member(text[1]) - else: - message = '%s was not a member' %text[1] - else: - message = 'Usage "remove "' - elif text[0] == 'list': - Crossfire.SetPlayerMessage('Who are the members?', 2) - list = guild.list_members() - - message = '\nList of members:\n' - for member in list: - message += '%s (%s)\n'%(member, guild.info(member)['Rank']) - message += 'Total members = ' + str(len(list)) - - elif text[0] == 'promote': - if len(text)==2: - record = guild.info(text[1]) - if record: - if guild.promote_member(text[1]): - record = guild.info(text[1]) #refresh record - message = '%s promoted to %s' %(text[1], record['Rank']) - else: - message = 'You cannot promote %s' %text[1] - else: - message = '%s is not a member' %text[1] - else: - message = 'Usage "promote "' - elif text[0] == 'demote': - if len(text)==2: - record = guild.info(text[1]) - if record: - if guild.demote_member(text[1]): - record = guild.info(text[1]) #refresh record - message = '%s demoted to %s' %(text[1], record['Rank']) - else: - message = 'You cannot demote %s' %text[1] - else: - message = '%s is not a member' %text[1] - else: - message = 'Usage "demote "' - elif text[0] == 'status': - if len(text)==3: - record = guild.info(text[1]) - if record: - if guild.change_status(text[1],text[2]): - record = guild.info(text[1]) #refresh record - message = '%s now has status of %s' %(text[1], record['Status']) - else: - message = '%s is not a valid status, valid values are "suspended", "probation" or "good"' %text[2] - else: - message = '%s is not a member' %text[1] - else: - message = 'Usage "status (suspended or probation or good)"' - elif text[0] == 'add' and isDM: - if len(text)==2: - if log.info(text[1]): - if guild.info(text[1]): - message = '%s is already a member.' %text[1] - else: - #changed to support python 2.5 guild.add_member(text[1], 'Initiate' if len(text)==2 else text[2]) - guild.add_member(text[1], 'Initiate' ) - message = 'Added %s to the guild' %text[1] - else: - message = 'Sorry, I don\'t know any %s' %text[1] - else: - message = 'Usage "add "' - elif text[0] == 'guildstatus' and isDM: - if len(text)==2: - record = guildhouse.info(guildname) - if record: - if guildhouse.change_status(guildname,text[1]): - record = guildhouse.info(text[1]) #refresh record - message = '%s now has status of %s' %(guildname, record['Status']) - else: - message = '%s is not a valid status' %text[1] - else: - message = '%s is not a guild' %guildname - else: - message = 'Usage "guildstatus \n%s"' %str(guildhouse.status) + if (guildname): + guild = CFGuilds.CFGuild(guildname) + guildhouse = CFGuilds.CFGuildHouses() + text = string.split(Crossfire.WhatIsMessage()) + if guild.info(activatorname) == 0 and isDM == 0: + message = 'You don\'t belong to this guild!' + elif text[0] == 'help' or text[0] == 'yes': + if isDM: + message = '\nList of commands:\n-list\n-add \n-remove \n-info \n-promote \n-demote \n-status \n-guildstatus ' + else: + message='\nList of commands:\n-list\n-remove \n-info \n-promote \n-demote \n-status ' + elif text[0] == 'info': + if len(text)==2: + record = guild.info(text[1]) + if record: + message = 'Information for %s:\n' %text[1] + message += 'Rank: %s\n'%record['Rank'] + message += 'Status: %s\n'%record['Status'] + message += 'Join date: %s\n'%record['Join_date'] + if record['Demerits'] != '0': + message += 'Demerits: %s\n'%record['Demerits'] + if record['Dues'] != '0': + message += 'Paid dues: %s\n'%Crossfire.CostStringFromValue(long(record['Dues'])) else: - message = 'What did you need?' - else: - message = 'Board Error' - whoami.Say(message) + message = '%s is not a member' %text[1] + else: + message = 'Usage "info "' + elif text[0] == 'remove': + if len(text)==2: + if guild.info(text[1]): + message = 'Removed %s from the guild' %text[1] + guild.remove_member(text[1]) + else: + message = '%s was not a member' %text[1] + else: + message = 'Usage "remove "' + elif text[0] == 'list': + Crossfire.SetPlayerMessage('Who are the members?', 2) + list = guild.list_members() + + message = '\nList of members:\n' + for member in list: + message += '%s (%s)\n'%(member, guild.info(member)['Rank']) + message += 'Total members = ' + str(len(list)) + + elif text[0] == 'promote': + if len(text)==2: + record = guild.info(text[1]) + if record: + if guild.promote_member(text[1]): + record = guild.info(text[1]) #refresh record + message = '%s promoted to %s' %(text[1], record['Rank']) + else: + message = 'You cannot promote %s' %text[1] + else: + message = '%s is not a member' %text[1] + else: + message = 'Usage "promote "' + elif text[0] == 'demote': + if len(text)==2: + record = guild.info(text[1]) + if record: + if guild.demote_member(text[1]): + record = guild.info(text[1]) #refresh record + message = '%s demoted to %s' %(text[1], record['Rank']) + else: + message = 'You cannot demote %s' %text[1] + else: + message = '%s is not a member' %text[1] + else: + message = 'Usage "demote "' + elif text[0] == 'status': + if len(text)==3: + record = guild.info(text[1]) + if record: + if guild.change_status(text[1],text[2]): + record = guild.info(text[1]) #refresh record + message = '%s now has status of %s' %(text[1], record['Status']) + else: + message = '%s is not a valid status, valid values are "suspended", "probation" or "good"' %text[2] + else: + message = '%s is not a member' %text[1] + else: + message = 'Usage "status (suspended or probation or good)"' + elif text[0] == 'add' and isDM: + if len(text)==2: + if log.info(text[1]): + if guild.info(text[1]): + message = '%s is already a member.' %text[1] + else: + #changed to support python 2.5 guild.add_member(text[1], 'Initiate' if len(text)==2 else text[2]) + guild.add_member(text[1], 'Initiate' ) + message = 'Added %s to the guild' %text[1] + else: + message = 'Sorry, I don\'t know any %s' %text[1] + else: + message = 'Usage "add "' + elif text[0] == 'guildstatus' and isDM: + if len(text)==2: + record = guildhouse.info(guildname) + if record: + if guildhouse.change_status(guildname,text[1]): + record = guildhouse.info(text[1]) #refresh record + message = '%s now has status of %s' %(guildname, record['Status']) + else: + message = '%s is not a valid status' %text[1] + else: + message = '%s is not a guild' %guildname + else: + message = 'Usage "guildstatus \n%s"' %str(guildhouse.status) + else: + message = 'What did you need?' + else: + message = 'Board Error' + whoami.Say(message)