[wpdev-commits] xmlscripts/scripts/skills mining.py,1.2,1.3

[<co...@us...>]

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

Modified Files:
	mining.py 
Log Message:
iron now is harvesting

Index: mining.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mining.py	1 Oct 2003 22:23:06 -0000	1.2
--- mining.py	2 Oct 2003 13:50:51 -0000	1.3
***************
*** 20,32 ****
  oretable = \
  {
! 'iron':		[ 0,   0, 100, 1007072, 0x19b9,     0, 49.6, 0  ],
! 'dullcopper':	[ 65, 25, 105, 1007073, 0x19b9, 0x973, 11.2, 50 ],
! 'shadowiron':	[ 70, 30, 110, 1007074, 0x19b9, 0x966,  9.8, 50 ], 
! 'copper':	[ 75, 35, 115, 1007075, 0x19b9, 0x960,  8.4, 50 ],
! 'bronze':	[ 80, 40, 120, 1007076, 0x19b9, 0x972,    7, 50 ],
! 'gold':		[ 85, 45, 125, 1007077, 0x19b9, 0x8a5,  5.6, 50 ],
! 'agapite':	[ 90, 50, 130, 1007078, 0x19b9, 0x979,  4.2, 50 ],
! 'verite':	[ 95, 55, 135, 1007079, 0x19b9, 0x89f,  2.8, 50 ],
! 'valorite':	[ 99, 59, 139, 1007080, 0x19b9, 0x8ab,  1.4, 50 ]
  }
  
--- 20,32 ----
  oretable = \
  {
! 'iron':		[   0,   0, 1000, 1007072, 0x19b9,     0, 49.6,  0 ],
! 'dullcopper':	[ 650, 250, 1050, 1007073, 0x19b9, 0x973, 11.2, 50 ],
! 'shadowiron':	[ 700, 300, 1100, 1007074, 0x19b9, 0x966,  9.8, 50 ], 
! 'copper':	[ 750, 350, 1150, 1007075, 0x19b9, 0x960,  8.4, 50 ],
! 'bronze':	[ 800, 400, 1200, 1007076, 0x19b9, 0x972,    7, 50 ],
! 'gold':		[ 850, 450, 1250, 1007077, 0x19b9, 0x8a5,  5.6, 50 ],
! 'agapite':	[ 900, 500, 1300, 1007078, 0x19b9, 0x979,  4.2, 50 ],
! 'verite':	[ 950, 550, 1350, 1007079, 0x19b9, 0x89f,  2.8, 50 ],
! 'valorite':	[ 990, 590, 1390, 1007080, 0x19b9, 0x8ab,  1.4, 50 ]
  }
  
***************
*** 34,46 ****
     socket = char.socket
  
!    if not char.hastag('mining_gem'):
!       veingem = getvein( socket, pos )
!       char.settag('mining_gem', veingem.serial )
     else:
-       gemserial = char.gettag('mining_gem')
-       veingem = wolfpack.finditem( gemserial )
-       
-    if veingem and char.distanceto( veingem ) > MINING_MAX_DISTANCE:
        veingem = getvein( socket, pos )
  
     resname = veingem.gettag( 'resname' ) # Sometimes mutated in colored ore and back
--- 34,59 ----
     socket = char.socket
  
!    if char.hastag( 'mining_gem' ):
!       veingem = wolfpack.finditem( char.gettag( 'mining_gem' ) )
!       if not veingem:
!          veingem = getvein( socket, pos )
!          if not veingem:
!             char.deltag( 'mining_gem' )
!             return OOPS
     else:
        veingem = getvein( socket, pos )
+       if not veingem:
+          return OOPS
+       else:
+          char.settag( 'mining_gem', veingem.serial )
+ 
+    if char.distanceto( veingem ) > MINING_MAX_DISTANCE:
+       veingem = getvein( socket, pos )
+ 
+    if not veingem:
+       return OOPS
+ 
+    if not veingem.hastag( 'resname' ) or not veingem.hastag( 'resourcecount' ):
+       return OOPS
  
     resname = veingem.gettag( 'resname' ) # Sometimes mutated in colored ore and back
***************
*** 48,51 ****
--- 61,65 ----
     reqskill = oretable[ resname ][ REQSKILL ]
  
+    success = 0
     # Are you skilled enough ? And here is ore ?
     if resourcecount > 2 and char.skill[ MINING ] > reqskill:
***************
*** 53,62 ****
        if char.skill[ MINING ] > reqskill:
           if whrandom.randint( oretable[ resname ][ MINSKILL ], oretable[ resname ][ MAXSKILL ] ) < char.skill[ MINING ]:
!             skills.successharvest( char, veingem, oretable, resname, 1 ) # 1 - amount of ore
!          else:
!             socket.clilocmessage( 501869, "", YELLOW, NORMAL ) # You loosen some rocks but fail to find any usable ore.
!       else:
!          socket.clilocmessage( 501869, "", YELLOW, NORMAL ) # You loosen some rocks but fail to find any usable ore.
!    else:
        socket.clilocmessage( 501869, "", YELLOW, NORMAL ) # You loosen some rocks but fail to find any usable ore.
        
--- 67,75 ----
        if char.skill[ MINING ] > reqskill:
           if whrandom.randint( oretable[ resname ][ MINSKILL ], oretable[ resname ][ MAXSKILL ] ) < char.skill[ MINING ]:
!             if whrandom.random() < 0.5:
!                success = 1
!                skills.successharvest( char, veingem, oretable, resname, 1 ) # 1 - amount of ore
! 
!    if success == 0:
        socket.clilocmessage( 501869, "", YELLOW, NORMAL ) # You loosen some rocks but fail to find any usable ore.
        
***************
*** 73,77 ****
        gem.settag( 'resname', 'iron' )
        gem.moveto( pos )
!       gem.visible = 1
        gem.update()
        return gem
--- 86,90 ----
        gem.settag( 'resname', 'iron' )
        gem.moveto( pos )
!       gem.visible = 0
        gem.update()
        return gem