[wpdev-commits] xmlscripts/scripts commoditydeed.py,1.1,1.2 multideed.py,1.6,1.7 potions.py,1.5,1.6 signpost.py,1.3,1.4 yarn.py,1.2,1.3

[<dar...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv19476

Modified Files:
	commoditydeed.py multideed.py potions.py signpost.py yarn.py 
Log Message:
moved some properties from cItem to python

Index: commoditydeed.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commoditydeed.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** commoditydeed.py	28 Mar 2003 22:16:33 -0000	1.1
--- commoditydeed.py	28 Aug 2003 20:47:57 -0000	1.2
***************
*** 13,17 ****
  def onShowToolTip( sender, target, tooltip ):
  	
! 	if target.morex == 1:
  		filled( target, tooltip )
  	else:
--- 13,17 ----
  def onShowToolTip( sender, target, tooltip ):
  	
! 	if target.gettag( 'filled' ) == 1:
  		filled( target, tooltip )
  	else:
***************
*** 96,100 ****
  	deed.settag( "color", color )
  	deed.settag( "amount", amount )
! 	deed.morex = 1
  	target.item.delete()
  	char.socket.clilocmessage( 0xFF9F0, "", 0x3b2, 3 )
--- 96,100 ----
  	deed.settag( "color", color )
  	deed.settag( "amount", amount )
! 	deed.settag( "filled", 1 )
  	target.item.delete()
  	char.socket.clilocmessage( 0xFF9F0, "", 0x3b2, 3 )

Index: multideed.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/multideed.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** multideed.py	24 May 2003 20:36:14 -0000	1.6
--- multideed.py	28 Aug 2003 20:47:57 -0000	1.7
***************
*** 197,203 ****
     signpost.moveto( newpos )
     sign.moveto( newpos )
!    sign.morex = multi.serial
!    sign.morey = signpost.serial
!    #sign.morez = woodenpost.serial
     sign.events = ["signpost"]
     #woodenpost.update()
--- 197,201 ----
     signpost.moveto( newpos )
     sign.moveto( newpos )
!    sign.settag( 'house', multi.serial )
     sign.events = ["signpost"]
     #woodenpost.update()

Index: potions.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** potions.py	11 Feb 2003 21:31:19 -0000	1.5
--- potions.py	28 Aug 2003 20:47:57 -0000	1.6
***************
*** 69,73 ****
  
  	amount = 0
! 	pType = potion.more1
  	
  	# Lesser Heal
--- 69,73 ----
  
  	amount = 0
! 	pType = int( potion.gettag( "type" ) )
  	
  	# Lesser Heal
***************
*** 101,105 ****
  
  	amount = 0
! 	pType = potion.more1
  	
  	# Agility
--- 101,105 ----
  
  	amount = 0
! 	pType = int( potion.gettag( "type" ) )
  	
  	# Agility
***************
*** 127,131 ****
  
  	amount = 0
! 	pType = potion.more1
  	
  	# Strength
--- 127,131 ----
  
  	amount = 0
! 	pType = int( potion.gettag( "type" ) )
  	
  	# Strength
***************
*** 172,180 ****
  		return 1
  
! 	pType = item.more1
! 
! 	if not potions.has_key( pType ):
! 		char.socket.sysmessage( "This potion has an unknown type: %u" % pType )
! 		return 1
  	
  	potions[ pType ]( char, item )
--- 172,177 ----
  		return 1
  
! 	if not potions.has_key( int( item.gettag( "type" ) ) ):
! 		return 0
  	
  	potions[ pType ]( char, item )

Index: signpost.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/signpost.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** signpost.py	24 May 2003 20:36:14 -0000	1.3
--- signpost.py	28 Aug 2003 20:47:57 -0000	1.4
***************
*** 287,291 ****
  
  def customize( char, item ):
!    multi = wolfpack.findmulti( item.morex )
     multi.sendcustomhouse( char )
     #char.socket.sysmessage( "Multi serial : %i" % multi.serial )
--- 287,294 ----
  
  def customize( char, item ):
!    if not item.hastag( 'house' ):
!    	return
! 
!    multi = wolfpack.findmulti( int( item.gettag( 'house' ) ) )
     multi.sendcustomhouse( char )
     #char.socket.sysmessage( "Multi serial : %i" % multi.serial )

Index: yarn.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/yarn.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** yarn.py	8 Feb 2003 13:07:38 -0000	1.2
--- yarn.py	28 Aug 2003 20:47:57 -0000	1.3
***************
*** 55,63 ****
  		char.soundeffect( 0x48 )
  	
! 		if ( target.item.more1 < 5 ):
! 			target.item.more1 = target.item.more1 + 1
! 
  		else:
! 			target.item.more1 = 0
  			item_new = wolfpack.additem( "f9a" )
  			if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ):
--- 55,69 ----
  		char.soundeffect( 0x48 )
  	
! 		if target.item.hastag( 'amount' ):
! 			amount = int( target.item.gettag( 'amount' ) )
! 			
! 			if amount < 5:
! 				target.item.settag( 'amount', amount + 1 )
! 		
  		else:
! 			target.item.delete()
! 	
! 		else:
! 			target.item.settag( 'amount', 0 )
  			item_new = wolfpack.additem( "f9a" )
  			if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ):