diff --git a/ChangeLog b/ChangeLog index 4dfe9c42f..7a1e862d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 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/CFGuilds.py +-- Ryo 2007-02-11 + python/IPO/say.py: Small change to use new package archetype and image from Mike B. -- Aaron Baugher 2007-02-10 diff --git a/python/CFGuilds.py b/python/CFGuilds.py index 07cff5924..c673fce09 100644 --- a/python/CFGuilds.py +++ b/python/CFGuilds.py @@ -283,7 +283,8 @@ class CFGuild: currentrank = record['Rank'] if currentrank != 'Initiate': ranknum = self.ranks.index(currentrank) - newrank = ranknum+1 + print "ranknum = %d"%ranknum + newrank = ranknum-1 record['Rank'] = self.ranks[newrank] self.guildlist.put_record(record) return 1 diff --git a/python/guilds/README.txt b/python/guilds/README.txt index 75c02883d..284c13b52 100644 --- a/python/guilds/README.txt +++ b/python/guilds/README.txt @@ -20,6 +20,12 @@ QuestPoints(mapmakers): put a call to the appropriate guildquest script (current ######################## Brief history of development +Update 07-02-12 + +Fixed typos, it's now possible to buy guilds. + +Ryo + Update 05-12-04 Uploaded guild package to CVS. diff --git a/python/guilds/guild_dues.py b/python/guilds/guild_dues.py index 371a1741b..cd1db757a 100644 --- a/python/guilds/guild_dues.py +++ b/python/guilds/guild_dues.py @@ -24,7 +24,7 @@ import string activator=Crossfire.WhoIsActivator() activatorname=activator.Name -whoami=whoami.WhoAmI() +whoami=Crossfire.WhoAmI() 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'] diff --git a/python/guilds/guild_entry.py b/python/guilds/guild_entry.py index 697cfacfc..4fa5fefaa 100644 --- a/python/guilds/guild_entry.py +++ b/python/guilds/guild_entry.py @@ -47,7 +47,7 @@ if (guildname): else: if guildrecord['Status'] == 'probation': - activator.Write('This guild is currently under probation.\nPlease see a DM for more information' + activator.Write('This guild is currently under probation.\nPlease see a DM for more information') record = guild.info(activatorname) #see if they are on the board if record: diff --git a/python/guilds/guildbuy.py b/python/guilds/guildbuy.py index d1f2486cb..ec134937a 100644 --- a/python/guilds/guildbuy.py +++ b/python/guilds/guildbuy.py @@ -19,8 +19,8 @@ names = [] if (guildname): #find players by coords - ob1=map.GetObjectAt(33,24) - ob2=map.GetObjectAt(33,26) + ob1=map.ObjectAt(33,24) + ob2=map.ObjectAt(33,26) objects = [ob1, ob2] for object in objects: temp = find_player(object) @@ -38,13 +38,14 @@ if (guildname): #Masterize them for player, name in zip(players, names): CFGuilds.CFGuild(guildname).add_member(name, 'GuildMaster') - guildmarker = CFPython.CreateInvisibleObjectInside(player, guildname) + guildmarker = player.CreateObject("marker") + guildmarker.Speed = 0 guildmarker.Name=guildname guildmarker.Slaying='GuildMaster' #teleport them player.Teleport(map,int(11),int(16)) - message = "You have purchased the %s guild. Rule it wisely. (I would type 'save' right about now...)" + message = "You have purchased the %s guild. Rule it wisely. (I would type 'save' right about now...)"%guildname else: message = 'To purchase a guild requires two additional persons to stand on the alcoves above.' @@ -52,5 +53,5 @@ else: print 'Guild Purchase Error: %s, %s' %(guildname, activatorname) message = 'Guild Purchase Error, please notify a DM' -whoami.Write(message) +whoami.Say(message) diff --git a/python/guilds/guildoracle.py b/python/guilds/guildoracle.py index 02efe174f..e87ab7531 100644 --- a/python/guilds/guildoracle.py +++ b/python/guilds/guildoracle.py @@ -26,7 +26,7 @@ import string activator=Crossfire.WhoIsActivator() activatorname=activator.Name whoami=Crossfire.WhoAmI() -isDM=activator.IsDungeonMaster +isDM=activator.DungeonMaster log=CFLog.CFLog() guildname=Crossfire.ScriptParameters() # 6 is say event