wpdev-commits — Wolfpack CVS commit info

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.77,1.78

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

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25097/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
12.9.11

Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** ChangeLog.wolfpack	9 Sep 2004 17:28:18 -0000	1.77
--- ChangeLog.wolfpack	9 Sep 2004 22:19:04 -0000	1.78
***************
*** 1,6 ****
! Wolfpack 13.0.0 ChangeLog
  
! Wolfpack 12.9.10 Beta (CVS)
! 	* Core Changes:
  	* Definition Changes:
  		- Added random speech for lizardmen, ratmen and orcs.
--- 1,23 ----
! Wolfpack ChangeLog
  
! Wolfpack 12.9.11 Beta (CVS)
! 	* Definition Changes:
! 	* Python Script Changes:
! 	* Misc. Changes:
! 	* Known Issues, Bugs, and Missing Features:
! 		- Some skills are still incomplete.
! 		- Spawn regions are incomplete.
! 			We welcome donated OSI-like spawn scripts!
! 		- Town/World regions are incomplete.
! 			We welcome donated OSI-like region scripts!
! 		- Teleport Scripts are incomplete.
! 			We welcome donated OSI-like teleport scripts!
! 		- Possible that a few monsters are missing and/or incomplete.
! 		- Reloading Python too many times can crash the server.
! 		- There are still some memory leaks.
! 		- Large gumps can potentially crash remote clients.
! 		- Multis (Houses/Boats) are not currently supported.
! 
! Wolfpack 12.9.10 Beta (10. September 2004)
  	* Definition Changes:
  		- Added random speech for lizardmen, ratmen and orcs.

[wpdev-commits] xmlscripts/scripts/skills animaltaming.py,1.17,1.18

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

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

Modified Files:
	animaltaming.py 
Log Message:
Bugfixes.

Index: animaltaming.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/animaltaming.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** animaltaming.py	25 Aug 2004 17:03:05 -0000	1.17
--- animaltaming.py	9 Sep 2004 17:28:11 -0000	1.18
***************
*** 75,78 ****
--- 75,83 ----
  		return
  
+ 	# Too Many Followers
+ 	if len(char.followers) + totame.controlslots > char.maxcontrolslots:
+ 		socket.clilocmessage( 1049611, "", 0x3b2, 3, totame )
+ 		return
+ 
  	# already tamed
  	if totame.tamed:
***************
*** 170,184 ****
  		if success:
  			removetags( totame )
  			# set owner
! 			totame.tamed = 1
  			totame.owner = char
! 			# increase follower control slot - will be added
! 			# set tamed number
  			num_tamed = 1
  			if totame.hastag( 'num_tamed' ):
  				num_tamed = totame.gettag( 'num_tamed' ) + 1
  			totame.settag( 'num_tamed', num_tamed )
  			# remove "Tame" context menu
! 			totame.addscript('speech.pets')
  
  			# success msg : 502799
--- 175,196 ----
  		if success:
  			removetags( totame )
+ 
+ 			# Too Many Followers
+ 			if len(char.followers) + totame.controlslots > char.maxcontrolslots:
+ 				socket.clilocmessage( 1049611, "", 0x3b2, 3, totame )
+ 				return
+ 
  			# set owner
! 			totame.tamed = True
  			totame.owner = char
! 
! 			# A creature can only be tamed a few times
  			num_tamed = 1
  			if totame.hastag( 'num_tamed' ):
  				num_tamed = totame.gettag( 'num_tamed' ) + 1
  			totame.settag( 'num_tamed', num_tamed )
+ 			
  			# remove "Tame" context menu
! 			totame.addscript('speech.pets') # Only adds if it doesnt exist yet.
  
  			# success msg : 502799

[wpdev-commits] xmlscripts/scripts/magic circle5.py,1.21,1.22 circle8.py,1.14,1.15

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

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

Modified Files:
	circle5.py circle8.py 
Log Message:
Bugfixes.

Index: circle8.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle8.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** circle8.py	7 Sep 2004 00:31:05 -0000	1.14
--- circle8.py	9 Sep 2004 17:28:11 -0000	1.15
***************
*** 115,119 ****
  
  		# Lowest controlslots we see is 2, Earth Elemental
! 		if char.player and char.controlslots + 2 > 5:
  			char.socket.clilocmessage(1049645)
  			return
--- 115,119 ----
  
  		# Lowest controlslots we see is 2, Earth Elemental
! 		if char.player and char.controlslots + 2 > char.maxcontrolslots:
  			char.socket.clilocmessage(1049645)
  			return
***************
*** 124,135 ****
  		creature = wolfpack.addnpc(self.elementid, target)
  		# If the creature is out of our control, delete it.
! 		if char.player and char.controlslots + creature.controlslots > 5:
  			creature.delete()
  			char.socket.clilocmessage(1049645)
  		else:
! 			creature.addscript('speech.pets')
  			creature.owner = char
  			creature.summontime = wolfpack.time.currenttime() + 120000
! 			creature.summoned = 1
  			creature.soundeffect(0x217)
  
--- 124,136 ----
  		creature = wolfpack.addnpc(self.elementid, target)
  		# If the creature is out of our control, delete it.
! 		if char.player and char.controlslots + creature.controlslots > char.maxcontrolslots:
  			creature.delete()
  			char.socket.clilocmessage(1049645)
  		else:
! 			creature.addscript('speech.pets') # This only adds if it has the event anyway
  			creature.owner = char
+ 			creature.tamed = True
  			creature.summontime = wolfpack.time.currenttime() + 120000
! 			creature.summoned = True
  			creature.soundeffect(0x217)
  

Index: circle5.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle5.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** circle5.py	7 Sep 2004 20:09:52 -0000	1.21
--- circle5.py	9 Sep 2004 17:28:11 -0000	1.22
***************
*** 324,328 ****
  
  	def cast(self, char, mode, args=[], target=None, item=None):
! 		if char.player and char.controlslots + 1 > 5:
  			if char.socket:
  				char.socket.clilocmessage(1049645)
--- 324,328 ----
  
  	def cast(self, char, mode, args=[], target=None, item=None):
! 		if char.player and char.controlslots + 1 > char.maxcontrolslots:
  			if char.socket:
  				char.socket.clilocmessage(1049645)
***************
*** 333,337 ****
  		char.turnto(target)
  
! 		if char.player and char.controlslots + 1 > 5:
  			if char.socket:
  				char.socket.clilocmessage(1049645)
--- 333,337 ----
  		char.turnto(target)
  
! 		if char.player and char.controlslots + 1 > char.maxcontrolslots:
  			if char.socket:
  				char.socket.clilocmessage(1049645)
***************
*** 352,364 ****
  		creature = wolfpack.addnpc(npcid, target)
  		# If the creature is out of our control, delete it.
! 		if creature.controlslots + char.controlslots > 5:
  			creature.delete()
  			char.socket.clilocmessage(1049645)
  		else:
! 			creature.tamed = 1
! 			creature.addscript('speech.pets')
  			creature.owner = char
  			creature.summontime = wolfpack.time.servertime() + int(char.skill[MAGERY] * 400)
! 			creature.summoned = 1
  			creature.ai = "Animal_Domestic"
  			creature.soundeffect(0x215)
--- 352,364 ----
  		creature = wolfpack.addnpc(npcid, target)
  		# If the creature is out of our control, delete it.
! 		if creature.controlslots + char.controlslots > char.maxcontrolslots:
  			creature.delete()
  			char.socket.clilocmessage(1049645)
  		else:
! 			creature.tamed = True
! 			creature.addscript('speech.pets') # This only adds if NPC doesnt have it anyway
  			creature.owner = char
  			creature.summontime = wolfpack.time.servertime() + int(char.skill[MAGERY] * 400)
! 			creature.summoned = True
  			creature.ai = "Animal_Domestic"
  			creature.soundeffect(0x215)

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.76,1.77

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

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28215/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
Bugfixes.

Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** ChangeLog.wolfpack	9 Sep 2004 17:27:18 -0000	1.76
--- ChangeLog.wolfpack	9 Sep 2004 17:28:18 -0000	1.77
***************
*** 41,44 ****
--- 41,46 ----
  		- New commands: kick, ban, unban.
  		- Fixed bug #0000280. (Tooltip not being resent in wolfpack.utilities.tocontainer)
+ 		- Summoning spells and the animal taming skill now take the player.maxcontrolslots property
+ 		  into account.
  	* Misc. Changes:
  		- Fixed bug #0000279. (Memory leak in the npc preview of the gm tool)

[wpdev-commits] xmlscripts/scripts/contextmenus petmenu.py,1.7,1.8

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

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

Modified Files:
	petmenu.py 
Log Message:
Bugfixes.

Index: petmenu.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/contextmenus/petmenu.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** petmenu.py	25 Aug 2004 17:03:04 -0000	1.7
--- petmenu.py	9 Sep 2004 17:28:11 -0000	1.8
***************
*** 14,18 ****
  		return 0
  	
! 	return object.owner == player
  
  def onContextEntry(char, target, tag):
--- 14,18 ----
  		return 0
  	
! 	return (object.owner == player) or player.gm
  
  def onContextEntry(char, target, tag):
***************
*** 20,24 ****
  		return 0
  
! 	if target.owner != char or not target.tamed:
  		return 0
  
--- 20,24 ----
  		return 0
  
! 	if (not char.gm and target.owner != char) or not target.tamed:
  		return 0
  

[wpdev-commits] xmlscripts/scripts/wolfpack utilities.py,1.66,1.67

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

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

Modified Files:
	utilities.py 
Log Message:
Bugfixes.

Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/utilities.py,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** utilities.py	7 Sep 2004 23:43:03 -0000	1.66
--- utilities.py	9 Sep 2004 17:28:12 -0000	1.67
***************
*** 144,147 ****
--- 144,148 ----
  				content.amount = content.amount + item.amount
  				content.update()
+ 				content.resendtooltip()
  				item.delete()
  				return 1 # Stacked

[wpdev-commits] xmlscripts/scripts/speech pets.py,1.16,1.17

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

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

Modified Files:
	pets.py 
Log Message:
Bugfixes.

Index: pets.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/speech/pets.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** pets.py	31 Aug 2004 00:55:25 -0000	1.16
--- pets.py	9 Sep 2004 17:28:12 -0000	1.17
***************
*** 25,29 ****
  		for follower in char.followers:
  			come(char, follower, 0)
! 	elif pet and pet.owner == char and pet.distanceto(char) < 18:
  		stopfight(pet)
  		pet.guarding = None
--- 25,29 ----
  		for follower in char.followers:
  			come(char, follower, 0)
! 	elif pet and (pet.owner == char or char.gm) and pet.distanceto(char) < 18:
  		stopfight(pet)
  		pet.guarding = None
***************
*** 35,39 ****
  		for follower in char.followers:
  			stop(char, follower, 0)
! 	elif pet and pet.owner == char and pet.distanceto(char) < 18:
  		stopfight(pet)
  		pet.guarding = None
--- 35,39 ----
  		for follower in char.followers:
  			stop(char, follower, 0)
! 	elif pet and (pet.owner == char or char.gm) and pet.distanceto(char) < 18:
  		stopfight(pet)
  		pet.guarding = None
***************
*** 45,49 ****
  		for follower in char.followers:
  			follow_me(char, follower, 0)
! 	if pet and pet.owner == char and pet.distanceto(char) < 18:
  		stopfight(pet)
  		pet.follow(char)
--- 45,49 ----
  		for follower in char.followers:
  			follow_me(char, follower, 0)
! 	if pet and (pet.owner == char or char.gm) and pet.distanceto(char) < 18:
  		stopfight(pet)
  		pet.follow(char)
***************
*** 57,61 ****
  	else:
  		pet = wolfpack.findchar(pet)
! 		if pet and pet.owner == char and pet.distanceto(char) < 18:
  			stopfight(pet)
  			pet.guarding = None
--- 57,61 ----
  	else:
  		pet = wolfpack.findchar(pet)
! 		if pet and (pet.owner == char or char.gm) and pet.distanceto(char) < 18:
  			stopfight(pet)
  			pet.guarding = None
***************
*** 81,85 ****
  			char.socket.sysmessage('Your pet refuses to kill itself.')
  			return
! 		if pet and pet.owner == char and pet.distanceto(char) < 18:
  			startfight(pet, target.char)
  			pet.fight(target.char)
--- 81,85 ----
  			char.socket.sysmessage('Your pet refuses to kill itself.')
  			return
! 		if pet and (pet.owner == char or char.gm) and pet.distanceto(char) < 18:
  			startfight(pet, target.char)
  			pet.fight(target.char)
***************
*** 104,116 ****
  	pet = wolfpack.findchar(arguments[0])
  
! 	if not pet:
! 		return
! 
! 	if len(target.char.followers) + pet.controlslots > 5:
! 		char.socket.sysmessage('Your target already controls too many pets.')
! 		return
! 
! 	if pet.owner == char:
  		pet.owner = target.char
  		pet.sound(SND_ATTACK)
  		char.socket.sysmessage('You transfer your pet to %s.' % target.char.name)
--- 104,117 ----
  	pet = wolfpack.findchar(arguments[0])
  
! 	if pet and (pet.owner == char or char.gm):
! 		if len(target.char.followers) + pet.controlslots > target.char.maxcontrolslots:
! 			char.socket.sysmessage('Your target already controls too many pets.')
! 			return
! 	
  		pet.owner = target.char
+ 		# Tame during transfer if gm
+ 		if char.gm and not pet.tamed:
+ 			pet.tamed = True
+ 			pet.resendtooltip()
  		pet.sound(SND_ATTACK)
  		char.socket.sysmessage('You transfer your pet to %s.' % target.char.name)
***************
*** 133,137 ****
  		for follower in char.followers:
  			go_target(char, [follower.serial, 0], target)
! 	elif pet and pet.owner == char and pet.distanceto(char) < 18:
  		#char.socket.sysmessage('Pet following:' + str(target.char.serial))
  		pet.guarding = None
--- 134,138 ----
  		for follower in char.followers:
  			go_target(char, [follower.serial, 0], target)
! 	elif pet and (pet.owner == char or char.gm) and pet.distanceto(char) < 18:
  		#char.socket.sysmessage('Pet following:' + str(target.char.serial))
  		pet.guarding = None
***************
*** 154,162 ****
  	pet.owner = None
  	if pet.tamed:
! 		pet.tamed = 0
  	pet.sound(SND_ATTACK)
  
- 	pet.removescript('speech.pets')
- 
  def onSpeech(pet, char, text, keywords):
  	if not char.socket:
--- 155,162 ----
  	pet.owner = None
  	if pet.tamed:
! 		pet.tamed = False
! 	pet.removescript('speech.pets') # Remove this script if it was added dynamically
  	pet.sound(SND_ATTACK)
  
  def onSpeech(pet, char, text, keywords):
  	if not char.socket:

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.75,1.76

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

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27967/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
Bugfixes.

Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** ChangeLog.wolfpack	9 Sep 2004 04:32:51 -0000	1.75
--- ChangeLog.wolfpack	9 Sep 2004 17:27:18 -0000	1.76
***************
*** 40,44 ****
--- 40,46 ----
  		  Remove should only delete player characters under the player acl.
  		- New commands: kick, ban, unban.
+ 		- Fixed bug #0000280. (Tooltip not being resent in wolfpack.utilities.tocontainer)
  	* Misc. Changes:
+ 		- Fixed bug #0000279. (Memory leak in the npc preview of the gm tool)
  	* Known Issues, Bugs, and Missing Features:
  		- Some skills are still incomplete.

[wpdev-commits] xmlscripts/definitions/system bodyinfo.xml,NONE,1.1

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

Update of /cvsroot/wpdev/xmlscripts/definitions/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2381/system

Added Files:
	bodyinfo.xml 
Log Message:
Creature sounds are back!

--- NEW FILE: bodyinfo.xml ---
<!--
/*=========================================================
 *   )      (\_     | WOLFPACK 13.0.0 Scripts
 *  ((    _/{  "-;  |
 *   )).-' {{ ;'`   |
 *  ( (  ;._ \\     |
 *=======================================================*/
-->
<bodyinfo>
	<!--
		BASESOUND:
			Offset of the sounds for the soundmode list below
			
		SOUNDMODE:
			2: No GetHit sound, No Idle sound
			3: No Idle sound
			4: Only First Sound (Attack)

		FLAGS:
			0x01: Creature can Fly
			0x02: Anti-Blink (Creature is Missing Animation #4)
      		0x04: Creature has no corpse

		FIGURINE:
			Item id for the animal in shrinked form (numeric!)
	-->
	<body id="0x1" basesound="0x1ab" figurine="0x20df" />
	<body id="0x2" basesound="0x16f" figurine="0x20d8" />
	<body id="0x3" basesound="0x1d7" figurine="0x20ec" />
	<body id="0x4" basesound="0x174" figurine="0x20d9" flags="0x1" />
	<body id="0x5" basesound="0x8f" figurine="0x20f2" flags="0x3" />
	<body id="0x6" basesound="0x7d" figurine="0x20ee" soundmode="1" flags="0x1" />
	<body id="0x7" basesound="0x1b0" figurine="0x20e0" />
	<body id="0x8" basesound="0x1ba" figurine="0x20d2" soundmode="3" />
	<body id="0x9" basesound="0x165" figurine="0x20d3" flags="0x1" />
	<body id="0xa" basesound="0x165" figurine="0x20d3" flags="0x1" />
	<body id="0xb" basesound="0x183" figurine="0x20fd" />
	<body id="0xc" basesound="0x16a" figurine="0x20d6" flags="0x1" />
	<body id="0xd" basesound="0x107" figurine="0x20ed" flags="0x04"/>
	<body id="0xe" basesound="0x10c" figurine="0x20d7"/>
	<body id="0xf" basesound="0x111" figurine="0x20f3" flags="0x04"/>
	<body id="0x10" basesound="0x116" figurine="0x210b" flags="0x04"/>
	<body id="0x11" basesound="0x1b0" figurine="0x20e0" />
	<body id="0x12" basesound="0x16f" figurine="0x20d8" />
	<body id="0x13" basesound="0x183" figurine="0x20fd" />
	<body id="0x14" basesound="0x388" figurine="0x20fd" />
	<body id="0x15" basesound="0xdb" figurine="0x20fe" />
	<body id="0x16" basesound="0x179" figurine="0x20ea" />
	<body id="0x17" basesound="0xe5" figurine="0x211c" />
	<body id="0x18" basesound="0x19c" figurine="0x20f8" />
	<body id="0x19" basesound="0xe5" figurine="0x211c" />
	<body id="0x1a" basesound="0x17e" figurine="0x2109" />
	<body id="0x1b" basesound="0xe5" figurine="0x211c" />
	<body id="0x1c" basesound="0x183" figurine="0x20fd" />
	<body id="0x1d" basesound="0x9e" figurine="0x20f5" />
	<body id="0x1e" basesound="0x192" figurine="0x20dc" />
	<body id="0x1f" basesound="0x197" figurine="0x210a" />
	<body id="0x21" basesound="0x1a1" figurine="0x20de" />
	<body id="0x22" basesound="0xe5" figurine="0x211c" />
	<body id="0x23" basesound="0x1a1" figurine="0x20de" />
	<body id="0x24" basesound="0x1a1" figurine="0x20de" />
	<body id="0x25" basesound="0xe5" figurine="0x211c" />
	<body id="0x26" basesound="0x2b8" figurine="0x2585" flags="0x1" />
	<body id="0x27" basesound="0x1a6" figurine="0x20f9" flags="0x1" />
	<body id="0x28" basesound="0x2b8" figurine="0x2586" flags="0x1" />
	<body id="0x29" basesound="0x1b0" figurine="0x20e0" />
	<body id="0x2a" basesound="0x1b5" figurine="0x20e3" />
	<body id="0x2b" basesound="0x2b8" figurine="0x2587" flags="0x1" />
	<body id="0x2c" basesound="0x1b5" figurine="0x20e3" />
	<body id="0x2d" basesound="0x1b5" figurine="0x20e3" />
	<body id="0x2e" basesound="0x16a" figurine="0x2104" flags="0x1" />
	<body id="0x2f" basesound="0x1ba" figurine="0x20fa" />
	<body id="0x30" basesound="0x18d" figurine="0x20e4" />
	<body id="0x31" basesound="0x16a" figurine="0x2104" flags="0x1" />
	<body id="0x32" basesound="0x1c4" figurine="0x20e7" />
	<body id="0x33" basesound="0x1c8" figurine="0x20e8" />
	<body id="0x34" basesound="0xdb" figurine="0x20fc" />
	<body id="0x35" basesound="0x1cd" figurine="0x20e9" />
	<body id="0x36" basesound="0x1cd" figurine="0x20e9" />
	<body id="0x37" basesound="0x1cd" figurine="0x20e9" />
	<body id="0x38" basesound="0x1c4" figurine="0x20e7" />
	<body id="0x39" basesound="0x1c4" figurine="0x20e7" />
	<body id="0x3a" basesound="0x1d2" figurine="0x2100" />
	<body id="0x3b" basesound="0x16a" figurine="0x20d6" flags="0x1" />
	<body id="0x3c" basesound="0x16a" figurine="0x20d6" flags="0x1" />
	<body id="0x3d" basesound="0x16a" figurine="0x20d6" flags="0x1" />
	<body id="0x3e" basesound="0x16a" figurine="0x25d4" flags="0x1" />
	<body id="0x3f" basesound="0x73" figurine="0x2583" />
	<body id="0x40" basesound="0x73" figurine="0x25a3" />
	<body id="0x41" basesound="0x73" figurine="0x25a3" />
	<body id="0x42" basesound="0x27f" figurine="0x25c8" />
	<body id="0x43" basesound="0x174" figurine="0x258e" />
	<body id="0x44" basesound="0x179" figurine="0x258f" />
	<body id="0x45" basesound="0x36b" figurine="0x20f4" />
	<body id="0x46" basesound="0x24e" figurine="0x25c9" />
	<body id="0x47" basesound="0x24e" figurine="0x25ca" />
	<body id="0x48" basesound="0x258" figurine="0x25cb" />
	<body id="0x49" basesound="0x192" figurine="0x2594" flags="0x1" />
	<body id="0x4a" basesound="0x3bf" figurine="0x259f" flags="0x1" />
	<body id="0x4b" basesound="0x25c" figurine="0x212d" />
	<body id="0x4c" basesound="0x261" figurine="0x25cd" />
	<body id="0x4d" basesound="0x44c" figurine="0x25a2" />
	<body id="0x4e" basesound="0x19c" figurine="0x20f8" />
	<body id="0x4f" basesound="0x1a1" figurine="0x20f8" />
	<body id="0x50" basesound="0x35a" figurine="0x212f" />
	<body id="0x51" basesound="0x35f" figurine="0x2130" />
	<body id="0x52" basesound="0x1a1" figurine="0x20f8" />
	<body id="0x53" basesound="0x1ab" figurine="0x20cb" />
	<body id="0x54" basesound="0x1ab" figurine="0x20cb" />
	<body id="0x55" basesound="0x280" figurine="0x25ab" />
	<body id="0x56" basesound="0x27b" figurine="0x25ac" />
	<body id="0x57" basesound="0x285" figurine="0x25ad" />
	<body id="0x58" basesound="0x99" figurine="0x2580" />
	<body id="0x59" basesound="0x183" figurine="0x25c0" />
	<body id="0x5a" basesound="0x183" figurine="0x25c1" />
	<body id="0x5b" basesound="0x388" figurine="0x25c2" />
	<body id="0x5c" basesound="0x388" figurine="0x25c2" />
	<body id="0x5d" basesound="0x388" figurine="0x25c2" />
	<body id="0x5e" basesound="0x1c8" figurine="0x20e8" />
	<body id="0x60" basesound="0x1c8" figurine="0x20e8" />
	<body id="0x61" basesound="0x85" figurine="0x2596" />
	<body id="0x62" basesound="0x85" figurine="0x2596" />
	<body id="0x63" basesound="0xe5" figurine="0x25cf" />
	<body id="0x64" basesound="0xe5" figurine="0x25cf" />
	<body id="0x65" basesound="0x2a7" figurine="0x2581" />
	<body id="0x66" basesound="0x300" figurine="0x2105" flags="0x1" />
	<body id="0x67" basesound="0x2c0" figurine="0x2593" flags="0x1" />
	<body id="0x68" basesound="0x488" figurine="0x20d6" flags="0x1" />
	<body id="0x69" basesound="0x2d2" figurine="0x20d6" flags="0x1" />
	<body id="0x6a" basesound="0x2cd" figurine="0x20d6" flags="0x1" />
	<body id="0x6b" basesound="0x10c" figurine="0x25d9" />
	<body id="0x6c" basesound="0x10c" figurine="0x25d9" />
	<body id="0x6d" basesound="0x10c" figurine="0x25d9" />
	<body id="0x6e" basesound="0x10c" figurine="0x20d7" />
	<body id="0x6f" basesound="0x10c" figurine="0x20d7" />
	<body id="0x70" basesound="0x10c" figurine="0x20d7" />
	<body id="0x71" basesound="0xa8" figurine="0x2121" />
	<body id="0x72" basesound="0xa8" figurine="0x2120" />
	<body id="0x73" basesound="0xa8" figurine="0x259c" />
	<body id="0x74" basesound="0xa8" figurine="0x259d" />
	<body id="0x75" basesound="0xa8" figurine="0x2121" />
	<body id="0x76" basesound="0xa8" figurine="0x2121" />
	<body id="0x77" basesound="0xa8" figurine="0x2121" />
	<body id="0x78" basesound="0xa8" figurine="0x2121" />
	<body id="0x79" basesound="0xa8" figurine="0x2121" />
	<body id="0x7a" basesound="0x4bc" figurine="0x25ce" />
	<body id="0x7b" basesound="0x2f5" figurine="0x2589" flags="0x1" />
	<body id="0x7c" basesound="0x24d" figurine="0x258a" />
	<body id="0x7d" basesound="0x27f" figurine="0x258b" />
	<body id="0x7e" basesound="0x257" figurine="0x258b" />
	<body id="0x7f" basesound="0x69" figurine="0x2597" />
	<body id="0x80" basesound="0x46d" figurine="0x25b6" />
	<body id="0x81" basesound="0x34e" figurine="0x25c8" />
	<body id="0x82" basesound="0x174" figurine="0x20d9" />
	<body id="0x83" basesound="0x370" figurine="0x2590" />
	<body id="0x84" basesound="0x3c5" figurine="0x25a0" />
	<body id="0x85" basesound="0x5a" figurine="0x211f" />
	<body id="0x86" basesound="0x2c7" figurine="0x25a1" flags="0x1" />
	<body id="0x87" basesound="0x1ab" figurine="0x25a8" />
	<body id="0x88" basesound="0x280" figurine="0x25a9" />
	<body id="0x89" basesound="0x27b" figurine="0x25aa" />
	<body id="0x8a" basesound="0x459" figurine="0x25b0" />
	<body id="0x8b" basesound="0x459" figurine="0x25b0" />
	<body id="0x8c" basesound="0x1ab" figurine="0x25b1" />
	<body id="0x8d" basesound="0x447" figurine="0x2106" />
	<body id="0x8e" basesound="0x1b5" figurine="0x25b7" />
	<body id="0x8f" basesound="0x1b5" figurine="0x25b7" />
	<body id="0x90" basesound="0x478" figurine="0x25ba" />
	<body id="0x91" basesound="0x3" figurine="0x20fb" />
	<body id="0x92" basesound="0x47d" figurine="0x258a" />
	<body id="0x93" basesound="0x48d" figurine="0x25bd" />
	<body id="0x94" basesound="0x48d" figurine="0x25be" />
	<body id="0x95" basesound="0x4b0" figurine="0x259f" />
	<body id="0x96" basesound="0x3" figurine="0x20fb" />
	<body id="0x97" basesound="0x8a" figurine="0x20f1" />
	<body id="0x98" basesound="0x492" figurine="0x25ca" />
	<body id="0x99" basesound="0x379" figurine="0x25c7" />
	<body id="0x9a" basesound="0x1d7" figurine="0x25bb" />
	<body id="0x9b" basesound="0x1d7" figurine="0x25a7" />
	<body id="0x9d" basesound="0x388" figurine="0x25c3" />
	<body id="0x9e" basesound="0x205" figurine="0x25d6" soundmode="2" />
	<body id="0x9f" basesound="0x205" figurine="0x25d8" soundmode="2" />
	<body id="0xa0" basesound="0x205" figurine="0x25d8" soundmode="2" />
	<body id="0xa1" basesound="0x107" figurine="0x25da" />
	<body id="0xa2" basesound="0x205" figurine="0x25db" soundmode="2" />
	<body id="0xa3" basesound="0x10c" figurine="0x25dc" />
	<body id="0xa4" basesound="0x107" figurine="0x25d8" />
	<body id="0xa5" basesound="0x1d2" figurine="0x2100" />
	<body id="0xa6" basesound="0x10c" figurine="0x25d9" />
	<body id="0xa7" basesound="0x4c2" figurine="0x211e" />
	<body id="0xa8" basesound="0x3bf" figurine="0x259f" />
	<body id="0xaa" basesound="0x3f3" figurine="0x20f6" />
	<body id="0xab" basesound="0xb7" figurine="0x25b4" soundmode="2" />
	<body id="0xac" basesound="0x16a" figurine="0x20d6" flags="0x1" />
	<body id="0xad" basesound="0x388" figurine="0x25c3" />
	<body id="0xae" basesound="0x4b0" figurine="0x259f" flags="0x1" />
	<body id="0xaf" basesound="0x2fa" figurine="0x2589" />
	<body id="0xb0" basesound="0x46c" figurine="0x25b6" flags="0x1" />
	<body id="0xb2" basesound="0xa8" figurine="0x259c" />
	<body id="0xb3" basesound="0xa8" figurine="0x259c" />
	<body id="0xb4" basesound="0x2c0" figurine="0x20d6" flags="0x1" />
	<body id="0xb5" basesound="0x1b0" figurine="0x25af" />
	<body id="0xb6" basesound="0x1b0" figurine="0x25b0" />
	<body id="0xbb" basesound="0x365" figurine="0x25b2" />
	<body id="0xbc" basesound="0x365" figurine="0x25b2" />
	<body id="0xbd" basesound="0x45a" figurine="0x25b0" />
	<body id="0xc8" basesound="0xa8" figurine="0x211f" />
	<body id="0xc9" basesound="0x69" figurine="0x211b" flags="0x2" />
	<body id="0xca" basesound="0x5a" figurine="0x20da" />
	<body id="0xcb" basesound="0xc4" figurine="0x2101" />
	<body id="0xcc" basesound="0xa8" figurine="0x2121" />
	<body id="0xcd" basesound="0xc9" figurine="0x2125" soundmode="2" />
	<body id="0xcf" basesound="0xd6" figurine="0x20eb" />
	<body id="0xd0" basesound="0x6e" figurine="0x20d1" />
	<body id="0xd1" basesound="0x99" figurine="0x20e6" />
	<body id="0xd3" basesound="0x5f" figurine="0x20cf" />
	<body id="0xd4" basesound="0x5f" figurine="0x20db" />
	<body id="0xd5" basesound="0x5f" figurine="0x20e1" />
	<body id="0xd6" basesound="0xba" figurine="0x2119" flags="0x2" />
	<body id="0xd7" basesound="0x188" figurine="0x20d0" />
	<body id="0xd8" basesound="0x78" figurine="0x20f0" />
	<body id="0xd9" basesound="0x85" figurine="0x20d5" />
	<body id="0xda" basesound="0x3f5" figurine="0x25b3" />
	<body id="0xdb" basesound="0x3f5" figurine="0x25b4" />
	<body id="0xdc" basesound="0xb7" figurine="0x20f6" soundmode="2" />
	<body id="0xdd" basesound="0xe0" figurine="0x20ff" />
	<body id="0xdf" basesound="0xd8" figurine="0x20e6" soundmode="2" />
	<body id="0xe1" basesound="0xe5" figurine="0x20ea" flags="0x2" />
	<body id="0xe2" basesound="0xa8" figurine="0x2124" />
	<body id="0xe4" basesound="0xa8" figurine="0x2120" />
	<body id="0xe7" basesound="0x78" figurine="0x20f0" flags="0x2" />
	<body id="0xe8" basesound="0x64" figurine="0x20ef" flags="0x2" />
	<body id="0xe9" basesound="0x78" figurine="0x2103" flags="0x2" />
	<body id="0xea" basesound="0x82" figurine="0x20d4" soundmode="2" />
	<body id="0xed" basesound="0x82" figurine="0x20d4" soundmode="2" />
	<body id="0xee" basesound="0xcc" figurine="0x2123" />
	<body id="0x122" basesound="0xc4" figurine="0x2101" />
	<body id="0x123" basesound="0xa8" figurine="0x2126" />
	<body id="0x124" basesound="0xb7" figurine="0x2127" soundmode="2" />
	<body id="0x190" basesound="0x0" figurine="0x2106" />
	<body id="0x191" basesound="0x0" figurine="0x2107" />
	<body id="0x192" basesound="0x0" figurine="0x25f0" />
	<body id="0x193" basesound="0x0" figurine="0x25f1" />
	<body id="0x23d" basesound="0x107" flags="0x04"/>
	<body id="0x23e" basesound="0x200" soundmode="4" flags="0x04"/>
	<body id="0x2f0" basesound="0x10c" figurine="0x25b1" />
	<body id="0x2f1" basesound="0x174" figurine="0x258d" flags="0x1" />
	<body id="0x2f2" basesound="0x174" figurine="0x258d" flags="0x1" />
	<body id="0x2f3" basesound="0x174" figurine="0x258d" flags="0x1" />
	<body id="0x2f4" basesound="0x36d" figurine="0x258f" />
	<body id="0x2f5" basesound="0x36d" figurine="0x258f" />
	<body id="0x2f6" basesound="0x174" figurine="0x258d" flags="0x1" />
	<body id="0x2fb" basesound="0x36d" figurine="0x258f" />
	<body id="0x307" basesound="0x351" figurine="0x20e8" />
	<body id="0x308" basesound="0x35f" figurine="0x212f" />
	<body id="0x309" basesound="0x456" figurine="0x25d5" />
	<body id="0x30a" basesound="0x36d" figurine="0x258f" />
	<body id="0x30b" basesound="0x2f8" figurine="0x20d7" />
	<body id="0x30c" basesound="0x300" figurine="0x2582" />
	<body id="0x30d" basesound="0x346" figurine="0x25c9" />
	<body id="0x30e" basesound="0x346" figurine="0x25ca" />
	<body id="0x30f" basesound="0x346" figurine="0x25cb" />
	<body id="0x310" basesound="0x165" figurine="0x2585" />
	<body id="0x311" basesound="0x2b8" figurine="0x2586" />
	<body id="0x312" basesound="0x388" figurine="0x25c3" />
	<body id="0x313" basesound="0x18d" figurine="0x25b9" />
	<body id="0x314" basesound="0x3ee" figurine="0x25cf" />
	<body id="0x315" basesound="0x451" figurine="0x25c4" />
	<body id="0x316" basesound="0x28f" figurine="0x25d9" />
	<body id="0x317" basesound="0x2bd" figurine="0x25c3" />
	<body id="0x318" basesound="0x165" figurine="0x2584" />
	<body id="0x319" basesound="0xa8" figurine="0x259b" />
	<body id="0x31a" basesound="0x16a" figurine="0x2593" flags="0x1" />
	<body id="0x31b" basesound="0x2b9" figurine="0x2584" />
	<body id="0x31c" basesound="0x2b9" figurine="0x2584" />
	<body id="0x31d" basesound="0x111" figurine="0x20d6" flags="0x1" />
	<body id="0x31e" basesound="0x16a" figurine="0x20d6" flags="0x1" />
	<body id="0x31f" basesound="0x16a" figurine="0x20d6" flags="0x1" />
	<body id="0x334" basesound="0xa8" figurine="0x2598" />
	<body id="0x338" basesound="0xa8" figurine="0x259a" />
	<body id="0x339" basesound="0x3f5" figurine="0x25b2" />
	<body id="0x33a" basesound="0x3f5" figurine="0x25b3" />
	<body id="0x33b" basesound="0x3f5" figurine="0x25b4" />
	<body id="0x33c" basesound="0xb7" figurine="0x20f6" soundmode="2" />
	<body id="0x33f" basesound="0xbf" figurine="0x211a" />
	<body id="0x340" basesound="0x2ee" figurine="0x20f2" />
	<body id="0x341" basesound="0x275" figurine="0x211a" />
	<body id="0x342" basesound="0x2a2" figurine="0x2597" />
	<body id="0x343" basesound="0xc9" figurine="0x2125" soundmode="2" />
	<body id="0x345" basesound="0xdb" figurine="0x25c0" />
	<body id="0x346" basesound="0xdb" figurine="0x25c1" />
	<body id="0x347" basesound="0x365" figurine="0x25b2" />
	<body id="0x348" basesound="0x365" figurine="0x25b2" />
	<body id="0x349" basesound="0x365" figurine="0x25b2" />
	<body id="0x34a" basesound="0x365" figurine="0x25b2" />
	<body id="0x34b" basesound="0xcc" figurine="0x2123" />
	<body id="0x34e" basesound="0xa8" figurine="0x2599" />
	<body id="0x350" basesound="0xa8" figurine="0x259e" />
	<body id="0x3e6" basesound="0xa8" figurine="0x25a0" />
</bodyinfo>

[wpdev-commits] xmlscripts/definitions/npcs creatures.xml,1.4,NONE

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

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2381/npcs

Removed Files:
	creatures.xml 
Log Message:
Creature sounds are back!

--- creatures.xml DELETED ---

[wpdev-commits] wolfpack/python global.cpp,1.154,1.155

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

Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2349/python

Modified Files:
	global.cpp 
Log Message:
Creature sounds are back!

Index: global.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -d -r1.154 -r1.155
*** global.cpp	7 Sep 2004 03:21:49 -0000	1.154
--- global.cpp	9 Sep 2004 05:52:47 -0000	1.155
***************
*** 1765,1769 ****
  	PyDict_SetItemString( dict, "basesound", PyInt_FromLong( basedef->basesound() ) );
  	PyDict_SetItemString( dict, "soundmode", PyInt_FromLong( basedef->soundmode() ) );
- 	PyDict_SetItemString( dict, "flags", PyInt_FromLong( basedef->flags() ) );
  	PyDict_SetItemString( dict, "figurine", PyInt_FromLong( basedef->figurine() ) );
  	PyDict_SetItemString( dict, "mindamage", PyInt_FromLong( basedef->minDamage() ) );
--- 1765,1768 ----

[wpdev-commits] wolfpack ChangeLog,1.42,1.43 basechar.h,1.83,1.84 basedef.cpp,1.17,1.18 basedef.h,1.15,1.16 serverconfig.cpp,1.6,1.7

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

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2349

Modified Files:
	ChangeLog basechar.h basedef.cpp basedef.h serverconfig.cpp 
Log Message:
Creature sounds are back!

Index: serverconfig.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/serverconfig.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** serverconfig.cpp	9 Sep 2004 02:07:52 -0000	1.6
--- serverconfig.cpp	9 Sep 2004 05:52:47 -0000	1.7
***************
*** 31,34 ****
--- 31,35 ----
  #include "preferences.h"
  #include "log.h"
+ #include "basedef.h"
  
  // Library Includes
***************
*** 224,227 ****
--- 225,232 ----
  
  	flush(); // if any key created, save it.
+ 
+ 	// Reload Body Info
+ 	CharBaseDefs::instance()->loadBodyInfo();
+ 
  	cComponent::load();
  }

Index: basedef.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** basedef.cpp	9 Sep 2004 03:19:58 -0000	1.17
--- basedef.cpp	9 Sep 2004 05:52:47 -0000	1.18
***************
*** 31,36 ****
--- 31,38 ----
  #include "definitions.h"
  #include "scriptmanager.h"
+ #include "serverconfig.h"
  #include "basics.h"
  #include <string.h>
+ #include <qdom.h>
  
  void cBaseDef::processNode( const cElement* node ) {
***************
*** 118,122 ****
  	basesound_ = 0;
  	soundmode_ = 0;
- 	flags_ = 0;
  	figurine_ = 0;
  	minDamage_ = 0;
--- 120,123 ----
***************
*** 169,184 ****
  		lootPacks_ = node->text();
  	}
- 	else if ( node->name() == "canfly" )
- 	{
- 		flags_ |= 0x01;
- 	}
- 	else if ( node->name() == "antiblink" )
- 	{
- 		flags_ |= 0x02;
- 	}
- 	else if ( node->name() == "nocorpse" )
- 	{
- 		flags_ |= 0x04;
- 	}
  	else
  	{
--- 170,173 ----
***************
*** 203,207 ****
  		}
  
! 		applyDefinition( element );
  	}
  }
--- 192,196 ----
  		}
  
! 		applyDefinition(element);
  	}
  }
***************
*** 220,223 ****
--- 209,302 ----
  }
  
+ void cCharBaseDefs::loadBodyInfo() {
+ 	// Null the existing one
+ 	memset(bodyinfo, 0, sizeof(bodyinfo));
+ 
+ 	QString filename = Config::instance()->getString("General", "Bodyinfo File", "definitions/system/bodyinfo.xml", true);
+ 	QFile file(filename);
+ 
+ 	if (!file.open(IO_ReadOnly)) {
+ 		Console::instance()->log(LOG_WARNING, QString("Unable to load body information from %1.\n").arg(filename));
+ 	}
+ 
+ 	QDomDocument document;
+ 	document.setContent(&file);
+ 
+ 	QDomNode parent = document.namedItem("bodyinfo");
+ 	if (parent.isElement()) {
+ 		for (int i = 0; i < parent.childNodes().count(); ++i) {
+ 			QDomElement element = parent.childNodes().item(i).toElement();
+ 
+ 			if (!element.isNull()) {
+ 				QString id = hex2dec(element.attribute("id"));
+ 				bool ok = false;
+ 				
+ 				stBodyInfo bodyinfo;
+ 
+ 				// The body id (mandatory)
+ 				bodyinfo.body = id.toUShort(&ok);
+ 				if (!ok) {
+ 					Console::instance()->log(LOG_WARNING, QString("Invalid body id in bodyinfo file: %1.\n").arg(id));
+ 					continue;
+ 				}
+ 
+ 				// The offset for sounds this creature is using
+ 				QString basesound = hex2dec(element.attribute("basesound"));
+ 				if (!basesound.isNull()) {
+ 					bodyinfo.basesound = basesound.toUShort(&ok);
+ 					if (!ok) {
+ 						Console::instance()->log(LOG_WARNING, QString("Invalid basesound in bodyinfo file: %1.\n").arg(basesound));
+ 						continue;
+ 					}
+ 				} else {
+ 					bodyinfo.basesound = 0;
+ 				}
+ 
+ 				// Load the figurine for shrinking (this is just a display id)
+ 				QString figurine = hex2dec(element.attribute("figurine"));
+ 				if (!figurine.isNull()) {
+ 					bodyinfo.figurine = figurine.toUShort(&ok);
+ 					if (!ok) {
+ 						Console::instance()->log(LOG_WARNING, QString("Invalid figurine in bodyinfo file: %1.\n").arg(figurine));
+ 						continue;
+ 					}
+ 				} else {
+ 					bodyinfo.figurine = 0;
+ 				}
+ 
+ 				// Soundmode for skipping non existing sounds
+ 				QString soundmode = hex2dec(element.attribute("soundmode"));
+ 				if (!soundmode.isNull()) {
+ 					bodyinfo.soundmode = soundmode.toUShort(&ok);
+ 					if (!ok) {
+ 						Console::instance()->log(LOG_WARNING, QString("Invalid soundmode in bodyinfo file: %1.\n").arg(soundmode));
+ 						continue;
+ 					}
+ 				} else {
+ 					bodyinfo.soundmode = 0;
+ 				}
+ 
+ 				// Flags for this creature (noblink, canfly, nocorpse)
+ 				QString flags = hex2dec(element.attribute("flags"));
+ 				if (!flags.isNull()) {
+ 					bodyinfo.flags = flags.toUShort(&ok);
+ 					if (!ok) {
+ 						Console::instance()->log(LOG_WARNING, QString("Invalid flags in bodyinfo file: %1.\n").arg(flags));
+ 						continue;
+ 					}
+ 				} else {
+ 					bodyinfo.flags = 0;
+ 				}
+ 
+ 				if (bodyinfo.body < 0x400) {
+ 					this->bodyinfo[bodyinfo.body] = bodyinfo;
+ 				}
+ 			}
+ 		}
+ 	}
+ 
+ 	document.clear();
+ }
+ 
  cCharBaseDefs::cCharBaseDefs()
  {

Index: basedef.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basedef.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** basedef.h	9 Sep 2004 03:19:58 -0000	1.15
--- basedef.h	9 Sep 2004 05:52:47 -0000	1.16
***************
*** 115,119 ****
  	unsigned short basesound_;
  	unsigned char soundmode_;
- 	unsigned int flags_;
  	unsigned char type_;
  	unsigned short figurine_;
--- 115,118 ----
***************
*** 124,132 ****
  	QCString lootPacks_;
  	unsigned char controlSlots_;
! 	unsigned char criticalHealth_;
  
  	// Misc Properties
  	void load();
! 	void reset();	
  public:
  	cCharBaseDef( const QCString& id );
--- 123,131 ----
  	QCString lootPacks_;
  	unsigned char controlSlots_;
! 	unsigned char criticalHealth_;	
  
  	// Misc Properties
  	void load();
! 	void reset();
  public:
  	cCharBaseDef( const QCString& id );
***************
*** 165,192 ****
  	}
  
- 	inline unsigned int flags()
- 	{
- 		load();
- 		return flags_;
- 	}
- 
- 	inline bool canFly()
- 	{
- 		load();
- 		return ( flags_ & 0x01 ) != 0;
- 	}
- 
- 	inline bool antiBlink()
- 	{
- 		load();
- 		return ( flags_ & 0x02 ) != 0;
- 	}
- 
- 	inline bool noCorpse()
- 	{
- 		load();
- 		return ( flags_ & 0x04 ) != 0;
- 	}
- 
  	inline unsigned short maxDamage()
  	{
--- 164,167 ----
***************
*** 220,229 ****
--- 195,216 ----
  };
  
+ struct stBodyInfo {
+ 	unsigned short body;
+ 	unsigned short basesound;
+ 	unsigned short figurine;
+ 	unsigned char flags;
+ 	unsigned char soundmode;
+ };
+ 
  class cCharBaseDefs
  {
+ friend class cCharBaseDef;
+ 
  protected:
  	typedef QMap<QCString, cCharBaseDef*> Container;
  	typedef Container::iterator Iterator;
  	Container definitions;
+ 	stBodyInfo bodyinfo[0x400];
+ 
  public:
  	cCharBaseDefs();
***************
*** 234,240 ****
--- 221,236 ----
  	cCharBaseDef* get( const QCString& id );
  
+ 	inline const stBodyInfo &getBodyInfo(unsigned short body) {
+ 		if (body < 0x400) {
+ 			return bodyinfo[body];
+ 		} else {
+ 			return bodyinfo[0];
+ 		}
+ 	}
+ 
  	// When reset is called, all loaded basedefs are unflagged.
  	void reset();
  	void refreshScripts();
+ 	void loadBodyInfo();
  };
  

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** ChangeLog	9 Sep 2004 03:19:58 -0000	1.42
--- ChangeLog	9 Sep 2004 05:52:47 -0000	1.43
***************
*** 44,47 ****
--- 44,48 ----
  	  a basedefinition.
  	- Moved several methods to a common baseclass for char and item base definitions.
+ 	- Added support for a separate file to define properties for certain bodies. (Sounds, Flags, Figurines)
  
  Wolfpack 12.9.9 Beta (4. September 2004)

Index: basechar.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** basechar.h	31 Aug 2004 15:18:25 -0000	1.83
--- basechar.h	9 Sep 2004 05:52:47 -0000	1.84
***************
*** 535,539 ****
  	inline unsigned short basesound()
  	{
! 		return basedef_ ? basedef_->basesound() : 0;
  	}
  
--- 535,543 ----
  	inline unsigned short basesound()
  	{
! 		unsigned short result = basedef_ ? basedef_->basesound() : 0;
! 		if (!result) {
! 			result = CharBaseDefs::instance()->getBodyInfo(body()).basesound;
! 		}
! 		return result;
  	}
  
***************
*** 545,554 ****
  	inline unsigned char soundmode()
  	{
! 		return basedef_ ? basedef_->soundmode() : 0;
  	}
  
  	inline unsigned short figurine()
  	{
! 		return basedef_ ? basedef_->figurine() : 0;
  	}
  
--- 549,566 ----
  	inline unsigned char soundmode()
  	{
! 		unsigned char result = basedef_ ? basedef_->soundmode() : 0;
! 		if (!result) {
! 			result = CharBaseDefs::instance()->getBodyInfo(body()).soundmode;
! 		}
! 		return result;
  	}
  
  	inline unsigned short figurine()
  	{
! 		unsigned short result = basedef_ ? basedef_->figurine() : 0;
! 		if (!result) {
! 			result = CharBaseDefs::instance()->getBodyInfo(body()).figurine;
! 		}
! 		return result;
  	}
  
***************
*** 590,604 ****
  	inline bool isCanFly()
  	{
! 		return basedef_ ? basedef_->canFly() : false;
  	}
  
  	inline bool isAntiBlink()
  	{
! 		return basedef_ ? basedef_->antiBlink() : false;
  	}
  
  	inline bool isNoCorpse()
  	{
! 		return basedef_ ? basedef_->noCorpse() : false;
  	}
  private:
--- 602,616 ----
  	inline bool isCanFly()
  	{
! 		return (CharBaseDefs::instance()->getBodyInfo(body()).flags & 0x01) != 0;
  	}
  
  	inline bool isAntiBlink()
  	{
! 		return (CharBaseDefs::instance()->getBodyInfo(body()).flags & 0x02) != 0;
  	}
  
  	inline bool isNoCorpse()
  	{
! 		return (CharBaseDefs::instance()->getBodyInfo(body()).flags & 0x04) != 0;
  	}
  private:

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.74,1.75

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

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24266/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
Corrected tailor vendor and some items.

Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** ChangeLog.wolfpack	9 Sep 2004 04:21:53 -0000	1.74
--- ChangeLog.wolfpack	9 Sep 2004 04:32:51 -0000	1.75
***************
*** 10,13 ****
--- 10,14 ----
  		- Fixed blue moongate definitions.
  		- Pet commands are now processed by all NPCs to allow GM control.
+ 		- Corrected shopkeeper inventory of the tailor vendor.
  	* Python Script Changes:
  		- Added a script for database structure updates (system/dbupdate.py).

[wpdev-commits] xmlscripts/definitions/items/vegetation plants.xml,1.14,1.15

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

Update of /cvsroot/wpdev/xmlscripts/definitions/items/vegetation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24089/items/vegetation

Modified Files:
	plants.xml 
Log Message:
Corrected tailor vendor and some items.

Index: plants.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/vegetation/plants.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** plants.xml	27 Aug 2004 14:43:28 -0000	1.14
--- plants.xml	9 Sep 2004 04:31:43 -0000	1.15
***************
*** 820,833 ****
  	</item>
  
- 	<item id="1a9c">
- 		<id>0x1A9C</id>
- 		<nodecay />
- 		<category>Vegetation\Plants\Flax\Flax 4</category>
- 	</item>
- 
  	<item id="1a9d">
  		<id>0x1A9D</id>
  		<nodecay />
! 		<category>Vegetation\Plants\Flax\Flax 5</category>
  	</item>
  
--- 820,827 ----
  	</item>
  
  	<item id="1a9d">
  		<id>0x1A9D</id>
  		<nodecay />
! 		<category>Vegetation\Plants\Flax\Flax 4</category>
  	</item>
  

[wpdev-commits] xmlscripts/definitions/lists npcs.xml,1.8,1.9

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

Update of /cvsroot/wpdev/xmlscripts/definitions/lists
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24089/lists

Modified Files:
	npcs.xml 
Log Message:
Corrected tailor vendor and some items.

Index: npcs.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/lists/npcs.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** npcs.xml	7 Sep 2004 22:17:25 -0000	1.8
--- npcs.xml	9 Sep 2004 04:31:44 -0000	1.9
***************
*** 43,47 ****
  		<item>bull_black</item>
  		<item>boar</item>
! 		<item>brown_bull</item>
  		<item>pig</item>
  		<item>sheep_sheered</item>
--- 43,47 ----
  		<item>bull_black</item>
  		<item>boar</item>
! 		<item>bull_brown</item>
  		<item>pig</item>
  		<item>sheep_sheered</item>

[wpdev-commits] xmlscripts/definitions/npcs/humans/vendors tailor.xml,1.3,1.4

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

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24089/npcs/humans/vendors

Modified Files:
	tailor.xml 
Log Message:
Corrected tailor vendor and some items.

Index: tailor.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/tailor.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tailor.xml	3 Feb 2004 18:19:12 -0000	1.3
--- tailor.xml	9 Sep 2004 04:31:45 -0000	1.4
***************
*** 8,11 ****
--- 8,57 ----
  -->
  <definitions>
+ 	<!-- The inventory of a tailor -->
+ 	<npc id="tailor_inventory">
+ 		<shopkeeper>
+ 			<!-- Stuff that is constantly being restocked by the vendor -->
+ 			<restockable>
+ 				<item id="f9e"><amount>20</amount></item> <!-- Scissors -->
+ 				<item id="f9d"><amount>20</amount></item> <!-- Sewing Kit -->
+ 				<item id="fa9"><amount>20</amount></item> <!-- Dyes -->
+ 				<item id="fab"><amount>20</amount></item> <!-- Dye Tub  -->
+ 				<item id="f95"><amount>20</amount><color>0</color></item> <!-- Bolt Of Cloth -->
+ 				
+ 				<item id="1efd"><amount>20</amount><color>0</color></item> <!-- Fancy Shirt -->
+ 				<item id="1517"><amount>20</amount><color>0</color></item> <!-- Shirt -->
+ 				<item id="152e"><amount>20</amount><color>0</color></item> <!-- Short Pants -->
+ 				<item id="15e9"><amount>20</amount><color>0</color></item> <!-- Long Pants -->
+ 				<item id="1515"><amount>20</amount><color>0</color></item> <!-- Cloak -->
+ 				<item id="1eff"><amount>20</amount><color>0</color></item> <!-- Fancy Dress -->
+ 				<item id="1f03"><amount>20</amount><color>0</color></item> <!-- Robe -->
+ 				<item id="1516"><amount>20</amount><color>0</color></item> <!-- Skirt -->
+ 				<item id="1537"><amount>20</amount><color>0</color></item> <!-- Kilt -->
+ 				<item id="153d"><amount>20</amount><color>0</color></item> <!-- Full Apron -->
+ 				<item id="153b"><amount>20</amount><color>0</color></item> <!-- Half Apron -->
+ 				<item id="1f7b"><amount>20</amount><color>0</color></item> <!-- Doublet -->
+ 				<item id="1fa1"><amount>20</amount><color>0</color></item> <!-- Tunic -->
+ 				<item id="1f9f"><amount>20</amount><color>0</color></item> <!-- Jester Suit -->
+ 				
+ 				<item id="171c"><amount>20</amount><color>0</color></item> <!-- Jester Hat -->
+ 				<item id="1713"><amount>20</amount><color>0</color></item> <!-- Floppy Hat -->
+ 				<item id="1714"><amount>20</amount><color>0</color></item> <!-- Wide Brim Hat -->
+ 				<item id="1715"><amount>20</amount><color>0</color></item> <!-- Cap -->
+ 				<item id="1543"><amount>20</amount><color>0</color></item> <!-- Skull Cap -->
+ 				<item id="153f"><amount>20</amount><color>0</color></item> <!-- Bandana -->
+ 				<item id="1716"><amount>20</amount><color>0</color></item> <!-- Tall Straw Hat -->
+ 				<item id="1717"><amount>20</amount><color>0</color></item> <!-- Straw Hat -->
+ 				<item id="1718"><amount>20</amount><color>0</color></item> <!-- Wizards Hat -->
+ 				<item id="1719"><amount>20</amount><color>0</color></item> <!-- Bonnet -->
+ 				<item id="171a"><amount>20</amount><color>0</color></item> <!-- Feathered Hat -->
+ 				<item id="171b"><amount>20</amount><color>0</color></item> <!-- Tricorne Hat -->
+ 				
+ 				<item id="fa0"><amount>20</amount></item> <!-- Spool Of Thread -->
+ 				<item id="1a9c"><amount>20</amount></item> <!-- Flax -->
+ 				<item id="df9"><amount>20</amount></item> <!-- Cotton -->
+ 				<item id="df8"><amount>20</amount></item> <!-- Wool -->
+ 			</restockable>
+ 		</shopkeeper>
+ 	</npc>
  
  	<!-- A Tailor vendor -->
***************
*** 13,61 ****
  		<inherit>vendor_male</inherit>
  		<title>the Tailor</title>
! 		<shopkeeper>
! 			<restockable>
! 				<item id="153f">
! 					<amount>10</amount>
! 				</item>
! 				<item id="1515">
! 					<amount>10</amount>
! 				</item>
! 				<item id="108b">
! 					<amount>10</amount>
! 				</item>
! 				<item id="1516">
! 					<amount>10</amount>
! 				</item>
! 				<item id="1517">
! 					<amount>10</amount>
! 				</item>
! 			</restockable>
! 		</shopkeeper>
  		<tailoring><random min="640" max="1000"/></tailoring>
  		<category>Vendors\Tailor (Male)</category>
  	</npc>
! 	
  	<npc id="tailor_female">
  		<inherit>vendor_female</inherit>
  		<title>the Tailor</title>
! 		<shopkeeper>
! 			<restockable>
! 				<item id="153f">
! 					<amount>10</amount>
! 				</item>
! 				<item id="1515">
! 					<amount>10</amount>
! 				</item>
! 				<item id="108b">
! 					<amount>10</amount>
! 				</item>
! 				<item id="1516">
! 					<amount>10</amount>
! 				</item>
! 				<item id="1517">
! 					<amount>10</amount>
! 				</item>
! 			</restockable>
! 		</shopkeeper>
  		<tailoring><random min="640" max="1000"/></tailoring>
  		<category>Vendors\Tailor (Female)</category>
--- 59,73 ----
  		<inherit>vendor_male</inherit>
  		<title>the Tailor</title>
! 		
! 		<inherit id="tailor_inventory" />
  		<tailoring><random min="640" max="1000"/></tailoring>
  		<category>Vendors\Tailor (Male)</category>
  	</npc>
! 
  	<npc id="tailor_female">
  		<inherit>vendor_female</inherit>
  		<title>the Tailor</title>
! 
! 		<inherit id="tailor_inventory" />
  		<tailoring><random min="640" max="1000"/></tailoring>
  		<category>Vendors\Tailor (Female)</category>

[wpdev-commits] xmlscripts/definitions/items/professions tailorer.xml,1.15,1.16

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

Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24089/items/professions

Modified Files:
	tailorer.xml 
Log Message:
Corrected tailor vendor and some items.

Index: tailorer.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/tailorer.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tailorer.xml	3 Sep 2004 15:53:18 -0000	1.15
--- tailorer.xml	9 Sep 2004 04:31:43 -0000	1.16
***************
*** 226,233 ****
--- 226,240 ----
  	</item>
  
+ 	<item id="1a9c">
+ 		<id>0x1a9c</id>
+ 		<category>Professions\Tailorer\Resources\Flax</category>
+ 		<buyprice>102</buyprice>
+ 	</item>
+ 
  	<!-- Raw Cotton -->
  	<item id="df9">
  		<id>0xdf9</id>
  		<category>Professions\Tailorer\Resources\Raw Cotton 2</category>
+ 		<buyprice>102</buyprice>
  	</item>
  
***************
*** 237,246 ****
  		<category>Professions\Tailorer\Resources\Pile of Wool 1</category>
  		<basescripts>wool</basescripts>
  	</item>
  
! 	<item id="101f">
  		<id>0x101f</id>
  		<category>Professions\Tailorer\Resources\Pile of Wool 2</category>
- 		<basescripts>wool</basescripts>
  	</item>
  
--- 244,253 ----
  		<category>Professions\Tailorer\Resources\Pile of Wool 1</category>
  		<basescripts>wool</basescripts>
+ 		<buyprice>62</buyprice>
  	</item>
  
! 	<item id="101f" inherit="df8">
  		<id>0x101f</id>
  		<category>Professions\Tailorer\Resources\Pile of Wool 2</category>
  	</item>
  
***************
*** 268,304 ****
  		<id>0xf95</id>
  		<category>Professions\Tailorer\Bolt of Cloth 1</category>
  	</item>
  
! 	<item id="f96">
  		<id>0xf96</id>
  		<category>Professions\Tailorer\Bolt of Cloth 2</category>
  	</item>
  
! 	<item id="f97">
  		<id>0xf97</id>
  		<category>Professions\Tailorer\Bolt of Cloth 3</category>
  	</item>
  
! 	<item id="f98">
  		<id>0xf98</id>
  		<category>Professions\Tailorer\Bolt of Cloth 4</category>
  	</item>
  
! 	<item id="f99">
  		<id>0xf99</id>
  		<category>Professions\Tailorer\Bolt of Cloth 5</category>
  	</item>
  
! 	<item id="f9a">
  		<id>0xf9a</id>
  		<category>Professions\Tailorer\Bolt of Cloth 6</category>
  	</item>
  
! 	<item id="f9b">
  		<id>0xf9b</id>
  		<category>Professions\Tailorer\Bolt of Cloth 7</category>
  	</item>
  
! 	<item id="f9c">
  		<id>0xf9c</id>
  		<category>Professions\Tailorer\Bolt of Cloth 8</category>
--- 275,312 ----
  		<id>0xf95</id>
  		<category>Professions\Tailorer\Bolt of Cloth 1</category>
+ 		<buyprice>120</buyprice>
  	</item>
  
! 	<item id="f96" inherit="f95">
  		<id>0xf96</id>
  		<category>Professions\Tailorer\Bolt of Cloth 2</category>
  	</item>
  
! 	<item id="f97" inherit="f95">
  		<id>0xf97</id>
  		<category>Professions\Tailorer\Bolt of Cloth 3</category>
  	</item>
  
! 	<item id="f98" inherit="f95">
  		<id>0xf98</id>
  		<category>Professions\Tailorer\Bolt of Cloth 4</category>
  	</item>
  
! 	<item id="f99" inherit="f95">
  		<id>0xf99</id>
  		<category>Professions\Tailorer\Bolt of Cloth 5</category>
  	</item>
  
! 	<item id="f9a" inherit="f95">
  		<id>0xf9a</id>
  		<category>Professions\Tailorer\Bolt of Cloth 6</category>
  	</item>
  
! 	<item id="f9b" inherit="f95">
  		<id>0xf9b</id>
  		<category>Professions\Tailorer\Bolt of Cloth 7</category>
  	</item>
  
! 	<item id="f9c" inherit="f95">
  		<id>0xf9c</id>
  		<category>Professions\Tailorer\Bolt of Cloth 8</category>
***************
*** 309,313 ****
  		<category>Professions\Tailorer\Sewing Kit</category>
  		<tag name="remaining_uses" type="int" value="35" />
!     <basescripts>skills.tailoring,equipment</basescripts>
  	</item>
  
--- 317,322 ----
  		<category>Professions\Tailorer\Sewing Kit</category>
  		<tag name="remaining_uses" type="int" value="35" />
!     	<basescripts>skills.tailoring,equipment</basescripts>
!     	<buyprice>3</buyprice>
  	</item>
  
***************
*** 316,319 ****
--- 325,329 ----
  		<category>Professions\Tailorer\Scissors (N/S)</category>
  		<basescripts>scissors</basescripts>
+ 		<buyprice>13</buyprice>
  	</item>
  
***************
*** 327,336 ****
  		<category>Professions\Tailorer\Resources\Spool of Thread (N/S)</category>
  		<basescripts>yarn</basescripts>
  	</item>
  
! 	<item id="fa1">
  		<id>0xfa1</id>
  		<category>Professions\Tailorer\Resources\Spool of Thread (W/E)</category>
- 		<basescripts>yarn</basescripts>
  	</item>
  
--- 337,346 ----
  		<category>Professions\Tailorer\Resources\Spool of Thread (N/S)</category>
  		<basescripts>yarn</basescripts>
+ 		<buyprice>18</buyprice>
  	</item>
  
! 	<item id="fa1" inherit="fa0">
  		<id>0xfa1</id>
  		<category>Professions\Tailorer\Resources\Spool of Thread (W/E)</category>
  	</item>
  
***************
*** 339,343 ****
  		<category>Professions\Tailorer\Dyes</category>
  		<tag name="remaining_uses" type="int" value="10" />
!     <basescripts>dyes</basescripts>
  	</item>
  
--- 349,354 ----
  		<category>Professions\Tailorer\Dyes</category>
  		<tag name="remaining_uses" type="int" value="10" />
!     	<basescripts>dyes</basescripts>
!     	<buyprice>8</buyprice>
  	</item>
  
***************
*** 346,349 ****
--- 357,361 ----
  		<category>Professions\Tailorer\Dying Tub</category>
  		<basescripts>environment</basescripts>
+ 		<buyprice>9</buyprice>
  	</item>
  

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.73,1.74

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

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22754/documentation/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
Meh


Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** ChangeLog.wolfpack	9 Sep 2004 03:19:27 -0000	1.73
--- ChangeLog.wolfpack	9 Sep 2004 04:21:53 -0000	1.74
***************
*** 35,38 ****
--- 35,42 ----
  		- Fixed bug #0000278 (Weapon not being unequipped)
  		- Pet commands now always allow control by GMs.
+ 		- Fixes for remove:
+ 		  Remove now gives a warning about deletion of players.
+ 		  Remove should only delete player characters under the player acl.
+ 		- New commands: kick, ban, unban.
  	* Misc. Changes:
  	* Known Issues, Bugs, and Missing Features:

[wpdev-commits] xmlscripts/definitions/system access.xml,1.5,1.6

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

Update of /cvsroot/wpdev/xmlscripts/definitions/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15746/system

Modified Files:
	access.xml 
Log Message:
Stuff.


Index: access.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/access.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** access.xml	3 Sep 2004 15:32:13 -0000	1.5
--- access.xml	9 Sep 2004 03:32:51 -0000	1.6
***************
*** 22,25 ****
--- 22,26 ----
  		<group name="Misc">
  			<action name="Unlimited Tile" permit="true" />
+ 			<action name="May Block Staff Accounts" permit="true" />
  		</group>
  	</acl>
***************
*** 42,49 ****
  		</group>
  		<group name="multi">
! 			<action name="any" permit="true" />			
  		</group>
  		<group name="Misc">
  			<action name="Unlimited Tile" permit="false" />
  		</group>
  	</acl>
--- 43,51 ----
  		</group>
  		<group name="multi">
! 			<action name="any" permit="true" />
  		</group>
  		<group name="Misc">
  			<action name="Unlimited Tile" permit="false" />
+ 			<action name="May Block Staff Accounts" permit="true" />
  		</group>
  	</acl>
***************
*** 55,59 ****
  			<action name="ACCOUNT" permit="false" />
  			<action name="ALLMOVE" permit="false" />
! 			<action name="ALLSHOW" permit="false" />			
  			<action name="DECORATION" permit="false" />
  			<action name="DOORGEN" permit="false" />
--- 57,61 ----
  			<action name="ACCOUNT" permit="false" />
  			<action name="ALLMOVE" permit="false" />
! 			<action name="ALLSHOW" permit="false" />
  			<action name="DECORATION" permit="false" />
  			<action name="DOORGEN" permit="false" />

[wpdev-commits] xmlscripts/scripts/commands kickban.py,1.2,1.3

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

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

Modified Files:
	kickban.py 
Log Message:
ok.. I think I'll leave it at this tonight... my brain is scrambled.


Index: kickban.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/kickban.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** kickban.py	9 Sep 2004 03:04:04 -0000	1.2
--- kickban.py	9 Sep 2004 03:31:15 -0000	1.3
***************
*** 3,12 ****
  	\description Kicks a connected client by target or account name.
  """
- 
  """
  	\command ban
  	\description Kick-bans an account by target or account name.
  """
- 
  """
  	\command unban
--- 3,10 ----
***************
*** 16,20 ****
  
  import wolfpack
! from wolfpack.consts import LOG_MESSAGE
  
  def onLoad():
--- 14,18 ----
  
  import wolfpack
! import wolfpack.accounts
  
  def onLoad():
***************
*** 26,35 ****
  	if len( args ) > 0:
  		accname = args.lower()
- 		account = None
  		account = wolfpack.accounts.find( accname )
  		accountAction( socket, account, 'kick' )
  		return
  	else:
! 		socket.sysmessage( "Please select the object for removal." )
  		socket.attachtarget( "commands.remove.doKick", [] )
  	return True
--- 24,32 ----
  	if len( args ) > 0:
  		accname = args.lower()
  		account = wolfpack.accounts.find( accname )
  		accountAction( socket, account, 'kick' )
  		return
  	else:
! 		socket.sysmessage( "Please select the character to kick." )
  		socket.attachtarget( "commands.remove.doKick", [] )
  	return True
***************
*** 38,47 ****
  	if len( args ) > 0:
  		accname = args.lower()
- 		account = None
  		account = wolfpack.accounts.find( accname )
  		accountAction( socket, account, 'ban' )
  		return
  	else:
! 		socket.sysmessage( "Please select the object for removal." )
  		socket.attachtarget( "commands.remove.doBan", [] )
  	return False
--- 35,43 ----
  	if len( args ) > 0:
  		accname = args.lower()
  		account = wolfpack.accounts.find( accname )
  		accountAction( socket, account, 'ban' )
  		return
  	else:
! 		socket.sysmessage( "Please select the character to kick-ban." )
  		socket.attachtarget( "commands.remove.doBan", [] )
  	return False
***************
*** 63,77 ****
  	if len( args ) > 0:
  		accname = args.lower()
- 		account = None
  		account = wolfpack.accounts.find( accname )
! 		if account:
! 			if account.rank > 1:
! 				if playeraccount.authorized( 'Misc', 'May Block Staff Accounts' ):
! 					continue
! 				else:
! 					socket.sysmessage( "You're not authorized to unblock staff members." )
! 					return False
  			account.unblock()
! 			socket.sysmessage( "You've unblocked the account %s." % account.name )
  			return True
  	else:
--- 59,71 ----
  	if len( args ) > 0:
  		accname = args.lower()
  		account = wolfpack.accounts.find( accname )
! 		if account and account.rank <= myrank:
! 			if account.rank > 1 and playeraccount.authorized( 'Misc', 'May Block Staff Accounts' ):
! 				continue
! 			else:
! 				socket.sysmessage( "You're not authorized to unban staff members." )
! 				return False
  			account.unblock()
! 			socket.sysmessage( "You've unban the account %s." % account.name )
  			return True
  	else:
***************
*** 86,105 ****
  		socket.sysmessage( "Failed to find an account with the given name." )
  		return False
! 	elif account and myrank > account.rank:
! 		if account.rank == 100:
! 			socket.sysmessage( "You can not kick or ban admins!" )
  			return False
- 		if account.rank > 1:
- 			if playeraccount.authorized( 'Misc', 'May Block Staff Accounts' ):
- 				continue
- 			else:
- 				socket.sysmessage( "You're not authorized to kick or ban staff members." )
- 				return False
  
  		if action == 'kick':
- 			account.block()
  			for char in account.characters:
  				if char.socket:
! 					char.soscket.sysmessage( "You've been kicked from the shard by the staff." )
  					char.socket.disconnect()
  					socket.sysmessage( "You have disconnected %s." % char.name )
--- 80,94 ----
  		socket.sysmessage( "Failed to find an account with the given name." )
  		return False
! 	elif account and account.rank <= myrank:
! 		if account.rank > 1 and playeraccount.authorized( 'Misc', 'May Block Staff Accounts' ):
! 			continue
! 		else:
! 			socket.sysmessage( "You're not authorized to kick or ban staff members." )
  			return False
  
  		if action == 'kick':
  			for char in account.characters:
  				if char.socket:
! 					char.socket.sysmessage( "You've been kicked from the shard by the staff." )
  					char.socket.disconnect()
  					socket.sysmessage( "You have disconnected %s." % char.name )
***************
*** 109,115 ****
  			for char in account.characters:
  				if char.socket:
! 					char.soscket.sysmessage( "You've been kick-banned from the shard by the staff." )
  					char.socket.disconnect()
  					socket.sysmessage( "You have kick-banned %s." % char.name )
  			return True
! 		return False
--- 98,104 ----
  			for char in account.characters:
  				if char.socket:
! 					char.socket.sysmessage( "You've been kick-banned from the shard by the staff." )
  					char.socket.disconnect()
  					socket.sysmessage( "You have kick-banned %s." % char.name )
  			return True
! 	return False

[wpdev-commits] wolfpack/ai ai_monsters.cpp,1.19,1.20

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

Update of /cvsroot/wpdev/wolfpack/ai
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13629/ai

Modified Files:
	ai_monsters.cpp 
Log Message:
GM control for npcs.
added basescript tag for xml
no hunger for gm controlled pets

Index: ai_monsters.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai_monsters.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ai_monsters.cpp	6 Sep 2004 22:31:25 -0000	1.19
--- ai_monsters.cpp	9 Sep 2004 03:19:58 -0000	1.20
***************
*** 91,95 ****
  
  		// We don't already attack the target, right?
! 		if (victim != target) {
  			// See if it's a target we want
  			unsigned int dist = npc->dist(victim);		
--- 91,97 ----
  
  		// We don't already attack the target, right?
! 		// If we're tamed we only choose this target if
! 		// it's fighting us.
! 		if (victim != target && (!npc->isTamed() || victim->attackTarget() == npc)) {
  			// See if it's a target we want
  			unsigned int dist = npc->dist(victim);		
***************
*** 102,106 ****
  
  	// If we're not tamed, we attack other players as well.
! 	if (!npc->isTamed()) {	
  		RegionIterator4Chars ri(npc->pos(), VISRANGE);
  		for ( ri.Begin(); !ri.atEnd(); ri++ ) {
--- 104,108 ----
  
  	// If we're not tamed, we attack other players as well.
! 	if (!npc->isTamed()) {
  		RegionIterator4Chars ri(npc->pos(), VISRANGE);
  		for ( ri.Begin(); !ri.atEnd(); ri++ ) {
***************
*** 130,133 ****
--- 132,136 ----
  	}
  
+ 	
  	if (nextVictimCheck < Server::instance()->time()) {
  		// Don't switch if we can hit it...

[wpdev-commits] wolfpack ChangeLog,1.41,1.42 basedef.cpp,1.16,1.17 basedef.h,1.14,1.15 timing.cpp,1.13,1.14

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

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13629

Modified Files:
	ChangeLog basedef.cpp basedef.h timing.cpp 
Log Message:
GM control for npcs.
added basescript tag for xml
no hunger for gm controlled pets

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** ChangeLog	9 Sep 2004 02:19:56 -0000	1.41
--- ChangeLog	9 Sep 2004 03:19:58 -0000	1.42
***************
*** 39,42 ****
--- 39,47 ----
  	- The default worldsave driver is now binary.
  	- Improved the Python interface Unicode support.
+ 	- Pets should now no longer fight if their owners tell them to stay/stop.
+ 	- NPCs owned by GMs no longer suffer hunger effects.
+ 	- Added <basescript>a</basescript> which will prepend the script a to the basescripts list of
+ 	  a basedefinition.
+ 	- Moved several methods to a common baseclass for char and item base definitions.
  
  Wolfpack 12.9.9 Beta (4. September 2004)

Index: timing.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/timing.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** timing.cpp	7 Sep 2004 03:21:47 -0000	1.13
--- timing.cpp	9 Sep 2004 03:19:58 -0000	1.14
***************
*** 426,468 ****
  	if ( npc->isTamed() && Config::instance()->hungerRate() && npc->hungerTime() <= time )
  	{
! 		if ( npc->hunger() )
! 		{
! 			npc->setHunger( npc->hunger() - 1 );
! 		}
! 
! 		npc->setHungerTime( time + Config::instance()->hungerRate() * MY_CLOCKS_PER_SEC );
! 
! 		switch ( npc->hunger() )
! 		{
! 		case 4:
! 			npc->emote( tr( "*%1 looks a little hungry*" ).arg( npc->name() ), 0x26 );
! 			break;
! 		case 3:
! 			npc->emote( tr( "*%1 looks fairly hungry*" ).arg( npc->name() ), 0x26 );
! 			break;
! 		case 2:
! 			npc->emote( tr( "*%1 looks extremely hungry*" ).arg( npc->name() ), 0x26 );
! 			break;
! 		case 1:
! 			npc->emote( tr( "*%1 looks weak from starvation*" ).arg( npc->name() ), 0x26 );
! 			break;
! 		case 0:
! 			npc->setWanderType( enFreely );
! 			npc->setTamed( false );
! 
! 			if ( npc->owner() )
  			{
! 				npc->setOwner( 0 );
  			}
  
! 			npc->bark( cBaseChar::Bark_Attacking );
! 			npc->talk( 1043255, npc->name(), 0, false, 0x26 );
  
! 			if ( Config::instance()->tamedDisappear() == 1 )
  			{
! 				npc->soundEffect( 0x1FE );
! 				npc->remove();
  			}
- 			break;
  		}
  	}
--- 426,471 ----
  	if ( npc->isTamed() && Config::instance()->hungerRate() && npc->hungerTime() <= time )
  	{
! 		// Creatures owned by GMs won't hunger.
! 		if (!npc->owner() || !npc->owner()->isGMorCounselor()) {
! 			if ( npc->hunger() )
  			{
! 				npc->setHunger( npc->hunger() - 1 );
  			}
  
! 			npc->setHungerTime( time + Config::instance()->hungerRate() * MY_CLOCKS_PER_SEC );
  
! 			switch ( npc->hunger() )
  			{
! 			case 4:
! 				npc->emote( tr( "*%1 looks a little hungry*" ).arg( npc->name() ), 0x26 );
! 				break;
! 			case 3:
! 				npc->emote( tr( "*%1 looks fairly hungry*" ).arg( npc->name() ), 0x26 );
! 				break;
! 			case 2:
! 				npc->emote( tr( "*%1 looks extremely hungry*" ).arg( npc->name() ), 0x26 );
! 				break;
! 			case 1:
! 				npc->emote( tr( "*%1 looks weak from starvation*" ).arg( npc->name() ), 0x26 );
! 				break;
! 			case 0:
! 				npc->setWanderType( enFreely );
! 				npc->setTamed( false );
! 
! 				if ( npc->owner() )
! 				{
! 					npc->setOwner( 0 );
! 				}
! 
! 				npc->bark( cBaseChar::Bark_Attacking );
! 				npc->talk( 1043255, npc->name(), 0, false, 0x26 );
! 
! 				if ( Config::instance()->tamedDisappear() == 1 )
! 				{
! 					npc->soundEffect( 0x1FE );
! 					npc->remove();
! 				}
! 				break;
  			}
  		}
  	}

Index: basedef.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** basedef.cpp	5 Sep 2004 17:43:51 -0000	1.16
--- basedef.cpp	9 Sep 2004 03:19:58 -0000	1.17
***************
*** 63,66 ****
--- 63,98 ----
  		}
  	}
+ 	else if ( node->name() == "bindmenu" )
+ 	{
+ 		bindmenu_ = node->text();
+ 	}
+ 	else if ( node->name() == "basescripts" )
+ 	{
+ 		baseScriptList_ = node->text();
+ 		refreshScripts();
+ 	}
+ 	else if ( node->name() == "basescript" )
+ 	{
+ 		if (baseScriptList_.isEmpty()) {
+ 			baseScriptList_.prepend(node->text());
+ 		} else {
+ 			baseScriptList_.prepend(node->text() + ",");
+ 		}
+ 		refreshScripts();
+ 	}
+ }
+ 
+ void cBaseDef::refreshScripts() {
+ 	if (loaded) {
+ 		QStringList scripts = QStringList::split(",", baseScriptList_);
+ 		QStringList::const_iterator it;
+ 		baseScripts_.clear();
+ 		for (it = scripts.begin(); it != scripts.end(); ++it) {
+ 			cPythonScript *script = ScriptManager::instance()->find((*it).latin1());
+ 			if (script) {
+ 				baseScripts_.append(script);
+ 			}
+ 		}
+ 	}
  }
  
***************
*** 149,161 ****
  		flags_ |= 0x04;
  	}
- 	else if ( node->name() == "bindmenu" )
- 	{
- 		bindmenu_ = node->text();
- 	}
- 	else if ( node->name() == "basescripts" )
- 	{
- 		baseScriptList_ = node->text();
- 		refreshScripts();
- 	}
  	else
  	{
--- 181,184 ----
***************
*** 164,181 ****
  }
  
- void cCharBaseDef::refreshScripts() {
- 	if (loaded) {
- 		QStringList scripts = QStringList::split(",", baseScriptList_);
- 		QStringList::const_iterator it;
- 		baseScripts_.clear();
- 		for (it = scripts.begin(); it != scripts.end(); ++it) {
- 			cPythonScript *script = ScriptManager::instance()->find((*it).latin1());
- 			if (script) {
- 				baseScripts_.append(script);
- 			}
- 		}
- 	}
- }
- 
  // Load this definition from the scripts.
  void cCharBaseDef::load()
--- 187,190 ----
***************
*** 269,286 ****
  }
  
- void cItemBaseDef::refreshScripts() {
- 	if (loaded) {
- 		QStringList scripts = QStringList::split(",", baseScriptList_);
- 		QStringList::const_iterator it;
- 		baseScripts_.clear();
- 		for (it = scripts.begin(); it != scripts.end(); ++it) {
- 			cPythonScript *script = ScriptManager::instance()->find((*it).latin1());
- 			if (script) {
- 				baseScripts_.append(script);
- 			}
- 		}
- 	}
- }
- 
  void cItemBaseDef::processNode( const cElement* node )
  {
--- 278,281 ----
***************
*** 301,308 ****
  		type_ = node->value().toUShort();
  	}
- 	else if ( node->name() == "bindmenu" )
- 	{
- 		bindmenu_ = node->text();
- 	}
  	else if ( node->name() == "lightsource" )
  	{
--- 296,299 ----
***************
*** 317,325 ****
  		setWaterSource( node->value().toUInt() != 0 );
  	}
- 	else if ( node->name() == "basescripts" )
- 	{
- 		baseScriptList_ = node->text();
- 		refreshScripts();
- 	}
  	else 
  	{
--- 308,311 ----

Index: basedef.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basedef.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** basedef.h	6 Sep 2004 22:31:25 -0000	1.14
--- basedef.h	9 Sep 2004 03:19:58 -0000	1.15
***************
*** 46,52 ****
--- 46,58 ----
  	QMap<QString, unsigned int> intproperties;
  	QMap<QString, QString> properties;
+ 
+ 	QPtrList<cPythonScript> baseScripts_;
+ 	QCString baseScriptList_;
+ 	QCString bindmenu_;
  	
  	bool loaded;
  	virtual void reset();
+ 	virtual void load() = 0;
+ 	void refreshScripts();
  public:
  	void processNode( const cElement* node );
***************
*** 56,60 ****
  		if (it == intproperties.end()) {
  			return def;
! 		} else {			
  			return *it;
  		}
--- 62,66 ----
  		if (it == intproperties.end()) {
  			return def;
! 		} else {
  			return *it;
  		}
***************
*** 82,85 ****
--- 88,109 ----
  		return id_;
  	}
+ 
+ 	inline const QCString& baseScriptList()
+ 	{
+ 		load();
+ 		return baseScriptList_;
+ 	}
+ 
+ 	inline const QPtrList<cPythonScript> &baseScripts()
+ 	{
+ 		load();
+ 		return baseScripts_;
+ 	}
+ 
+ 	inline const QCString& bindmenu()
+ 	{
+ 		load();
+ 		return bindmenu_;
+ 	}
  };
  
***************
*** 99,112 ****
  	QCString carve_;
  	QCString lootPacks_;
- 	QCString bindmenu_;
  	unsigned char controlSlots_;
  	unsigned char criticalHealth_;
- 	QPtrList<cPythonScript> baseScripts_;
- 	QCString baseScriptList_;
  
  	// Misc Properties
  	void load();
! 	void reset();
! 	void refreshScripts();
  public:
  	cCharBaseDef( const QCString& id );
--- 123,132 ----
  	QCString carve_;
  	QCString lootPacks_;
  	unsigned char controlSlots_;
  	unsigned char criticalHealth_;
  
  	// Misc Properties
  	void load();
! 	void reset();	
  public:
  	cCharBaseDef( const QCString& id );
***************
*** 115,130 ****
  	void processNode( const cElement* node );	
  
- 	inline const QCString& baseScriptList()
- 	{
- 		load();
- 		return baseScriptList_;
- 	}
- 
- 	inline const QPtrList<cPythonScript> &baseScripts()
- 	{
- 		load();
- 		return baseScripts_;
- 	}
- 
  	inline unsigned char controlSlots()
  	{
--- 135,138 ----
***************
*** 210,219 ****
  		return lootPacks_;
  	}
- 
- 	inline const QCString& bindmenu()
- 	{
- 		load();
- 		return bindmenu_;
- 	}
  };
  
--- 218,221 ----
***************
*** 251,265 ****
  	unsigned int buyprice_;
  	unsigned short type_;
- 	QCString bindmenu_;
  	unsigned char lightsource_;
  	unsigned int decaydelay_;
  	unsigned int flags_;
- 	QPtrList<cPythonScript> baseScripts_;
- 	QCString baseScriptList_;
  
  	// Misc Properties
  	void load();
  	void reset();
- 	void refreshScripts();
  
  	inline void setWaterSource( bool data )
--- 253,263 ----
***************
*** 280,295 ****
  	void processNode( const cElement* node );
  
- 	inline const QCString& baseScriptList()
- 	{
- 		load();
- 		return baseScriptList_;
- 	}
- 
- 	inline const QPtrList<cPythonScript> & baseScripts()
- 	{
- 		load();
- 		return baseScripts_;
- 	}
- 
  	inline unsigned int decaydelay()
  	{
--- 278,281 ----
***************
*** 322,331 ****
  	}
  
- 	inline const QCString& bindmenu()
- 	{
- 		load();
- 		return bindmenu_;
- 	}
- 
  	inline unsigned char lightsource()
  	{
--- 308,311 ----

[wpdev-commits] xmlscripts/definitions/npcs/monsters/orc orc_bomber.xml,1.12,1.13 orc_brute.xml,1.12,1.13 orc_captain.xml,1.12,1.13 orc_chopper.xml,1.12,1.13 orc_mage.xml,1.11,1.12 orc_scout.xml,1.12,1.13 orcish_lord.xml,1.12,1.13 orcs.xml,1.14,1.15

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

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/orc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13483/npcs/monsters/orc

Modified Files:
	orc_bomber.xml orc_brute.xml orc_captain.xml orc_chopper.xml 
	orc_mage.xml orc_scout.xml orcish_lord.xml orcs.xml 
Log Message:
gm control for npcs.

Index: orc_scout.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/orc/orc_scout.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** orc_scout.xml	7 Sep 2004 00:28:05 -0000	1.12
--- orc_scout.xml	9 Sep 2004 03:19:38 -0000	1.13
***************
*** 12,16 ****
  	<npc id="orc_scout" inherit="monster_base">
  		<name>orc scout</name>
! 		<basescripts>speech.monster</basescripts>
  		<strproperty name="monsterspeech" value="orc" />
  		<id>181</id>
--- 12,16 ----
  	<npc id="orc_scout" inherit="monster_base">
  		<name>orc scout</name>
! 		<basescript>speech.monster</basescript>
  		<strproperty name="monsterspeech" value="orc" />
  		<id>181</id>

Index: orc_bomber.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/orc/orc_bomber.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** orc_bomber.xml	7 Sep 2004 00:28:05 -0000	1.12
--- orc_bomber.xml	9 Sep 2004 03:19:38 -0000	1.13
***************
*** 13,17 ****
  		<name>orc bomber</name>
  		<strproperty name="monsterspeech" value="orc" />
! 		<basescripts>speech.monster</basescripts>
  		<id>182</id>
  		<inherit id="KARMA_L2" />
--- 13,17 ----
  		<name>orc bomber</name>
  		<strproperty name="monsterspeech" value="orc" />
! 		<basescript>speech.monster</basescript>
  		<id>182</id>
  		<inherit id="KARMA_L2" />

Index: orcish_lord.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/orc/orcish_lord.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** orcish_lord.xml	7 Sep 2004 00:28:05 -0000	1.12
--- orcish_lord.xml	9 Sep 2004 03:19:38 -0000	1.13
***************
*** 13,17 ****
  		<name>orcish lord</name>
  		<strproperty name="monsterspeech" value="orc" />
! 		<basescripts>speech.monster</basescripts>
  		<id>138</id>
  		<inherit id="KARMA_L3" />
--- 13,17 ----
  		<name>orcish lord</name>
  		<strproperty name="monsterspeech" value="orc" />
! 		<basescript>speech.monster</basescript>
  		<id>138</id>
  		<inherit id="KARMA_L3" />

Index: orc_chopper.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/orc/orc_chopper.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** orc_chopper.xml	7 Sep 2004 00:28:05 -0000	1.12
--- orc_chopper.xml	9 Sep 2004 03:19:38 -0000	1.13
***************
*** 11,15 ****
  	<!-- orc chopper -->
  	<npc id="orc_chopper" inherit="monster_base">
! 		<basescripts>speech.monster</basescripts>
  		<strproperty name="monsterspeech" value="orc" />
  		<name>orc chopper</name>
--- 11,15 ----
  	<!-- orc chopper -->
  	<npc id="orc_chopper" inherit="monster_base">
! 		<basescript>speech.monster</basescript>
  		<strproperty name="monsterspeech" value="orc" />
  		<name>orc chopper</name>

Index: orc_brute.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/orc/orc_brute.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** orc_brute.xml	7 Sep 2004 00:28:05 -0000	1.12
--- orc_brute.xml	9 Sep 2004 03:19:38 -0000	1.13
***************
*** 12,16 ****
  	<npc id="orc_brute" inherit="monster_base">
  		<strproperty name="monsterspeech" value="orc" />
! 		<basescripts>speech.monster</basescripts>
  		<name>orc brute</name>
  		<id>189</id>
--- 12,16 ----
  	<npc id="orc_brute" inherit="monster_base">
  		<strproperty name="monsterspeech" value="orc" />
! 		<basescript>speech.monster</basescript>
  		<name>orc brute</name>
  		<id>189</id>

Index: orcs.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/orc/orcs.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** orcs.xml	7 Sep 2004 00:28:05 -0000	1.14
--- orcs.xml	9 Sep 2004 03:19:38 -0000	1.15
***************
*** 11,15 ****
  	<npc id="orc" inherit="monster_base">
  		<strproperty name="monsterspeech" value="orc" />
! 		<basescripts>speech.monster</basescripts>
  		<name><random list="NAMES_ORC" /></name>
  		<id><random list="NPCIDS_ORC" /></id>
--- 11,15 ----
  	<npc id="orc" inherit="monster_base">
  		<strproperty name="monsterspeech" value="orc" />
! 		<basescript>speech.monster</basescript>
  		<name><random list="NAMES_ORC" /></name>
  		<id><random list="NPCIDS_ORC" /></id>

Index: orc_mage.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/orc/orc_mage.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** orc_mage.xml	7 Sep 2004 00:28:05 -0000	1.11
--- orc_mage.xml	9 Sep 2004 03:19:38 -0000	1.12
***************
*** 12,16 ****
  	<npc id="orc_mage" inherit="monster_base">
  		<name>orc mage</name>
! 		<basescripts>speech.monster</basescripts>
  		<strproperty name="monsterspeech" value="orc" />
  		<id>140</id>
--- 12,16 ----
  	<npc id="orc_mage" inherit="monster_base">
  		<name>orc mage</name>
! 		<basescript>speech.monster</basescript>
  		<strproperty name="monsterspeech" value="orc" />
  		<id>140</id>

Index: orc_captain.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/orc/orc_captain.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** orc_captain.xml	7 Sep 2004 00:28:05 -0000	1.12
--- orc_captain.xml	9 Sep 2004 03:19:38 -0000	1.13
***************
*** 12,16 ****
  	<npc id="orc_captain" inherit="monster_base">
  		<strproperty name="monsterspeech" value="orc" />
! 		<basescripts>speech.monster</basescripts>
  		<name>orc captain</name>
  		<id>7</id>
--- 12,16 ----
  	<npc id="orc_captain" inherit="monster_base">
  		<strproperty name="monsterspeech" value="orc" />
! 		<basescript>speech.monster</basescript>
  		<name>orc captain</name>
  		<id>7</id>

[wpdev-commits] xmlscripts/definitions/npcs/monsters/ratmen ratman_archer.xml,1.12,1.13 ratman_mage.xml,1.12,1.13 ratmen.xml,1.14,1.15

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

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ratmen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13483/npcs/monsters/ratmen

Modified Files:
	ratman_archer.xml ratman_mage.xml ratmen.xml 
Log Message:
gm control for npcs.

Index: ratmen.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ratmen/ratmen.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ratmen.xml	7 Sep 2004 00:28:05 -0000	1.14
--- ratmen.xml	9 Sep 2004 03:19:39 -0000	1.15
***************
*** 13,17 ****
  		<!-- Monsterspeech -->
  		<strproperty name="monsterspeech" value="ratman" />
! 		<basescripts>speech.monster</basescripts>
  		
  		<name><random list="NAMES_RATMAN" /></name>
--- 13,17 ----
  		<!-- Monsterspeech -->
  		<strproperty name="monsterspeech" value="ratman" />
! 		<basescript>speech.monster</basescript>
  		
  		<name><random list="NAMES_RATMAN" /></name>

Index: ratman_mage.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ratmen/ratman_mage.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ratman_mage.xml	7 Sep 2004 00:28:05 -0000	1.12
--- ratman_mage.xml	9 Sep 2004 03:19:39 -0000	1.13
***************
*** 11,15 ****
  	<!-- a ratman mage -->
  	<npc id="ratman_mage" inherit="monster_base">
! 		<basescripts>speech.monster</basescripts>
  		<strproperty name="monsterspeech" value="ratman" />
  		<name><random list="NAMES_RATMAN" /></name>
--- 11,15 ----
  	<!-- a ratman mage -->
  	<npc id="ratman_mage" inherit="monster_base">
! 		<basescript>speech.monster</basescript>
  		<strproperty name="monsterspeech" value="ratman" />
  		<name><random list="NAMES_RATMAN" /></name>

Index: ratman_archer.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ratmen/ratman_archer.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ratman_archer.xml	7 Sep 2004 00:28:05 -0000	1.12
--- ratman_archer.xml	9 Sep 2004 03:19:39 -0000	1.13
***************
*** 11,15 ****
  	<!-- a ratman archer-->
  	<npc id="ratman_archer" inherit="monster_base">
! 		<basescripts>speech.monster</basescripts>
  		<strproperty name="monsterspeech" value="ratman" />
  		<name><random list="NAMES_RATMAN" /></name>
--- 11,15 ----
  	<!-- a ratman archer-->
  	<npc id="ratman_archer" inherit="monster_base">
! 		<basescript>speech.monster</basescript>
  		<strproperty name="monsterspeech" value="ratman" />
  		<name><random list="NAMES_RATMAN" /></name>

[wpdev-commits] xmlscripts/definitions/system players.xml,1.10,1.11 skills.xml,1.2,1.3

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

Update of /cvsroot/wpdev/xmlscripts/definitions/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13483/system

Modified Files:
	players.xml skills.xml 
Log Message:
gm control for npcs.

Index: players.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/players.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** players.xml	7 Sep 2004 13:33:02 -0000	1.10
--- players.xml	9 Sep 2004 03:19:39 -0000	1.11
***************
*** 6,10 ****
  
  	<npc id="players_base">
! 		<basescripts>system.players,system.regionchange,system.hunger</basescripts>
  	</npc>
  
--- 6,10 ----
  
  	<npc id="players_base">
! 		<basescripts>ancientrealms.spieler,system.players,system.regionchange,system.hunger</basescripts>
  	</npc>
  

Index: skills.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/skills.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** skills.xml	13 May 2004 07:03:55 -0000	1.2
--- skills.xml	9 Sep 2004 03:19:39 -0000	1.3
***************
*** 305,309 ****
  		<intchance>0.5</intchance>
  		<defname>MAGICRESIST</defname>
! 		<name>Magic Resist</name>
  		<title>Mage</title>
  	</skill>
--- 305,309 ----
  		<intchance>0.5</intchance>
  		<defname>MAGICRESIST</defname>
! 		<name>MagicResist</name>
  		<title>Mage</title>
  	</skill>