[wpdev-commits] xmlscripts/scripts/guilds deed.py,1.3,1.4 member.py,1.5,1.6 stone.py,1.4,1.5

[Jorge P. <ke...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts/guilds
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28093/guilds

Modified Files:
	deed.py member.py stone.py 
Log Message:
- Replaced access to .events with the calls hasevent/addevent/removeevent in all relevant places.
Notice that addevent() is expected to add the event to the head of the list.
I recognized no situation (of those changed) where it would make a difference adding the event to the end of the list, so in those cases used addevent aswell.
- Fixed a copy&paste error in trap.py on removing the tags (pointed out by Incannus).

note: .events can now be made read only, bearing in mind that in doing so there is no way to make a distinction between adding an event at the top or at the end of the event list.



Index: stone.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/guilds/stone.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** stone.py	26 May 2004 13:07:22 -0000	1.4
--- stone.py	24 Aug 2004 18:10:27 -0000	1.5
***************
*** 553,559 ****
          sendMessage(target.char, 'You have been recruited as a canidate for %s by %s.' % (guild.name, player.name))
          guild.addcanidate(target.char)
!         events = target.char.events
!         if 'guilds.member' not in events:
!           target.char.events = events + ['guilds.member']
          target.char.resendtooltip()
          if guild.guildstone:
--- 553,557 ----
          sendMessage(target.char, 'You have been recruited as a canidate for %s by %s.' % (guild.name, player.name))
          guild.addcanidate(target.char)
!         target.char.addevent( 'guilds.member' )
          target.char.resendtooltip()
          if guild.guildstone:
***************
*** 609,616 ****
  
              # Make sure our member has the neccesary event
!             events = char.events
!             if 'guilds.member' not in events:
!               char.events = events + ['guilds.member']
! 
              char.resendtooltip()
              if guild.guildstone:
--- 607,611 ----
  
              # Make sure our member has the neccesary event
!             char.addevent( 'guilds.member' )
              char.resendtooltip()
              if guild.guildstone:

Index: member.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/guilds/member.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** member.py	26 May 2004 13:07:22 -0000	1.5
--- member.py	24 Aug 2004 18:10:27 -0000	1.6
***************
*** 27,34 ****
          player.deltag(tag)
  
!     events = player.events
!     while 'guilds.member' in events:
!       events.remove('guilds.member')
!     player.events = events
    else:
      # Remove voting tags just in case
--- 27,31 ----
          player.deltag(tag)
  
!     player.removeevent( 'guilds.member' )
    else:
      # Remove voting tags just in case

Index: deed.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/guilds/deed.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** deed.py	2 Apr 2004 01:06:14 -0000	1.3
--- deed.py	24 Aug 2004 18:10:27 -0000	1.4
***************
*** 28,34 ****
          guild.addmember(player)
          guild.leader = player
!         events = player.events
!         if 'guilds.member' not in events:
!           player.events = events + ['guilds.member']
  
          # Create a guildstone at the given location
--- 28,33 ----
          guild.addmember(player)
          guild.leader = player
! 
!         player.addevent( 'guilds.member' )
  
          # Create a guildstone at the given location