[wpdev-commits] xmlscripts/scripts/commands addtree.py,1.7,1.8

[Richard M. <dr...@us...>]

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

Modified Files:
	addtree.py 
Log Message:
This works a bit better


Index: addtree.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/addtree.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** addtree.py	6 Aug 2004 02:25:43 -0000	1.7
--- addtree.py	14 Aug 2004 05:45:33 -0000	1.8
***************
*** 248,252 ****
  			randomtrees = [ randint(0,2), randint(0,12), randint(2,12), randint(0,20), randint(13,15), randint(16,20) ]
  			item = treeindex[ randomtrees[ randint( 0, 5 ) ] ]
! 			if trees[ item ]:
  				if wolfpack.getdefinition( WPDT_ITEM, trees[item][TREE] ) and wolfpack.getdefinition( WPDT_ITEM, trees[item][LEAVES] ):
  					socket.sysmessage( "Where do you want to place the tree '%s', '%s' ?" % ( trees[item][TREE], trees[item][LEAVES ]) )
--- 248,252 ----
  			randomtrees = [ randint(0,2), randint(0,12), randint(2,12), randint(0,20), randint(13,15), randint(16,20) ]
  			item = treeindex[ randomtrees[ randint( 0, 5 ) ] ]
! 			if item in trees:
  				if wolfpack.getdefinition( WPDT_ITEM, trees[item][TREE] ) and wolfpack.getdefinition( WPDT_ITEM, trees[item][LEAVES] ):
  					socket.sysmessage( "Where do you want to place the tree '%s', '%s' ?" % ( trees[item][TREE], trees[item][LEAVES ]) )
***************
*** 257,265 ****
  			socket.attachitemtarget( 'commands.addtree.createyewtree', yewindex, 0, 0, 0, [] )
  			return
! 		elif trees[item] and ( item not in jungletreeindex ):
  			if wolfpack.getdefinition( WPDT_ITEM, trees[item][TREE] ) and wolfpack.getdefinition( WPDT_ITEM, trees[item][LEAVES] ):
  				socket.sysmessage( "Where do you want to place the tree '%s', '%s' ?" % ( trees[item][TREE], trees[item][LEAVES]) )
  				socket.attachtarget( 'commands.addtree.createtree', [ item ] )
! 		elif item in jungletreeindex and jungleindex[item]:
  			socket.sysmessage( "Where do you want to place the jungle tree [%s]?" %( item ) )
  			socket.attachtarget(  'commands.addtree.createjungletree', [ item ] )
--- 257,265 ----
  			socket.attachitemtarget( 'commands.addtree.createyewtree', yewindex, 0, 0, 0, [] )
  			return
! 		elif item in trees and not item in jungletreeindex:
  			if wolfpack.getdefinition( WPDT_ITEM, trees[item][TREE] ) and wolfpack.getdefinition( WPDT_ITEM, trees[item][LEAVES] ):
  				socket.sysmessage( "Where do you want to place the tree '%s', '%s' ?" % ( trees[item][TREE], trees[item][LEAVES]) )
  				socket.attachtarget( 'commands.addtree.createtree', [ item ] )
! 		elif item in jungletreeindex and item in jungleindex:
  			socket.sysmessage( "Where do you want to place the jungle tree [%s]?" %( item ) )
  			socket.attachtarget(  'commands.addtree.createjungletree', [ item ] )