[wpdev-commits] xmlscripts/scripts/commands adddecor.py,1.4,1.5

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

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

Modified Files:
	adddecor.py 
Log Message:
Updates


Index: adddecor.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/adddecor.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** adddecor.py	16 Aug 2004 01:43:43 -0000	1.4
--- adddecor.py	17 Aug 2004 19:30:46 -0000	1.5
***************
*** 66,79 ****
  
  forest_decor = [
- 	'c84', # Foxglove Flowers
- 	'c85', # Orfluer Flowers
- 	'c87', # Champion Flowers
- 	'c88', # Snowdrops
- 	'c89', # Champion Flowers
- 	'c8a', # Foxglove Flowers
- 	'c8b', # White Flowers
- 	'c8c', # White Flowers
- 	'cdd', # White Poppies
- 	'c8e', # Snowdrops
  	'cac', # Grasses
  	'cad', # Grasses
--- 66,69 ----
***************
*** 87,112 ****
  	'cb5', # Grasses
  	'cb6', # Grasses
- 	'cb7', # Cattails
- 	'cb8', # Cattails
- 	'cb9', # Grasses
- 	'cba', # Grasses
- 	'cbe', # Poppies
- 	'cbf', # Poppies
- 	'cc0', # Orfluer Flowers
- 	'cc1', # Orfluer Flowers
- 	'cc3', # Muck
  	'cc5', # Grasses
  	'cc6', # Grasses
! 	'cc7', # Weed
! 	'cc8', # Juniper Bush
! 	'cc9', # Spider Tree
! 	'd3f', # Brambles
! 	'd40', # Brambles
! 	'c9e', # O'hii Tree
! 	'd29', # Flowers
! 	'd2b', # Flowers
! 	'd2d', # Flowers
! 	'd36', # Flowers
! 	'd2f' # Flowers
  ]
  plains_decor = [
--- 77,83 ----
  	'cb5', # Grasses
  	'cb6', # Grasses
  	'cc5', # Grasses
  	'cc6', # Grasses
! 	'cc7' # Weed
  ]
  plains_decor = [
***************
*** 144,153 ****
  	'cc6', # Grasses
  	'cc7', # Weed
! 	'c9e', # O'hii Tree
! 	'd29', # Flowers
! 	'd2b', # Flowers
! 	'd2d', # Flowers
! 	'd36', # Flowers
! 	'd2f' # Flowers
  ]
  desert_decor = [
--- 115,119 ----
  	'cc6', # Grasses
  	'cc7', # Weed
! 	'c9e' # O'hii Tree
  ]
  desert_decor = [
***************
*** 241,244 ****
--- 207,245 ----
  	'cc5' # Grasses
  ]
+ flowers_decor = [
+ 	'c37', 'c38', 'c45', 'c46', 'c47', 'c48', 'c49', 'c4a', 'c4b', 'c4c', 'c4d', 'c4e', # Small Flowers
+ 	'c84', # Foxglove Flowers
+ 	'c85', # Orfluer Flowers
+ 	'c87', # Champion Flowers
+ 	'c88', # Snowdrops
+ 	'c89', # Champion Flowers
+ 	'c8a', # Foxglove Flowers
+ 	'c8b', # White Flowers
+ 	'c8c', # White Flowers
+ 	'c8d', # White Popies
+ 	'c8e', # Snowdrops
+ 	'cbe', # Poppies
+ 	'cbf', # Poppies
+ 	'cc0', # Orfluer Flowers
+ 	'cc1' # Orfluer Flowers
+ ]
+ smallflowers_decor = [ 'c37', 'c38', 'c45', 'c46', 'c47', 'c48', 'c49', 'c4a', 'c4b', 'c4c', 'c4d', 'c4e' ]
+ 
+ bigflowers_decor = [
+ 	'c84', # Foxglove Flowers
+ 	'c85', # Orfluer Flowers
+ 	'c87', # Champion Flowers
+ 	'c88', # Snowdrops
+ 	'c89', # Champion Flowers
+ 	'c8a', # Foxglove Flowers
+ 	'c8b', # White Flowers
+ 	'c8c', # White Flowers
+ 	'c8d', # White Popies
+ 	'c8e', # Snowdrops
+ 	'cbe', # Poppies
+ 	'cbf', # Poppies
+ 	'cc0', # Orfluer Flowers
+ 	'cc1' # Orfluer Flowers
+ ]
  
  # Constants
***************
*** 545,548 ****
--- 546,550 ----
  				# Tree Logs log1, log2
  				elif value in [ 'log1', 'log2' ]: #added by Jim 20040814
+ 					item = value
  					socket.sysmessage( "Where do you want to place the fallen log [%s]?" % ( item ) )
  					socket.attachtarget( 'commands.adddecor.createlog', [ item ] )
***************
*** 644,647 ****
--- 646,669 ----
  					socket.attachtarget( 'commands.adddecor.createground', [ item ] )
  					return True
+ 				# Random Ground Flowers
+ 				elif value in [ "flowers", "smallflowers", "bigflowers" ]:
+ 					if value == "flowers":
+ 						flowers = flowers_decor
+ 					elif value == "smallflowers":
+ 						flowers = smallflowers_decor
+ 					elif value == "bigflowers":
+ 						flowers = bigflowers_decor
+ 					if socket.hastag( 'last_ground_flowers' ):
+ 						templist = []
+ 						for choice in flowers:
+ 							if choice != str( socket.gettag( 'last_ground_flowers' ) ):
+ 								templist += [ choice ]
+ 						item = random.choice( templist )
+ 						socket.settag( 'last_ground_flowers', str( item ) )
+ 					else:
+ 						item = random.choice( flowers )
+ 						socket.settag( 'last_ground_flowers', str( item ) )
+ 					socket.attachtarget( 'commands.adddecor.createground', [ item ] )
+ 					return True
  				# Nothing
  				else: