From d7f17e1e6bf63e49e4b4af340f07e2d606d76ee4 Mon Sep 17 00:00:00 2001 From: ryo_saeba Date: Mon, 12 Feb 2007 22:39:10 +0000 Subject: [PATCH] Fix joining script. Non members can't use the guild oracle. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5524 282e977c-c81d-0410-88c4-b93c2d0d6712 --- ChangeLog | 3 ++- python/guilds/guildjoin.py | 2 +- python/guilds/guildoracle.py | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a1e862d3..154401c6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,8 @@ ChangeLog for SVN maps trunk directory: --------------------------------------------------------------------------- Guild fixes, enabling to buy again, and manage status through the Oracle. - python/guilds/README.txt guildbuy.py guild_entry.py guildoracle.py guild_dues.py + python/guilds/README.txt guildbuy.py guild_entry.py guildoracle.py + guild_dues.py guild_join.py python/CFGuilds.py -- Ryo 2007-02-11 diff --git a/python/guilds/guildjoin.py b/python/guilds/guildjoin.py index cbdcd05cd..12f841494 100644 --- a/python/guilds/guildjoin.py +++ b/python/guilds/guildjoin.py @@ -39,7 +39,7 @@ guildname=Crossfire.ScriptParameters() # 1 is 'apply' event if (guildname): guild = CFGuilds.CFGuild(guildname) #find players by coords - ob=map.GetFirstObjectOnSquare(9,16) + ob=map.ObjectAt(9,16) player = find_player(ob) if player: # look for player charname=player.Name diff --git a/python/guilds/guildoracle.py b/python/guilds/guildoracle.py index e87ab7531..fa9be2ed4 100644 --- a/python/guilds/guildoracle.py +++ b/python/guilds/guildoracle.py @@ -37,7 +37,9 @@ if (guildname): guildhouse = CFGuilds.CFGuildHouses() text = string.split(Crossfire.WhatIsMessage()) - if text[0] == 'help' or text[0] == 'yes': + 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: