wpdev-commits — Wolfpack CVS commit info

[wpdev-commits] xmlscripts/scripts/wolfpack consts.py,1.37,1.38

[<dr...@pr...>]

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

Modified Files:
	consts.py 
Log Message:
Slight tweak for mining.
Updates for potions.
The following potions work now:
  Greater Heal, Heal, and Lesser Heal
  Agility and Greater Agility
  Strength and Greater Strength


Index: consts.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** consts.py	25 Jan 2004 03:47:21 -0000	1.37
--- consts.py	26 Jan 2004 03:23:40 -0000	1.38
***************
*** 107,163 ****
  
  skillnamesids = \
! { 
! 	'alchemy' : ALCHEMY, 
! 	'anatomy' : ANATOMY, 
! 	'animallore' : ANIMALLORE, 
! 	'itemid' : ITEMID, 
! 	'armslore' : ARMSLORE, 
  	'parrying' : PARRYING,
! 	'begging' : BEGGING, 
! 	'blacksmithing' : BLACKSMITHING, 
! 	'bowcraft' : BOWCRAFT, 
! 	'peacemaking' : PEACEMAKING, 
! 	'camping' : CAMPING, 
  	'carpentry' : CARPENTRY,
! 	'cartography' : CARTOGRAPHY, 
! 	'cooking' : COOKING, 
! 	'detectinghidden' : DETECTINGHIDDEN, 
! 	'enticement' : ENTICEMENT, 
  	'evaluatingintel' : EVALUATINGINTEL,
! 	'healing' : HEALING, 
! 	'fishing' : FISHING, 
! 	'forensics' : FORENSICS, 
! 	'herding' : HERDING, 
! 	'hiding' : HIDING, 
  	'provocation' : PROVOCATION,
! 	'inscription' : INSCRIPTION, 
! 	'lockpicking' : LOCKPICKING, 
! 	'magery' : MAGERY, 
! 	'magicresistance' : MAGICRESISTANCE, 
! 	'tactics' : TACTICS, 
  	'snooping' : SNOOPING,
! 	'musicianship' : MUSICIANSHIP, 
! 	'poisoning' : POISONING, 
! 	'archery' : ARCHERY, 
! 	'spiritspeak' : SPIRITSPEAK, 
! 	'stealing' : STEALING, 
  	'tailoring' : TAILORING,
! 	'taming' : TAMING, 
! 	'tasteid' : TASTEID, 
! 	'tinkering' : TINKERING, 
! 	'tracking' : TRACKING, 
! 	'veterinary' : VETERINARY, 
  	'swordsmanship' : SWORDSMANSHIP,
! 	'macefighting' : MACEFIGHTING, 
! 	'fencing' : FENCING, 
! 	'wrestling' : WRESTLING, 
! 	'lumberjacking' : LUMBERJACKING, 
! 	'mining' : MINING, 
  	'meditation' : MEDITATION,
! 	'stealth' : STEALTH, 
! 	'removetraps' : REMOVETRAPS, 
! 	'necromancy' : NECROMANCY, 
! 	'focus' : FOCUS, 
! 	'chivalry' : CHIVALRY 
  }
  
--- 107,163 ----
  
  skillnamesids = \
! {
! 	'alchemy' : ALCHEMY,
! 	'anatomy' : ANATOMY,
! 	'animallore' : ANIMALLORE,
! 	'itemid' : ITEMID,
! 	'armslore' : ARMSLORE,
  	'parrying' : PARRYING,
! 	'begging' : BEGGING,
! 	'blacksmithing' : BLACKSMITHING,
! 	'bowcraft' : BOWCRAFT,
! 	'peacemaking' : PEACEMAKING,
! 	'camping' : CAMPING,
  	'carpentry' : CARPENTRY,
! 	'cartography' : CARTOGRAPHY,
! 	'cooking' : COOKING,
! 	'detectinghidden' : DETECTINGHIDDEN,
! 	'enticement' : ENTICEMENT,
  	'evaluatingintel' : EVALUATINGINTEL,
! 	'healing' : HEALING,
! 	'fishing' : FISHING,
! 	'forensics' : FORENSICS,
! 	'herding' : HERDING,
! 	'hiding' : HIDING,
  	'provocation' : PROVOCATION,
! 	'inscription' : INSCRIPTION,
! 	'lockpicking' : LOCKPICKING,
! 	'magery' : MAGERY,
! 	'magicresistance' : MAGICRESISTANCE,
! 	'tactics' : TACTICS,
  	'snooping' : SNOOPING,
! 	'musicianship' : MUSICIANSHIP,
! 	'poisoning' : POISONING,
! 	'archery' : ARCHERY,
! 	'spiritspeak' : SPIRITSPEAK,
! 	'stealing' : STEALING,
  	'tailoring' : TAILORING,
! 	'taming' : TAMING,
! 	'tasteid' : TASTEID,
! 	'tinkering' : TINKERING,
! 	'tracking' : TRACKING,
! 	'veterinary' : VETERINARY,
  	'swordsmanship' : SWORDSMANSHIP,
! 	'macefighting' : MACEFIGHTING,
! 	'fencing' : FENCING,
! 	'wrestling' : WRESTLING,
! 	'lumberjacking' : LUMBERJACKING,
! 	'mining' : MINING,
  	'meditation' : MEDITATION,
! 	'stealth' : STEALTH,
! 	'removetraps' : REMOVETRAPS,
! 	'necromancy' : NECROMANCY,
! 	'focus' : FOCUS,
! 	'chivalry' : CHIVALRY
  }
  
***************
*** 344,347 ****
--- 344,353 ----
  ANIM_FIDGET3=0x22
  
+ # Some Sounds
+ SOUND_DRINK1 = 0x50
+ SOUND_AGILITY_DOWN = 0x1ee
+ SOUND_AGILITY_UP = 0x1ed
+ SOUND_STRENGTH_UP = 0x1e7
+ 
  # Definitions for the Sextant
  SEXTANT_CENTER_X = 5936

[wpdev-commits] xmlscripts/definitions/items/equipment potions.xml,1.4,1.5

[<dr...@pr...>]

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

Modified Files:
	potions.xml 
Log Message:
Slight tweak for mining.
Updates for potions.
The following potions work now:
  Greater Heal, Heal, and Lesser Heal
  Agility and Greater Agility
  Strength and Greater Strength


Index: potions.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/equipment/potions.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** potions.xml	8 Jan 2004 17:59:47 -0000	1.4
--- potions.xml	26 Jan 2004 03:23:39 -0000	1.5
***************
*** 13,23 ****
  	<item id="potion_nightsight">
  		<id>0xf06</id>
! 		<name>Black Potion</name>
! 		<identified>Nightsight</identified>
! 		<more1>1</more1>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Nightsight</category>
! 
  		<!-- Pricing information -->
  		<buyprice>15</buyprice>
--- 13,22 ----
  	<item id="potion_nightsight">
  		<id>0xf06</id>
! 		<name>black potion</name>
! 		<identified>nightsight</identified>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Nightsight</category>
! 		<tag name="potiontype" value="nightsight" />
  		<!-- Pricing information -->
  		<buyprice>15</buyprice>
***************
*** 28,38 ****
  	<item id="potion_lesserheal">
  		<id>0xf0c</id>
! 		<name>Yellow Potion</name>
! 		<identified>Lesser Heal</identified>
! 		<more1>2</more1>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Heal (lesser)</category>
! 
  		<!-- Pricing information -->
  		<buyprice>15</buyprice>
--- 27,36 ----
  	<item id="potion_lesserheal">
  		<id>0xf0c</id>
! 		<name>yellow potion</name>
! 		<identified>lesser heal</identified>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Heal (lesser)</category>
! 		<tag name="potiontype" value="lesser_heal" />
  		<!-- Pricing information -->
  		<buyprice>15</buyprice>
***************
*** 43,53 ****
  	<item id="potion_heal">
  		<id>0xf0c</id>
! 		<name>Yellow Potion</name>
! 		<identified>Heal</identified>
! 		<more1>3</more1>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Heal</category>
! 
  		<!-- Pricing information -->
  	</item>
--- 41,50 ----
  	<item id="potion_heal">
  		<id>0xf0c</id>
! 		<name>yellow potion</name>
! 		<identified>heal</identified>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Heal</category>
! 		<tag name="potiontype" value="heal" />
  		<!-- Pricing information -->
  	</item>
***************
*** 56,66 ****
  	<item id="potion_greaterheal">
  		<id>0xf0c</id>
! 		<name>Yellow Potion</name>
! 		<identified>Greater Heal</identified>
! 		<more1>3</more1>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Heal (greater)</category>
! 
  		<!-- Pricing information -->
  	</item>
--- 53,62 ----
  	<item id="potion_greaterheal">
  		<id>0xf0c</id>
! 		<name>yellow potion</name>
! 		<identified>greater heal</identified>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Heal (greater)</category>
! 		<tag name="potiontype" value="greater_heal" />
  		<!-- Pricing information -->
  	</item>
***************
*** 69,154 ****
  	<item id="potion_lesserpoison">
  		<id>0xf0a</id>
! 		<name>Green Potion</name>
! 		<identified>Lesser Poison</identified>
! 		<more1>4</more1>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Poison (lesser)</category>
! 
  		<!-- Pricing information -->
  		<buyprice>15</buyprice>
  		<sellprice>7</sellprice>
! 	</item>	
  
  	<!-- Poison -->
  	<item id="potion_poison">
  		<id>0xf0a</id>
! 		<name>Green Potion</name>
! 		<identified>Poison</identified>
! 		<more1>4</more1>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Poison</category>
! 
  		<!-- Pricing information -->
! 	</item>	
  
  	<!-- Greater Poison -->
  	<item id="potion_greaterpoison">
  		<id>0xf0a</id>
! 		<name>Green Potion</name>
! 		<identified>Greater Poison</identified>
! 		<more1>4</more1>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Poison (greater)</category>
! 
  		<!-- Pricing information -->
! 	</item>	
  
  	<!-- Greater Poison -->
  	<item id="potion_deadlypoison">
  		<id>0xf0a</id>
! 		<name>Green Potion</name>
! 		<identified>Deadly Poison</identified>
! 		<more1>4</more1>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Poison (deadly)</category>
  
  		<!-- Pricing information -->
! 	</item>	
  
! 	<!-- Refresh -->
! <!--
! 	 Orange Potion
! 	<item id="f07">
  		<id>0xf07</id>
! 		<category>Professions\Alchemist\Potions\Orange Potion</category>
  	</item>
  
! 	Blue Potion
! 	<item id="f08">
  		<id>0xf08</id>
! 		<category>Professions\Alchemist\Potions\Blue Potion</category>
  	</item>
  
! 	White Potion
! 	<item id="f09">
  		<id>0xf09</id>
! 		<category>Professions\Alchemist\Potions\White Potion</category>
  	</item>
  
! 	Red Potion
! 	<item id="f0b">
! 		<id>0xf0b</id>
! 		<category>Professions\Alchemist\Potions\Red Potion</category>
  	</item>
  
! 	Purple Potion
! 	<item id="f0d">
  		<id>0xf0d</id>
! 		<category>Professions\Alchemist\Potions\Purple Potion</category>
  	</item>
! 	-->
  </definitions>
\ No newline at end of file
--- 65,246 ----
  	<item id="potion_lesserpoison">
  		<id>0xf0a</id>
! 		<name>green potion</name>
! 		<identified>lesser poison</identified>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Poison (lesser)</category>
! 		<tag name="potiontype" value="lesser_poison" />
  		<!-- Pricing information -->
  		<buyprice>15</buyprice>
  		<sellprice>7</sellprice>
! 	</item>
  
  	<!-- Poison -->
  	<item id="potion_poison">
  		<id>0xf0a</id>
! 		<name>green potion</name>
! 		<identified>poison</identified>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Poison</category>
! 		<tag name="potiontype" value="poison" />
  		<!-- Pricing information -->
! 	</item>
  
  	<!-- Greater Poison -->
  	<item id="potion_greaterpoison">
  		<id>0xf0a</id>
! 		<name>green potion</name>
! 		<identified>greater poison</identified>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Poison (greater)</category>
! 		<tag name="potiontype" value="greater_poison" />
  		<!-- Pricing information -->
! 	</item>
  
  	<!-- Greater Poison -->
  	<item id="potion_deadlypoison">
  		<id>0xf0a</id>
! 		<name>green potion</name>
! 		<identified>deadly poison</identified>
  		<weight>0.5</weight>
  		<events>potions</events>
  		<category>Equipment\Potions\Poison (deadly)</category>
+ 		<tag name="potiontype" value="deadly_poison" />
+ 		<!-- Pricing information -->
+ 	</item>
  
+ 	<item id="potion_refresh">
+ 		<id>0xf0b</id>
+ 		<name>red potion</name>
+ 		<identified>refresh</identified>
+ 		<weight>0.5</weight>
+ 		<events>potions</events>
+ 		<category>Equipment\Potions\Refresh</category>
+ 		<tag name="potiontype" value="refresh" />
  		<!-- Pricing information -->
! 	</item>
  
! 	<item id="potion_totalrefresh">
! 		<id>0xf0b</id>
! 		<name>red potion</name>
! 		<identified>total refresh</identified>
! 		<weight>0.5</weight>
! 		<events>potions</events>
! 		<category>Equipment\Potions\Refresh</category>
! 		<tag name="potiontype" value="total_refresh" />
! 		<!-- Pricing information -->
! 	</item>
! 
! 	<item id="potion_lessercure">
  		<id>0xf07</id>
! 		<name>orange potion</name>
! 		<identified>lesser cure</identified>
! 		<weight>0.5</weight>
! 		<events>potions</events>
! 		<category>Equipment\Potions\Cure (lesser)</category>
! 		<tag name="potiontype" value="lesser_cure" />
! 		<!-- Pricing information -->
  	</item>
  
! 	<item id="potion_cure">
! 		<id>0xf07</id>
! 		<name>orange potion</name>
! 		<identified>cure</identified>
! 		<weight>0.5</weight>
! 		<events>potions</events>
! 		<category>Equipment\Potions\Cure</category>
! 		<tag name="potiontype" value="cure" />
! 		<!-- Pricing information -->
! 	</item>
! 
! 	<item id="potion_greatercure">
! 		<id>0xf07</id>
! 		<name>orange potion</name>
! 		<identified>lesser cure</identified>
! 		<weight>0.5</weight>
! 		<events>potions</events>
! 		<category>Equipment\Potions\Cure (greater)</category>
! 		<tag name="potiontype" value="greater_cure" />
! 		<!-- Pricing information -->
! 	</item>
! 
! 	<item id="potion_agility">
  		<id>0xf08</id>
! 		<name>blue potion</name>
! 		<identified>agility</identified>
! 		<weight>0.5</weight>
! 		<events>potions</events>
! 		<category>Equipment\Potions\Agility</category>
! 		<tag name="potiontype" value="agility" />
! 		<!-- Pricing information -->
  	</item>
  
! 	<item id="potion_greateragility">
! 		<id>0xf08</id>
! 		<name>blue potion</name>
! 		<identified>greater agility</identified>
! 		<weight>0.5</weight>
! 		<events>potions</events>
! 		<category>Equipment\Potions\Agility (greater)</category>
! 		<tag name="potiontype" value="greater_agility" />
! 		<!-- Pricing information -->
! 	</item>
! 
! 	<item id="potion_strength">
  		<id>0xf09</id>
! 		<name>white potion</name>
! 		<identified>strength</identified>
! 		<weight>0.5</weight>
! 		<events>potions</events>
! 		<category>Equipment\Potions\Strength</category>
! 		<tag name="potiontype" value="strength" />
! 		<!-- Pricing information -->
  	</item>
  
! 	<item id="potion_greaterstrength">
! 		<id>0xf09</id>
! 		<name>white potion</name>
! 		<identified>greater strength</identified>
! 		<weight>0.5</weight>
! 		<events>potions</events>
! 		<category>Equipment\Potions\Strength (greater)</category>
! 		<tag name="potiontype" value="greater_strength" />
! 		<!-- Pricing information -->
  	</item>
  
! 	<item id="potion_lesserexplosion">
  		<id>0xf0d</id>
! 		<name>purple potion</name>
! 		<identified>lesser explosion</identified>
! 		<weight>0.5</weight>
! 		<events>potions</events>
! 		<category>Equipment\Potions\Explosion (lesser)</category>
! 		<tag name="potiontype" value="lesser_explosion" />
! 		<!-- Pricing information -->
  	</item>
! 
! 	<item id="potion_explosion">
! 		<id>0xf0d</id>
! 		<name>purple potion</name>
! 		<identified>explosion</identified>
! 		<weight>0.5</weight>
! 		<events>potions</events>
! 		<category>Equipment\Potions\Explosion</category>
! 		<tag name="potiontype" value="explosion" />
! 		<!-- Pricing information -->
! 	</item>
! 
! 	<item id="potion_greaterexplosion">
! 		<id>0xf0d</id>
! 		<name>purple potion</name>
! 		<identified>greater explosion</identified>
! 		<weight>0.5</weight>
! 		<events>potions</events>
! 		<category>Equipment\Potions\Explosion (greater)</category>
! 		<tag name="potiontype" value="greater_explosion" />
! 		<!-- Pricing information -->
! 	</item>
! 
  </definitions>
\ No newline at end of file

[wpdev-commits] wolfpack uobject.cpp,1.124,1.125

[<thi...@pr...>]

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

Modified Files:
	uobject.cpp 
Log Message:
Fix: tags not being copied when you move pileable objects in/out of piles.

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** uobject.cpp	25 Jan 2004 20:24:26 -0000	1.124
--- uobject.cpp	26 Jan 2004 00:45:10 -0000	1.125
***************
*** 80,84 ****
  	this->free = src.free;
  	this->changed( TOOLTIP );
! 	tooltip_ = src.tooltip_;
  	changed_ = true;
  }
--- 80,85 ----
  	this->free = src.free;
  	this->changed( TOOLTIP );
! 	this->tooltip_ = src.tooltip_;
! 	this->tags_ = src.tags_;
  	changed_ = true;
  }

[wpdev-commits] xmlscripts/scripts/wolfpack consts.py,1.38,1.39

[<dr...@pr...>]

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

Modified Files:
	consts.py 
Log Message:
Fixed an error in potions.py
Added a ton of sounds to consts.py, many are AoS sounds.


Index: consts.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** consts.py	26 Jan 2004 03:23:40 -0000	1.38
--- consts.py	26 Jan 2004 11:40:42 -0000	1.39
***************
*** 107,163 ****
  
  skillnamesids = \
! {
! 	'alchemy' : ALCHEMY,
! 	'anatomy' : ANATOMY,
! 	'animallore' : ANIMALLORE,
! 	'itemid' : ITEMID,
! 	'armslore' : ARMSLORE,
  	'parrying' : PARRYING,
! 	'begging' : BEGGING,
! 	'blacksmithing' : BLACKSMITHING,
! 	'bowcraft' : BOWCRAFT,
! 	'peacemaking' : PEACEMAKING,
! 	'camping' : CAMPING,
  	'carpentry' : CARPENTRY,
! 	'cartography' : CARTOGRAPHY,
! 	'cooking' : COOKING,
! 	'detectinghidden' : DETECTINGHIDDEN,
! 	'enticement' : ENTICEMENT,
  	'evaluatingintel' : EVALUATINGINTEL,
! 	'healing' : HEALING,
! 	'fishing' : FISHING,
! 	'forensics' : FORENSICS,
! 	'herding' : HERDING,
! 	'hiding' : HIDING,
  	'provocation' : PROVOCATION,
! 	'inscription' : INSCRIPTION,
! 	'lockpicking' : LOCKPICKING,
! 	'magery' : MAGERY,
! 	'magicresistance' : MAGICRESISTANCE,
! 	'tactics' : TACTICS,
  	'snooping' : SNOOPING,
! 	'musicianship' : MUSICIANSHIP,
! 	'poisoning' : POISONING,
! 	'archery' : ARCHERY,
! 	'spiritspeak' : SPIRITSPEAK,
! 	'stealing' : STEALING,
  	'tailoring' : TAILORING,
! 	'taming' : TAMING,
! 	'tasteid' : TASTEID,
! 	'tinkering' : TINKERING,
! 	'tracking' : TRACKING,
! 	'veterinary' : VETERINARY,
  	'swordsmanship' : SWORDSMANSHIP,
! 	'macefighting' : MACEFIGHTING,
! 	'fencing' : FENCING,
! 	'wrestling' : WRESTLING,
! 	'lumberjacking' : LUMBERJACKING,
! 	'mining' : MINING,
  	'meditation' : MEDITATION,
! 	'stealth' : STEALTH,
! 	'removetraps' : REMOVETRAPS,
! 	'necromancy' : NECROMANCY,
! 	'focus' : FOCUS,
! 	'chivalry' : CHIVALRY
  }
  
--- 107,163 ----
  
  skillnamesids = \
! { 
! 	'alchemy' : ALCHEMY, 
! 	'anatomy' : ANATOMY, 
! 	'animallore' : ANIMALLORE, 
! 	'itemid' : ITEMID, 
! 	'armslore' : ARMSLORE, 
  	'parrying' : PARRYING,
! 	'begging' : BEGGING, 
! 	'blacksmithing' : BLACKSMITHING, 
! 	'bowcraft' : BOWCRAFT, 
! 	'peacemaking' : PEACEMAKING, 
! 	'camping' : CAMPING, 
  	'carpentry' : CARPENTRY,
! 	'cartography' : CARTOGRAPHY, 
! 	'cooking' : COOKING, 
! 	'detectinghidden' : DETECTINGHIDDEN, 
! 	'enticement' : ENTICEMENT, 
  	'evaluatingintel' : EVALUATINGINTEL,
! 	'healing' : HEALING, 
! 	'fishing' : FISHING, 
! 	'forensics' : FORENSICS, 
! 	'herding' : HERDING, 
! 	'hiding' : HIDING, 
  	'provocation' : PROVOCATION,
! 	'inscription' : INSCRIPTION, 
! 	'lockpicking' : LOCKPICKING, 
! 	'magery' : MAGERY, 
! 	'magicresistance' : MAGICRESISTANCE, 
! 	'tactics' : TACTICS, 
  	'snooping' : SNOOPING,
! 	'musicianship' : MUSICIANSHIP, 
! 	'poisoning' : POISONING, 
! 	'archery' : ARCHERY, 
! 	'spiritspeak' : SPIRITSPEAK, 
! 	'stealing' : STEALING, 
  	'tailoring' : TAILORING,
! 	'taming' : TAMING, 
! 	'tasteid' : TASTEID, 
! 	'tinkering' : TINKERING, 
! 	'tracking' : TRACKING, 
! 	'veterinary' : VETERINARY, 
  	'swordsmanship' : SWORDSMANSHIP,
! 	'macefighting' : MACEFIGHTING, 
! 	'fencing' : FENCING, 
! 	'wrestling' : WRESTLING, 
! 	'lumberjacking' : LUMBERJACKING, 
! 	'mining' : MINING, 
  	'meditation' : MEDITATION,
! 	'stealth' : STEALTH, 
! 	'removetraps' : REMOVETRAPS, 
! 	'necromancy' : NECROMANCY, 
! 	'focus' : FOCUS, 
! 	'chivalry' : CHIVALRY 
  }
  
***************
*** 344,353 ****
  ANIM_FIDGET3=0x22
  
- # Some Sounds
- SOUND_DRINK1 = 0x50
- SOUND_AGILITY_DOWN = 0x1ee
- SOUND_AGILITY_UP = 0x1ed
- SOUND_STRENGTH_UP = 0x1e7
- 
  # Definitions for the Sextant
  SEXTANT_CENTER_X = 5936
--- 344,347 ----
***************
*** 410,411 ****
--- 404,603 ----
  #3 uses of object
  ANTIMACROALLOWANCE = 3
+ 
+ # A Huge Sound List!
+ #
+ # Notes: 0x4d4 appears to be the final sound ID
+ 
+ SOUND_JUNGLE_BIRDS_1 = 0x0
+ SOUND_JUNGLE_BIRDS_2 = 0x1
+ SOUND_JUNGLE_BIRDS_3 = 0x2
+ SOUND_FOREST_BIRDS_1 = 0x3
+ SOUND_FOREST_BIRDS_2 = 0x4
+ SOUND_FOREST_BIRDS_3 = 0x5
+ SOUND_FOREST_BIRDS_4 = 0x6
+ SOUND_SWAMP_BIRDS_1 = 0x7
+ SOUND_SWAMP_BIRDS_2 = 0x8
+ SOUND_SWAMP_BIRDS_3 = 0x9
+ SOUND_SWAMP_BIRDS_4 = 0xa
+ SOUND_SWAMP_BIRDS_5 = 0xc
+ SOUND_SWAMP_BIRDS_6 = 0xd
+ SOUND_SWAMP_BIRDS_7 = 0xe
+ SOUND_SWAMP_BIRDS_8 = 0xf
+ SOUND_RIVER_BIRDS = 0xb
+ 
+ SOUND_RIVER = 0x10
+ SOUND_STREAM = 0x11
+ SOUND_BEACH = 0x12
+ 
+ SOUND_BOAT_OCEAN = 0x13
+ 
+ SOUND_STORM_1 = 0x14 # Light Wind
+ SOUND_STORM_2 = 0x15 # Heavy Wind
+ SOUND_STORM_3 = 0x16 # Moderate Wind
+ 
+ SOUND_BIRDCALL_1 = 0x17
+ SOUND_BIRDCALL_2 = 0x18
+ SOUND_BIRDCALL_3 = 0x19
+ SOUND_BIRDCALL_4 = 0x1a
+ SOUND_BIRDCALL_5 = 0x1b
+ SOUND_BIRDCALL_6 = 0x1c
+ SOUND_BIRDCALL_7 = 0x1d
+ SOUND_BIRDCALL_8 = 0x1e
+ SOUND_BIRDCALL_9 = 0x1f
+ 
+ SOUND_WATERBUBBLE_1 = 0x20 # Slow
+ SOUND_WATERBUBBLE_2 = 0x21 # Fast
+ 
+ SOUND_WATER_DROP_1 = 0x22 #
+ SOUND_WATER_DROP_2 = 0x23 #
+ SOUND_WATER_DROP_3 = 0x24 # Two drops
+ SOUND_WATER_DROP_4 = 0x25 # Small object into water
+ SOUND_WATER_DROP_5 = 0x26 # Large object into water
+ SOUND_WATER_DROP_6 = 0x27 # Medium obj
+ 
+ SOUND_THUNDER_1 = 0x28 # Shorter/Deeper thunder
+ SOUND_THUNDER_1 = 0x29 # Long/Sharp thunder
+ 
+ SOUND_HAMMER_1 = 0x2a # Blacksmith Sound
+ 
+ SOUND_DRINK1 = 0x30
+ SOUND_DRINK2 = 0x31
+ SOUND_DRINK3 = 0x50
+ 
+ SOUND_AGILITY_DOWN = 0x1ee
+ SOUND_AGILITY_UP = 0x1ed
+ SOUND_STRENGTH_UP = 0x1e7
+ SOUND_FIZZLE_SPELL = 0x5c
+ SOUND_FILL_BOTTLE = 0x240
+ SOUND_INSCRIBE1 = 0x241
+ SOUND_INSCRIBE2 = 0x4f
+ SOUND_MOTAR = 0x242
+ SOUND_MEDITATE = 0x24a
+ SOUND_FELUCIA = 0x245
+ 
+ SOUND_EXPLOSION_3 = 0x306
+ SOUND_EXPLOSION_4 = 0x307
+ SOUND_EXPLOSION_5 = 0x308
+ SOUND_EXPLOSION_6 = 0x309
+ 
+ SOUND_MAGICAL_01 = 0x3bd # A Summoning Sound
+ SOUND_MAGICAL_02 = 0x3c4 # A Summoning Sound
+ SOUND_MAGICAL_03 = 0x456 # Like an energy field...
+ 
+ SOUND_WARP_01 = 0x474 # A more modern recall sound?
+ 
+ SOUND_FIREBALL_01 = 0x44b # 
+ 
+ SOUND_BREAKING_1 = 0x38d
+ SOUND_BREAKING_2 = 0x38e
+ SOUND_BREAKING_3 = 0x38f
+ SOUND_BREAKING_4 = 0x390
+ 
+ # I think this is the new lute sound anways...
+ SOUND_LUTE_01 = 0x391 # Cool tune Battle Music
+ SOUND_LUTE_02 = 0x392 # Cool tune Peace Music
+ # I think this is the harp sounds...
+ SOUND_HARP_01 = 0x403 # Cool tune Battle Music
+ SOUND_HARP_02 = 0x40b # Cool tune Peace Music
+ SOUND_HARP_03 = 0x418 # Cool tune
+ 
+ SOUND_TAMBER_01 = 0x4b6 # Short tune
+ SOUND_TAMBER_02 = 0x4b7 # Longer Tune, Battle?
+ 
+ SOUND_MALE_01 = 0x419 # Ah!
+ SOUND_MALE_02 = 0x41a # Aha!
+ SOUND_MALE_03 = 0x41b # Clapping
+ SOUND_MALE_04 = 0x41c # ??
+ SOUND_MALE_05 = 0x41d # Burp
+ SOUND_MALE_06 = 0x41e # Woo Hoo!
+ SOUND_MALE_07 = 0x41f # *Attention cough*
+ SOUND_MALE_08 = 0x420 # Cough
+ SOUND_MALE_09 = 0x421 # Choking?
+ SOUND_MALE_10 = 0x422 # Crying
+ SOUND_MALE_11 = 0x423 # Dying
+ SOUND_MALE_12 = 0x424 # Dying
+ SOUND_MALE_13 = 0x425 # Dying
+ SOUND_MALE_14 = 0x426 # Dying
+ SOUND_MALE_15 = 0x427 # Dying
+ SOUND_MALE_16 = 0x428 # Fart
+ SOUND_MALE_17 = 0x429 # Gasp
+ SOUND_MALE_18 = 0x42a # Laugh
+ SOUND_MALE_19 = 0x42b # Groan
+ SOUND_MALE_20 = 0x42c # Mean Groan
+ SOUND_MALE_21 = 0x42d # Hey!
+ SOUND_MALE_22 = 0x42e # Hicup
+ SOUND_MALE_23 = 0x42f # Huh?
+ SOUND_MALE_24 = 0x430 # Blowing a kiss
+ SOUND_MALE_25 = 0x431 # Laughing
+ SOUND_MALE_26 = 0x432 # No
+ SOUND_MALE_27 = 0x433 # Oh!
+ SOUND_MALE_28 = 0x434 # Groan
+ SOUND_MALE_29 = 0x435 # Groan
+ SOUND_MALE_30 = 0x436 # Groan
+ SOUND_MALE_31 = 0x437 # Groan soft
+ SOUND_MALE_32 = 0x438 # Groan gross sounding
+ SOUND_MALE_33 = 0x439 # Oogh...
+ SOUND_MALE_34 = 0x43a # Oohhhh...
+ SOUND_MALE_35 = 0x43b # "Hoomph!"
+ SOUND_MALE_36 = 0x43c # ugh
+ SOUND_MALE_37 = 0x43d # ooooooooo!
+ SOUND_MALE_38 = 0x43e # Oops
+ SOUND_MALE_39 = 0x43f # Throwing up
+ SOUND_MALE_40 = 0x440 # Ahhhhhhhhhhhh!
+ SOUND_MALE_41 = 0x441 # Shhhhhhhh
+ SOUND_MALE_42 = 0x442 # Yawning/Sighing
+ SOUND_MALE_43 = 0x443 # Sneezing
+ SOUND_MALE_44 = 0x444 # Sniffing
+ SOUND_MALE_45 = 0x445 # Snoring
+ SOUND_MALE_46 = 0x446 # Spitting Sound
+ SOUND_MALE_47 = 0x447 # Whistles
+ SOUND_MALE_48 = 0x448 # Yawning
+ SOUND_MALE_49 = 0x449 # Yeah!
+ SOUND_MALE_50 = 0x44a # Hoaghhh!
+ 
+ SOUND_FEMALE_01 = 0x30a # Ooooh!
+ SOUND_FEMALE_02 = 0x30b # Aha!
+ SOUND_FEMALE_03 = 0x30c # Clap
+ SOUND_FEMALE_04 = 0x30d # Sneeze?
+ SOUND_FEMALE_05 = 0x30e # Burp
+ SOUND_FEMALE_06 = 0x30f # Woohoo!
+ SOUND_FEMALE_07 = 0x310 # Cough
+ SOUND_FEMALE_08 = 0x311 # Cough 2
+ SOUND_FEMALE_09 = 0x312 # Cough 3
+ SOUND_FEMALE_10 = 0x313 # Cry
+ SOUND_FEMALE_11 = 0x314 # Groan
+ SOUND_FEMALE_12 = 0x315 # Groan 2
+ SOUND_FEMALE_13 = 0x316 # Groan 3
+ SOUND_FEMALE_14 = 0x317 # Groan 4
+ SOUND_FEMALE_15 = 0x318 # Fart Sound
+ SOUND_FEMALE_16 = 0x319 # Gasp
+ SOUND_FEMALE_17 = 0x31a # Laugh
+ SOUND_FEMALE_18 = 0x31b # Groan/Frustrated
+ SOUND_FEMALE_19 = 0x31c # Aggitated
+ SOUND_FEMALE_20 = 0x31d # "Hey!"
+ SOUND_FEMALE_21 = 0x31f # "Huh?"
+ SOUND_FEMALE_22 = 0x320 # Blowing Kiss
+ SOUND_FEMALE_23 = 0x321 # Soft Laugh
+ SOUND_FEMALE_24 = 0x322 # NO!
+ SOUND_FEMALE_25 = 0x323 # "Oh!"
+ SOUND_FEMALE_26 = 0x324 # "Ugh!"
+ SOUND_FEMALE_27 = 0x325 # "Ugh!" 2
+ SOUND_FEMALE_28 = 0x326 # "Ughhhh" 3
+ SOUND_FEMALE_29 = 0x327 # "Ughhhhhh" 4
+ SOUND_FEMALE_30 = 0x328 # "Urraghh!"
+ SOUND_FEMALE_31 = 0x329 # "Uhh!"
+ SOUND_FEMALE_32 = 0x32a # Ugh! 
+ SOUND_FEMALE_33 = 0x32b # ooooooooo!
+ SOUND_FEMALE_34 = 0x32c # Ooops!
+ SOUND_FEMALE_35 = 0x32d # Gag sound
+ SOUND_FEMALE_36 = 0x32e # Screaming
+ SOUND_FEMALE_37 = 0x32f # Shhhhhh!
+ SOUND_FEMALE_38 = 0x330 # *Sigh*
+ SOUND_FEMALE_39 = 0x331 # Sneeze
+ SOUND_FEMALE_40 = 0x332 # Sniffles
+ SOUND_FEMALE_41 = 0x333 # Snores
+ SOUND_FEMALE_42 = 0x334 # ???
+ SOUND_FEMALE_43 = 0x335 # Whistles
+ SOUND_FEMALE_44 = 0x336 # Yawns
+ SOUND_FEMALE_45 = 0x337 # Yeah!
+ SOUND_FEMALE_46 = 0x338 # Really frustrated

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

[<dr...@pr...>]

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

Modified Files:
	potions.py 
Log Message:
Fixed an error in potions.py
Added a ton of sounds to consts.py, many are AoS sounds.


Index: potions.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** potions.py	26 Jan 2004 03:23:39 -0000	1.7
--- potions.py	26 Jan 2004 11:40:42 -0000	1.8
***************
*** 170,174 ****
  	elapsed = int( char.gettag( "heal_timer" ) )
  	if elapsed > wolfpack.time.servertime():
! 		char.clilocmessage( 0x7A20B ) # You must wait 10 seconds before using another healing potion.
  		return OOPS
  	else:
--- 170,174 ----
  	elapsed = int( char.gettag( "heal_timer" ) )
  	if elapsed > wolfpack.time.servertime():
! 		char.socket.clilocmessage( 0x7A20B, GRAY ) # You must wait 10 seconds before using another healing potion.
  		return OOPS
  	else:

[wpdev-commits] xmlscripts/definitions/items/armory/colored color_defines.xml,1.2,1.3 colored_list.xml,1.1,1.2

[<dr...@pr...>]

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

Modified Files:
	color_defines.xml colored_list.xml 
Log Message:
Mining now works great, all four ore types can be dug up. 12 ore types 
(silver, merkite and mythril are added ontop of OSI ones.) There is a few
bugs that I noticed when clicking mountain tiles that are of certain angles
but I think that is hard coded... I'll look into it later.


Index: color_defines.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/color_defines.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** color_defines.xml	29 Dec 2003 12:34:30 -0000	1.2
--- color_defines.xml	25 Jan 2004 01:25:55 -0000	1.3
***************
*** 16,21 ****
  	<define id="dull_copper_armor">
  		<name>dull copper %1</name>
! 		<color>0x0973</color>
! 		<defense>+6</defense>
  		<value>1.1</value>
  		<tag name="armor_physical" value="6" type="int" />
--- 16,21 ----
  	<define id="dull_copper_armor">
  		<name>dull copper %1</name>
! 		<color>0x973</color>
! 		<!-- <defense>+6</defense> -->
  		<value>1.1</value>
  		<tag name="armor_physical" value="6" type="int" />
***************
*** 36,42 ****
  
  	<define id="shadow_armor">
! 		<name>shadow %1</name>
! 		<color>0x0966</color>
! 		<defense>+2</defense> <!-- this means 110 percent of original defense -->
  		<value>1.2</value>
  		<tag name="armor_physical" value="2" type="int" />
--- 36,42 ----
  
  	<define id="shadow_armor">
! 		<name>shadow iron %1</name>
! 		<color>0x966</color>
! 		<!-- <defense>+2</defense> --> <!-- this means 110 percent of original defense -->
  		<value>1.2</value>
  		<tag name="armor_physical" value="2" type="int" />
***************
*** 56,61 ****
  	<define id="copper_armor">
  		<name>copper %1</name>
! 		<color>0x096e</color>
! 		<defense>+1</defense>
  		<value>1.3</value>
  		<tag name="armor_physical" value="1" type="int" />
--- 56,61 ----
  	<define id="copper_armor">
  		<name>copper %1</name>
! 		<color>0x96d</color>
! 		<!-- <defense>+1</defense> -->
  		<value>1.3</value>
  		<tag name="armor_physical" value="1" type="int" />
***************
*** 73,78 ****
  	<define id="bronze_armor">
  		<name>bronze %1</name>
! 		<color>0x08a9</color>
! 		<defense>+3</defense>
  		<value>1.4</value>
  		<tag name="armor_physical" value="3" type="int" />
--- 73,78 ----
  	<define id="bronze_armor">
  		<name>bronze %1</name>
! 		<color>0x972</color>
! 		<!-- <defense>+3</defense>-->
  		<value>1.4</value>
  		<tag name="armor_physical" value="3" type="int" />
***************
*** 90,95 ****
  	<define id="golden_armor">
  		<name>gold %1</name>
! 		<color>0x08a5</color>
! 		<defense>+1</defense>
  		<value>1.5</value>
  		<tag name="armor_physical" value="1" type="int" />
--- 90,95 ----
  	<define id="golden_armor">
  		<name>gold %1</name>
! 		<color>0x8a5</color>
! 		<!-- <defense>+1</defense>-->
  		<value>1.5</value>
  		<tag name="armor_physical" value="1" type="int" />
***************
*** 108,115 ****
  	</define>
  
  	<define id="agapite_armor">
  		<name>agapite %1</name>
! 		<color>0x0979</color>
! 		<defense>+2</defense>
  		<value>1.6</value>
  		<tag name="armor_physical" value="2" type="int" />
--- 108,135 ----
  	</define>
  
+ 	<define id="silver_armor">
+ 		<name>silver %1</name>
+ 		<color>0x430</color>
+ 		<!-- <defense>+1</defense>-->
+ 		<value>1.5</value>
+ 		<tag name="armor_physical" value="1" type="int" />
+ 		<tag name="armor_fire" value="1" type="int" />
+ 		<tag name="armor_cold" value="3" type="int" />
+ 		<tag name="armor_poison" value="1" type="int" />
+ 		<tag name="armor_energy" value="2" type="int" />
+ 		<tag name="weapon_physical" value="-10" type="int" />
+ 		<tag name="weapon_fire" value="0" type="int" />
+ 		<tag name="weapon_cold" value="10" type="int" />
+ 		<tag name="weapon_poison" value="0" type="int" />
+ 		<tag name="weapon_energy" value="0" type="int" />
+ 		<tag name="luck" value="40" type="int" />
+ 		<tag name="armor_reqs" value="30" type="int" />
+ 		<tag name="weapon_reqs" value="50" type="int" />
+ 	</define>
+ 
  	<define id="agapite_armor">
  		<name>agapite %1</name>
! 		<color>0x979</color>
! 		<!-- <defense>+2</defense>-->
  		<value>1.6</value>
  		<tag name="armor_physical" value="2" type="int" />
***************
*** 127,132 ****
  	<define id="verite_armor">
  		<name>verite %1</name>
! 		<color>0x089f</color>
! 		<defense>+3</defense>
  		<value>1.7</value>
  		<tag name="armor_physical" value="3" type="int" />
--- 147,152 ----
  	<define id="verite_armor">
  		<name>verite %1</name>
! 		<color>0x89f</color>
! 		<!-- <defense>+3</defense> -->
  		<value>1.7</value>
  		<tag name="armor_physical" value="3" type="int" />
***************
*** 144,149 ****
  	<define id="valorite_armor">
  		<name>valorite %1</name>
! 		<color>0x08ab</color>
! 		<defense>+4</defense>
  		<value>1.8</value>
  		<tag name="armor_physical" value="4" type="int" />
--- 164,169 ----
  	<define id="valorite_armor">
  		<name>valorite %1</name>
! 		<color>0x8ab</color>
! 		<!-- <defense>+4</defense> -->
  		<value>1.8</value>
  		<tag name="armor_physical" value="4" type="int" />
***************
*** 160,169 ****
  		<tag name="weapon_durability" value="0" type="int" />
  	</define>
! 
  	<define id="merkite_armor">
  		<name>merkite %1</name>
! 		<color>0x02C3</color>
! 		<defense>+5</defense>
! 		<value>1.6</value>
  		<tag name="armor_physical" value="3" type="int" />
  		<tag name="armor_fire" value="3" type="int" />
--- 180,189 ----
  		<tag name="weapon_durability" value="0" type="int" />
  	</define>
! 	
  	<define id="merkite_armor">
  		<name>merkite %1</name>
! 		<color>0x8b0</color>
! 		<!-- <defense>+5</defense> -->
! 		<value>2.0</value>
  		<tag name="armor_physical" value="3" type="int" />
  		<tag name="armor_fire" value="3" type="int" />
***************
*** 179,182 ****
--- 199,221 ----
  		<tag name="weapon_durability" value="50" type="int" />
  	</define>
+ 	
+ 	<define id="mythril_armor">
+ 		<name>mythril %1</name>
+ 		<color>0x84c</color>
+ 		<!-- <defense>+5</defense> -->
+ 		<value>2.2</value>
+ 		<tag name="armor_physical" value="4" type="int" />
+ 		<tag name="armor_fire" value="4" type="int" />
+ 		<tag name="armor_cold" value="4" type="int" />
+ 		<tag name="armor_poison" value="4" type="int" />
+ 		<tag name="armor_energy" value="4" type="int" />
+ 		<tag name="weapon_physical" value="-80" type="int" />
+ 		<tag name="weapon_fire" value="20" type="int" />
+ 		<tag name="weapon_cold" value="20" type="int" />
+ 		<tag name="weapon_poison" value="20" type="int" />
+ 		<tag name="weapon_energy" value="20" type="int" />
+ 		<tag name="armor_durability" value="50" type="int" />
+ 		<tag name="weapon_durability" value="50" type="int" />
+ 	</define>
  
  </definitions>

Index: colored_list.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/colored_list.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** colored_list.xml	29 Dec 2003 11:06:59 -0000	1.1
--- colored_list.xml	25 Jan 2004 01:25:56 -0000	1.2
***************
*** 16,23 ****
--- 16,25 ----
  	<include file="definitions/items/armory/colored/chain/bronze.xml"/>
  	<include file="definitions/items/armory/colored/chain/golden.xml"/>
+ 	<include file="definitions/items/armory/colored/chain/silver.xml"/>
  	<include file="definitions/items/armory/colored/chain/agapite.xml"/>
  	<include file="definitions/items/armory/colored/chain/verite.xml"/>
  	<include file="definitions/items/armory/colored/chain/valorite.xml"/>
  	<include file="definitions/items/armory/colored/chain/merkite.xml"/>
+ 	<include file="definitions/items/armory/colored/chain/mythril.xml"/>
  
  	<!-- Helmets -->
***************
*** 28,35 ****
--- 30,39 ----
  	<include file="definitions/items/armory/colored/helmets/bronze.xml"/>
  	<include file="definitions/items/armory/colored/helmets/golden.xml"/>
+ 	<include file="definitions/items/armory/colored/helmets/silver.xml"/>
  	<include file="definitions/items/armory/colored/helmets/agapite.xml"/>
  	<include file="definitions/items/armory/colored/helmets/verite.xml"/>
  	<include file="definitions/items/armory/colored/helmets/valorite.xml"/>
  	<include file="definitions/items/armory/colored/helmets/merkite.xml"/>
+ 	<include file="definitions/items/armory/colored/helmets/mythril.xml"/>
  
  	<!-- Plate -->
***************
*** 40,47 ****
--- 44,53 ----
  	<include file="definitions/items/armory/colored/plate/bronze.xml"/>
  	<include file="definitions/items/armory/colored/plate/golden.xml"/>
+ 	<include file="definitions/items/armory/colored/plate/silver.xml"/>
  	<include file="definitions/items/armory/colored/plate/agapite.xml"/>
  	<include file="definitions/items/armory/colored/plate/verite.xml"/>
  	<include file="definitions/items/armory/colored/plate/valorite.xml"/>
  	<include file="definitions/items/armory/colored/plate/merkite.xml"/>
+ 	<include file="definitions/items/armory/colored/plate/mythril.xml"/>
  
  	<!-- Ring -->
***************
*** 52,59 ****
--- 58,67 ----
  	<include file="definitions/items/armory/colored/ring/bronze.xml"/>
  	<include file="definitions/items/armory/colored/ring/golden.xml"/>
+ 	<include file="definitions/items/armory/colored/ring/silver.xml"/>
  	<include file="definitions/items/armory/colored/ring/agapite.xml"/>
  	<include file="definitions/items/armory/colored/ring/verite.xml"/>
  	<include file="definitions/items/armory/colored/ring/valorite.xml"/>
  	<include file="definitions/items/armory/colored/ring/merkite.xml"/>
+ 	<include file="definitions/items/armory/colored/ring/mythril.xml"/>
  
  	<!-- Shields -->
***************
*** 64,71 ****
--- 72,81 ----
  	<include file="definitions/items/armory/colored/shields/bronze.xml"/>
  	<include file="definitions/items/armory/colored/shields/golden.xml"/>
+ 	<include file="definitions/items/armory/colored/shields/silver.xml"/>
  	<include file="definitions/items/armory/colored/shields/agapite.xml"/>
  	<include file="definitions/items/armory/colored/shields/verite.xml"/>
  	<include file="definitions/items/armory/colored/shields/valorite.xml"/>
  	<include file="definitions/items/armory/colored/shields/merkite.xml"/>
+ 	<include file="definitions/items/armory/colored/shields/mythril.xml"/>
  
  </definitions>

[wpdev-commits] xmlscripts/definitions access.xml,1.7,1.8 scripts.xml,1.72,1.73

[<dr...@pr...>]

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

Modified Files:
	access.xml scripts.xml 
Log Message:
Mining now works great, all four ore types can be dug up. 12 ore types 
(silver, merkite and mythril are added ontop of OSI ones.) There is a few
bugs that I noticed when clicking mountain tiles that are of certain angles
but I think that is hard coded... I'll look into it later.


Index: access.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/access.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** access.xml	22 Jan 2004 04:06:07 -0000	1.7
--- access.xml	25 Jan 2004 01:25:41 -0000	1.8
***************
*** 18,22 ****
  		<group name="multi"></group>
  	</acl>
! 	
  	<!-- Admin privs -->
  	<acl id="admin" plevel="100">
--- 18,22 ----
  		<group name="multi"></group>
  	</acl>
! 
  	<!-- Admin privs -->
  	<acl id="admin" plevel="100">
***************
*** 31,35 ****
  		</group>
  	</acl>
! 	
  	<!-- GameMaster privs -->
  	<acl id="gm" plevel="50">
--- 31,35 ----
  		</group>
  	</acl>
! 
  	<!-- GameMaster privs -->
  	<acl id="gm" plevel="50">
***************
*** 46,50 ****
  		<group name="command">
  			<action name="any" permit="true" />
! 		</group>		
  		<group name="multi"></group>
  	</acl>
--- 46,50 ----
  		<group name="command">
  			<action name="any" permit="true" />
! 		</group>
  		<group name="multi"></group>
  	</acl>

Index: scripts.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** scripts.xml	22 Jan 2004 04:33:16 -0000	1.72
--- scripts.xml	25 Jan 2004 01:25:42 -0000	1.73
***************
*** 26,30 ****
  	<script>clothing_bless_deed</script>
  	<script>item_bless_deed</script>
! 	<script>carpentry_deed</script>	
  	<script>environment</script>
  	<script>door</script>
--- 26,30 ----
  	<script>clothing_bless_deed</script>
  	<script>item_bless_deed</script>
! 	<script>carpentry_deed</script>
  	<script>environment</script>
  	<script>door</script>
***************
*** 33,38 ****
  	<script>equipment</script>
  	<script>bandages</script>
!   <script>key</script>
! 	
  	<!-- Commands -->
  	<script>wolfpack.commands</script>
--- 33,39 ----
  	<script>equipment</script>
  	<script>bandages</script>
! 	<script>key</script>
! 	<script>ore</script>
! 
  	<!-- Commands -->
  	<script>wolfpack.commands</script>
***************
*** 41,44 ****
--- 42,46 ----
  	<script>wolfpack.commands.cast</script>
  	<script>wolfpack.commands.decoration</script>
+ 	<script>wolfpack.commands.dye</script>
  	<script>wolfpack.commands.export</script>
  	<script>wolfpack.commands.import</script>
***************
*** 48,51 ****
--- 50,54 ----
  	<script>wolfpack.commands.skill</script>
  	<script>wolfpack.commands.stat</script>
+ 	<script>wolfpack.commands.sound</script>
  	<script>wolfpack.commands.travel</script>
  
***************
*** 82,86 ****
  	<script>multideed</script>
  	<script>signpost</script>
! 	
  	<!-- Moongate -->
  	<script>moongate</script>
--- 85,89 ----
  	<script>multideed</script>
  	<script>signpost</script>
! 
  	<!-- Moongate -->
  	<script>moongate</script>

[wpdev-commits] xmlscripts/definitions/items/armory/shields bronze_shield.xml,1.3,1.4 buckler.xml,1.3,1.4 chaos_shield.xml,1.3,1.4 heater_shield.xml,1.3,1.4 metal_kite_shield.xml,1.3,1.4 metal_shield.xml,1.3,1.4 order_shield.xml,1.3,1.4 wooden_kite_shield.xml,1.3,1.4 wooden_shield.xml,1.3,1.4

[<dr...@pr...>]

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

Modified Files:
	bronze_shield.xml buckler.xml chaos_shield.xml 
	heater_shield.xml metal_kite_shield.xml metal_shield.xml 
	order_shield.xml wooden_kite_shield.xml wooden_shield.xml 
Log Message:
I added resname tags to weapons/armor. This will be useful for smelting
weapons and armor, and even cutting armor that gives leather. AoS has the
four leather types. Also, wooden objects have 'plainwood' in case later
there happens to be multiple wood types or something...


Index: bronze_shield.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/shields/bronze_shield.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** bronze_shield.xml	29 Dec 2003 12:09:12 -0000	1.3
--- bronze_shield.xml	26 Jan 2004 07:02:27 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="0" type="int" />
  		<tag name="res_energy" value="0" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>4</smelt>

Index: buckler.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/shields/buckler.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buckler.xml	29 Dec 2003 12:09:12 -0000	1.3
--- buckler.xml	26 Jan 2004 07:02:27 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="1" type="int" />
  		<tag name="res_energy" value="0" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>8</smelt>

Index: chaos_shield.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/shields/chaos_shield.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** chaos_shield.xml	29 Dec 2003 12:09:12 -0000	1.3
--- chaos_shield.xml	26 Jan 2004 07:02:27 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="0" type="int" />
  		<tag name="res_energy" value="0" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>0</restock>
  		<weight>5</weight>

Index: heater_shield.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/shields/heater_shield.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** heater_shield.xml	29 Dec 2003 12:09:12 -0000	1.3
--- heater_shield.xml	26 Jan 2004 07:02:27 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="0" type="int" />
  		<tag name="res_energy" value="0" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>14</smelt>

Index: metal_kite_shield.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/shields/metal_kite_shield.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** metal_kite_shield.xml	29 Dec 2003 12:09:12 -0000	1.3
--- metal_kite_shield.xml	26 Jan 2004 07:02:27 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="0" type="int" />
  		<tag name="res_energy" value="1" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>13</smelt>

Index: metal_shield.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/shields/metal_shield.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** metal_shield.xml	29 Dec 2003 12:09:12 -0000	1.3
--- metal_shield.xml	26 Jan 2004 07:02:27 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="0" type="int" />
  		<tag name="res_energy" value="0" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>11</smelt>

Index: order_shield.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/shields/order_shield.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** order_shield.xml	29 Dec 2003 12:09:12 -0000	1.3
--- order_shield.xml	26 Jan 2004 07:02:27 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="0" type="int" />
  		<tag name="res_energy" value="0" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>0</restock>
  		<weight>7</weight>

Index: wooden_kite_shield.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/shields/wooden_kite_shield.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wooden_kite_shield.xml	29 Dec 2003 12:09:12 -0000	1.3
--- wooden_kite_shield.xml	26 Jan 2004 07:02:27 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="0" type="int" />
  		<tag name="res_energy" value="1" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>6</smelt>

Index: wooden_shield.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/shields/wooden_shield.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wooden_shield.xml	29 Dec 2003 12:09:12 -0000	1.3
--- wooden_shield.xml	26 Jan 2004 07:02:27 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="0" type="int" />
  		<tag name="res_energy" value="1" type="int" />
+ 		<tag name="resname" value="plainwood" />
  		<restock>10</restock>
  		<weight>5</weight>

[wpdev-commits] xmlscripts/scripts keyring.py,NONE,1.1 key.py,1.4,1.5

[<dar...@pr...>]

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

Modified Files:
	key.py 
Added Files:
	keyring.py 
Log Message:
Started Implementation of Keyrings

--- NEW FILE: keyring.py ---

def onDropOnItem(keyring, key):
  if 'keyring' not in keyring.events or 'key' not in key.events:
    return 0

  char = key.container

  # Only non-blank keys may be put on a keyring...
  if not key.hastag('lock'):
    char.socket.clilocmessage(501689)
    return 0

  # Keyring is full
  keycount = len(keyring.content)

  if keycount >= 20:
    char.socket.clilocmessage(1008138)
    return 0

  # Add the key to the keyring
  key.removefromview(0)
  key.container = keyring
  key.layer = 0

  # Id?
  if keycount >= 5:
    newid = 0x176b
  elif keycount >= 3:
    newid = 0x176a
  else:
    newid = 0x1769

  if keyring.id != newid:
    keyring.id = newid
    keyring.update()

  char.socket.clilocmessage(501691)
  return 1

def onUse(char, item):
  return 1
Index: key.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/key.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** key.py	25 Jan 2004 20:26:54 -0000	1.4
--- key.py	26 Jan 2004 03:45:19 -0000	1.5
***************
*** 6,10 ****
  
  def gump_response(char, args, response):
!   if len(args) < 1:
      return
  
--- 6,10 ----
  
  def gump_response(char, args, response):
!   if len(args) < 1 or response.button != 1:
      return
  
***************
*** 18,22 ****
    new_name = response.text[1][:30] # 30 Chars max.
    key.name = new_name
! 
    # Rekey
    if char.gm:
--- 18,23 ----
    new_name = response.text[1][:30] # 30 Chars max.
    key.name = new_name
!   char.socket.sysmessage("You renamed the key to '%s'" % new_name)
!   
    # Rekey
    if char.gm:
***************
*** 24,32 ****
      
      if len(new_lock) != 0:
!       key.settag(new_lock)
!       char.socket.sysmessage('This key now unlocks:' + new_lock)
      else:
        key.deltag('lock')
!       char.socket.sysmessage('You erase the lock information.')    
  
  def rename_key(char, key):
--- 25,35 ----
      
      if len(new_lock) != 0:
!       key.settag('lock', new_lock)
!       char.socket.sysmessage('This key now unlocks: ' + new_lock)
      else:
        key.deltag('lock')
!       char.socket.sysmessage('You erase the lock information from the key.')    
! 
!   key.update()
  
  def rename_key(char, key):
***************
*** 149,153 ****
  
    # The user defined name
!   if len(item.name) != 0:
      tooltip.add(1050045, " \t" + item.name + "\t ")
  
--- 152,156 ----
  
    # The user defined name
!   if len(item.name) > 0:
      tooltip.add(1050045, " \t" + item.name + "\t ")
  

[wpdev-commits] xmlscripts/scripts/wolfpack utilities.py,1.24,1.25

[<dr...@pr...>]

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

Modified Files:
	utilities.py 
Log Message:
Added some more tile ranges for mountain/caves.
Added a tile range for crystals incase it's ever used for something.


Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/utilities.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** utilities.py	25 Jan 2004 01:26:17 -0000	1.24
--- utilities.py	26 Jan 2004 04:07:51 -0000	1.25
***************
*** 238,253 ****
  
  def ismountainorcave( tile ):
! 	return tile in  range(  220,  231 ) + \
! 			range(  236,  247 ) + \
! 			range(  252,  263 ) + \
! 			range(  268,  279 ) + \
! 			range(  286,  297 ) + \
! 			range(  321,  324 ) + \
! 			range(  467,  474 ) + \
! 			range(  476,  487 ) + \
! 			range(  492,  495 ) + \
! 			range(  543,  579 ) + \
! 			range(  581,  601 ) + \
! 			range(  610,  613 ) + \
  			range( 1339, 1359 ) + \
  			range( 1361, 1363 ) + \
--- 238,253 ----
  
  def ismountainorcave( tile ):
! 	return tile in range( 220, 231 ) + \
! 			range( 236, 247 ) + \
! 			range( 252, 263 ) + \
! 			range( 268, 279 ) + \
! 			range( 286, 297 ) + \
! 			range( 321, 324 ) + \
! 			range( 467, 474 ) + \
! 			range( 476, 487 ) + \
! 			range( 492, 495 ) + \
! 			range( 543, 579 ) + \
! 			range( 581, 621 ) + \
! 			range( 700, 715 ) + \
  			range( 1339, 1359 ) + \
  			range( 1361, 1363 ) + \
***************
*** 260,267 ****
  			range( 1981, 2004 ) + \
  			range( 2028, 2033 ) + \
! 			range( 2100, 2105 )
  
  def issand( tile ):
! 	return tile in  range(   22,   62 ) + \
  			range(   68,   75 ) + \
  			range(  286,  301 ) + \
--- 260,274 ----
  			range( 1981, 2004 ) + \
  			range( 2028, 2033 ) + \
! 			range( 2100, 2105 ) + \
! 			range( 16233, 16248 ) + \
! 			range( 17419, 17438 ) + \
! 			range( 17723, 17747 ) + \
! 			range( 23335, 23358 ) + \
! 			range( 29505, 29521 ) + \
! 			range( 29745, 29753 ) + \
! 			range( 30009, 30012 )
  
  def issand( tile ):
! 	return tile in range(   22,   62 ) + \
  			range(   68,   75 ) + \
  			range(  286,  301 ) + \
***************
*** 283,286 ****
--- 290,296 ----
  			range( 1647, 1650 )
  
+ def iscrystal( tile ):
+ 	return tile in range( 25904, 25132 )
+ 
  def cleartag( self, args ):
  	char = args[0]

[wpdev-commits] wolfpack dragdrop.cpp,1.208,1.209 uobject.cpp,1.125,1.126 wolfpack.vcproj,1.7,1.8

[<dar...@pr...>]

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

Modified Files:
	dragdrop.cpp uobject.cpp wolfpack.vcproj 
Log Message:
Fixed an issue with onDropOnItem...

Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.208
retrieving revision 1.209
diff -C2 -d -r1.208 -r1.209
*** dragdrop.cpp	26 Nov 2003 03:53:52 -0000	1.208
--- dragdrop.cpp	26 Jan 2004 03:48:40 -0000	1.209
***************
*** 780,785 ****
  	// And were *un*able to stack it (!)
  	// >> Set it to the location of the item we dropped it on and stack it up by 2
! 	pItem->moveTo( pCont->pos() );
! 	pItem->setPos( pItem->pos() + Coord_cl(0, 0, 2) );
  	pItem->update();
  
--- 780,796 ----
  	// And were *un*able to stack it (!)
  	// >> Set it to the location of the item we dropped it on and stack it up by 2
! 	if (pCont->container()) {
! 		P_ITEM pNewCont = dynamic_cast<P_ITEM>(pCont->container());
! 
! 		if (pNewCont) {
! 			pNewCont->addItem(pItem, false);
! 			pItem->setPos(pCont->pos() + Coord_cl(0, 0, 2));
! 		} else {
! 			pChar->getBackpack()->addItem(pItem);
! 		}
! 	} else {
! 		pItem->moveTo(pCont->pos() + Coord_cl(0, 0, 2));
! 	}
! 
  	pItem->update();
  

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** uobject.cpp	26 Jan 2004 00:45:10 -0000	1.125
--- uobject.cpp	26 Jan 2004 03:48:40 -0000	1.126
***************
*** 735,755 ****
  
  void cUObject::resendTooltip() {
! 	tooltip_ = World::instance()->getUnusedTooltip(); 
! 	setTooltip(tooltip_);
! 
! 	cUOTxAttachTooltip tooltip;
! 
! 	tooltip.setId( tooltip_ );
! 	tooltip.setSerial( serial() );
! 
! 	cUOTxAttachTooltip attach;
! 	attach.setId(tooltip_);
! 	attach.setSerial(serial_);
  
! 	for (cUOSocket *s = cNetwork::instance()->first(); s; s = cNetwork::instance()->next()) {
! 		if (s->player() && s->player()->inRange(this, s->player()->visualRange())) {
! 			s->addTooltip(tooltip_);
! 			s->send(&attach);
  		}
  	}
  }
--- 735,754 ----
  
  void cUObject::resendTooltip() {
! 	// Either Attach or Refresh the Data
! 	if (tooltip_ == 0xFFFFFFFF) {
! 		tooltip_ = World::instance()->getUnusedTooltip();
! 		
! 		cUOTxAttachTooltip attach;
! 		attach.setId(tooltip_);
! 		attach.setSerial(serial_);
  
! 		for (cUOSocket *s = cNetwork::instance()->first(); s; s = cNetwork::instance()->next()) {
! 			if (s->player() && s->player()->inRange(this, s->player()->visualRange())) {
! 				s->addTooltip(tooltip_);
! 				s->send(&attach);
! 			}
  		}
+ 	} else {
+ 		// TODO: Tooltip implementation sucks... redo...
  	}
  }

Index: wolfpack.vcproj
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wolfpack.vcproj	24 Jan 2004 22:35:28 -0000	1.7
--- wolfpack.vcproj	26 Jan 2004 03:48:40 -0000	1.8
***************
*** 76,90 ****
  				Optimization="3"
  				GlobalOptimizations="TRUE"
! 				InlineFunctionExpansion="2"
  				EnableIntrinsicFunctions="TRUE"
! 				FavorSizeOrSpeed="1"
  				OptimizeForWindowsApplication="FALSE"
  				AdditionalIncludeDirectories="sqlite"
  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_DLL;QT_NO_STL;QT_THREAD_SUPPORT"
  				MinimalRebuild="FALSE"
  				RuntimeLibrary="0"
  				BufferSecurityCheck="FALSE"
  				EnableFunctionLevelLinking="FALSE"
  				ForceConformanceInForLoopScope="TRUE"
  				UsePrecompiledHeader="0"
  				BrowseInformation="1"
--- 76,93 ----
  				Optimization="3"
  				GlobalOptimizations="TRUE"
! 				InlineFunctionExpansion="1"
  				EnableIntrinsicFunctions="TRUE"
! 				FavorSizeOrSpeed="2"
  				OptimizeForWindowsApplication="FALSE"
  				AdditionalIncludeDirectories="sqlite"
  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_DLL;QT_NO_STL;QT_THREAD_SUPPORT"
+ 				StringPooling="TRUE"
  				MinimalRebuild="FALSE"
  				RuntimeLibrary="0"
  				BufferSecurityCheck="FALSE"
  				EnableFunctionLevelLinking="FALSE"
+ 				EnableEnhancedInstructionSet="1"
  				ForceConformanceInForLoopScope="TRUE"
+ 				RuntimeTypeInfo="TRUE"
  				UsePrecompiledHeader="0"
  				BrowseInformation="1"
***************
*** 96,100 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="qt-mt321.lib ws2_32.lib"
  				OutputFile="../wolfpack.exe"
  				LinkIncremental="1"
--- 99,103 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="qt-mt322.lib ws2_32.lib"
  				OutputFile="../wolfpack.exe"
  				LinkIncremental="1"

[wpdev-commits] wolfpack accounts.cpp,1.76,1.77

[<dar...@pr...>]

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

Modified Files:
	accounts.cpp 
Log Message:
Possible ACL fix

Index: accounts.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/accounts.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** accounts.cpp	22 Jan 2004 05:59:46 -0000	1.76
--- accounts.cpp	25 Jan 2004 01:42:52 -0000	1.77
***************
*** 502,506 ****
  
  	while (it != accounts.end()) {
! 		it.data()->acl_ = 0;
  		++it;
  	}
--- 502,506 ----
  
  	while (it != accounts.end()) {
!     it.data()->refreshAcl();
  		++it;
  	}

[wpdev-commits] xmlscripts/scripts/wolfpack/commands skill.py,1.1,1.2

[<as...@pr...>]

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

Modified Files:
	skill.py 
Log Message:
rank check for the 'skill command


Index: skill.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/commands/skill.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** skill.py	29 Sep 2003 13:27:16 -0000	1.1
--- skill.py	25 Jan 2004 03:47:59 -0000	1.2
***************
*** 59,62 ****
--- 59,67 ----
  		return OK
  
+ 	# check for rank
+ 	if target.char.rank >= char.rank and not char == target.char:
+ 		socket.sysmessage( "You are not very skilled, are you?" )
+ 		return OK
+ 
  	( skill, value ) = args
  

[wpdev-commits] xmlscripts/scripts/wolfpack consts.py,1.36,1.37

[<as...@pr...>]

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

Modified Files:
	consts.py 
Log Message:
changed port number back to its original state, to avoid bugreports submitted by thousands of users *gg*


Index: consts.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** consts.py	25 Jan 2004 01:26:16 -0000	1.36
--- consts.py	25 Jan 2004 03:47:21 -0000	1.37
***************
*** 9,13 ****
  
  # Which port should the remote admin run on
! REMOTEADMIN_PORT = 2600
  
  # Spell Settings
--- 9,13 ----
  
  # Which port should the remote admin run on
! REMOTEADMIN_PORT = 2594
  
  # Spell Settings

[wpdev-commits] xmlscripts/scripts/tools pickaxe.py,1.6,1.7

[<dr...@pr...>]

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

Modified Files:
	pickaxe.py 
Log Message:
Mining now works great, all four ore types can be dug up. 12 ore types 
(silver, merkite and mythril are added ontop of OSI ones.) There is a few
bugs that I noticed when clicking mountain tiles that are of certain angles
but I think that is hard coded... I'll look into it later.


Index: pickaxe.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/tools/pickaxe.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pickaxe.py	16 Jan 2004 21:14:20 -0000	1.6
--- pickaxe.py	25 Jan 2004 01:26:14 -0000	1.7
***************
*** 17,21 ****
  def onUse( char, tool ):
  	#Already digging ?
! 	if char.hastag( 'is_mining' ) and ( char.gettag( 'is_mining' ) > servertime() ):
  		char.socket.clilocmessage( 503029, "", GRAY, NORMAL ) # You are already digging.
  		return OK
--- 17,21 ----
  def onUse( char, tool ):
  	#Already digging ?
! 	if char.hastag( 'is_mining' ) and ( int( char.gettag( 'is_mining' ) ) > servertime() ):
  		char.socket.clilocmessage( 503029, "", GRAY, NORMAL ) # You are already digging.
  		return OK
***************
*** 23,40 ****
  	# Can't mine on horses
  	if char.itemonlayer( LAYER_MOUNT ):
! 		char.socket.clilocmessage( 501864, "", RED, NORMAL ) # You can't mine while riding.
  		return OK
  	
  	# Who is tool owner ?
  	if tool.getoutmostchar() != char:
! 		char.socket.clilocmessage( 500364, "", RED, NORMAL ) # You can't use that, it belongs to someone else
  		return OK
  	
  	# Is that mining tool ?
! 	if isminingtool(tool):
! 		char.socket.clilocmessage( 503033, "", YELLOW, NORMAL ) # Where do you wish to dig?
  		char.socket.attachtarget( "skills.mining.response", [ tool ] )
  	else:
! 		char.socket.clilocmessage( 500735, "", RED, NORMAL ) # Don't play with things you don't know about. :)
  		return OK
  	
--- 23,40 ----
  	# Can't mine on horses
  	if char.itemonlayer( LAYER_MOUNT ):
! 		char.socket.clilocmessage( 501864, "", GRAY, NORMAL ) # You can't mine while riding.
  		return OK
  	
  	# Who is tool owner ?
  	if tool.getoutmostchar() != char:
! 		char.socket.clilocmessage( 500364, "", GRAY, NORMAL ) # You can't use that, it belongs to someone else
  		return OK
  	
  	# Is that mining tool ?
! 	if isminingtool( tool ):
! 		char.socket.clilocmessage( 503033, "", GRAY, NORMAL ) # Where do you wish to dig?
  		char.socket.attachtarget( "skills.mining.response", [ tool ] )
  	else:
! 		char.socket.clilocmessage( 500735, "", GRAY, NORMAL ) # Don't play with things you don't know about. :)
  		return OK
  	

[wpdev-commits] xmlscripts/definitions/items/armory/colored/plate mythril.xml,NONE,1.1 silver.xml,NONE,1.1

[<dr...@pr...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/plate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24376/plate

Added Files:
	mythril.xml silver.xml 
Log Message:
Armor for silver/merkite/mythril.


--- NEW FILE: mythril.xml ---
<!--
=================================================================
|   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
|  ((    _/{  "-;  | Created by: Kosh	                        |
|   )).-' {{ ;'`   | Revised by: Viper, Dreoth                   |
|  ( (  ;._ \\ ctr | Last Modification: Split, both IDs     |
=================================================================
-->
<definitions>

	<!-- plate armor -->
	<!-- female plate armor -->
	<item id="mythril_armor_plate_female">
		<inherit id="1c04" />
		<mythril_armor />
		<category>Armor\Mythril\Platemail\Female Armor (N/S)</category>
	</item>

	<item id="mythril_armor_plate_female_2">
		<inherit id="1c05" />
		<mythril_armor />
		<category>Armor\Mythril\Platemail\Female Armor (E/W)</category>
	</item>

	<!-- male plate armor -->
	<item id="mythril_armor_plate_male">
		<inherit id="1415" />
		<mythril_armor />
		<category>Armor\Mythril\Platemail\Male Armor (N/S)</category>
	</item>

	<item id="mythril_armor_plate_male_2">
		<inherit id="1416" />
		<mythril_armor />
		<category>Armor\Mythril\Platemail\Male Armor (E/W)</category>
	</item>

	<!-- plate arms -->
	<item id="mythril_armor_plate_arms">
		<inherit id="1410" />
		<mythril_armor />
		<category>Armor\Mythril\Platemail\Arms (N/S)</category>
	</item>

	<item id="mythril_armor_plate_arms_2">
		<inherit id="1417" />
		<mythril_armor />
		<category>Armor\Mythril\Platemail\Arms (E/W)</category>
	</item>

	<!-- plate gloves -->
	<item id="mythril_armor_plate_gloves">
		<inherit id="1414" />
		<mythril_armor />
		<category>Armor\Mythril\Platemail\Gloves (N/S)</category>
	</item>

	<item id="mythril_armor_plate_gloves_2">
		<inherit id="1418" />
		<mythril_armor />
		<category>Armor\Mythril\Platemail\Gloves (E/W)</category>
	</item>

	<!-- plate gorget -->
	<item id="mythril_armor_plate_gorget">
		<inherit id="1413" />
		<mythril_armor />
		<category>Armor\Mythril\Platemail\Gorget</category>
	</item>

	<!-- plate helmet -->
	<item id="mythril_armor_plate_helmet">
		<inherit id="1412" />
		<mythril_armor />
		<category>Armor\Mythril\Platemail\Helm (N/S)</category>
	</item>

	<item id="mythril_armor_plate_helmet_2">
		<inherit id="1419" />
		<mythril_armor />
		<category>Armor\Mythril\Platemail\Helm (E/W)</category>
	</item>

	<!-- plate leggings -->
	<item id="mythril_armor_plate_leggings">
		<inherit id="1411" />
		<mythril_armor />
		<category>Armor\Mythril\Platemail\Legs (N/S)</category>
	</item>

	<item id="mythril_armor_plate_leggings_2">
		<inherit id="141a" />
		<mythril_armor />
		<category>Armor\Mythril\Platemail\Legs (E/W)</category>
	</item>

</definitions>

--- NEW FILE: silver.xml ---
<!--
=================================================================
|   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
|  ((    _/{  "-;  | Created by: Kosh	                        |
|   )).-' {{ ;'`   | Revised by: Viper, Dreoth                   |
|  ( (  ;._ \\ ctr | Last Modification: Split, both IDs     |
=================================================================
-->
<definitions>

	<!-- plate armor -->
	<!-- female plate armor -->
	<item id="silver_armor_plate_female">
		<inherit id="1c04" />
		<silver_armor />
		<category>Armor\Silver\Platemail\Female Armor (N/S)</category>
	</item>

	<item id="silver_armor_plate_female_2">
		<inherit id="1c05" />
		<silver_armor />
		<category>Armor\Silver\Platemail\Female Armor (E/W)</category>
	</item>

	<!-- male plate armor -->
	<item id="silver_armor_plate_male">
		<inherit id="1415" />
		<silver_armor />
		<category>Armor\Silver\Platemail\Male Armor (N/S)</category>
	</item>

	<item id="silver_armor_plate_male_2">
		<inherit id="1416" />
		<silver_armor />
		<category>Armor\Silver\Platemail\Male Armor (E/W)</category>
	</item>

	<!-- plate arms -->
	<item id="silver_armor_plate_arms">
		<inherit id="1410" />
		<silver_armor />
		<category>Armor\Silver\Platemail\Arms (N/S)</category>
	</item>

	<item id="silver_armor_plate_arms_2">
		<inherit id="1417" />
		<silver_armor />
		<category>Armor\Silver\Platemail\Arms (E/W)</category>
	</item>

	<!-- plate gloves -->
	<item id="silver_armor_plate_gloves">
		<inherit id="1414" />
		<silver_armor />
		<category>Armor\Silver\Platemail\Gloves (N/S)</category>
	</item>

	<item id="silver_armor_plate_gloves_2">
		<inherit id="1418" />
		<silver_armor />
		<category>Armor\Silver\Platemail\Gloves (E/W)</category>
	</item>

	<!-- plate gorget -->
	<item id="silver_armor_plate_gorget">
		<inherit id="1413" />
		<silver_armor />
		<category>Armor\Silver\Platemail\Gorget</category>
	</item>

	<!-- plate helmet -->
	<item id="silver_armor_plate_helmet">
		<inherit id="1412" />
		<silver_armor />
		<category>Armor\Silver\Platemail\Helm (N/S)</category>
	</item>

	<item id="silver_armor_plate_helmet_2">
		<inherit id="1419" />
		<silver_armor />
		<category>Armor\Silver\Platemail\Helm (E/W)</category>
	</item>

	<!-- plate leggings -->
	<item id="silver_armor_plate_leggings">
		<inherit id="1411" />
		<silver_armor />
		<category>Armor\Silver\Platemail\Legs (N/S)</category>
	</item>

	<item id="silver_armor_plate_leggings_2">
		<inherit id="141a" />
		<silver_armor />
		<category>Armor\Silver\Platemail\Legs (E/W)</category>
	</item>

</definitions>

[wpdev-commits] xmlscripts/scripts door.py,1.5,1.6

[<thi...@pr...>]

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

Modified Files:
	door.py 
Log Message:
Checks distance before opening the linked door.

Index: door.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/door.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** door.py	14 Jan 2004 12:48:29 -0000	1.5
--- door.py	23 Jan 2004 01:56:02 -0000	1.6
***************
*** 1,2 ****
--- 1,10 ----
+ #===============================================================#
+ #   )      (\_     | WOLFPACK 13.0.0 Scripts                    #
+ #  ((    _/{  "-;  | Created by: unknown                        #
+ #   )).-' {{ ;'`   | Revised by:                                #
+ #  ( (  ;._ \\ ctr | Last Modification: Created                 #
+ #===============================================================#
+ # Doors                                                         #                    									#
+ #===============================================================#
  
  import wolfpack
***************
*** 296,306 ****
  	char.objectdelay = 0
  
- 	# Do we have a linked door, is this door not open?
- 	if item.hastag('link') and not item.hastag('opened'):
- 		doubledoor = wolfpack.finditem( hex2dec(item.gettag('link')) )
- 		# Double check to make sure either door isn't open.
- 		if not item.hastag('opened') and not doubledoor.hastag('opened'):
- 			opendoor( char, doubledoor )
- 	
  	# In Range?
  	if not char.gm and not char.canreach( item, 2 ):
--- 304,307 ----
***************
*** 308,311 ****
--- 309,318 ----
  		return 1
  		
+ 	# Do we have a linked door, is this door not open?
+ 	if item.hastag('link') and not item.hastag('opened'):
+ 		doubledoor = wolfpack.finditem( int(item.gettag('link')) )
+ 		# Double check to make sure either door isn't open.
+ 		if not item.hastag('opened') and not doubledoor.hastag('opened'):
+ 			opendoor( char, doubledoor )
  	return opendoor( char, item )
  

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

[<dar...@pr...>]

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

Modified Files:
	lock.py 
Log Message:
Completed the 'lock command.

Index: lock.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/lock.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lock.py	22 Jan 2004 03:51:22 -0000	1.2
--- lock.py	23 Jan 2004 00:39:03 -0000	1.3
***************
*** 4,35 ****
  import random
  
  def gump_response(char, args, response):
    # Add a lock to this item
!   if response.button == 1 and len(args) == 1:
!     item = wolfpack.finditem(args[0])
  
!     if item:
!       # Prepend 'lock' to the event chain
!       if not 'lock' in item.events:
!         events = item.events
!         events[:0] = ['lock']
!         item.events = events
  
!       # Set the lock id
!       item.settag('lock', response.text[1])
  
!       char.socket.sysmessage('Added the lock to the item.')
  
!       # Should we create a key in the backpack of the user?
!       if 1 in response.switches:
!         keys = ['100e', '100f', '1010', '1013']
!         key = wolfpack.additem(random.choice(keys))
!         key.settag('lock', response.text[1])
!         key.container = char.getbackpack()
!         key.update()
  
!         char.socket.sysmessage('A key has been added to your backpack.')
  
!       return
  
  def lock_response(char, args, target):
--- 4,74 ----
  import random
  
+ def createkey(char, id):
+   keys = ['100e', '100f', '1010', '1013']
+   key = wolfpack.additem(random.choice(keys))
+   key.settag('lock', id)
+   key.container = char.getbackpack()
+   key.update()
+   char.socket.sysmessage('A key has been added to your backpack.')
+ 
  def gump_response(char, args, response):
+   if len(args) < 1:
+     return
+ 
+   item = wolfpack.finditem(args[0])
+ 
+   if not item:
+     return
+ 
    # Add a lock to this item
!   if response.button == 1:
!     # Prepend 'lock' to the event chain
!     if not 'lock' in item.events:
!       events = item.events
!       events[:0] = ['lock']
!       item.events = events
  
!     # Set the lock id
!     item.settag('lock', response.text[1])
  
!     char.socket.sysmessage('Added the lock to the item.')
  
!     # Should we create a key in the backpack of the user?
!     if 1 in response.switches:
!       createkey(char, response.text[1])
  
!   # Modify lock
!   elif response.button == 2:
!     # Set the lock id
!     item.settag('lock', response.text[1])
  
!     # Remove or Add the locked tag
!     if 1 in response.switches:
!       item.settag('locked', 1)
!     elif item.hastag('locked'):
!       item.deltag('locked')
  
!     char.socket.sysmessage('Modified the lock of this item.')
! 
!   # Remove lock
!   elif response.button == 3:
!     item.deltag('lock')
!     item.deltag('locked')
! 
!     # Remove the event from the eventlist
!     events = item.events
!     while 'lock' in events:
!       events.remove('lock')
!     item.events = events
! 
!     char.socket.sysmessage('The lock has been removed from the item.')
! 
!   # Create a key
!   elif response.button == 4:
!     if not item.hastag('lock'):
!       char.socket.sysmessage('This item has no lock.')
!     else:
!       lock = str(item.gettag('lock'))
!       createkey(char, lock)
  
  def lock_response(char, args, target):
***************
*** 45,57 ****
    # Check if the item already has a lock
    if 'lock' in target.item.events and target.item.hastag('lock'):
!     gump.addBackground(id=0x2436, width=450, height=350)	
  
      lock = str(target.item.gettag('lock'))
      locked = 0
      if target.item.hastag('locked') and int(target.item.gettag('locked')) != 0:
        locked = 1
  
!     text = '<basefont color="#FECECE"><h3>Manage Lock</h3><br><basefont color="#FEFEFE">This dialog will help you to manage the lock of this item.'
!     gump.addHtmlGump(x=20, y=20, width=410, height=200, html=text)
  
    # The targetted item is unlocked 
--- 84,119 ----
    # Check if the item already has a lock
    if 'lock' in target.item.events and target.item.hastag('lock'):
!     gump.addBackground(id=0x2436, width=425, height=285)
  
      lock = str(target.item.gettag('lock'))
      locked = 0
+ 
      if target.item.hastag('locked') and int(target.item.gettag('locked')) != 0:
        locked = 1
  
!     text = '<basefont color="#FECECE"><h3>Manage Lock</h3><br><basefont color="#FEFEFE">This dialog will help you to manage the lock and status of this item.'
!     gump.addHtmlGump(x=20, y=20, width=410, height=90, html=text)
! 
!     # InputField for the key id
!     gump.addText(x=20, y=90, text='The id for this lock:', hue=0x835)
!     gump.addResizeGump(x=20, y=113, id=0xBB8, width=160, height=25)
!     gump.addInputField(x=25, y=115, width=150, height=20, hue=0x834, id=1, starttext=lock)
! 
!     # "Locked? Unlocked?"
!     gump.addCheckbox(x=20, y=164, off=0x25f8, on=0x25fb, id=1, checked=locked)
!     gump.addText(x=55, y=168, text='Locked', hue=0x835)
! 
!     # Add Button
!     gump.addText(x=50, y=212, text='Modify lock', hue=0x835)
!     gump.addButton(x=20, y=212, up=0x26af, down=0x26b1, returncode=2)
! 
!     gump.addText(x=50, y=242, text='Cancel', hue=0x835)
!     gump.addButton(x=20, y=242, up=0x26af, down=0x26b1, returncode=0)
! 
!     gump.addText(x=250, y=212, text='Remove lock', hue=0x835)
!     gump.addButton(x=220, y=212, up=0x26af, down=0x26b1, returncode=3)
! 
!     gump.addText(x=250, y=242, text='Create key', hue=0x835)
!     gump.addButton(x=220, y=242, up=0x26af, down=0x26b1, returncode=4)
  
    # The targetted item is unlocked 
***************
*** 76,80 ****
      # "Create a key in my backpack"
      gump.addCheckbox(x=20, y=167, off=0x25f8, on=0x25fb, id=1)
!     gump.addText(x=55, y=171, text='Create a key in my backpack.', hue=0x835)
  
      # Add Button
--- 138,142 ----
      # "Create a key in my backpack"
      gump.addCheckbox(x=20, y=167, off=0x25f8, on=0x25fb, id=1)
!     gump.addText(x=55, y=171, text='Create a key in my backpack', hue=0x835)
  
      # Add Button

[wpdev-commits] wolfpack commands.cpp,1.216,1.217 wolfpack.vcproj,1.5,1.6

[<dar...@pr...>]

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

Modified Files:
	commands.cpp wolfpack.vcproj 
Log Message:
Slightly modified the confirmations for the reload command.

Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.216
retrieving revision 1.217
diff -C2 -d -r1.216 -r1.217
*** commands.cpp	22 Jan 2004 05:59:46 -0000	1.216
--- commands.cpp	22 Jan 2004 22:34:39 -0000	1.217
***************
*** 873,877 ****
  	if( args.count() == 0 )
  	{
! 		socket->sysMessage( tr( "Usage: reload <accounts|scripts|all>" ) );
  		return;
  	}
--- 873,877 ----
  	if( args.count() == 0 )
  	{
! 		socket->sysMessage( tr( "Usage: reload <accounts|scripts|python|all>" ) );
  		return;
  	}
***************
*** 883,899 ****
  	{
  		Accounts::instance()->reload();
! 		socket->sysMessage( tr("Accounts reloaded") );
  	}
  	if( subCommand == "python" )
  	{
- 		Console::instance()->send( "Reloading python scripts\n" );
  		ScriptManager::instance()->reload();
  		ContextMenus::instance()->reload();
! 		Console::instance()->send( "Python scripts reloaded\n" );
  	}
  	if( subCommand == "scripts" )
  	{
- 		Console::instance()->send( "Reloading definitions, scripts and wolfpack.xml\n" );
- 
  		SrvParams->reload(); // Reload wolfpack.xml
  
--- 883,896 ----
  	{
  		Accounts::instance()->reload();
! 		socket->sysMessage("The accounts have been reloaded.");
  	}
  	if( subCommand == "python" )
  	{
  		ScriptManager::instance()->reload();
  		ContextMenus::instance()->reload();
!     socket->sysMessage("The python scripts have been reloaded.");
  	}
  	if( subCommand == "scripts" )
  	{
  		SrvParams->reload(); // Reload wolfpack.xml
  
***************
*** 921,925 ****
  
  		cNetwork::instance()->reload(); // This will be integrated into the normal definition system soon
! 		socket->sysMessage( tr("Definitions, scripts and wolfpack.xml reloaded") );
  	}
  	if( subCommand == "all" )
--- 918,922 ----
  
  		cNetwork::instance()->reload(); // This will be integrated into the normal definition system soon
! 		socket->sysMessage("The configuration, definitions and python scripts have been reloaded.");
  	}
  	if( subCommand == "all" )
***************
*** 951,955 ****
  
  		cNetwork::instance()->reload(); // This will be integrated into the normal definition system soon
! 		socket->sysMessage( tr("Accounts, definitions, scripts and wolfpack.xml reloaded") );
  	}
  }
--- 948,952 ----
  
  		cNetwork::instance()->reload(); // This will be integrated into the normal definition system soon
! 		socket->sysMessage("The accounts, configuration, definitions and python scripts have been reloaded.");
  	}
  }

Index: wolfpack.vcproj
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wolfpack.vcproj	26 Nov 2003 03:53:53 -0000	1.5
--- wolfpack.vcproj	22 Jan 2004 22:34:41 -0000	1.6
***************
*** 1,3 ****
! <?xml version="1.0" encoding = "Windows-1252"?>
  <VisualStudioProject
  	ProjectType="Visual C++"
--- 1,3 ----
! <?xml version="1.0" encoding="Windows-1252"?>
  <VisualStudioProject
  	ProjectType="Visual C++"
***************
*** 31,49 ****
  				WarningLevel="1"
[...1170 lines suppressed...]
  			<File
! 				RelativePath=".\multiscache.cpp">
! 			</File>
  			<File
! 				RelativePath=".\multiscache.h">
! 			</File>
  			<File
! 				RelativePath=".\tilecache.cpp">
! 			</File>
  			<File
! 				RelativePath=".\tilecache.h">
! 			</File>
  			<File
! 				RelativePath=".\tileflags.h">
! 			</File>
  		</Filter>
  	</Files>
! 	<Globals>
! 	</Globals>
  </VisualStudioProject>

[wpdev-commits] wolfpack targetrequests.h,1.50,1.51

[<as...@pr...>]

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

Modified Files:
	targetrequests.h 
Log Message:
fixed rank checking


Index: targetrequests.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** targetrequests.h	22 Jan 2004 20:39:19 -0000	1.50
--- targetrequests.h	22 Jan 2004 22:33:14 -0000	1.51
***************
*** 585,588 ****
--- 585,600 ----
  		}
  
+ 		// check for rank
+ 		P_CHAR pChar = dynamic_cast< P_CHAR >( pObject );
+ 		if( pChar && pChar->objectType() == enPlayer)
+ 		{
+ 			P_PLAYER pp = dynamic_cast<P_PLAYER>( pChar );
+ 			if( pp->account()->rank() >= socket->player()->account()->rank() && pp != socket->player() )
+ 			{
+ 				socket->sysMessage( tr( "Better do not try that!" ) );
+ 				return true;
+ 			}
+ 		}
+ 
  		// Move the object relatively
  		pObject->removeFromView();
***************
*** 594,608 ****
  			P_CHAR pChar = dynamic_cast< P_CHAR >( pObject );
  
- 			// check for rank
- 			if( pChar && pChar->objectType() == enPlayer)
- 			{
- 				P_PLAYER pp = dynamic_cast<P_PLAYER>( pChar );
- 				if( pp->account()->rank() >= socket->player()->account()->rank() && pp != socket->player() )
- 				{
- 					socket->sysMessage( tr( "Better do not try that!" ) );
- 					return true;
- 				}
- 			}
- 
  			if( pChar )
  				pChar->resend();
--- 606,609 ----

[wpdev-commits] xmlscripts/scripts/wolfpack/commands info.py,1.16,1.17

[<as...@pr...>]

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

Modified Files:
	info.py 
Log Message:
added rank checking


Index: info.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/commands/info.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** info.py	14 Jan 2004 04:11:37 -0000	1.16
--- info.py	22 Jan 2004 20:42:54 -0000	1.17
***************
*** 391,394 ****
--- 391,399 ----
  		return 1
  
+ 	# check for rank
+ 	if char.rank >= player.rank and not player == char:
+ 		socket.sysmessage( "You've burnt your fingers!" )
+ 		return 1
+ 
  	textentries = choice.text
  	keys = textentries.keys()

[wpdev-commits] xmlscripts/scripts/wolfpack/commands cast.py,1.1,1.2

[<as...@pr...>]

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

Modified Files:
	cast.py 
Log Message:
no reagends are neeeded anymore


Index: cast.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/commands/cast.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cast.py	22 Jan 2004 04:36:32 -0000	1.1
--- cast.py	22 Jan 2004 20:41:23 -0000	1.2
***************
*** 16,20 ****
  	except:
  		socket.sysmessage( "Usage: cast <spell-id>" )
! 	castSpell( socket.player, args )
  
  	return OK
--- 16,20 ----
  	except:
  		socket.sysmessage( "Usage: cast <spell-id>" )
! 	castSpell( socket.player, args, 1 )
  
  	return OK

[wpdev-commits] wolfpack gumps.cpp,1.148,1.149 targetrequests.cpp,1.81,1.82 targetrequests.h,1.49,1.50

[<as...@pr...>]

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

Modified Files:
	gumps.cpp targetrequests.cpp targetrequests.h 
Log Message:
added rank chencking


Index: gumps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** gumps.cpp	8 Jan 2004 23:43:57 -0000	1.148
--- gumps.cpp	22 Jan 2004 20:39:12 -0000	1.149
***************
*** 449,453 ****
  		case 1:
  			// Check if the privileges are ok
! 			if( mChar && !mChar->account()->authorized("command", "go" ))
  			{
  				socket->sysMessage( tr( "Access to command 'go' was denied" ) );
--- 449,453 ----
  		case 1:
  			// Check if the privileges are ok
! 			if( mChar && !mChar->account()->authorized( "command", "go" ) )
  			{
  				socket->sysMessage( tr( "Access to command 'go' was denied" ) );
***************
*** 464,470 ****
  		case 2:
  			// Check if the privileges are ok
! 			if( mChar && !mChar->account()->authorized("command", "go" ))
  			{
! 				socket->sysMessage( tr( "Access to command 'go' was denied" ) );
  			}
  			else if( mChar )
--- 464,470 ----
  		case 2:
  			// Check if the privileges are ok
! 			if( mChar && !mChar->account()->authorized( "command", "move" ) || pChar->account()->rank() >= mChar->account()->rank() )
  			{
! 				socket->sysMessage( tr( "Access to command 'move' was denied" ) );
  			}
  			else if( mChar )
***************
*** 485,489 ****
  		case 5:
  			// Check if the privileges are ok
! 			if( mChar && !mChar->account()->authorized("command", "info" ))
  			{
  				socket->sysMessage( tr( "Access to command 'info' was denied" ) );
--- 485,489 ----
  		case 5:
  			// Check if the privileges are ok
! 			if( mChar && !mChar->account()->authorized( "command", "info" ) )
  			{
  				socket->sysMessage( tr( "Access to command 'info' was denied" ) );
***************
*** 505,510 ****
  			break;
  		case 7:
! 			socket_->disconnect();
! 			socket->sysMessage( tr("Socket disconnected.") );
  			break;
  		}
--- 505,517 ----
  			break;
  		case 7:
! 			if( pChar->account()->rank() >= mChar->account()->rank() )
! 			{
! 				socket->sysMessage( tr( "You're getting megalomaniac!" ) );
! 			}
! 			else
! 			{
! 				socket_->disconnect();
! 				socket->sysMessage( tr("Socket disconnected.") );
! 			}
  			break;
  		}
***************
*** 712,716 ****
  		case 1:
  			// Check if the privileges are ok
! 			if( mChar && !mChar->account()->authorized("command", "go" ))
  			{
  				socket->sysMessage( tr( "Access to command 'go' was denied" ) );
--- 719,723 ----
  		case 1:
  			// Check if the privileges are ok
! 			if( mChar && !mChar->account()->authorized( "command", "go" ) )
  			{
  				socket->sysMessage( tr( "Access to command 'go' was denied" ) );
***************
*** 727,733 ****
  		case 2:
  			// Check if the privileges are ok
! 			if( mChar && !mChar->account()->authorized("command", "go" ))
  			{
! 				socket->sysMessage( tr( "Access to command 'go' was denied" ) );
  			}
  			else if( mChar )
--- 734,740 ----
  		case 2:
  			// Check if the privileges are ok
! 			if( mChar && !mChar->account()->authorized( "command", "move" ) || pChar->account()->rank() >= mChar->account()->rank() )
  			{
! 				socket->sysMessage( tr( "Access to command 'move' was denied" ) );
  			}
  			else if( mChar )
***************
*** 742,746 ****
  		case 3:
  			// Check if the privileges are ok
! 			if( mChar && !mChar->account()->authorized("command", "go" ))
  			{
  				socket->sysMessage( tr( "Access to command 'go' was denied" ) );
--- 749,753 ----
  		case 3:
  			// Check if the privileges are ok
! 			if( mChar && !mChar->account()->authorized("command", "go" ) )
  			{
  				socket->sysMessage( tr( "Access to command 'go' was denied" ) );
***************
*** 766,770 ****
  		case 5:
  			// Check if the privileges are ok
! 			if( mChar && !mChar->account()->authorized("command", "info" ))
  			{
  				socket->sysMessage( tr( "Access to command 'info' was denied" ) );
--- 773,777 ----
  		case 5:
  			// Check if the privileges are ok
! 			if( mChar && !mChar->account()->authorized("command", "info" ) || pChar->account()->rank() >= mChar->account()->rank() )
  			{
  				socket->sysMessage( tr( "Access to command 'info' was denied" ) );

Index: targetrequests.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** targetrequests.cpp	7 Jan 2004 03:09:09 -0000	1.81
--- targetrequests.cpp	22 Jan 2004 20:39:18 -0000	1.82
***************
*** 392,395 ****
--- 392,406 ----
  	}
  
+ 	// check for rank
+ 	if( pChar && pChar->objectType() == enPlayer )
+ 	{
+ 		P_PLAYER pp = dynamic_cast<P_PLAYER>( pChar );
+ 		if( pp->account()->rank() >= socket->player()->account()->rank() && pp != socket->player() )
+ 		{
+ 			socket->sysMessage( tr( "Better do not try that!" ) );
+ 			return true;
+ 		}
+ 	}
+ 
  	cVariant value( this->value );
  	stError *error = pObject->setProperty( key, value );

Index: targetrequests.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** targetrequests.h	22 Jan 2004 04:48:12 -0000	1.49
--- targetrequests.h	22 Jan 2004 20:39:19 -0000	1.50
***************
*** 240,243 ****
--- 240,254 ----
  		P_CHAR pChar = FindCharBySerial( target->serial() );
  
+ 		// check for rank
+ 		if( pChar && pChar->objectType() == enPlayer)
+ 		{
+ 			P_PLAYER pp = dynamic_cast<P_PLAYER>( pChar );
+ 			if( pp->account()->rank() >= socket->player()->account()->rank() && pp != socket->player() )
+ 			{
+ 				socket->sysMessage( tr( "You want to suicide?" ) );
+ 				return true;
+ 			}
+ 		}
+ 
  		if( !pChar )
  		{
***************
*** 323,328 ****
--- 334,351 ----
  		{
  			P_CHAR pChar = FindCharBySerial( target->serial() );
+ 
  			if( pChar )
  			{
+ 				// check for rank
+ 				if( pChar->objectType() == enPlayer)
+ 				{
+ 					P_PLAYER pp = dynamic_cast<P_PLAYER>( pChar );
+ 					if( pp->account()->rank() >= socket->player()->account()->rank() && pp != socket->player() )
+ 					{
+ 						socket->sysMessage( tr( "Better do not try that!" ) );
+ 						return true;
+ 					}
+ 				}
+ 
  				if( type_ )
  					pChar->setTag( key_, cVariant( value_.toInt() ) );
***************
*** 401,404 ****
--- 424,438 ----
  			if( pChar )
  			{
+ 				// check for rank
+ 				if( pChar->objectType() == enPlayer)
+ 				{
+ 					P_PLAYER pp = dynamic_cast<P_PLAYER>( pChar );
+ 					if( pp->account()->rank() >= socket->player()->account()->rank() && pp != socket->player() )
+ 					{
+ 						socket->sysMessage( tr( "Better do not try that!" ) );
+ 						return true;
+ 					}
+ 				}
+ 
  				if( key_.lower() == "all" )
  				{
***************
*** 559,562 ****
--- 593,608 ----
  		{
  			P_CHAR pChar = dynamic_cast< P_CHAR >( pObject );
+ 
+ 			// check for rank
+ 			if( pChar && pChar->objectType() == enPlayer)
+ 			{
+ 				P_PLAYER pp = dynamic_cast<P_PLAYER>( pChar );
+ 				if( pp->account()->rank() >= socket->player()->account()->rank() && pp != socket->player() )
+ 				{
+ 					socket->sysMessage( tr( "Better do not try that!" ) );
+ 					return true;
+ 				}
+ 			}
+ 
  			if( pChar )
  				pChar->resend();

[wpdev-commits] wolfpack accounts.cpp,1.75,1.76 accounts.h,1.35,1.36 commands.cpp,1.215,1.216 commands.h,1.18,1.19

[<as...@us...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv18743

Modified Files:
	accounts.cpp accounts.h commands.cpp commands.h 
Log Message:
renamed "plevel" to "rank" to avoid confusion :)


Index: accounts.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/accounts.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** accounts.cpp	22 Jan 2004 04:48:11 -0000	1.75
--- accounts.cpp	22 Jan 2004 05:59:46 -0000	1.76
***************
*** 217,226 ****
  }
  
! unsigned char cAccount::plevel() const {
! 	if (acl_) {
! 		return acl_->plevel;
! 	} else {
  		return 1;
- 	}
  }
  
--- 217,225 ----
  }
  
! unsigned int cAccount::rank() const {
! 	if (acl_)
! 		return acl_->rank;
! 	else
  		return 1;
  }
  

Index: accounts.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/accounts.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** accounts.h	22 Jan 2004 04:48:11 -0000	1.35
--- accounts.h	22 Jan 2004 05:59:46 -0000	1.36
***************
*** 77,81 ****
  	QString login() const;
  	QString password() const;
! 	unsigned char plevel() const;
  	void remove();
  	void setPassword( const QString& );
--- 77,81 ----
  	QString login() const;
  	QString password() const;
! 	unsigned int rank() const;
  	void remove();
  	void setPassword( const QString& );

Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.215
retrieving revision 1.216
diff -C2 -d -r1.215 -r1.216
*** commands.cpp	22 Jan 2004 04:48:12 -0000	1.215
--- commands.cpp	22 Jan 2004 05:59:46 -0000	1.216
***************
*** 159,165 ****
  		cAcl *acl = new cAcl;
  		acl->name = ACLname;
! 		acl->plevel = Tag->getAttribute("plevel", "1").toUShort();
! 		if (acl->plevel == 0 || acl->plevel == 255) {
! 			acl->plevel = 1;
  		}
  
--- 159,165 ----
  		cAcl *acl = new cAcl;
  		acl->name = ACLname;
! 		acl->rank = Tag->getAttribute("rank", "1").toUShort();
! 		if (acl->rank == 0 || acl->rank == 255) {
! 			acl->rank = 1;
  		}
  

Index: commands.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** commands.h	22 Jan 2004 04:48:12 -0000	1.18
--- commands.h	22 Jan 2004 05:59:46 -0000	1.19
***************
*** 54,58 ****
  public:
  	QString name;
! 	unsigned char plevel;
  	QMap< QString, QMap< QString, bool > > groups;
  };
--- 54,58 ----
  public:
  	QString name;
! 	unsigned int rank;
  	QMap< QString, QMap< QString, bool > > groups;
  };

[wpdev-commits] wolfpack/python char.cpp,1.112,1.113 pyaccount.cpp,1.20,1.21

[<as...@us...>]

Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1:/tmp/cvs-serv18743/python

Modified Files:
	char.cpp pyaccount.cpp 
Log Message:
renamed "plevel" to "rank" to avoid confusion :)


Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** char.cpp	22 Jan 2004 04:03:21 -0000	1.112
--- char.cpp	22 Jan 2004 05:59:46 -0000	1.113
***************
*** 1746,1750 ****
  
  		return player->isGM() ? PyTrue : PyFalse;
! 	} else if (!strcmp("plevel", name)) {
  		P_PLAYER player = dynamic_cast<P_PLAYER>( self->pChar );
  	
--- 1746,1750 ----
  
  		return player->isGM() ? PyTrue : PyFalse;
! 	} else if( !strcmp("rank", name)) {
  		P_PLAYER player = dynamic_cast<P_PLAYER>( self->pChar );
  	
***************
*** 1755,1759 ****
  
  		if (account) {
! 			return PyInt_FromLong(account->plevel());
  		} else {
  			return PyInt_FromLong(1);
--- 1755,1759 ----
  
  		if (account) {
! 			return PyInt_FromLong(account->rank());
  		} else {
  			return PyInt_FromLong(1);

Index: pyaccount.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/pyaccount.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** pyaccount.cpp	22 Jan 2004 04:48:13 -0000	1.20
--- pyaccount.cpp	22 Jan 2004 05:59:46 -0000	1.21
***************
*** 223,228 ****
  			return PyFalse;
  	}
! 	else if(!strcmp(name,"plevel")) {
! 		return PyInt_FromLong(self->account->plevel());
  	} else {
  		return Py_FindMethod( wpAccountMethods, (PyObject*)self, name );
--- 223,229 ----
  			return PyFalse;
  	}
! 	else if( !strcmp( name, "rank" ) )
! 	{
! 		return PyInt_FromLong( self->account->rank() );
  	} else {
  		return Py_FindMethod( wpAccountMethods, (PyObject*)self, name );