|
From: Richard M. <dr...@us...> - 2004-07-21 14:20:50
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31896/commands Modified Files: import.py info.py turnitem.py Log Message: Rest of the .magic cleanups Index: info.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/info.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** info.py 17 Jul 2004 12:29:07 -0000 1.12 --- info.py 21 Jul 2004 14:20:41 -0000 1.13 *************** *** 828,832 **** gump.addText( 113, 400, "Movable:", 0x834 ) gump.addResizeGump( 280, 400, 0xBB8, 215, 20 ) ! gump.addInputField( 284, 400, 200, 16, 0x834, 13, unicode( item.magic ) ) # next page --- 828,832 ---- gump.addText( 113, 400, "Movable:", 0x834 ) gump.addResizeGump( 280, 400, 0xBB8, 215, 20 ) ! gump.addInputField( 284, 400, 200, 16, 0x834, 13, unicode( item.movable ) ) # next page *************** *** 1090,1096 **** elif key == 12: item.newbie = int( hex2dec( textentries[ key ] ) ) ! elif key == 13: ! # this should be .movable :P ! item.magic = int( hex2dec( textentries[ key ] ) ) elif key == 14: item.visible = int( hex2dec( textentries[ key ] ) ) --- 1090,1095 ---- elif key == 12: item.newbie = int( hex2dec( textentries[ key ] ) ) ! elif key == 13 ! item.movable = int( hex2dec( textentries[ key ] ) ) elif key == 14: item.visible = int( hex2dec( textentries[ key ] ) ) Index: import.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/import.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** import.py 20 Jun 2004 18:51:42 -0000 1.7 --- import.py 21 Jul 2004 14:20:41 -0000 1.8 *************** *** 210,214 **** item = wolfpack.newitem(1) item.decay = 0 ! item.magic = 2 item.id = itemid item.color = color --- 210,214 ---- item = wolfpack.newitem(1) item.decay = 0 ! item.movable = 2 item.id = itemid item.color = color Index: turnitem.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/turnitem.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** turnitem.py 26 May 2004 13:07:21 -0000 1.2 --- turnitem.py 21 Jul 2004 14:20:41 -0000 1.3 *************** *** 142,146 **** socket.sysmessage("You must target an item!") return 1 ! if finditem.magic != 1: socket.sysmessage("This object is not movable by you!") return 1 --- 142,146 ---- socket.sysmessage("You must target an item!") return 1 ! if ( finditem.movable != 1 ) or ( finditem.movable == 1 and finditem.owner != char.serial ): socket.sysmessage("This object is not movable by you!") return 1 |
