wpdev-commits Mailing List for Wolfpack Emu (Page 59)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
wpdev-commits — Wolfpack CVS commit info
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
|
From: Sebastian H. <dar...@us...> - 2004-08-27 14:44:07
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23985/items/armory/helmets Modified Files: bascinet.xml close_helmet.xml helmet.xml kabuto.xml nose_helm.xml orc_helm.xml Log Message: basescripts property Index: nose_helm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets/nose_helm.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** nose_helm.xml 25 Aug 2004 17:03:40 -0000 1.12 --- nose_helm.xml 27 Aug 2004 14:43:24 -0000 1.13 *************** *** 22,26 **** <sellprice>72</sellprice> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Helmets\Nose Helm (N/S)</category> </item> --- 22,26 ---- <sellprice>72</sellprice> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Helmets\Nose Helm (N/S)</category> </item> Index: close_helmet.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets/close_helmet.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** close_helmet.xml 25 Aug 2004 17:03:40 -0000 1.12 --- close_helmet.xml 27 Aug 2004 14:43:24 -0000 1.13 *************** *** 23,27 **** <sellprice>72</sellprice> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Helmets\Close Helm (N/S)</category> </item> --- 23,27 ---- <sellprice>72</sellprice> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Helmets\Close Helm (N/S)</category> </item> Index: helmet.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets/helmet.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** helmet.xml 25 Aug 2004 17:03:40 -0000 1.12 --- helmet.xml 27 Aug 2004 14:43:24 -0000 1.13 *************** *** 22,26 **** <sellprice>58</sellprice> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Helmets\Normal Helm (N/S)</category> </item> --- 22,26 ---- <sellprice>58</sellprice> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Helmets\Normal Helm (N/S)</category> </item> Index: bascinet.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets/bascinet.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** bascinet.xml 25 Aug 2004 17:03:40 -0000 1.12 --- bascinet.xml 27 Aug 2004 14:43:24 -0000 1.13 *************** *** 22,26 **** <sellprice>63</sellprice> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Helmets\Bascinet (N/S)</category> </item> --- 22,26 ---- <sellprice>63</sellprice> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Helmets\Bascinet (N/S)</category> </item> Index: orc_helm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets/orc_helm.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** orc_helm.xml 25 Aug 2004 17:03:40 -0000 1.10 --- orc_helm.xml 27 Aug 2004 14:43:24 -0000 1.11 *************** *** 21,25 **** <sellprice>63</sellprice> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Helmets\Orc Helm (N/S)</category> </item> --- 21,25 ---- <sellprice>63</sellprice> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Helmets\Orc Helm (N/S)</category> </item> Index: kabuto.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets/kabuto.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kabuto.xml 25 Aug 2004 17:03:40 -0000 1.3 --- kabuto.xml 27 Aug 2004 14:43:24 -0000 1.4 *************** *** 23,27 **** <sellprice>63</sellprice> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Helmets\Kabuto (N/S)</category> </item> --- 23,27 ---- <sellprice>63</sellprice> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Helmets\Kabuto (N/S)</category> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-08-27 14:44:07
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/dragon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23985/items/armory/dragon Modified Files: dragon_breastplate.xml dragon_gloves.xml dragon_helm.xml dragon_leggings.xml dragon_sleeves.xml Log Message: basescripts property Index: dragon_breastplate.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/dragon/dragon_breastplate.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dragon_breastplate.xml 25 Aug 2004 17:03:39 -0000 1.4 --- dragon_breastplate.xml 27 Aug 2004 14:43:23 -0000 1.5 *************** *** 19,23 **** <weight>10.0</weight> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Dragon\Dragon Breastplate 1</category> </item> --- 19,23 ---- <weight>10.0</weight> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Dragon\Dragon Breastplate 1</category> </item> Index: dragon_helm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/dragon/dragon_helm.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dragon_helm.xml 25 Aug 2004 17:03:39 -0000 1.4 --- dragon_helm.xml 27 Aug 2004 14:43:23 -0000 1.5 *************** *** 19,23 **** <weight>7.0</weight> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Dragon\Dragon Helm 1</category> </item> --- 19,23 ---- <weight>7.0</weight> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Dragon\Dragon Helm 1</category> </item> Index: dragon_sleeves.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/dragon/dragon_sleeves.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dragon_sleeves.xml 25 Aug 2004 17:03:39 -0000 1.4 --- dragon_sleeves.xml 27 Aug 2004 14:43:23 -0000 1.5 *************** *** 19,23 **** <weight>5.0</weight> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Dragon\Dragon Sleeves 1</category> </item> --- 19,23 ---- <weight>5.0</weight> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Dragon\Dragon Sleeves 1</category> </item> Index: dragon_gloves.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/dragon/dragon_gloves.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dragon_gloves.xml 25 Aug 2004 17:03:39 -0000 1.4 --- dragon_gloves.xml 27 Aug 2004 14:43:23 -0000 1.5 *************** *** 19,23 **** <weight>2.0</weight> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Dragon\Dragon Gloves 1</category> </item> --- 19,23 ---- <weight>2.0</weight> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Dragon\Dragon Gloves 1</category> </item> Index: dragon_leggings.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/dragon/dragon_leggings.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dragon_leggings.xml 25 Aug 2004 17:03:39 -0000 1.4 --- dragon_leggings.xml 27 Aug 2004 14:43:23 -0000 1.5 *************** *** 19,23 **** <weight>7.0</weight> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Dragon\Dragon Leggings 1</category> </item> --- 19,23 ---- <weight>7.0</weight> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Dragon\Dragon Leggings 1</category> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-08-27 14:44:03
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/chain In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23985/items/armory/chain Modified Files: chain_coif.xml chain_leggings.xml chain_tunic.xml Log Message: basescripts property Index: chain_coif.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/chain/chain_coif.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** chain_coif.xml 25 Aug 2004 17:03:39 -0000 1.11 --- chain_coif.xml 27 Aug 2004 14:43:23 -0000 1.12 *************** *** 22,26 **** <sellprice>65</sellprice> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Chainmail\Coif NS</category> </item> --- 22,26 ---- <sellprice>65</sellprice> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Chainmail\Coif NS</category> </item> Index: chain_tunic.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/chain/chain_tunic.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** chain_tunic.xml 25 Aug 2004 17:03:39 -0000 1.11 --- chain_tunic.xml 27 Aug 2004 14:43:23 -0000 1.12 *************** *** 21,25 **** <buyprice>103</buyprice> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Chainmail\Tunic NS</category> </item> --- 21,25 ---- <buyprice>103</buyprice> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Chainmail\Tunic NS</category> </item> Index: chain_leggings.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/chain/chain_leggings.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** chain_leggings.xml 25 Aug 2004 17:03:39 -0000 1.11 --- chain_leggings.xml 27 Aug 2004 14:43:23 -0000 1.12 *************** *** 22,26 **** <sellprice>83</sellprice> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Chainmail\Leggings (N/S)</category> </item> --- 22,26 ---- <sellprice>83</sellprice> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Chainmail\Leggings (N/S)</category> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-08-27 14:44:03
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23985/items/armory/bone Modified Files: bone_armor.xml bone_arms.xml bone_gloves.xml bone_helm.xml bone_leggings.xml Log Message: basescripts property Index: bone_arms.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_arms.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** bone_arms.xml 25 Aug 2004 17:03:39 -0000 1.11 --- bone_arms.xml 27 Aug 2004 14:43:23 -0000 1.12 *************** *** 20,24 **** <tag name="resname" value="leather" /> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Bone\Bone Arms (N/S)</category> </item> --- 20,24 ---- <tag name="resname" value="leather" /> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Bone\Bone Arms (N/S)</category> </item> Index: bone_gloves.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_gloves.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** bone_gloves.xml 25 Aug 2004 17:03:39 -0000 1.11 --- bone_gloves.xml 27 Aug 2004 14:43:23 -0000 1.12 *************** *** 20,24 **** <value>0</value> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Bone\Bone Gloves (N/S)</category> </item> --- 20,24 ---- <value>0</value> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Bone\Bone Gloves (N/S)</category> </item> Index: bone_armor.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_armor.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** bone_armor.xml 25 Aug 2004 17:03:39 -0000 1.11 --- bone_armor.xml 27 Aug 2004 14:43:23 -0000 1.12 *************** *** 20,24 **** <value>0</value> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Bone\Bone Armor (N/S)</category> </item> --- 20,24 ---- <value>0</value> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Bone\Bone Armor (N/S)</category> </item> Index: bone_leggings.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_leggings.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** bone_leggings.xml 25 Aug 2004 17:03:39 -0000 1.11 --- bone_leggings.xml 27 Aug 2004 14:43:23 -0000 1.12 *************** *** 20,24 **** <value>0</value> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Bone\Leggings (N/S)</category> </item> --- 20,24 ---- <value>0</value> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Bone\Leggings (N/S)</category> </item> Index: bone_helm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_helm.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** bone_helm.xml 25 Aug 2004 17:03:39 -0000 1.11 --- bone_helm.xml 27 Aug 2004 14:43:23 -0000 1.12 *************** *** 20,24 **** <value>0</value> <type>1009</type> ! <scripts>equipment</scripts> <category>Armor\Base\Bone\Bone Helmet (N/S)</category> </item> --- 20,24 ---- <value>0</value> <type>1009</type> ! <basescripts>equipment</basescripts> <category>Armor\Base\Bone\Bone Helmet (N/S)</category> </item> |
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23985/items/weaponry/swordsmanship Modified Files: axe.xml bardiche.xml battle_axe.xml bladed_staff.xml bone_harvester.xml broadsword.xml butcher_knife.xml cleaver.xml crescent_blade.xml cutlass.xml double_axe.xml executioners_axe.xml halberd.xml hatchet.xml katana.xml large_battle_axe.xml long_sword.xml longsword.xml paladin_sword.xml pickaxe.xml scimitar.xml scythe.xml skinning_knife.xml two_handed_axe.xml viking_sword.xml Log Message: basescripts property Index: viking_sword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/viking_sword.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** viking_sword.xml 25 Aug 2004 17:03:57 -0000 1.11 --- viking_sword.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1001</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Viking Sword (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1001</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Viking Sword (N/S)</category> </item> Index: pickaxe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/pickaxe.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** pickaxe.xml 25 Aug 2004 17:03:57 -0000 1.14 --- pickaxe.xml 27 Aug 2004 14:43:29 -0000 1.15 *************** *** 22,26 **** <tag name="remaining_uses" type="int" value="35" /> <type>1001</type> ! <scripts>equipment,pickaxe</scripts> <category>Weapons\Swords\Pickaxe (N/S)</category> <category>Professions\Miner\Tools\Pickaxe (N/S)</category> --- 22,26 ---- <tag name="remaining_uses" type="int" value="35" /> <type>1001</type> ! <basescripts>equipment,pickaxe</basescripts> <category>Weapons\Swords\Pickaxe (N/S)</category> <category>Professions\Miner\Tools\Pickaxe (N/S)</category> Index: bladed_staff.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/bladed_staff.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** bladed_staff.xml 25 Aug 2004 17:03:57 -0000 1.11 --- bladed_staff.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1001</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Bladed Staff (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1001</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Bladed Staff (N/S)</category> </item> Index: cutlass.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/cutlass.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** cutlass.xml 25 Aug 2004 17:03:57 -0000 1.11 --- cutlass.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1001</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Cutlass (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1001</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Cutlass (N/S)</category> </item> Index: longsword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/longsword.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** longsword.xml 25 Aug 2004 17:03:57 -0000 1.11 --- longsword.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1001</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Longsword (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1001</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Longsword (N/S)</category> </item> Index: hatchet.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/hatchet.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** hatchet.xml 25 Aug 2004 17:03:57 -0000 1.14 --- hatchet.xml 27 Aug 2004 14:43:29 -0000 1.15 *************** *** 20,24 **** <weight>4.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment,blades</scripts> <category>Weapons\Axes\Hatchet (N/S)</category> <type>1002</type> --- 20,24 ---- <weight>4.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Axes\Hatchet (N/S)</category> <type>1002</type> Index: battle_axe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/battle_axe.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** battle_axe.xml 25 Aug 2004 17:03:57 -0000 1.11 --- battle_axe.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 21,25 **** <tag name="resname" value="iron" /> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,blades</scripts> <type>1002</type> <category>Weapons\Axes\Battle Axe (N/S)</category> --- 21,25 ---- <tag name="resname" value="iron" /> <tag name="remaining_uses" type="int" value="35" /> ! <basescripts>equipment,blades</basescripts> <type>1002</type> <category>Weapons\Axes\Battle Axe (N/S)</category> Index: halberd.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/halberd.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** halberd.xml 25 Aug 2004 17:03:57 -0000 1.13 --- halberd.xml 27 Aug 2004 14:43:29 -0000 1.14 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1002</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Halberd (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1002</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Halberd (N/S)</category> </item> Index: bone_harvester.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/bone_harvester.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** bone_harvester.xml 25 Aug 2004 17:03:57 -0000 1.11 --- bone_harvester.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1001</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Bone Harvester (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1001</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Bone Harvester (N/S)</category> </item> Index: paladin_sword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/paladin_sword.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** paladin_sword.xml 25 Aug 2004 17:03:57 -0000 1.11 --- paladin_sword.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1001</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Paladin Sword (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1001</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Paladin Sword (N/S)</category> </item> Index: double_axe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/double_axe.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** double_axe.xml 25 Aug 2004 17:03:57 -0000 1.11 --- double_axe.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 20,24 **** <weight>3.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment,blades</scripts> <type>1002</type> <category>Weapons\Axes\Double Axe (N/S)</category> --- 20,24 ---- <weight>3.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment,blades</basescripts> <type>1002</type> <category>Weapons\Axes\Double Axe (N/S)</category> Index: large_battle_axe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/large_battle_axe.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** large_battle_axe.xml 25 Aug 2004 17:03:57 -0000 1.11 --- large_battle_axe.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 20,24 **** <weight>6.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment,blades</scripts> <category>Weapons\Axes\Large Battle Axe (N/S)</category> <type>1002</type> --- 20,24 ---- <weight>6.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Axes\Large Battle Axe (N/S)</category> <type>1002</type> Index: broadsword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/broadsword.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** broadsword.xml 25 Aug 2004 17:03:57 -0000 1.11 --- broadsword.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1001</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Broadsword (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1001</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Broadsword (N/S)</category> </item> Index: katana.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/katana.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** katana.xml 25 Aug 2004 17:03:57 -0000 1.11 --- katana.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1001</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Katana (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1001</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Katana (N/S)</category> </item> Index: executioners_axe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/executioners_axe.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** executioners_axe.xml 25 Aug 2004 17:03:57 -0000 1.11 --- executioners_axe.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 20,24 **** <weight>3.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment,blades</scripts> <category>Weapons\Axes\Executioner's Axe (N/S)</category> <type>1002</type> --- 20,24 ---- <weight>3.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Axes\Executioner's Axe (N/S)</category> <type>1002</type> Index: two_handed_axe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/two_handed_axe.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** two_handed_axe.xml 25 Aug 2004 17:03:57 -0000 1.11 --- two_handed_axe.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 20,24 **** <weight>8.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment,blades</scripts> <category>Weapons\Axes\Two Handed Axe (N/S)</category> <type>1002</type> --- 20,24 ---- <weight>8.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Axes\Two Handed Axe (N/S)</category> <type>1002</type> Index: long_sword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/long_sword.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** long_sword.xml 25 Aug 2004 17:03:57 -0000 1.11 --- long_sword.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1001</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Long Sword (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1001</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Long Sword (N/S)</category> </item> Index: cleaver.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/cleaver.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** cleaver.xml 25 Aug 2004 17:03:57 -0000 1.12 --- cleaver.xml 27 Aug 2004 14:43:29 -0000 1.13 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1001</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Cleaver (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1001</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Cleaver (N/S)</category> </item> Index: axe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/axe.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** axe.xml 25 Aug 2004 17:03:57 -0000 1.11 --- axe.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 20,24 **** <weight>4.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment,blades</scripts> <type>1002</type> <category>Weapons\Axes\Axe (N/S)</category> --- 20,24 ---- <weight>4.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment,blades</basescripts> <type>1002</type> <category>Weapons\Axes\Axe (N/S)</category> Index: butcher_knife.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/butcher_knife.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** butcher_knife.xml 25 Aug 2004 17:03:57 -0000 1.12 --- butcher_knife.xml 27 Aug 2004 14:43:29 -0000 1.13 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1001</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Butcher Knife (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1001</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Butcher Knife (N/S)</category> </item> Index: bardiche.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/bardiche.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** bardiche.xml 25 Aug 2004 17:03:57 -0000 1.13 --- bardiche.xml 27 Aug 2004 14:43:29 -0000 1.14 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1002</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Bardiche (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1002</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Bardiche (N/S)</category> </item> Index: scythe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/scythe.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** scythe.xml 25 Aug 2004 17:03:57 -0000 1.13 --- scythe.xml 27 Aug 2004 14:43:29 -0000 1.14 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1002</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Scythe (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1002</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Scythe (N/S)</category> </item> Index: skinning_knife.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/skinning_knife.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** skinning_knife.xml 25 Aug 2004 17:03:57 -0000 1.11 --- skinning_knife.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1001</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Skinning Knife (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1001</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Skinning Knife (N/S)</category> </item> Index: crescent_blade.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/crescent_blade.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** crescent_blade.xml 25 Aug 2004 17:03:57 -0000 1.11 --- crescent_blade.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1001</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Crescent Blade (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1001</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Crescent Blade (N/S)</category> </item> Index: scimitar.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/scimitar.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** scimitar.xml 25 Aug 2004 17:03:57 -0000 1.11 --- scimitar.xml 27 Aug 2004 14:43:29 -0000 1.12 *************** *** 21,25 **** <tag name="resname" value="iron" /> <type>1001</type> ! <scripts>equipment,blades</scripts> <category>Weapons\Swords\Scimitar (N/S)</category> </item> --- 21,25 ---- <tag name="resname" value="iron" /> <type>1001</type> ! <basescripts>equipment,blades</basescripts> <category>Weapons\Swords\Scimitar (N/S)</category> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-08-27 14:43:41
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23985/items/weaponry/macefighting Modified Files: black_staff.xml club.xml gnarled_staff.xml hammer_pick.xml mace.xml maul.xml quarter_staff.xml scepter.xml shepherds_crook.xml sledge_hammer.xml smithing_hammer.xml war_axe.xml war_hammer.xml war_mace.xml Log Message: basescripts property Index: scepter.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/scepter.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** scepter.xml 25 Aug 2004 17:03:57 -0000 1.9 --- scepter.xml 27 Aug 2004 14:43:29 -0000 1.10 *************** *** 20,24 **** <weight>7.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1004</type> <category>Weapons\Maces\Scepter (N/S)</category> --- 20,24 ---- <weight>7.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment</basescripts> <type>1004</type> <category>Weapons\Maces\Scepter (N/S)</category> Index: war_mace.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/war_mace.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** war_mace.xml 25 Aug 2004 17:03:57 -0000 1.9 --- war_mace.xml 27 Aug 2004 14:43:29 -0000 1.10 *************** *** 20,24 **** <weight>17.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1004</type> <category>Weapons\Maces\War Mace (N/S)</category> --- 20,24 ---- <weight>17.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment</basescripts> <type>1004</type> <category>Weapons\Maces\War Mace (N/S)</category> Index: shepherds_crook.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/shepherds_crook.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** shepherds_crook.xml 25 Aug 2004 17:03:57 -0000 1.10 --- shepherds_crook.xml 27 Aug 2004 14:43:29 -0000 1.11 *************** *** 18,22 **** <durability><random min="30" max="50" /></durability> <weight>2.0</weight> ! <scripts>equipment</scripts> <type>1003</type> <twohanded /> --- 18,22 ---- <durability><random min="30" max="50" /></durability> <weight>2.0</weight> ! <basescripts>equipment</basescripts> <type>1003</type> <twohanded /> Index: hammer_pick.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/hammer_pick.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** hammer_pick.xml 25 Aug 2004 17:03:56 -0000 1.9 --- hammer_pick.xml 27 Aug 2004 14:43:29 -0000 1.10 *************** *** 20,24 **** <weight>9.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1004</type> <category>Weapons\Maces\Hammer Pick (N/S)</category> --- 20,24 ---- <weight>9.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment</basescripts> <type>1004</type> <category>Weapons\Maces\Hammer Pick (N/S)</category> Index: smithing_hammer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/smithing_hammer.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** smithing_hammer.xml 25 Aug 2004 17:03:57 -0000 1.4 --- smithing_hammer.xml 27 Aug 2004 14:43:29 -0000 1.5 *************** *** 15,19 **** <decay /> <nodye /> ! <scripts>skills.blacksmithing,equipment</scripts> <type>1004</type> <category>Weapons\Maces\Smith's Hammer (W/E)</category> --- 15,19 ---- <decay /> <nodye /> ! <basescripts>skills.blacksmithing,equipment</basescripts> <type>1004</type> <category>Weapons\Maces\Smith's Hammer (W/E)</category> Index: black_staff.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/black_staff.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** black_staff.xml 25 Aug 2004 17:03:56 -0000 1.10 --- black_staff.xml 27 Aug 2004 14:43:29 -0000 1.11 *************** *** 18,22 **** <durability><random min="30" max="39" /></durability> <weight>6.0</weight> ! <scripts>equipment</scripts> <type>1003</type> <twohanded /> --- 18,22 ---- <durability><random min="30" max="39" /></durability> <weight>6.0</weight> ! <basescripts>equipment</basescripts> <type>1003</type> <twohanded /> Index: war_axe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/war_axe.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** war_axe.xml 25 Aug 2004 17:03:57 -0000 1.12 --- war_axe.xml 27 Aug 2004 14:43:29 -0000 1.13 *************** *** 20,24 **** <weight>3.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment,blades</scripts> <type>1004</type> <category>Weapons\Axes\War Axe (N/S)</category> --- 20,24 ---- <weight>3.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment,blades</basescripts> <type>1004</type> <category>Weapons\Axes\War Axe (N/S)</category> Index: quarter_staff.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/quarter_staff.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** quarter_staff.xml 25 Aug 2004 17:03:57 -0000 1.10 --- quarter_staff.xml 27 Aug 2004 14:43:29 -0000 1.11 *************** *** 18,22 **** <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <scripts>equipment</scripts> <type>1003</type> <twohanded /> --- 18,22 ---- <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <basescripts>equipment</basescripts> <type>1003</type> <twohanded /> Index: mace.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/mace.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mace.xml 25 Aug 2004 17:03:57 -0000 1.9 --- mace.xml 27 Aug 2004 14:43:29 -0000 1.10 *************** *** 20,24 **** <weight>14.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1004</type> <category>Weapons\Maces\Mace (N/S)</category> --- 20,24 ---- <weight>14.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment</basescripts> <type>1004</type> <category>Weapons\Maces\Mace (N/S)</category> Index: gnarled_staff.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/gnarled_staff.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gnarled_staff.xml 25 Aug 2004 17:03:56 -0000 1.10 --- gnarled_staff.xml 27 Aug 2004 14:43:29 -0000 1.11 *************** *** 18,22 **** <durability><random min="30" max="49" /></durability> <weight>3.0</weight> ! <scripts>equipment</scripts> <type>1003</type> <twohanded /> --- 18,22 ---- <durability><random min="30" max="49" /></durability> <weight>3.0</weight> ! <basescripts>equipment</basescripts> <type>1003</type> <twohanded /> Index: sledge_hammer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/sledge_hammer.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sledge_hammer.xml 25 Aug 2004 17:03:57 -0000 1.4 --- sledge_hammer.xml 27 Aug 2004 14:43:29 -0000 1.5 *************** *** 22,26 **** <tag name="remaining_uses" type="int" value="45" /> <tag name="resname" value="iron" /> ! <scripts>skills.blacksmithing,equipment</scripts> <category>Weapons\Maces\Sledge Hammer (W/E)</category> </item> --- 22,26 ---- <tag name="remaining_uses" type="int" value="45" /> <tag name="resname" value="iron" /> ! <basescripts>skills.blacksmithing,equipment</basescripts> <category>Weapons\Maces\Sledge Hammer (W/E)</category> </item> Index: war_hammer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/war_hammer.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** war_hammer.xml 25 Aug 2004 17:03:57 -0000 1.10 --- war_hammer.xml 27 Aug 2004 14:43:29 -0000 1.11 *************** *** 20,24 **** <weight>10.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1004</type> <category>Weapons\Maces\War Hammer (N/S)</category> --- 20,24 ---- <weight>10.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment</basescripts> <type>1004</type> <category>Weapons\Maces\War Hammer (N/S)</category> Index: club.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/club.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** club.xml 25 Aug 2004 17:03:56 -0000 1.10 --- club.xml 27 Aug 2004 14:43:29 -0000 1.11 *************** *** 19,23 **** <durability><random min="30" max="40" /></durability> <weight>14.0</weight> ! <scripts>equipment</scripts> <type>1004</type> <category>Weapons\Maces\Club (N/S)</category> --- 19,23 ---- <durability><random min="30" max="40" /></durability> <weight>14.0</weight> ! <basescripts>equipment</basescripts> <type>1004</type> <category>Weapons\Maces\Club (N/S)</category> Index: maul.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/maul.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** maul.xml 25 Aug 2004 17:03:57 -0000 1.9 --- maul.xml 27 Aug 2004 14:43:29 -0000 1.10 *************** *** 20,24 **** <weight>14.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1004</type> <category>Weapons\Maces\Maul (N/S)</category> --- 20,24 ---- <weight>14.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment</basescripts> <type>1004</type> <category>Weapons\Maces\Maul (N/S)</category> |
|
From: Sebastian H. <dar...@us...> - 2004-08-27 14:43:41
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23985/items/weaponry/fencing Modified Files: dagger.xml double_bladed_staff.xml kryss.xml lance.xml pike.xml pitchfork.xml short_spear.xml spear.xml war_fork.xml Log Message: basescripts property Index: war_fork.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/war_fork.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** war_fork.xml 25 Aug 2004 17:03:55 -0000 1.11 --- war_fork.xml 27 Aug 2004 14:43:28 -0000 1.12 *************** *** 20,24 **** <weight>1.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1005</type> <category>Weapons\Fencing\War Fork (N/S)</category> --- 20,24 ---- <weight>1.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment</basescripts> <type>1005</type> <category>Weapons\Fencing\War Fork (N/S)</category> Index: pike.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/pike.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pike.xml 25 Aug 2004 17:03:50 -0000 1.11 --- pike.xml 27 Aug 2004 14:43:28 -0000 1.12 *************** *** 20,24 **** <weight>10.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment,blades</scripts> <type>1005</type> <category>Weapons\Fencing\Pike (N/S)</category> --- 20,24 ---- <weight>10.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment,blades</basescripts> <type>1005</type> <category>Weapons\Fencing\Pike (N/S)</category> Index: short_spear.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/short_spear.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** short_spear.xml 25 Aug 2004 17:03:50 -0000 1.11 --- short_spear.xml 27 Aug 2004 14:43:28 -0000 1.12 *************** *** 20,24 **** <weight>4.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1005</type> <category>Weapons\Fencing\Short Spear (N/S)</category> --- 20,24 ---- <weight>4.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment</basescripts> <type>1005</type> <category>Weapons\Fencing\Short Spear (N/S)</category> Index: lance.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/lance.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** lance.xml 25 Aug 2004 17:03:50 -0000 1.11 --- lance.xml 27 Aug 2004 14:43:28 -0000 1.12 *************** *** 20,24 **** <weight>12.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1005</type> <category>Weapons\Fencing\Lance (N/S)</category> --- 20,24 ---- <weight>12.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment</basescripts> <type>1005</type> <category>Weapons\Fencing\Lance (N/S)</category> Index: double_bladed_staff.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/double_bladed_staff.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** double_bladed_staff.xml 25 Aug 2004 17:03:49 -0000 1.11 --- double_bladed_staff.xml 27 Aug 2004 14:43:28 -0000 1.12 *************** *** 20,24 **** <weight>7.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment,blades</scripts> <type>1005</type> <category>Weapons\Fencing\Double Bladed Staff (N/S)</category> --- 20,24 ---- <weight>7.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment,blades</basescripts> <type>1005</type> <category>Weapons\Fencing\Double Bladed Staff (N/S)</category> Index: pitchfork.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/pitchfork.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pitchfork.xml 25 Aug 2004 17:03:50 -0000 1.11 --- pitchfork.xml 27 Aug 2004 14:43:28 -0000 1.12 *************** *** 20,24 **** <weight>10.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1005</type> <category>Weapons\Fencing\Pitchfork (N/S)</category> --- 20,24 ---- <weight>10.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment</basescripts> <type>1005</type> <category>Weapons\Fencing\Pitchfork (N/S)</category> Index: spear.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/spear.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** spear.xml 25 Aug 2004 17:03:50 -0000 1.11 --- spear.xml 27 Aug 2004 14:43:28 -0000 1.12 *************** *** 20,24 **** <weight>7.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1005</type> <category>Weapons\Fencing\Spear (N/S)</category> --- 20,24 ---- <weight>7.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment</basescripts> <type>1005</type> <category>Weapons\Fencing\Spear (N/S)</category> Index: kryss.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/kryss.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** kryss.xml 25 Aug 2004 17:03:50 -0000 1.11 --- kryss.xml 27 Aug 2004 14:43:28 -0000 1.12 *************** *** 20,24 **** <weight>1.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment,blades</scripts> <type>1005</type> <category>Weapons\Fencing\Kryss (N/S)</category> --- 20,24 ---- <weight>1.0</weight> <tag name="resname" value="iron" /> ! <basescripts>equipment,blades</basescripts> <type>1005</type> <category>Weapons\Fencing\Kryss (N/S)</category> Index: dagger.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/dagger.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** dagger.xml 25 Aug 2004 17:03:49 -0000 1.11 --- dagger.xml 27 Aug 2004 14:43:28 -0000 1.12 *************** *** 20,24 **** <durability><random min="30" max="39" /></durability> <weight>1.0</weight> ! <scripts>equipment,blades</scripts> <type>1005</type> <category>Weapons\Fencing\Dagger (N/S)</category> --- 20,24 ---- <durability><random min="30" max="39" /></durability> <weight>1.0</weight> ! <basescripts>equipment,blades</basescripts> <type>1005</type> <category>Weapons\Fencing\Dagger (N/S)</category> |
|
From: Sebastian H. <dar...@us...> - 2004-08-27 14:43:40
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/vegetation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23985/items/vegetation Modified Files: plants.xml Log Message: basescripts property Index: plants.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/vegetation/plants.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** plants.xml 25 Aug 2004 17:03:48 -0000 1.13 --- plants.xml 27 Aug 2004 14:43:28 -0000 1.14 *************** *** 227,231 **** <nodecay /> <category>Vegetation\Plants\Cotton\Cotton 1</category> ! <scripts>environment</scripts> </item> --- 227,231 ---- <nodecay /> <category>Vegetation\Plants\Cotton\Cotton 1</category> ! <basescripts>environment</basescripts> </item> *************** *** 234,238 **** <nodecay /> <category>Vegetation\Plants\Cotton\Cotton 2</category> ! <scripts>environment</scripts> </item> --- 234,238 ---- <nodecay /> <category>Vegetation\Plants\Cotton\Cotton 2</category> ! <basescripts>environment</basescripts> </item> *************** *** 241,245 **** <nodecay /> <category>Vegetation\Plants\Cotton\Cotton 3</category> ! <scripts>environment</scripts> </item> --- 241,245 ---- <nodecay /> <category>Vegetation\Plants\Cotton\Cotton 3</category> ! <basescripts>environment</basescripts> </item> *************** *** 248,252 **** <nodecay /> <category>Vegetation\Plants\Cotton\Cotton 4</category> ! <scripts>environment</scripts> </item> --- 248,252 ---- <nodecay /> <category>Vegetation\Plants\Cotton\Cotton 4</category> ! <basescripts>environment</basescripts> </item> *************** *** 255,259 **** <nodecay /> <category>Vegetation\Plants\Cotton\Cotton 5</category> ! <scripts>environment</scripts> </item> --- 255,259 ---- <nodecay /> <category>Vegetation\Plants\Cotton\Cotton 5</category> ! <basescripts>environment</basescripts> </item> *************** *** 262,266 **** <nodecay /> <category>Vegetation\Plants\Cotton\Cotton 6</category> ! <scripts>environment</scripts> </item> --- 262,266 ---- <nodecay /> <category>Vegetation\Plants\Cotton\Cotton 6</category> ! <basescripts>environment</basescripts> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-08-27 14:43:40
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23985/items/weaponry/archery Modified Files: bow.xml composite_bow.xml crossbow.xml heavy_crossbow.xml repeating_crossbow.xml Log Message: basescripts property Index: heavy_crossbow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/heavy_crossbow.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** heavy_crossbow.xml 25 Aug 2004 17:03:49 -0000 1.10 --- heavy_crossbow.xml 27 Aug 2004 14:43:28 -0000 1.11 *************** *** 21,25 **** <durability><random min="30" max="55" /></durability> <weight>9.0</weight> ! <scripts>equipment</scripts> <type>1007</type> <category>Weapons\Bows\Heavy Crossbow (N/S)</category> --- 21,25 ---- <durability><random min="30" max="55" /></durability> <weight>9.0</weight> ! <basescripts>equipment</basescripts> <type>1007</type> <category>Weapons\Bows\Heavy Crossbow (N/S)</category> Index: composite_bow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/composite_bow.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** composite_bow.xml 25 Aug 2004 17:03:49 -0000 1.10 --- composite_bow.xml 27 Aug 2004 14:43:28 -0000 1.11 *************** *** 21,25 **** <durability><random min="30" max="70" /></durability> <weight>7.0</weight> ! <scripts>equipment</scripts> <type>1006</type> <category>Weapons\Bows\Composite Bow (N/S)</category> --- 21,25 ---- <durability><random min="30" max="70" /></durability> <weight>7.0</weight> ! <basescripts>equipment</basescripts> <type>1006</type> <category>Weapons\Bows\Composite Bow (N/S)</category> Index: repeating_crossbow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/repeating_crossbow.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** repeating_crossbow.xml 25 Aug 2004 17:03:49 -0000 1.10 --- repeating_crossbow.xml 27 Aug 2004 14:43:28 -0000 1.11 *************** *** 21,25 **** <durability><random min="30" max="49" /></durability> <weight>7.0</weight> ! <scripts>equipment</scripts> <type>1007</type> <category>Weapons\Bows\Repeating Crossbow (N/S)</category> --- 21,25 ---- <durability><random min="30" max="49" /></durability> <weight>7.0</weight> ! <basescripts>equipment</basescripts> <type>1007</type> <category>Weapons\Bows\Repeating Crossbow (N/S)</category> Index: bow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/bow.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** bow.xml 25 Aug 2004 17:03:49 -0000 1.11 --- bow.xml 27 Aug 2004 14:43:28 -0000 1.12 *************** *** 20,24 **** <durability><random min="30" max="50" /></durability> <weight>7.0</weight> ! <scripts>equipment</scripts> <type>1006</type> <category>Weapons\Bows\Bow (N/S)</category> --- 20,24 ---- <durability><random min="30" max="50" /></durability> <weight>7.0</weight> ! <basescripts>equipment</basescripts> <type>1006</type> <category>Weapons\Bows\Bow (N/S)</category> Index: crossbow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/crossbow.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** crossbow.xml 25 Aug 2004 17:03:49 -0000 1.10 --- crossbow.xml 27 Aug 2004 14:43:28 -0000 1.11 *************** *** 21,25 **** <durability><random min="30" max="51" /></durability> <weight>7.0</weight> ! <scripts>equipment</scripts> <type>1007</type> <category>Weapons\Bows\Crossbow (N/S)</category> --- 21,25 ---- <durability><random min="30" max="51" /></durability> <weight>7.0</weight> ! <basescripts>equipment</basescripts> <type>1007</type> <category>Weapons\Bows\Crossbow (N/S)</category> |
|
From: Sebastian H. <dar...@us...> - 2004-08-27 14:43:40
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23985/npcs/humans/vendors Modified Files: banker.xml barber.xml Log Message: basescripts property Index: banker.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/banker.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** banker.xml 25 Aug 2004 17:03:59 -0000 1.6 --- banker.xml 27 Aug 2004 14:43:30 -0000 1.7 *************** *** 16,20 **** <invulnerable /> <title>the Banker</title> ! <scripts>speech.banker</scripts> <equipped> <item id="1515" /> <!-- Cloak --> --- 16,20 ---- <invulnerable /> <title>the Banker</title> ! <basescripts>speech.banker</basescripts> <equipped> <item id="1515" /> <!-- Cloak --> *************** *** 36,40 **** <invulnerable /> <title>the Banker</title> ! <scripts>speech.banker</scripts> <equipped> <item id="1515" /> <!-- Cloak --> --- 36,40 ---- <invulnerable /> <title>the Banker</title> ! <basescripts>speech.banker</basescripts> <equipped> <item id="1515" /> <!-- Cloak --> Index: barber.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/barber.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** barber.xml 25 Aug 2004 17:03:59 -0000 1.4 --- barber.xml 27 Aug 2004 14:43:30 -0000 1.5 *************** *** 12,16 **** <inherit>base_male</inherit> <title>the Barber</title> ! <scripts>speech.barber</scripts> <category>Vendors\Barber (Male)</category> <invulnerable /> --- 12,16 ---- <inherit>base_male</inherit> <title>the Barber</title> ! <basescripts>speech.barber</basescripts> <category>Vendors\Barber (Male)</category> <invulnerable /> *************** *** 20,24 **** <inherit>base_female</inherit> <title>the Barber</title> ! <scripts>speech.barber</scripts> <category>Vendors\Barber (Female)</category> <invulnerable /> --- 20,24 ---- <inherit>base_female</inherit> <title>the Barber</title> ! <basescripts>speech.barber</basescripts> <category>Vendors\Barber (Female)</category> <invulnerable /> |
|
From: Sebastian H. <dar...@us...> - 2004-08-27 14:41:31
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23599 Modified Files: ChangeLog basechar.cpp basechar.h basedef.cpp basedef.h items.cpp items.h pythonscript.cpp pythonscript.h scriptmanager.cpp uobject.cpp uobject.h Log Message: basescripts property Index: uobject.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v retrieving revision 1.181 retrieving revision 1.182 diff -C2 -d -r1.181 -r1.182 *** uobject.cpp 25 Aug 2004 17:01:23 -0000 1.181 --- uobject.cpp 27 Aug 2004 14:41:16 -0000 1.182 *************** *** 157,161 **** pos_.z = atoi( result[offset++] ); pos_.map = atoi( result[offset++] ); ! QString scriptList = ( result[offset] == 0 ) ? QString::null : QString( result[offset] ); offset++; bool havetags_ = atoi( result[offset++] ); --- 157,161 ---- pos_.z = atoi( result[offset++] ); pos_.map = atoi( result[offset++] ); ! QCString scriptList = result[offset]; offset++; bool havetags_ = atoi( result[offset++] ); *************** *** 227,231 **** writer.writeByte( pos_.z ); writer.writeByte( pos_.map ); ! writer.writeUtf8( scriptList() ); } --- 227,231 ---- writer.writeByte( pos_.z ); writer.writeByte( pos_.map ); ! writer.writeAscii( scriptList() ); } *************** *** 239,243 **** pos_.z = reader.readByte(); pos_.map = reader.readByte(); ! setScriptList( reader.readUtf8() ); } --- 239,243 ---- pos_.z = reader.readByte(); pos_.map = reader.readByte(); ! setScriptList( reader.readAscii() ); } *************** *** 312,316 **** \sa addEvent */ ! bool cUObject::hasScript( const QString& name ) const { if ( scriptChain ) --- 312,316 ---- \sa addEvent */ ! bool cUObject::hasScript( const QCString &name ) { if ( scriptChain ) *************** *** 385,389 **** Removes an event handler from the object */ ! void cUObject::removeScript( const QString& name ) { if ( isScriptChainFrozen() ) --- 385,389 ---- Removes an event handler from the object */ ! void cUObject::removeScript( const QCString& name ) { if ( isScriptChainFrozen() ) *************** *** 520,524 **** else if ( TagName == "scripts" ) { ! setScriptList( Value ); } else --- 520,524 ---- else if ( TagName == "scripts" ) { ! setScriptList( Value.latin1() ); } else *************** *** 914,932 **** bool cUObject::onCreate( const QString& definition ) { - cPythonScript* global = ScriptManager::instance()->getGlobalHook( EVENT_CREATE ); bool result = false; ! ! if ( scriptChain || global ) ! { ! PyObject* args = Py_BuildValue( "(Ns)", getPyObject(), definition.latin1() ); ! ! result = cPythonScript::callChainedEventHandler( EVENT_CREATE, scriptChain, args ); ! ! if ( !result && global ) ! result = global->callEventHandler( EVENT_CREATE, args ); ! Py_DECREF( args ); } - return result; } --- 914,923 ---- bool cUObject::onCreate( const QString& definition ) { bool result = false; ! if (canHandleEvent(EVENT_CREATE)) { ! PyObject* args = Py_BuildValue("(Ns)", getPyObject(), definition.latin1()); ! result = callEventHandler(EVENT_CREATE, args); Py_DECREF( args ); } return result; } *************** *** 935,946 **** { bool result = false; ! ! if ( scriptChain ) ! { ! PyObject* args = Py_BuildValue( "NNN", PyGetCharObject( sender ), getPyObject(), PyGetTooltipObject( tooltip ) ); ! result = cPythonScript::callChainedEventHandler( EVENT_SHOWTOOLTIP, scriptChain, args ); Py_DECREF( args ); } - return result; } --- 926,934 ---- { bool result = false; ! if (canHandleEvent(EVENT_SHOWTOOLTIP)) { ! PyObject* args = Py_BuildValue( "(NNN)", PyGetCharObject( sender ), getPyObject(), PyGetTooltipObject( tooltip ) ); ! result = callEventHandler(EVENT_SHOWTOOLTIP, args); Py_DECREF( args ); } return result; } *************** *** 975,979 **** for ( unsigned int i = 1; i <= count; ++i ) { ! QCString* name = new QCString( scriptChain[i]->name().latin1() ); scriptChain[i] = reinterpret_cast<cPythonScript*>( name ); } --- 963,967 ---- for ( unsigned int i = 1; i <= count; ++i ) { ! QCString* name = new QCString( scriptChain[i]->name() ); scriptChain[i] = reinterpret_cast<cPythonScript*>( name ); } *************** *** 1023,1034 **** } ! QString cUObject::scriptList() const { if ( !scriptChain ) { ! return QString::null; } ! QString result; unsigned int count = reinterpret_cast<unsigned int>( scriptChain[0] ); for ( unsigned int i = 1; i <= count; ++i ) --- 1011,1022 ---- } ! QCString cUObject::scriptList() const { if ( !scriptChain ) { ! return QCString(); } ! QCString result; unsigned int count = reinterpret_cast<unsigned int>( scriptChain[0] ); for ( unsigned int i = 1; i <= count; ++i ) *************** *** 1048,1052 **** } ! void cUObject::setScriptList( const QString& eventlist ) { if ( isScriptChainFrozen() ) --- 1036,1040 ---- } ! void cUObject::setScriptList( const QCString& eventlist ) { if ( isScriptChainFrozen() ) *************** *** 1094,1095 **** --- 1082,1084 ---- tags_.save( serial_, writer ); } + Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -d -r1.135 -r1.136 *** basechar.cpp 21 Aug 2004 21:52:17 -0000 1.135 --- basechar.cpp 27 Aug 2004 14:41:15 -0000 1.136 *************** *** 2134,2137 **** --- 2134,2143 ---- PY_PROPERTY( "controlslots", controlSlots() ) + /* + \rproperty char.basescripts This is a comma separated list of scripts assigned to this item + via the baseid. They are called after the scripts assigned dynamically to the item. + */ + PY_PROPERTY( "basescripts", basedef_ ? basedef_->baseScriptList() : "" ); + if ( name.left( 6 ) == "skill." ) { *************** *** 2502,2517 **** Event Wrappers */ - bool cBaseChar::onWalk( unsigned char direction, unsigned char sequence ) { bool result = false; ! ! if ( scriptChain ) { PyObject* args = Py_BuildValue( "O&bb", PyGetCharObject, this, direction, sequence ); ! result = cPythonScript::callChainedEventHandler( EVENT_WALK, scriptChain, args ); Py_DECREF( args ); } - return result; } --- 2508,2520 ---- Event Wrappers */ bool cBaseChar::onWalk( unsigned char direction, unsigned char sequence ) { bool result = false; ! if (canHandleEvent(EVENT_WALK)) { PyObject* args = Py_BuildValue( "O&bb", PyGetCharObject, this, direction, sequence ); ! result = callEventHandler(EVENT_WALK, args); Py_DECREF( args ); } return result; } *************** *** 2520,2531 **** { bool result = false; ! ! if ( scriptChain ) { ! PyObject* args = Py_BuildValue( "O&bhhuu", PyGetCharObject, this, type, color, font, text.ucs2(), lang.ucs2() ); ! result = cPythonScript::callChainedEventHandler( EVENT_TALK, scriptChain, args ); Py_DECREF( args ); } - return result; } --- 2523,2532 ---- { bool result = false; ! if (canHandleEvent(EVENT_TALK)) { ! PyObject* args = Py_BuildValue( "O&bhhNN", PyGetCharObject, this, type, color, font, QString2Python(text), QString2Python(lang) ); ! result = callEventHandler(EVENT_TALK, args); Py_DECREF( args ); } return result; } *************** *** 2534,2545 **** { bool result = false; ! ! if ( scriptChain ) { PyObject* args = Py_BuildValue( "O&i", PyGetCharObject, this, war ? 1 : 0 ); ! result = cPythonScript::callChainedEventHandler( EVENT_WARMODETOGGLE, scriptChain, args ); Py_DECREF( args ); } - return result; } --- 2535,2544 ---- { bool result = false; ! if (canHandleEvent(EVENT_WARMODETOGGLE)) { PyObject* args = Py_BuildValue( "O&i", PyGetCharObject, this, war ? 1 : 0 ); ! result = callEventHandler(EVENT_WARMODETOGGLE, args); Py_DECREF( args ); } return result; } *************** *** 2548,2559 **** { bool result = false; ! ! if ( scriptChain ) { PyObject* args = Py_BuildValue( "O&O&", PyGetCharObject, this, PyGetCharObject, pOrigin ); ! result = cPythonScript::callChainedEventHandler( EVENT_SHOWPAPERDOLL, scriptChain, args ); Py_DECREF( args ); } - return result; } --- 2547,2556 ---- { bool result = false; ! if (canHandleEvent(EVENT_SHOWPAPERDOLL)) { PyObject* args = Py_BuildValue( "O&O&", PyGetCharObject, this, PyGetCharObject, pOrigin ); ! result = callEventHandler(EVENT_SHOWPAPERDOLL, args); Py_DECREF( args ); } return result; } *************** *** 2562,2573 **** { bool result = false; ! ! if ( scriptChain ) { PyObject* args = Py_BuildValue( "(N)", getPyObject() ); ! result = cPythonScript::callChainedEventHandler( EVENT_SHOWSKILLGUMP, scriptChain, args ); Py_DECREF( args ); } - return result; } --- 2559,2568 ---- { bool result = false; ! if (canHandleEvent(EVENT_SHOWSKILLGUMP)) { PyObject* args = Py_BuildValue( "(N)", getPyObject() ); ! result = callEventHandler(EVENT_SHOWSKILLGUMP, args); Py_DECREF( args ); } return result; } *************** *** 2575,2593 **** bool cBaseChar::onSkillUse( unsigned char skill ) { - cPythonScript* global = ScriptManager::instance()->getGlobalHook( EVENT_SKILLUSE ); bool result = false; ! ! if ( scriptChain || global ) { PyObject* args = Py_BuildValue( "O&b", PyGetCharObject, this, skill ); ! ! result = cPythonScript::callChainedEventHandler( EVENT_SKILLUSE, scriptChain, args ); ! ! if ( !result && global ) ! result = global->callEventHandler( EVENT_SKILLUSE, args ); ! Py_DECREF( args ); } - return result; } --- 2570,2580 ---- bool cBaseChar::onSkillUse( unsigned char skill ) { bool result = false; ! if (canHandleEvent(EVENT_SKILLUSE)) { PyObject* args = Py_BuildValue( "O&b", PyGetCharObject, this, skill ); ! result = callEventHandler(EVENT_SKILLUSE, args); Py_DECREF( args ); } return result; } *************** *** 2596,2607 **** { bool result = false; ! ! if ( scriptChain ) { PyObject* args = Py_BuildValue( "O&O&", PyGetCharObject, this, PyGetItemObject, pItem ); ! result = cPythonScript::callChainedEventHandler( EVENT_DROPONCHAR, scriptChain, args ); Py_DECREF( args ); } - return result; } --- 2583,2592 ---- { bool result = false; ! if (canHandleEvent(EVENT_DROPONCHAR)) { PyObject* args = Py_BuildValue( "O&O&", PyGetCharObject, this, PyGetItemObject, pItem ); ! result = callEventHandler(EVENT_DROPONCHAR, args); Py_DECREF( args ); } return result; } *************** *** 2612,2627 **** QString name = QString::null; ! if ( scriptChain ) { PyObject* args = Py_BuildValue( "O&O&", PyGetCharObject, this, PyGetCharObject, pOrigin ); ! PyObject* result = cPythonScript::callChainedEvent( EVENT_SHOWPAPERDOLLNAME, scriptChain, args ); ! if ( result ) ! { ! name = Python2QString( result ); } ! Py_XDECREF( result ); Py_DECREF( args ); } --- 2597,2611 ---- QString name = QString::null; ! if ( canHandleEvent(EVENT_SHOWPAPERDOLLNAME) ) { PyObject* args = Py_BuildValue( "O&O&", PyGetCharObject, this, PyGetCharObject, pOrigin ); ! PyObject* result = callEvent(EVENT_SHOWPAPERDOLLNAME, args); ! if (result) { ! name = Python2QString(result); } ! Py_XDECREF(result); Py_DECREF( args ); } *************** *** 2633,2652 **** { bool result = false; ! cPythonScript* global = ScriptManager::instance()->getGlobalHook( EVENT_DEATH ); ! ! if ( scriptChain || global ) { PyObject* args = Py_BuildValue( "(O&O&O&)", PyGetCharObject, this, PyGetObjectObject, source, PyGetItemObject, corpse ); ! if ( global ) ! { ! global->callEventHandler( EVENT_DEATH, args ); ! } ! if ( scriptChain ) ! { ! result = cPythonScript::callChainedEventHandler( EVENT_DEATH, scriptChain, args ); ! } Py_DECREF( args ); } - return result; } --- 2617,2626 ---- { bool result = false; ! if (canHandleEvent(EVENT_DEATH)) { PyObject* args = Py_BuildValue( "(O&O&O&)", PyGetCharObject, this, PyGetObjectObject, source, PyGetItemObject, corpse ); ! result = callEventHandler(EVENT_DEATH, args); Py_DECREF( args ); } return result; } *************** *** 2654,2672 **** bool cBaseChar::onCHLevelChange( unsigned int level ) { - cPythonScript* global = ScriptManager::instance()->getGlobalHook( EVENT_CHLEVELCHANGE ); bool result = false; ! ! if ( scriptChain || global ) { PyObject* args = Py_BuildValue( "O&i", PyGetCharObject, this, level ); ! ! result = cPythonScript::callChainedEventHandler( EVENT_CHLEVELCHANGE, scriptChain, args ); ! ! if ( !result && global ) ! result = global->callEventHandler( EVENT_CHLEVELCHANGE, args ); ! Py_DECREF( args ); } - return result; } --- 2628,2638 ---- bool cBaseChar::onCHLevelChange( unsigned int level ) { bool result = false; ! if (canHandleEvent(EVENT_CHLEVELCHANGE)) { PyObject* args = Py_BuildValue( "O&i", PyGetCharObject, this, level ); ! result = callEventHandler(EVENT_CHLEVELCHANGE, args); Py_DECREF( args ); } return result; } *************** *** 2674,2692 **** bool cBaseChar::onSkillGain( unsigned char skill, unsigned short min, unsigned short max, bool success ) { - cPythonScript* global = ScriptManager::instance()->getGlobalHook( EVENT_SKILLGAIN ); bool result = false; ! ! if ( scriptChain || global ) { PyObject* args = Py_BuildValue( "O&bhhi", PyGetCharObject, this, skill, min, max, success ? 1 : 0 ); ! ! result = cPythonScript::callChainedEventHandler( EVENT_SKILLGAIN, scriptChain, args ); ! ! if ( !result && global ) ! result = global->callEventHandler( EVENT_SKILLGAIN, args ); ! Py_DECREF( args ); } - return result; } --- 2640,2650 ---- bool cBaseChar::onSkillGain( unsigned char skill, unsigned short min, unsigned short max, bool success ) { bool result = false; ! if (canHandleEvent(EVENT_SKILLGAIN)) { PyObject* args = Py_BuildValue( "O&bhhi", PyGetCharObject, this, skill, min, max, success ? 1 : 0 ); ! result = callEventHandler(EVENT_SKILLGAIN, args); Py_DECREF( args ); } return result; } *************** *** 3440,3441 **** --- 3398,3488 ---- SectorMaps::instance()->add( this ); } + + PyObject *cBaseChar::callEvent(ePythonEvent event, PyObject *args, bool ignoreErrors) { + PyObject *result = 0; + + if (scriptChain) { + result = cPythonScript::callChainedEvent(event, scriptChain, args); + + // Break if there has been a result already + if (result && PyObject_IsTrue(result)) { + return result; + } + } + + // call the basescripts + if (basedef_) { + const QPtrList<cPythonScript> &list = basedef_->baseScripts(); + QPtrList<cPythonScript>::const_iterator it(list.begin()); + for (; it != list.end(); ++it) { + result = (*it)->callEvent(event, args, ignoreErrors); + + if (result && PyObject_IsTrue(result)) { + return result; + } + } + } + + // check for a global handler + cPythonScript *globalHook = ScriptManager::instance()->getGlobalHook(event); + + if (globalHook) { + result = globalHook->callEvent(event, args, ignoreErrors); + } + + return result; + } + + bool cBaseChar::canHandleEvent(ePythonEvent event) { + // Is there a global event? + cPythonScript *globalHook = ScriptManager::instance()->getGlobalHook(event); + + if (globalHook) { + return true; + } + + if (cPythonScript::canChainHandleEvent(event, scriptChain)) { + return true; + } + + if (basedef_) { + const QPtrList<cPythonScript> &list = basedef_->baseScripts(); + QPtrList<cPythonScript>::const_iterator it(list.begin()); + for (; it != list.end(); ++it) { + if ((*it)->canHandleEvent(event)) { + return true; + } + } + } + + return false; + } + + bool cBaseChar::callEventHandler(ePythonEvent event, PyObject *args, bool ignoreErrors) { + PyObject *result = callEvent(event, args, ignoreErrors); + + if (result) { + if (PyObject_IsTrue(result)) { + Py_DECREF(result); + return true; + } else { + Py_DECREF(result); + } + } + return false; + } + + bool cBaseChar::hasScript( const QCString& name ) + { + if (basedef_) { + const QPtrList<cPythonScript> &list = basedef_->baseScripts(); + QPtrList<cPythonScript>::const_iterator it(list.begin()); + for (; it != list.end(); ++it) { + if ((*it)->name() == name) { + return true; + } + } + } + + return cUObject::hasScript(name); + } Index: uobject.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/uobject.h,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** uobject.h 25 Aug 2004 17:01:23 -0000 1.107 --- uobject.h 27 Aug 2004 14:41:16 -0000 1.108 *************** *** 110,120 **** void clearScripts(); void addScript( cPythonScript * script, bool append = false ); ! void removeScript( const QString& Name ); ! bool hasScript( const QString& Name ) const; void freezeScriptChain(); void unfreezeScriptChain(); bool isScriptChainFrozen(); ! void setScriptList( const QString& scripts ); ! QString scriptList() const; inline cPythonScript** getScripts() { --- 110,121 ---- void clearScripts(); void addScript( cPythonScript * script, bool append = false ); ! void removeScript( const QCString &name ); ! virtual bool hasScript(const QCString &name); ! void freezeScriptChain(); void unfreezeScriptChain(); bool isScriptChainFrozen(); ! void setScriptList( const QCString &scripts ); ! QCString scriptList() const; inline cPythonScript** getScripts() { *************** *** 234,237 **** --- 235,252 ---- stError* setProperty( const QString& name, const cVariant& value ); PyObject* getProperty( const QString& name ); + + // Call an event handler for this object and take both the normal + // and the base script chain into account. This will also call the + // global handler. + virtual PyObject *callEvent(ePythonEvent event, PyObject *args = 0, bool ignoreErrors = false) = 0; + + // Call a python event handler and return true if any of the + // events in the call chain returns an object that evaluates + // to true. + virtual bool callEventHandler(ePythonEvent event, PyObject *args = 0, bool ignoreErrors = false) = 0; + + // Check if any of the scripts assigned to this object can handle the given event, + // this returns true even if there is a global handler for the event. + virtual bool canHandleEvent(ePythonEvent event) = 0; }; #pragma pack() Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ChangeLog 23 Aug 2004 21:37:39 -0000 1.13 --- ChangeLog 27 Aug 2004 14:41:15 -0000 1.14 *************** *** 17,20 **** --- 17,27 ---- - Binary backups can automatically be compressed using gzip. - The number of backups kept can be limited. + - Allowed scripts to be attached to base definitions by using <basescripts>a,b,c</basescripts>. + Those scripts are attached to objects by using their baseid property. If you change the <basescripts> + tags in the definition, all objects using that definition will use the new scripts automatically. + - onDetach and onAttach are not called for those scripts. + - hasscript(a) will return true if a is in the basescripts. + - addscript now prepends a new script rather than appending it. + Wolfpack 12.9.8 Beta (19. August 2004) Index: pythonscript.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** pythonscript.h 19 Aug 2004 05:28:21 -0000 1.38 --- pythonscript.h 27 Aug 2004 14:41:16 -0000 1.39 *************** *** 95,99 **** { protected: ! QString name_; // Important! bool loaded; PyObject* codeModule; // This object stores the compiled Python Module --- 95,99 ---- { protected: ! QCString name_; // Important! bool loaded; PyObject* codeModule; // This object stores the compiled Python Module *************** *** 105,118 **** // We need an identification value for the scripts ! void setName( const QString& value ) { name_ = value; } ! QString name() const { return name_; } ! bool load( const QString& name ); void unload( void ); bool isLoaded() const; --- 105,118 ---- // We need an identification value for the scripts ! void setName( const QCString& value ) { name_ = value; } ! const QCString &name() const { return name_; } ! bool load( const QCString& name ); void unload( void ); bool isLoaded() const; Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.440 retrieving revision 1.441 diff -C2 -d -r1.440 -r1.441 *** items.cpp 25 Aug 2004 17:01:23 -0000 1.440 --- items.cpp 27 Aug 2004 14:41:15 -0000 1.441 *************** *** 62,180 **** using namespace std; - /* - cItemBaseDef and cItemBaseDefs - */ - cItemBaseDef::cItemBaseDef( const QCString& id ) - { - id_ = id; - reset(); - } - - cItemBaseDef::~cItemBaseDef() - { - } - - void cItemBaseDef::reset() - { - loaded = false; - weight_ = 0.0f; - decaydelay_ = 0; - sellprice_ = 0; - buyprice_ = 0; - type_ = 0; - lightsource_ = 0; - flags_ = 0; - } - - void cItemBaseDef::processNode( const cElement* node ) - { - if ( node->name() == "weight" ) - { - weight_ = node->text().toFloat(); - } - else if ( node->name() == "buyprice" ) - { - buyprice_ = node->value().toUInt(); - } - else if ( node->name() == "sellprice" ) - { - sellprice_ = node->value().toUInt(); - } - else if ( node->name() == "type" ) - { - type_ = node->value().toUShort(); - } - else if ( node->name() == "bindmenu" ) - { - bindmenu_ = node->text(); - } - else if ( node->name() == "lightsource" ) - { - lightsource_ = node->value().toUShort(); - } - else if ( node->name() == "decaydelay" ) - { - decaydelay_ = node->value().toUInt(); - } - else if ( node->name() == "watersource" ) - { - setWaterSource( node->value().toUInt() != 0 ); - } - } - - // Load this definition from the scripts. - void cItemBaseDef::load() - { - if ( !loaded ) - { - loaded = true; - const cElement* element = Definitions::instance()->getDefinition( WPDT_ITEM, id_ ); - - if ( !element ) - { - Console::instance()->log( LOG_WARNING, QString( "Missing item definition '%1'.\n" ).arg( id_ ) ); - return; - } - - applyDefinition( element ); - } - } - - cItemBaseDef* cItemBaseDefs::get( const QCString& id ) - { - Iterator it = definitions.find( id ); - - if ( it == definitions.end() ) - { - cItemBaseDef* def = new cItemBaseDef( id ); - it = definitions.insert( id, def ); - } - - return it.data(); - } - - cItemBaseDefs::cItemBaseDefs() - { - } - - cItemBaseDefs::~cItemBaseDefs() - { - Iterator it; - for ( it = definitions.begin(); it != definitions.end(); ++it ) - { - delete it.data(); - } - definitions.clear(); - } - - void cItemBaseDefs::reset() - { - Iterator it; - for ( it = definitions.begin(); it != definitions.end(); ++it ) - { - it.data()->reset(); - } - } - /***************************************************************************** * cItem member functions --- 62,65 ---- *************** *** 688,702 **** } ! bool cItem::onSingleClick( P_PLAYER Viewer ) ! { bool result = false; ! ! if ( scriptChain ) ! { ! PyObject* args = Py_BuildValue( "O&O&", PyGetItemObject, this, PyGetCharObject, Viewer ); ! result = cPythonScript::callChainedEventHandler( EVENT_SINGLECLICK, scriptChain, args ); ! Py_DECREF( args ); } - return result; } --- 573,583 ---- } ! bool cItem::onSingleClick( P_PLAYER Viewer ) { bool result = false; ! if (canHandleEvent(EVENT_SINGLECLICK)) { ! PyObject* args = Py_BuildValue("O&O&", PyGetItemObject, this, PyGetCharObject, Viewer); ! result = callEventHandler(EVENT_SINGLECLICK, args); ! Py_DECREF(args); } return result; } *************** *** 705,716 **** { bool result = false; ! ! if ( scriptChain ) ! { PyObject* args = Py_BuildValue( "O&O&", PyGetItemObject, layer_ == 0x1E ? pItem : this, PyGetItemObject, layer_ == 0x1E ? this : pItem ); ! result = cPythonScript::callChainedEventHandler( EVENT_DROPONITEM, scriptChain, args ); ! Py_DECREF( args ); } - return result; } --- 586,594 ---- { bool result = false; ! if (canHandleEvent(EVENT_DROPONITEM)) { PyObject* args = Py_BuildValue( "O&O&", PyGetItemObject, layer_ == 0x1E ? pItem : this, PyGetItemObject, layer_ == 0x1E ? this : pItem ); ! result = callEventHandler(EVENT_DROPONITEM, args); ! Py_DECREF(args); } return result; } *************** *** 719,730 **** { bool result = false; ! ! if ( scriptChain ) ! { PyObject* args = Py_BuildValue( "O&N", PyGetItemObject, this, PyGetCoordObject( pos ) ); ! result = cPythonScript::callChainedEventHandler( EVENT_DROPONGROUND, scriptChain, args ); ! Py_DECREF( args ); } - return result; } --- 597,605 ---- { bool result = false; ! if (canHandleEvent(EVENT_DROPONGROUND)) { PyObject* args = Py_BuildValue( "O&N", PyGetItemObject, this, PyGetCoordObject( pos ) ); ! result = callEventHandler(EVENT_DROPONGROUND, args); ! Py_DECREF(args); } return result; } *************** *** 734,742 **** bool result = false; ! if ( scriptChain ) { PyObject* args = Py_BuildValue( "O&O&", PyGetCharObject, pChar, PyGetItemObject, this ); ! result = cPythonScript::callChainedEventHandler( EVENT_PICKUP, scriptChain, args ); ! Py_DECREF( args ); } --- 609,617 ---- bool result = false; ! if (canHandleEvent(EVENT_PICKUP)) { PyObject* args = Py_BuildValue( "O&O&", PyGetCharObject, pChar, PyGetItemObject, this ); ! result = callEventHandler(EVENT_PICKUP, args); ! Py_DECREF(args); } *************** *** 747,758 **** { bool result = false; ! ! if ( scriptChain ) ! { PyObject* args = Py_BuildValue( "O&O&b", PyGetCharObject, pChar, PyGetItemObject, this, layer ); ! result = cPythonScript::callChainedEventHandler( EVENT_EQUIP, scriptChain, args ); ! Py_DECREF( args ); } - return result; } --- 622,630 ---- { bool result = false; ! if (canHandleEvent(EVENT_EQUIP)) { PyObject* args = Py_BuildValue( "O&O&b", PyGetCharObject, pChar, PyGetItemObject, this, layer ); ! result = callEventHandler(EVENT_EQUIP, args); ! Py_DECREF(args); } return result; } *************** *** 761,772 **** { bool result = false; ! ! if ( scriptChain ) ! { PyObject* args = Py_BuildValue( "O&O&b", PyGetCharObject, pChar, PyGetItemObject, this, layer ); ! result = cPythonScript::callChainedEventHandler( EVENT_UNEQUIP, scriptChain, args ); ! Py_DECREF( args ); } - return result; } --- 633,641 ---- { bool result = false; ! if (canHandleEvent(EVENT_UNEQUIP)) { PyObject* args = Py_BuildValue( "O&O&b", PyGetCharObject, pChar, PyGetItemObject, this, layer ); ! result = callEventHandler(EVENT_UNEQUIP, args); ! Py_DECREF(args); } return result; } *************** *** 775,815 **** { bool result = false; ! ! if ( scriptChain ) ! { PyObject* args = Py_BuildValue( "O&O&O&b", PyGetCharObject, pPlayer, PyGetCharObject, pChar, PyGetItemObject, this, layer ); ! result = cPythonScript::callChainedEventHandler( EVENT_WEARITEM, scriptChain, args ); ! Py_DECREF( args ); } - return result; } ! bool cItem::onUse( P_CHAR pChar ) ! { bool result = false; ! ! if ( scriptChain ) ! { PyObject* args = Py_BuildValue( "O&O&", PyGetCharObject, pChar, PyGetItemObject, this ); ! result = cPythonScript::callChainedEventHandler( EVENT_USE, scriptChain, args ); ! Py_DECREF( args ); } - return result; } ! ! bool cItem::onCollide( P_CHAR pChar ) { bool result = false; ! ! if ( scriptChain ) ! { PyObject* args = Py_BuildValue( "O&O&", PyGetCharObject, pChar, PyGetItemObject, this ); ! result = cPythonScript::callChainedEventHandler( EVENT_COLLIDE, scriptChain, args ); ! Py_DECREF( args ); } - return result; } --- 644,673 ---- { bool result = false; ! if (canHandleEvent(EVENT_WEARITEM)) { PyObject* args = Py_BuildValue( "O&O&O&b", PyGetCharObject, pPlayer, PyGetCharObject, pChar, PyGetItemObject, this, layer ); ! result = callEventHandler(EVENT_WEARITEM, args); ! Py_DECREF(args); } return result; } ! bool cItem::onUse(P_CHAR pChar) { bool result = false; ! if (canHandleEvent(EVENT_USE)) { PyObject* args = Py_BuildValue( "O&O&", PyGetCharObject, pChar, PyGetItemObject, this ); ! result = callEventHandler(EVENT_USE, args); ! Py_DECREF(args); } return result; } ! bool cItem::onCollide(P_CHAR pChar) { bool result = false; ! if (canHandleEvent(EVENT_COLLIDE)) { PyObject* args = Py_BuildValue( "O&O&", PyGetCharObject, pChar, PyGetItemObject, this ); ! result = callEventHandler(EVENT_COLLIDE, args); ! Py_DECREF(args); } return result; } *************** *** 818,829 **** { bool result = false; ! ! if ( scriptChain ) ! { PyObject* args = Py_BuildValue( "O&O&", PyGetCharObject, pChar, PyGetItemObject, this ); ! result = cPythonScript::callChainedEventHandler( EVENT_DROPONCHAR, scriptChain, args ); ! Py_DECREF( args ); } - return result; } --- 676,684 ---- { bool result = false; ! if (canHandleEvent(EVENT_DROPONCHAR)) { PyObject* args = Py_BuildValue( "O&O&", PyGetCharObject, pChar, PyGetItemObject, this ); ! result = callEventHandler(EVENT_DROPONCHAR, args); ! Py_DECREF(args); } return result; } *************** *** 2040,2043 **** --- 1895,1903 ---- */ PY_PROPERTY( "watersource", isWaterSource() ) + /* + \rproperty item.basescripts This is a comma separated list of scripts assigned to this item + via the baseid. They are called after the scripts assigned dynamically to the item. + */ + PY_PROPERTY( "basescripts", basedef_ ? basedef_->baseScriptList() : "" ); return cUObject::getProperty( name ); *************** *** 2376,2377 **** --- 2236,2326 ---- } } + + bool cItem::callEventHandler(ePythonEvent event, PyObject *args, bool ignoreErrors) { + PyObject *result = callEvent(event, args, ignoreErrors); + + if (result) { + if (PyObject_IsTrue(result)) { + Py_DECREF(result); + return true; + } else { + Py_DECREF(result); + } + } + return false; + } + + PyObject *cItem::callEvent(ePythonEvent event, PyObject *args, bool ignoreErrors) { + PyObject *result = 0; + + if (scriptChain) { + result = cPythonScript::callChainedEvent(event, scriptChain, args); + + // Break if there has been a result already + if (result && PyObject_IsTrue(result)) { + return result; + } + } + + // call the basescripts + if (basedef_) { + const QPtrList<cPythonScript> &list = basedef_->baseScripts(); + QPtrList<cPythonScript>::const_iterator it(list.begin()); + for (; it != list.end(); ++it) { + result = (*it)->callEvent(event, args, ignoreErrors); + + if (result && PyObject_IsTrue(result)) { + return result; + } + } + } + + // check for a global handler + cPythonScript *globalHook = ScriptManager::instance()->getGlobalHook(event); + + if (globalHook) { + result = globalHook->callEvent(event, args, ignoreErrors); + } + + return result; + } + + bool cItem::canHandleEvent(ePythonEvent event) { + // Is there a global event? + cPythonScript *globalHook = ScriptManager::instance()->getGlobalHook(event); + + if (globalHook) { + return true; + } + + if (cPythonScript::canChainHandleEvent(event, scriptChain)) { + return true; + } + + if (basedef_) { + const QPtrList<cPythonScript> &list = basedef_->baseScripts(); + QPtrList<cPythonScript>::const_iterator it(list.begin()); + for (; it != list.end(); ++it) { + if ((*it)->canHandleEvent(event)) { + return true; + } + } + } + + return false; + } + + bool cItem::hasScript( const QCString& name ) + { + if (basedef_) { + const QPtrList<cPythonScript> &list = basedef_->baseScripts(); + QPtrList<cPythonScript>::const_iterator it(list.begin()); + for (; it != list.end(); ++it) { + if ((*it)->name() == name) { + return true; + } + } + } + + return cUObject::hasScript(name); + } Index: scriptmanager.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/scriptmanager.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** scriptmanager.cpp 6 Jun 2004 12:03:09 -0000 1.23 --- scriptmanager.cpp 27 Aug 2004 14:41:16 -0000 1.24 *************** *** 149,153 **** cPythonScript* script = new cPythonScript; scripts.replace( element->text().utf8(), script ); ! script->load( element->text() ); ++loaded; } --- 149,153 ---- cPythonScript* script = new cPythonScript; scripts.replace( element->text().utf8(), script ); ! script->load( element->text().latin1() ); ++loaded; } Index: items.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.h,v retrieving revision 1.214 retrieving revision 1.215 diff -C2 -d -r1.214 -r1.215 *** items.h 19 Aug 2004 01:55:56 -0000 1.214 --- items.h 27 Aug 2004 14:41:16 -0000 1.215 *************** *** 31,34 **** --- 31,35 ---- // Wolfpack Includes #include "uobject.h" + #include "basedef.h" #include "defines.h" #include "network/uotxpackets.h" *************** *** 45,163 **** /* - This class represents an item definition and it's - static properties. - */ - class cItemBaseDef : public cDefinable - { - friend class cItemBaseDefs; - protected: - // Our id - QCString id_; - float weight_; - unsigned int sellprice_; - unsigned int buyprice_; - unsigned short type_; - QCString bindmenu_; - unsigned char lightsource_; - unsigned int decaydelay_; - unsigned int flags_; - - // Misc Properties - bool loaded; - void load(); - void reset(); - - inline void setWaterSource( bool data ) - { - if ( data ) - { - flags_ |= 0x01; - } - else - { - flags_ &= ~0x01; - } - } - public: - cItemBaseDef( const QCString& id ); - ~cItemBaseDef(); - - void processNode( const cElement* node ); - - inline const QCString& id() const - { - return id_; - } - - inline unsigned int decaydelay() - { - load(); - return decaydelay_; - } - - inline float weight() - { - load(); - return weight_; - } - - inline unsigned int sellprice() - { - load(); - return sellprice_; - } - - inline unsigned int buyprice() - { - load(); - return buyprice_; - } - - inline unsigned short type() - { - load(); - return type_; - } - - inline const QCString& bindmenu() - { - load(); - return bindmenu_; - } - - inline unsigned char lightsource() - { - load(); - return lightsource_; - } - - inline bool isWaterSource() - { - load(); - return ( flags_ & 0x01 ) != 0; - } - }; - - class cItemBaseDefs - { - protected: - typedef QMap<QCString, cItemBaseDef*> Container; - typedef Container::iterator Iterator; - Container definitions; - public: - cItemBaseDefs(); - ~cItemBaseDefs(); - - // Get a base definition - // This is guaranteed to return a basedef. Even if uninitialized. - cItemBaseDef* get( const QCString& id ); - - // When reset is called, all loaded basedefs are unflagged. - void reset(); - }; - - typedef SingletonHolder<cItemBaseDefs> ItemBaseDefs; - - /* Notes for further memory footprint reduction: --- 46,49 ---- *************** *** 180,183 **** --- 66,74 ---- public: + PyObject *callEvent(ePythonEvent event, PyObject *args = 0, bool ignoreErrors = false); + bool callEventHandler(ePythonEvent event, PyObject *args = 0, bool ignoreErrors = false); + bool canHandleEvent(ePythonEvent event); + bool hasScript(const QCString &name); + cItem(); cItem( const cItem& src ); // Copy constructor *************** *** 306,309 **** --- 197,204 ---- return basedef_ ? basedef_->id() : 0; } + inline cItemBaseDef *basedef() const + { + return basedef_; + } inline void setBaseid( const QCString& id ) { Index: pythonscript.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** pythonscript.cpp 22 Aug 2004 02:29:51 -0000 1.46 --- pythonscript.cpp 27 Aug 2004 14:41:16 -0000 1.47 *************** *** 432,437 **** \event onAttach \param object The object. ! \condition Triggered when a script is attached to an object. ! \notes This is even triggered when the item is loaded from a worldfile. */ "onAttach", --- 432,438 ---- \event onAttach \param object The object. ! \condition Triggered when a script is attached to an object. ! \notes This is even triggered when the item is loaded from a worldfile, but not ! for scripts in the objects basescripts list. */ "onAttach", *************** *** 440,444 **** \event onDetach \param object The object. ! \condition Triggered when a script is removed from an object. */ "onDetach", --- 441,446 ---- \event onDetach \param object The object. ! \condition Triggered when a script is removed from an object, but not ! for scripts in the objects basescripts list. */ "onDetach", *************** *** 558,562 **** */ // Find our module name ! bool cPythonScript::load( const QString& name ) { if ( name.isEmpty() ) --- 560,564 ---- */ // Find our module name ! bool cPythonScript::load( const QCString& name ) { if ( name.isEmpty() ) *************** *** 567,571 **** setName( name ); ! codeModule = PyImport_ImportModule( const_cast<char*>( name.latin1() ) ); if ( !codeModule ) --- 569,573 ---- setName( name ); ! codeModule = PyImport_ImportModule( const_cast<char*>( name.data() ) ); if ( !codeModule ) *************** *** 752,756 **** result = copy[i]->callEvent( event, args ); ! if ( result ) break; } --- 754,758 ---- result = copy[i]->callEvent( event, args ); ! if ( result && PyObject_IsTrue( result ) ) break; } Index: basedef.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** basedef.cpp 2 Jun 2004 15:04:03 -0000 1.10 --- basedef.cpp 27 Aug 2004 14:41:15 -0000 1.11 *************** *** 30,33 **** --- 30,34 ---- #include "basedef.h" #include "definitions.h" + #include "scriptmanager.h" #include "basics.h" #include <string.h> *************** *** 115,118 **** --- 116,136 ---- bindmenu_ = node->text(); } + else if ( node->name() == "basescripts" ) + { + baseScriptList_ = node->text(); + } + } + + void cCharBaseDef::refreshScripts() { + if (loaded) { + QStringList scripts = QStringList::split(",", baseScriptList_); + QStringList::const_iterator it; + for (it = scripts.begin(); it != scripts.end(); ++it) { + cPythonScript *script = ScriptManager::instance()->find((*it).latin1()); + if (script) { + baseScripts_.append(script); + } + } + } } *************** *** 170,171 **** --- 188,341 ---- } } + + void cCharBaseDefs::refreshScripts() + { + Iterator it; + for ( it = definitions.begin(); it != definitions.end(); ++it ) + { + it.data()->refreshScripts(); + } + } + + + /* + cItemBaseDef and cItemBaseDefs + */ + cItemBaseDef::cItemBaseDef( const QCString& id ) + { + id_ = id; + reset(); + } + + cItemBaseDef::~cItemBaseDef() + { + } + + void cItemBaseDef::reset() + { + loaded = false; + weight_ = 0.0f; + decaydelay_ = 0; + sellprice_ = 0; + buyprice_ = 0; + type_ = 0; + lightsource_ = 0; + flags_ = 0; + } + + void cItemBaseDef::refreshScripts() { + if (loaded) { + QStringList scripts = QStringList::split(",", baseScriptList_); + QStringList::const_iterator it; + for (it = scripts.begin(); it != scripts.end(); ++it) { + cPythonScript *script = ScriptManager::instance()->find((*it).latin1()); + if (script) { + baseScripts_.append(script); + } + } + } + } + + void cItemBaseDef::processNode( const cElement* node ) + { + if ( node->name() == "weight" ) + { + weight_ = node->text().toFloat(); + } + else if ( node->name() == "buyprice" ) + { + buyprice_ = node->value().toUInt(); + } + else if ( node->name() == "sellprice" ) + { + sellprice_ = node->value().toUInt(); + } + else if ( node->name() == "type" ) + { + type_ = node->value().toUShort(); + } + else if ( node->name() == "bindmenu" ) + { + bindmenu_ = node->text(); + } + else if ( node->name() == "lightsource" ) + { + lightsource_ = node->value().toUShort(); + } + else if ( node->name() == "decaydelay" ) + { + decaydelay_ = node->value().toUInt(); + } + else if ( node->name() == "watersource" ) + { + setWaterSource( node->value().toUInt() != 0 ); + } + else if ( node->name() == "basescripts" ) + { + baseScriptList_ = node->text(); + refreshScripts(); + } + } + + // Load this definition from the scripts. + void cItemBaseDef::load() + { + if ( !loaded ) + { + loaded = true; + const cElement* element = Definitions::instance()->getDefinition( WPDT_ITEM, id_ ); + + if ( !element ) + { + Console::instance()->log( LOG_WARNING, QString( "Missing item definition '%1'.\n" ).arg( id_ ) ); + return; + } + + applyDefinition( element ); + } + } + + cItemBaseDef* cItemBaseDefs::get( const QCString& id ) + { + Iterator it = definitions.find( id ); + + if ( it == definitions.end() ) + { + cItemBaseDef* def = new cItemBaseDef( id ); + it = definitions.insert( id, def ); + } + + return it.data(); + } + + cItemBaseDefs::cItemBaseDefs() + { + } + + cItemBaseDefs::~cItemBaseDefs() + { + Iterator it; + for ( it = definitions.begin(); it != definitions.end(); ++it ) + { + delete it.data(); + } + definitions.clear(); + } + + void cItemBaseDefs::reset() + { + Iterator it; + for ( it = definitions.begin(); it != definitions.end(); ++it ) + { + it.data()->reset(); + } + } + + void cItemBaseDefs::refreshScripts() + { + Iterator it; + for ( it = definitions.begin(); it != definitions.end(); ++it ) + { + it.data()->refreshScripts(); + } + } Index: basedef.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** basedef.h 10 Aug 2004 03:15:56 -0000 1.11 --- basedef.h 27 Aug 2004 14:41:15 -0000 1.12 *************** *** 32,37 **** --- 32,40 ---- #include "singleton.h" #include <qmap.h> + #include <qptrlist.h> + #include <qcstring.h> class cElement; + class cPythonScript; class cCharBaseDef : public cDefinable *************** *** 56,59 **** --- 59,64 ---- unsigned char controlSlots_; unsigned char criticalHealth_; + QPtrList<cPythonScript> baseScripts_; + QCString baseScriptList_; // Misc Properties *************** *** 61,69 **** void load(); void reset(); public: cCharBaseDef( const QCString& id ); ~cCharBaseDef(); ! void processNode( const cElement* node ); inline unsigned char controlSlots() --- 66,87 ---- void load(); void reset(); + void refreshScripts(); public: cCharBaseDef( const QCString& id ); ~cCharBaseDef(); ! void processNode( const cElement* node ); ! ! inline const QCString& baseScriptList() ! { ! load(); ! return baseScriptList_; ! } ! ! inline const QPtrList<cPythonScript> &baseScripts() ! { ! load(); ! return baseScripts_; ! } inline unsigned char controlSlots() *************** *** 179,185 **** --- 197,336 ---- // When reset is called, all loaded basedefs are unflagged. void reset(); + void refreshScripts(); }; typedef SingletonHolder<cCharBaseDefs> CharBaseDefs; + /* + This class represents an item definition and it's + static properties. + */ + class cItemBaseDef : public cDefinable + { + friend class cItemBaseDefs; + protected: + // Our id + QCString id_; + float weight_; + unsigned int sellprice_; + unsigned int buyprice_; + unsigned short type_; + QCString bindmenu_; + unsigned char lightsource_; + unsigned int decaydelay_; + unsigned int flags_; + QPtrList<cPythonScript> baseScripts_; + QCString baseScriptList_; + + // Misc Properties + bool loaded; + void load(); + void reset(); + void refreshScripts(); + + inline void setWaterSource( bool data ) + { + if ( data ) + { + flags_ |= 0x01; + } + else + { + flags_ &= ~0x01; + } + } + + public: + cItemBaseDef( const QCString& id ); + ~cItemBaseDef(); + + void processNode( const cElement* node ); + + inline const QCString& baseScriptList() + { + load(); + return baseScriptList_; + } + + inline const QPtrList<cPythonScript> & baseScripts() + { + load(); + return baseScripts_; + } + + inline const QCString& id() const + { + return id_; + } + + inline unsigned int decaydelay() + { + load(); + return decaydelay_; + } + + inline float weight() + { + load(); + return weight_; + } + + inline unsigned int sellprice() + { + load(); + return sellprice_; + } + + inline unsigned int buyprice() + { + load(); + return buyprice_; + } + + inline unsigned short type() + { + load(); + return type_; + } + + inline const QCString& bindmenu() + { + load(); + return bindmenu_; + } + + inline unsigned char lightsource() + { + load(); + return lightsource_; + } + + inline bool isWaterSource() + { + load(); + return ( flags_ & 0x01 ) != 0; + } + }; + + class cItemBaseDefs + { + protected: + typedef QMap<QCString, cItemBaseDef*> Container; + typedef Container::iterator Iterator; + Container definitions; + public: + cItemBaseDefs(); + ~cItemBaseDefs(); + + // Get a base definition + // This is guaranteed to return a basedef. Even if uninitialized. + cItemBaseDef* get( const QCString& id ); + + // When reset is called, all loaded basedefs are unflagged. + void reset(); + void refreshScripts(); + }; + + typedef SingletonHolder<cItemBaseDefs> ItemBaseDefs; + #endif Index: basechar.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** basechar.h 15 Aug 2004 02:17:39 -0000 1.80 --- basechar.h 27 Aug 2004 14:41:15 -0000 1.81 *************** *** 310,313 **** --- 310,317 ---- virtual bool onCHLevelChange( uint level ); // Fired when player moving trough levels virtual bool onSkillGain( unsigned char skill, unsigned short min, unsigned short max, bool success ); + PyObject *callEvent(ePythonEvent event, PyObject *args = 0, bool ignoreErrors = false); + bool callEventHandler(ePythonEvent event, PyObject *args = 0, bool ignoreErrors = false); + bool canHandleEvent(ePythonEvent event); + bool hasScript(const QCString &name); // Combat *************** *** 337,340 **** --- 341,349 ---- } + inline cCharBaseDef *basedef() const + { + return basedef_; + } + inline void setBaseid( const QCString& id ) { |
|
From: Sebastian H. <dar...@us...> - 2004-08-27 14:41:29
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23599/python Modified Files: char.cpp item.cpp Log Message: basescripts property Index: item.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** item.cpp 25 Aug 2004 17:01:33 -0000 1.125 --- item.cpp 27 Aug 2004 14:41:18 -0000 1.126 *************** *** 1039,1055 **** } ! if ( cPythonScript::canChainHandleEvent( ( ePythonEvent ) event, self->pItem->getScripts() ) ) ! { ! bool result = cPythonScript::callChainedEventHandler( ( ePythonEvent ) event, self->pItem->getScripts(), eventargs ); ! if ( result ) ! { ! Py_INCREF( Py_True ); ! return Py_True; ! } } ! Py_INCREF( Py_False ); ! return Py_False; } --- 1039,1050 ---- } ! PyObject *result = self->pItem->callEvent((ePythonEvent)event, eventargs); ! if (!result) { ! result = Py_None; ! Py_INCREF(result); } ! return result; } *************** *** 1199,1203 **** else if ( !strcmp( "scripts", name ) ) { ! QStringList events = QStringList::split( ",", self->pItem->scriptList() ); PyObject* list = PyList_New( events.count() ); for ( uint i = 0; i < events.count(); ++i ) --- 1194,1207 ---- else if ( !strcmp( "scripts", name ) ) { ! QStringList events = QStringList::split(",", self->pItem->scriptList()); ! if (self->pItem->basedef()) { ! const QPtrList<cPythonScript> &list = self->pItem->basedef()->baseScripts(); ! QPtrList<cPythonScript>::const_iterator it(list.begin()); ! while (it != list.end()) { ! events.append( (*it)->name() ); ! ++it; ! } ! } ! PyObject* list = PyList_New( events.count() ); for ( uint i = 0; i < events.count(); ++i ) Index: char.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v retrieving revision 1.184 retrieving revision 1.185 diff -C2 -d -r1.184 -r1.185 *** char.cpp 26 Aug 2004 00:51:11 -0000 1.184 --- char.cpp 27 Aug 2004 14:41:17 -0000 1.185 *************** *** 2298,2314 **** } ! if ( cPythonScript::canChainHandleEvent( ( ePythonEvent ) event, self->pChar->getScripts() ) ) ! { ! bool result = cPythonScript::callChainedEventHandler( ( ePythonEvent ) event, self->pChar->getScripts(), eventargs ); ! if ( result ) ! { ! Py_INCREF( Py_True ); ! return Py_True; ! } } ! Py_INCREF( Py_False ); ! return Py_False; } --- 2298,2309 ---- } ! PyObject *result = self->pChar->callEvent((ePythonEvent)event, eventargs); ! if (!result) { ! result = Py_None; ! Py_INCREF(result); } ! return result; } *************** *** 2647,2650 **** --- 2642,2653 ---- { QStringList scripts = QStringList::split( ",", self->pChar->scriptList() ); + if (self->pChar->basedef()) { + const QPtrList<cPythonScript> &list = self->pChar->basedef()->baseScripts(); + QPtrList<cPythonScript>::const_iterator it(list.begin()); + while (it != list.end()) { + scripts.append( (*it)->name() ); + ++it; + } + } PyObject* list = PyList_New( scripts.count() ); for ( uint i = 0; i < scripts.count(); ++i ) |
|
From: Correa <thi...@us...> - 2004-08-27 02:32:45
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21969 Modified Files: configure.py Log Message: Experimental MacOS X support Index: configure.py =================================================================== RCS file: /cvsroot/wpdev/wolfpack/configure.py,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** configure.py 24 Aug 2004 00:34:34 -0000 1.33 --- configure.py 27 Aug 2004 02:32:36 -0000 1.34 *************** *** 309,315 **** # MacPython is build as a Framework, not a library :/ PY_LIBDIR = distutils.sysconfig.get_config_vars("LINKFORSHARED")[0] else: PY_LIBDIR = buildLibLine( py_libpath, py_libfile ) ! config.write("PY_LIBDIR = %s\n" % PY_LIBDIR) config.write("PY_INCDIR = %s\n" % py_incpath ) --- 309,316 ---- # MacPython is build as a Framework, not a library :/ PY_LIBDIR = distutils.sysconfig.get_config_vars("LINKFORSHARED")[0] + PY_LIBDIR += " -flat_namespace" else: PY_LIBDIR = buildLibLine( py_libpath, py_libfile ) ! config.write("PY_LIBDIR = %s\n" % PY_LIBDIR) config.write("PY_INCDIR = %s\n" % py_incpath ) |
|
From: Richard M. <dr...@us...> - 2004-08-27 00:42:54
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4328/commands Modified Files: restore.py Log Message: Another stupid bug from me :X Index: restore.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/restore.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** restore.py 23 Aug 2004 03:10:39 -0000 1.3 --- restore.py 27 Aug 2004 00:42:39 -0000 1.4 *************** *** 42,47 **** target.char.mana = int( target.char.maxmana ) target.char.updatestats() ! target.effect(0x376A, 9, 32) ! target.soundeffect(0x202) char.log( LOG_MESSAGE, "Restored 0x%x.\n" % target.char.serial ) --- 42,47 ---- target.char.mana = int( target.char.maxmana ) target.char.updatestats() ! target.char.effect(0x376A, 9, 32) ! target.char.soundeffect(0x202) char.log( LOG_MESSAGE, "Restored 0x%x.\n" % target.char.serial ) *************** *** 59,63 **** target.char.hitpoints = int( target.char.maxhitpoints ) target.char.updatestats() ! target.effect(0x376A, 9, 32) ! target.soundeffect(0x202) char.log( LOG_MESSAGE, "Healed 0x%x.\n" % target.char.serial ) --- 59,63 ---- target.char.hitpoints = int( target.char.maxhitpoints ) target.char.updatestats() ! target.char.effect(0x376A, 9, 32) ! target.char.soundeffect(0x202) char.log( LOG_MESSAGE, "Healed 0x%x.\n" % target.char.serial ) |
|
From: Richard M. <dr...@us...> - 2004-08-26 22:23:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12327/commands Modified Files: events.py Log Message: Fixed a small bug from the hasevent/hasscript switch. Index: events.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/events.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** events.py 25 Aug 2004 17:03:04 -0000 1.5 --- events.py 26 Aug 2004 22:23:33 -0000 1.6 *************** *** 3,7 **** from wolfpack.consts import LOG_MESSAGE, EVENT_USE ! def addscript_response(player, arguments, target): script = arguments[0] object = None --- 3,7 ---- from wolfpack.consts import LOG_MESSAGE, EVENT_USE ! def addscript_response( player, arguments, target ): script = arguments[0] object = None *************** *** 11,26 **** elif target.char: if target.char.rank > player.rank and player != target.char: ! player.socket.sysmessage("You've burnt your fingers!") ! return ! object = target.char else: ! player.socket.sysmessage('You have to target a character or item.') ! return ! player.log(LOG_MESSAGE, "Adds script '%s' to object 0x%x.\n" % (script, object.serial)) ! object.addscript(script) object.resendtooltip() ! player.socket.sysmessage('You add the script to your target.') """ --- 11,26 ---- elif target.char: if target.char.rank > player.rank and player != target.char: ! player.socket.sysmessage( "You've burnt your fingers!" ) ! return False object = target.char else: ! player.socket.sysmessage( 'You have to target a character or item.' ) ! return False ! player.log( LOG_MESSAGE, "Adds script '%s' to object 0x%x.\n" % ( script, object.serial ) ) ! object.addscript( str( script ) ) object.resendtooltip() ! player.socket.sysmessage( 'You add the script to your target.' ) ! return True """ *************** *** 30,50 **** Script is the id of the script you want to attach. """ ! def commandAddscript(socket, command, arguments): if len(arguments) == 0: ! socket.sysmessage('Usage: addscript <identifier>') ! return script = arguments.strip() try: ! wolfpack.hasscript(script, EVENT_USE) except: ! socket.sysmessage('No such script: %s.' % script) ! return ! socket.sysmessage("Please select the object you want to add the script '%s' to." % script) ! socket.attachtarget('commands.events.addscript_response', [script]) ! def removescript_response(player, arguments, target): script = arguments[0] object = None --- 30,50 ---- Script is the id of the script you want to attach. """ ! def commandAddscript( socket, command, arguments ): if len(arguments) == 0: ! socket.sysmessage( 'Usage: addscript <identifier>' ) ! return False script = arguments.strip() try: ! wolfpack.hasevent( script, EVENT_USE ) except: ! socket.sysmessage( 'No such script: %s.' % script ) ! return False ! socket.sysmessage( "Please select the object you want to add the script '%s' to." % script) ! socket.attachtarget( 'commands.events.addscript_response', [ script ] ) ! def removescript_response( player, arguments, target ): script = arguments[0] object = None *************** *** 54,72 **** elif target.char: if target.char.rank > player.rank and player != target.char: ! player.socket.sysmessage("You've burnt your fingers!") ! return object = target.char else: ! player.socket.sysmessage('You have to target a character or item.') ! return ! if object.hasscript(script): ! player.log(LOG_MESSAGE, "Removes script '%s' from object 0x%x.\n" % (script, object.serial)) ! object.removescript(script) object.resendtooltip() ! player.socket.sysmessage('You remove the script from your target.') else: ! player.socket.sysmessage('Your target does not have the given script.') """ --- 54,74 ---- elif target.char: if target.char.rank > player.rank and player != target.char: ! player.socket.sysmessage( "You've burnt your fingers!" ) ! return False object = target.char else: ! player.socket.sysmessage( 'You have to target a character or item.' ) ! return False ! if object.hasscript( str( script ) ): ! player.log( LOG_MESSAGE, "Removes script '%s' from object 0x%x.\n" % ( script, object.serial ) ) ! object.removescript( str( script ) ) object.resendtooltip() ! player.socket.sysmessage( 'You remove the script from your target.' ) ! return True else: ! player.socket.sysmessage( 'Your target does not have the given script.' ) ! return False """ *************** *** 79,96 **** if len(arguments) == 0: socket.sysmessage('Usage: removescript <identifier>') ! return script = arguments.strip() try: ! wolfpack.hasscript(script, EVENT_USE) except: ! socket.sysmessage('No such script: %s.' % script) ! return ! socket.sysmessage("Please select the object you want to remove the script '%s' from." % script) ! socket.attachtarget('commands.events.removescript_response', [script]) def onLoad(): ! wolfpack.registercommand('addscript', commandAddscript) ! wolfpack.registercommand('removescript', commandRemovescript) --- 81,99 ---- if len(arguments) == 0: socket.sysmessage('Usage: removescript <identifier>') ! return False script = arguments.strip() try: ! wolfpack.hasevent( script, EVENT_USE ) except: ! socket.sysmessage( 'No such script: %s.' % script ) ! return False ! socket.sysmessage( "Please select the object you want to remove the script '%s' from." % script) ! socket.attachtarget( 'commands.events.removescript_response', [ script ] ) ! return True def onLoad(): ! wolfpack.registercommand( 'addscript', commandAddscript ) ! wolfpack.registercommand( 'removescript', commandRemovescript ) |
|
From: Richard M. <dr...@us...> - 2004-08-26 22:03:41
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9017/system Modified Files: players.py Log Message: Fix Index: players.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/players.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** players.py 13 Aug 2004 17:56:49 -0000 1.5 --- players.py 26 Aug 2004 22:03:32 -0000 1.6 *************** *** 9,13 **** player.update() socket.resendplayer() - return True def onLogout( player ): --- 9,12 ---- *************** *** 16,18 **** player.hidden = 1 player.update() - return True --- 15,16 ---- |
|
From: Richard M. <dr...@us...> - 2004-08-26 21:11:40
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31879/webroot Modified Files: ChangeLog.wolfpack Log Message: Updates Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** ChangeLog.wolfpack 23 Aug 2004 03:21:59 -0000 1.45 --- ChangeLog.wolfpack 26 Aug 2004 21:11:30 -0000 1.46 *************** *** 4,9 **** --- 4,16 ---- * Core Changes: - Added an email field for accounts. + - Timer fixes. + - Changes to event/script functions. ( See Python changes. ) * Definition Changes: + - Tag Changes: + <events></events> is now <scripts></scripts> * Python Script Changes: + - Function Changes: + Old: addevent() hasevent() removeevent() + New: addscript() hasscript() removescript() - Added the bolt command, just lightnings the target. - Added the email command, changes your account's email. *************** *** 13,16 **** --- 20,24 ---- Fixed a bug in updating the password Added support for the email field. + Fixed a bug with updating passwords. ( Dreoth was tired. :P ) - Tweaked the hunger script. - Fixed an update bug with npcs and the dye command. |
|
From: Richard M. <dr...@us...> - 2004-08-26 21:02:35
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29913/commands Modified Files: account.py Log Message: Fixes for very stupid mistakes... Added a show all thing, shows everything but the password for an account. Thanks to spddmn in IRC for pointing this out. Index: account.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/account.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** account.py 23 Aug 2004 03:10:39 -0000 1.11 --- account.py 26 Aug 2004 21:02:25 -0000 1.12 *************** *** 248,252 **** socket.sysmessage( "Error: Your account rank does not permit this!" ) return False ! if key == 'acl': socket.sysmessage( "%s.acl = %s" % ( account.name, account.acl ) ) char.log( LOG_MESSAGE, "Requested %s.acl.\n" % account.name ) --- 248,262 ---- socket.sysmessage( "Error: Your account rank does not permit this!" ) return False ! if key == 'all': ! socket.sysmessage( "Account properties for %s:" % account.name ) ! socket.sysmessage( " acl: %s" % account.acl ) ! socket.sysmessage( " email: %s" % account.email ) ! socket.sysmessage( " rank: %s" % account.rank ) ! socket.sysmessage( " flags: %s" % account.flags ) ! socket.sysmessage( " inuse: %s" % account.inuse ) ! socket.sysmessage( " lastlogin: %s" % account.lastlogin ) ! socket.sysmessage( " multigems: %s" % account.multigems ) ! socket.sysmessage( " characters: %s" % account.characters ) ! elif key == 'acl': socket.sysmessage( "%s.acl = %s" % ( account.name, account.acl ) ) char.log( LOG_MESSAGE, "Requested %s.acl.\n" % account.name ) *************** *** 349,353 **** oldvalue = account.flags socket.sysmessage( "Previous: %s.flags = %s" % ( account.name, account.flags ) ) ! account.flags = hex2dec(value) socket.sysmessage( "Changed: %s.flags = %s" % ( account.name, account.flags ) ) char.log( LOG_MESSAGE, "Modified %s.flags ( %s :: %s ).\n" % ( account.name, oldvalue, value ) ) --- 359,363 ---- oldvalue = account.flags socket.sysmessage( "Previous: %s.flags = %s" % ( account.name, account.flags ) ) ! account.flags = hex2dec( value ) socket.sysmessage( "Changed: %s.flags = %s" % ( account.name, account.flags ) ) char.log( LOG_MESSAGE, "Modified %s.flags ( %s :: %s ).\n" % ( account.name, oldvalue, value ) ) *************** *** 367,379 **** # Password elif key == 'password': ! if len( key ) > 16 or len( key ) == 0: ! if len( key ) > 16: socket.sysmessage( "Error: Password exceeds the 16 character limit!" ) ! if len( key ) == 0: socket.sysmessage( "Error: Password is NULL!" ) return False else: oldvalue = account.password ! account.password = key socket.sysmessage( "Changed: %s.password" % account.name ) char.log( LOG_MESSAGE, "Modified %s.password.\n" % account.name ) --- 377,389 ---- # Password elif key == 'password': ! if len( value ) > 16 or len( value ) == 0: ! if len( value ) > 16: socket.sysmessage( "Error: Password exceeds the 16 character limit!" ) ! if len( value ) == 0: socket.sysmessage( "Error: Password is NULL!" ) return False else: oldvalue = account.password ! account.password = str( value ) socket.sysmessage( "Changed: %s.password" % account.name ) char.log( LOG_MESSAGE, "Modified %s.password.\n" % account.name ) *************** *** 381,393 **** # Email elif key == 'email': ! if len( key ) > 255 or len( key ) == 0: ! if len( key ) > 255: socket.sysmessage( "Error: Email exceeds the 255 character limit!" ) ! if len( key ) == 0: socket.sysmessage( "Error: Email is NULL!" ) return False else: oldvalue = account.email ! account.email = key socket.sysmessage( "Changed: %s.email" % account.name ) char.log( LOG_MESSAGE, "Modified %s.email.\n" % account.name ) --- 391,403 ---- # Email elif key == 'email': ! if len( value ) > 255 or len( value ) == 0: ! if len( value ) > 255: socket.sysmessage( "Error: Email exceeds the 255 character limit!" ) ! if len( value ) == 0: socket.sysmessage( "Error: Email is NULL!" ) return False else: oldvalue = account.email ! account.email = str( value ) socket.sysmessage( "Changed: %s.email" % account.name ) char.log( LOG_MESSAGE, "Modified %s.email.\n" % account.name ) *************** *** 395,399 **** # READ ONLY VALUES elif key in ['name','lastlogin','inuse','characters','rank']: ! char.log( LOG_MESSAGE, "Attempted modification of read-only value %s.%s.\n" % ( char.serial, account.name, key ) ) socket.sysmessage( "Error: The account.%s property is read only!" % key ) return False --- 405,409 ---- # READ ONLY VALUES elif key in ['name','lastlogin','inuse','characters','rank']: ! char.log( LOG_MESSAGE, "Attempted modification of read-only value %s.%s.\n" % ( account.name, key ) ) socket.sysmessage( "Error: The account.%s property is read only!" % key ) return False |
|
From: Jorge P. <ke...@us...> - 2004-08-26 01:21:51
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16207/scripts Modified Files: equipment.py Log Message: Fixed equipment items not equipping on dclick. Index: equipment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** equipment.py 25 Aug 2004 17:03:05 -0000 1.28 --- equipment.py 26 Aug 2004 01:21:22 -0000 1.29 *************** *** 370,378 **** # in the eventchain somewhere. if not, # return 1 to handle the equip event. ! events = item.scripts ! for event in events: ! if wolfpack.hasscript(event, EVENT_WEARITEM): ! result = wolfpack.callevent(event, EVENT_WEARITEM, (player, player, item, layer)) if result: return 1 --- 370,378 ---- # in the eventchain somewhere. if not, # return 1 to handle the equip event. ! scripts = item.scripts ! for script in scripts: ! if wolfpack.hasevent(script, EVENT_WEARITEM): ! result = wolfpack.callevent(script, EVENT_WEARITEM, (player, player, item, layer)) if result: return 1 *************** *** 382,387 **** item.soundeffect(0x57) ! for event in events[events.index("equipment")+1:]: ! if wolfpack.hasscript(event, EVENT_USE): return 0 --- 382,387 ---- item.soundeffect(0x57) ! for script in scripts[scripts.index("equipment")+1:]: ! if wolfpack.hasevent(script, EVENT_USE): return 0 |
|
From: Jorge P. <ke...@us...> - 2004-08-26 00:52:23
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11843 Modified Files: target.h Log Message: Create-once for python objects: target.char, target.item, target.pos. Index: target.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/target.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** target.h 22 Aug 2004 02:29:53 -0000 1.22 --- target.h 26 Aug 2004 00:52:13 -0000 1.23 *************** *** 43,48 **** --- 43,52 ---- Q_UINT16 model; SERIAL object; + + PyObject * py_pos; + PyObject * py_obj; // char or item } wpTarget; + static PyObject* wpTarget_getAttr( wpTarget* self, char* name ) { *************** *** 52,56 **** */ if ( !strcmp( name, "pos" ) ) ! return PyGetCoordObject( self->pos ); /* \rproperty target.model If a static tile has been targetted by the client, this property contains the art id of the targetted static tile. If a character has been targetted, --- 56,66 ---- */ if ( !strcmp( name, "pos" ) ) ! { ! if ( !self->py_pos ) ! self->py_pos = PyGetCoordObject( self->pos ); ! ! Py_INCREF( self->py_pos ); ! return self->py_pos; ! } /* \rproperty target.model If a static tile has been targetted by the client, this property contains the art id of the targetted static tile. If a character has been targetted, *************** *** 58,62 **** --- 68,74 ---- */ else if ( !strcmp( name, "model" ) ) + { return PyInt_FromLong( self->model ); + } /* \rproperty target.item If a valid item has been targetted, this property contains an <object id="item">item</object> object for the targetted item. *************** *** 65,69 **** { if ( isItemSerial( self->object ) ) ! return PyGetItemObject( FindItemBySerial( self->object ) ); } /* --- 77,87 ---- { if ( isItemSerial( self->object ) ) ! { ! if ( !self->py_obj ) ! self->py_obj = PyGetItemObject( FindItemBySerial( self->object ) ); ! ! Py_INCREF( self->py_obj ); ! return self->py_obj; ! } } /* *************** *** 71,80 **** */ else if ( !strcmp( name, "char" ) ) if ( isCharSerial( self->object ) ) ! return PyGetCharObject( FindCharBySerial( self->object ) ); Py_RETURN_FALSE; } static PyTypeObject wpTargetType = { --- 89,115 ---- */ else if ( !strcmp( name, "char" ) ) + { if ( isCharSerial( self->object ) ) ! { ! if ( !self->py_obj ) ! self->py_obj = PyGetCharObject( FindCharBySerial( self->object ) ); + Py_INCREF( self->py_obj ); + return self->py_obj; + } + } Py_RETURN_FALSE; } + + static void wpTarget_Dealloc( wpTarget * self ) + { + Py_XDECREF( self->py_pos ); + Py_XDECREF( self->py_obj ); + + wpDealloc( (PyObject*) self ); + } + + static PyTypeObject wpTargetType = { *************** *** 84,88 **** sizeof( wpTargetType ), 0, ! wpDealloc, 0, ( getattrfunc ) wpTarget_getAttr, --- 119,123 ---- sizeof( wpTargetType ), 0, ! ( destructor ) wpTarget_Dealloc, 0, ( getattrfunc ) wpTarget_getAttr, *************** *** 95,98 **** --- 130,134 ---- }; + static PyObject* PyGetTarget( cUORxTarget* target, Q_UINT8 map ) { *************** *** 110,116 **** pos.map = map; ! returnVal->pos = pos; ! returnVal->object = target->serial(); ! returnVal->model = target->model(); return ( PyObject * ) returnVal; --- 146,155 ---- pos.map = map; ! returnVal->pos = pos; ! returnVal->object = target->serial(); ! returnVal->model = target->model(); ! ! returnVal->py_pos = NULL; ! returnVal->py_obj = NULL; return ( PyObject * ) returnVal; |
|
From: Jorge P. <ke...@us...> - 2004-08-26 00:51:22
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11736 Modified Files: char.cpp Log Message: Create-once for python objects: char.account, char.region, char.socket, char.skill, char.skillcap, char.skilllock. Index: char.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v retrieving revision 1.183 retrieving revision 1.184 diff -C2 -d -r1.183 -r1.184 *** char.cpp 25 Aug 2004 17:01:33 -0000 1.183 --- char.cpp 26 Aug 2004 00:51:11 -0000 1.184 *************** *** 59,62 **** --- 59,69 ---- PyObject_HEAD; P_CHAR pChar; + + PyObject * py_account; + PyObject * py_region; + PyObject * py_socket; + PyObject * py_skill; + PyObject * py_skillcap; + PyObject * py_skilllock; } wpChar; *************** *** 76,79 **** --- 83,100 ---- } + + + static void wpChar_Dealloc( wpChar * self ) + { + Py_XDECREF( self->py_account ); + Py_XDECREF( self->py_region ); + Py_XDECREF( self->py_socket ); + Py_XDECREF( self->py_skill ); + Py_XDECREF( self->py_skillcap ); + Py_XDECREF( self->py_skilllock); + + wpDealloc( (PyObject*) self ); + } + /*! The typedef for Wolfpack Python chars *************** *** 86,91 **** sizeof( wpCharType ), 0, ! // FreeCharObject, ! wpDealloc, 0, ( getattrfunc ) wpChar_getAttr, --- 107,111 ---- sizeof( wpCharType ), 0, ! ( destructor ) wpChar_Dealloc, 0, ( getattrfunc ) wpChar_getAttr, *************** *** 131,134 **** --- 151,156 ---- }; + + PyObject* PyGetCharObject( P_CHAR pChar ) { *************** *** 141,144 **** --- 163,174 ---- wpChar* returnVal = PyObject_New( wpChar, &wpCharType ); returnVal->pChar = pChar; + + returnVal->py_account = NULL; + returnVal->py_region = NULL; + returnVal->py_socket = NULL; + returnVal->py_skill = NULL; + returnVal->py_skillcap = NULL; + returnVal->py_skilllock = NULL; + return ( PyObject * ) returnVal; } *************** *** 2482,2486 **** } else if ( !strcmp( "region", name ) ) ! return PyGetRegionObject( self->pChar->region() ); /* --- 2512,2521 ---- } else if ( !strcmp( "region", name ) ) ! { ! if ( !self->py_region ) ! self->py_region = PyGetRegionObject( self->pChar->region() ); ! Py_INCREF( self->py_region ); ! return self->py_region; ! } /* *************** *** 2496,2500 **** Py_RETURN_NONE; } ! return PyGetAccountObject( player->account() ); } /* --- 2531,2538 ---- Py_RETURN_NONE; } ! if ( !self->py_account ) ! self->py_account = PyGetAccountObject( player->account() ); ! Py_INCREF( self->py_account ); ! return self->py_account; } /* *************** *** 2511,2515 **** Py_RETURN_NONE; } ! return PyGetSocketObject( player->socket() ); } /* --- 2549,2556 ---- Py_RETURN_NONE; } ! if ( !self->py_socket ) ! self->py_socket = PyGetSocketObject( player->socket() ); ! Py_INCREF( self->py_socket ); ! return self->py_socket; } /* *************** *** 2519,2526 **** else if ( !strcmp( "skill", name ) ) { ! wpSkills* skills = PyObject_New( wpSkills, &wpSkillsType ); ! skills->pChar = self->pChar; ! skills->type = 0; ! return ( PyObject * ) ( skills ); } --- 2560,2572 ---- else if ( !strcmp( "skill", name ) ) { ! if ( !self->py_skill ) ! { ! wpSkills* skills = PyObject_New( wpSkills, &wpSkillsType ); ! skills->pChar = self->pChar; ! skills->type = 0; ! self->py_skill = (PyObject *) skills; ! } ! Py_INCREF( self->py_skill ); ! return self->py_skill; } *************** *** 2531,2538 **** else if ( !strcmp( "skillcap", name ) ) { ! wpSkills* skills = PyObject_New( wpSkills, &wpSkillsType ); ! skills->pChar = self->pChar; ! skills->type = 1; ! return ( PyObject * ) ( skills ); } /* --- 2577,2589 ---- else if ( !strcmp( "skillcap", name ) ) { ! if ( !self->py_skillcap ) ! { ! wpSkills* skills = PyObject_New( wpSkills, &wpSkillsType ); ! skills->pChar = self->pChar; ! skills->type = 1; ! self->py_skillcap = (PyObject *) skills; ! } ! Py_INCREF( self->py_skillcap ); ! return self->py_skillcap; } /* *************** *** 2542,2549 **** else if ( !strcmp( "skilllock", name ) ) { ! wpSkills* skills = PyObject_New( wpSkills, &wpSkillsType ); ! skills->pChar = self->pChar; ! skills->type = 2; ! return ( PyObject * ) ( skills ); } /* --- 2593,2605 ---- else if ( !strcmp( "skilllock", name ) ) { ! if ( !self->py_skilllock ) ! { ! wpSkills* skills = PyObject_New( wpSkills, &wpSkillsType ); ! skills->pChar = self->pChar; ! skills->type = 2; ! self->py_skilllock = (PyObject *) skills; ! } ! Py_INCREF( self->py_skilllock ); ! return self->py_skilllock; } /* *************** *** 2595,2611 **** PyList_SetItem( list, i, PyString_FromString( scripts[i].latin1() ) ); return list; - /* - \rproperty char.npc True if this character is a npc, false otherwise. - This property is exclusive to python scripts and overrides normal properties with the same name. - */ } else if ( !strcmp( "npc", name ) ) { return self->pChar->objectType() == enNPC ? PyTrue() : PyFalse(); - /* - \rproperty char.player True if this character is a player, false otherwise. - This property is exclusive to python scripts and overrides normal properties with the same name. - */ } else if ( !strcmp( "player", name ) ) { --- 2651,2667 ---- PyList_SetItem( list, i, PyString_FromString( scripts[i].latin1() ) ); return list; } + /* + \rproperty char.npc True if this character is a npc, false otherwise. + This property is exclusive to python scripts and overrides normal properties with the same name. + */ else if ( !strcmp( "npc", name ) ) { return self->pChar->objectType() == enNPC ? PyTrue() : PyFalse(); } + /* + \rproperty char.player True if this character is a player, false otherwise. + This property is exclusive to python scripts and overrides normal properties with the same name. + */ else if ( !strcmp( "player", name ) ) { |
|
From: Jorge P. <ke...@us...> - 2004-08-25 18:46:35
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2288 Modified Files: timers.cpp Log Message: Fixed a crash in removing timers (apparently Linux only) Index: timers.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/timers.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** timers.cpp 25 Aug 2004 17:01:23 -0000 1.12 --- timers.cpp 25 Aug 2004 18:46:15 -0000 1.13 *************** *** 239,250 **** { cTimer* tEffect = NULL; - if ( !teffects.empty() ) - tEffect = *teffects.begin(); - - if ( !tEffect ) - return; ! while ( tEffect && tEffect->expiretime <= Server::instance()->time() ) { if ( isCharSerial( tEffect->getDest() ) ) { --- 239,249 ---- { cTimer* tEffect = NULL; ! while ( !teffects.empty() ) { + tEffect = *teffects.begin(); + if ( !tEffect || tEffect->expiretime > Server::instance()->time() ) + break; + if ( isCharSerial( tEffect->getDest() ) ) { *************** *** 257,268 **** tEffect->Expire(); - std::pop_heap( teffects.begin(), teffects.end(), cTimers::ComparePredicate() ); - teffects.pop_back(); - delete tEffect; ! if ( !teffects.empty() ) ! tEffect = *teffects.begin(); ! else ! break; } } --- 256,263 ---- tEffect->Expire(); ! erase( tEffect ); ! ! delete tEffect; } } |
|
From: Sebastian H. <dar...@us...> - 2004-08-25 17:04:37
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12582/items/professions Modified Files: alchemist.xml barber.xml blacksmith.xml carpenter.xml cook.xml fisher.xml fletcher.xml healer.xml mage.xml mapmaker.xml miner.xml musician.xml necromancer.xml tailorer.xml thieve.xml tinker.xml Log Message: Changed all references to "events" to "scripts" Index: tinker.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/tinker.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tinker.xml 17 Jul 2004 03:30:00 -0000 1.6 --- tinker.xml 25 Aug 2004 17:03:47 -0000 1.7 *************** *** 73,77 **** <id>0x1057</id> <category>Professions\Tinker\Sextant (W/E)</category> ! <events>environment</events> </item> --- 73,77 ---- <id>0x1057</id> <category>Professions\Tinker\Sextant (W/E)</category> ! <scripts>environment</scripts> </item> *************** *** 79,83 **** <id>0x1058</id> <category>Professions\Tinker\Sextant (N/S)</category> ! <events>environment</events> </item> --- 79,83 ---- <id>0x1058</id> <category>Professions\Tinker\Sextant (N/S)</category> ! <scripts>environment</scripts> </item> *************** *** 85,89 **** <id>0x1059</id> <category>Professions\Tinker\Sextant Parts (W/E)</category> ! <events>environment</events> </item> --- 85,89 ---- <id>0x1059</id> <category>Professions\Tinker\Sextant Parts (W/E)</category> ! <scripts>environment</scripts> </item> *************** *** 91,95 **** <id>0x105a</id> <category>Professions\Tinker\Sextant Parts (N/S)</category> ! <events>environment</events> </item> --- 91,95 ---- <id>0x105a</id> <category>Professions\Tinker\Sextant Parts (N/S)</category> ! <scripts>environment</scripts> </item> *************** *** 160,164 **** <category>Professions\Tinker\Tools\Toolkit 2 (W/E)</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>skills.tinkering</events> </item> --- 160,164 ---- <category>Professions\Tinker\Tools\Toolkit 2 (W/E)</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>skills.tinkering</scripts> </item> *************** *** 167,171 **** <category>Professions\Tinker\Tools\Toolkit 2 (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>skills.tinkering</events> </item> --- 167,171 ---- <category>Professions\Tinker\Tools\Toolkit 2 (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>skills.tinkering</scripts> </item> *************** *** 174,178 **** <category>Professions\Tinker\Tools\Tinker Tools</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>equipment,skills.tinkering</events> </item> --- 174,178 ---- <category>Professions\Tinker\Tools\Tinker Tools</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,skills.tinkering</scripts> </item> Index: mapmaker.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/mapmaker.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mapmaker.xml 17 Jul 2004 03:30:00 -0000 1.5 --- mapmaker.xml 25 Aug 2004 17:03:46 -0000 1.6 *************** *** 88,92 **** <item id="map_britain" inherit="14eb"> <name>map of Britain</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="britain" /> --- 88,92 ---- <item id="map_britain" inherit="14eb"> <name>map of Britain</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="britain" /> *************** *** 96,100 **** <item id="map_britaintoskarabrae" inherit="14eb"> <name>map of Britain to Skara Brae</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="britaintoskarabrae" /> --- 96,100 ---- <item id="map_britaintoskarabrae" inherit="14eb"> <name>map of Britain to Skara Brae</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="britaintoskarabrae" /> *************** *** 104,108 **** <item id="map_britaintotrinsic" inherit="14eb"> <name>map of Britain to Trinsic</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="britaintotrinsic" /> --- 104,108 ---- <item id="map_britaintotrinsic" inherit="14eb"> <name>map of Britain to Trinsic</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="britaintotrinsic" /> *************** *** 112,116 **** <item id="map_bucsden" inherit="14eb"> <name>map of Buccaneer's Den</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="bucsden" /> --- 112,116 ---- <item id="map_bucsden" inherit="14eb"> <name>map of Buccaneer's Den</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="bucsden" /> *************** *** 120,124 **** <item id="map_bucsdentomagincia" inherit="14eb"> <name>map of Buccaneer's Den to Magincia</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="bucsdentomagincia" /> --- 120,124 ---- <item id="map_bucsdentomagincia" inherit="14eb"> <name>map of Buccaneer's Den to Magincia</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="bucsdentomagincia" /> *************** *** 128,132 **** <item id="map_bucsdentoocllo" inherit="14eb"> <name>map of Buccaneer's Den to Ocllo</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="bucsdentoocllo" /> --- 128,132 ---- <item id="map_bucsdentoocllo" inherit="14eb"> <name>map of Buccaneer's Den to Ocllo</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="bucsdentoocllo" /> *************** *** 136,140 **** <item id="map_jhelom" inherit="14eb"> <name>map of Jhelom</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="jhelom" /> --- 136,140 ---- <item id="map_jhelom" inherit="14eb"> <name>map of Jhelom</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="jhelom" /> *************** *** 144,148 **** <item id="map_magincia" inherit="14eb"> <name>map of Magincia</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="magincia" /> --- 144,148 ---- <item id="map_magincia" inherit="14eb"> <name>map of Magincia</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="magincia" /> *************** *** 152,156 **** <item id="map_maginciatoocllo" inherit="14eb"> <name>map of Magincia to Ocllo</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="maginciatoocllo" /> --- 152,156 ---- <item id="map_maginciatoocllo" inherit="14eb"> <name>map of Magincia to Ocllo</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="maginciatoocllo" /> *************** *** 160,164 **** <item id="map_minoc" inherit="14eb"> <name>map of Minoc</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="minoc" /> --- 160,164 ---- <item id="map_minoc" inherit="14eb"> <name>map of Minoc</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="minoc" /> *************** *** 168,172 **** <item id="map_minoctoyew" inherit="14eb"> <name>map of Minoc to Yew</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="minoctoyew" /> --- 168,172 ---- <item id="map_minoctoyew" inherit="14eb"> <name>map of Minoc to Yew</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="minoctoyew" /> *************** *** 176,180 **** <item id="map_minoctovesper" inherit="14eb"> <name>map of Minoc to Vesper</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="minoctovesper" /> --- 176,180 ---- <item id="map_minoctovesper" inherit="14eb"> <name>map of Minoc to Vesper</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="minoctovesper" /> *************** *** 184,188 **** <item id="map_moonglow" inherit="14eb"> <name>map of Moonglow</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="moonglow" /> --- 184,188 ---- <item id="map_moonglow" inherit="14eb"> <name>map of Moonglow</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="moonglow" /> *************** *** 192,196 **** <item id="map_moonglowtonujelm" inherit="14eb"> <name>map of Moonglow to Nujelm</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="moonglowtonujelm" /> --- 192,196 ---- <item id="map_moonglowtonujelm" inherit="14eb"> <name>map of Moonglow to Nujelm</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="moonglowtonujelm" /> *************** *** 200,204 **** <item id="map_nujelm" inherit="14eb"> <name>map of Nujelm</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="nujelm" /> --- 200,204 ---- <item id="map_nujelm" inherit="14eb"> <name>map of Nujelm</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="nujelm" /> *************** *** 208,212 **** <item id="map_nujelmtomagincia" inherit="14eb"> <name>map of Nujelm to Magincia</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="nujelmtomagincia" /> --- 208,212 ---- <item id="map_nujelmtomagincia" inherit="14eb"> <name>map of Nujelm to Magincia</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="nujelmtomagincia" /> *************** *** 216,220 **** <item id="map_occlo" inherit="14eb"> <name>map of Ocllo</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="occlo" /> --- 216,220 ---- <item id="map_occlo" inherit="14eb"> <name>map of Ocllo</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="occlo" /> *************** *** 224,228 **** <item id="map_serpentshold" inherit="14eb"> <name>map of Serpent's Hold</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="serpentshold" /> --- 224,228 ---- <item id="map_serpentshold" inherit="14eb"> <name>map of Serpent's Hold</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="serpentshold" /> *************** *** 232,236 **** <item id="map_serpentsholdtoocllo" inherit="14eb"> <name>map of Serpent's Hold to Ocllo</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="serpentsholdtoocllo" /> --- 232,236 ---- <item id="map_serpentsholdtoocllo" inherit="14eb"> <name>map of Serpent's Hold to Ocllo</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="serpentsholdtoocllo" /> *************** *** 240,244 **** <item id="map_skarabrae" inherit="14eb"> <name>map of Skara Brae</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="skarabrae" /> --- 240,244 ---- <item id="map_skarabrae" inherit="14eb"> <name>map of Skara Brae</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="skarabrae" /> *************** *** 248,252 **** <item id="map_world" inherit="14eb"> <name>map of The World</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="world" /> --- 248,252 ---- <item id="map_world" inherit="14eb"> <name>map of The World</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="world" /> *************** *** 256,260 **** <item id="map_trinsic" inherit="14eb"> <name>map of Trinsic</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="trinsic" /> --- 256,260 ---- <item id="map_trinsic" inherit="14eb"> <name>map of Trinsic</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="trinsic" /> *************** *** 264,268 **** <item id="map_trinsictobucsden" inherit="14eb"> <name>map of Trinsic to Buccaneer's Den</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="trinsictobucsden" /> --- 264,268 ---- <item id="map_trinsictobucsden" inherit="14eb"> <name>map of Trinsic to Buccaneer's Den</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="trinsictobucsden" /> *************** *** 272,276 **** <item id="map_trinsictojhelom" inherit="14eb"> <name>map of Trinsic to Jhelom</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="trinsictojhelom" /> --- 272,276 ---- <item id="map_trinsictojhelom" inherit="14eb"> <name>map of Trinsic to Jhelom</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="trinsictojhelom" /> *************** *** 280,284 **** <item id="map_vesper" inherit="14eb"> <name>map of Vesper</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="vesper" /> --- 280,284 ---- <item id="map_vesper" inherit="14eb"> <name>map of Vesper</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="vesper" /> *************** *** 288,292 **** <item id="map_vespertonujelm" inherit="14eb"> <name>map of Vesper to Nujelm</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="vespertonujelm" /> --- 288,292 ---- <item id="map_vespertonujelm" inherit="14eb"> <name>map of Vesper to Nujelm</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="vespertonujelm" /> *************** *** 296,300 **** <item id="map_yew" inherit="14eb"> <name>map of Yew</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="yew" /> --- 296,300 ---- <item id="map_yew" inherit="14eb"> <name>map of Yew</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="yew" /> *************** *** 304,308 **** <item id="map_yewtobritain" inherit="14eb"> <name>map of Yew to Britain</name> ! <events>map</events> <tag name="type" value="preset" /> <tag name="preset" value="yewtobritain" /> --- 304,308 ---- <item id="map_yewtobritain" inherit="14eb"> <name>map of Yew to Britain</name> ! <scripts>map</scripts> <tag name="type" value="preset" /> <tag name="preset" value="yewtobritain" /> Index: carpenter.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/carpenter.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** carpenter.xml 25 Apr 2004 04:22:33 -0000 1.8 --- carpenter.xml 25 Aug 2004 17:03:46 -0000 1.9 *************** *** 34,38 **** <category>Professions\Carpenter\Tools\Vise (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>equipment,skills.carpentry</events> </item> --- 34,38 ---- <category>Professions\Carpenter\Tools\Vise (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,skills.carpentry</scripts> </item> *************** *** 252,256 **** <category>Professions\Carpenter\Tools\Chisels (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>equipment,skills.carpentry</events> </item> --- 252,256 ---- <category>Professions\Carpenter\Tools\Chisels (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,skills.carpentry</scripts> </item> *************** *** 266,270 **** <category>Professions\Carpenter\Tools\Dovetail Saw (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>equipment,skills.carpentry</events> </item> --- 266,270 ---- <category>Professions\Carpenter\Tools\Dovetail Saw (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,skills.carpentry</scripts> </item> *************** *** 280,284 **** <category>Professions\Carpenter\Tools\Hammer 1</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>equipment,skills.carpentry</events> </item> --- 280,284 ---- <category>Professions\Carpenter\Tools\Hammer 1</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,skills.carpentry</scripts> </item> *************** *** 294,298 **** <category>Professions\Carpenter\Tools\Moulding Planes (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>equipment,skills.carpentry</events> </item> --- 294,298 ---- <category>Professions\Carpenter\Tools\Moulding Planes (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,skills.carpentry</scripts> </item> *************** *** 306,310 **** <category>Professions\Carpenter\Tools\Nails (W/E)</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>equipment,skills.carpentry</events> </item> --- 306,310 ---- <category>Professions\Carpenter\Tools\Nails (W/E)</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,skills.carpentry</scripts> </item> *************** *** 320,324 **** <category>Professions\Carpenter\Tools\Jointing Plane (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>equipment,skills.carpentry</events> </item> --- 320,324 ---- <category>Professions\Carpenter\Tools\Jointing Plane (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,skills.carpentry</scripts> </item> *************** *** 334,338 **** <category>Professions\Carpenter\Tools\Smoothing Plane (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>equipment,skills.carpentry</events> </item> --- 334,338 ---- <category>Professions\Carpenter\Tools\Smoothing Plane (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,skills.carpentry</scripts> </item> *************** *** 348,352 **** <category>Professions\Carpenter\Tools\Saw (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>equipment,skills.carpentry</events> </item> --- 348,352 ---- <category>Professions\Carpenter\Tools\Saw (N/S)</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,skills.carpentry</scripts> </item> *************** *** 362,366 **** <category>Professions\Carpenter\Draw Knife</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>equipment,skills.carpentry</events> </item> --- 362,366 ---- <category>Professions\Carpenter\Draw Knife</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,skills.carpentry</scripts> </item> *************** *** 371,375 **** <category>Professions\Carpenter\Tools\Froe</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>equipment,skills.carpentry</events> </item> --- 371,375 ---- <category>Professions\Carpenter\Tools\Froe</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,skills.carpentry</scripts> </item> *************** *** 380,384 **** <category>Professions\Carpenter\Tools\Inshave</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>equipment,skills.carpentry</events> </item> --- 380,384 ---- <category>Professions\Carpenter\Tools\Inshave</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,skills.carpentry</scripts> </item> *************** *** 389,393 **** <category>Professions\Carpenter\Tools\Scorp</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>equipment,skills.carpentry</events> </item> --- 389,393 ---- <category>Professions\Carpenter\Tools\Scorp</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>equipment,skills.carpentry</scripts> </item> Index: healer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/healer.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** healer.xml 17 Jul 2004 03:30:00 -0000 1.6 --- healer.xml 25 Aug 2004 17:03:46 -0000 1.7 *************** *** 14,18 **** <id>0xe20</id> <category>Professions\Healer\Bloody Bandages 2</category> ! <events>bandages</events> </item> --- 14,18 ---- <id>0xe20</id> <category>Professions\Healer\Bloody Bandages 2</category> ! <scripts>bandages</scripts> </item> *************** *** 20,24 **** <id>0xe21</id> <category>Professions\Healer\Clean Bandages 2</category> ! <events>bandages</events> </item> --- 20,24 ---- <id>0xe21</id> <category>Professions\Healer\Clean Bandages 2</category> ! <scripts>bandages</scripts> </item> *************** *** 26,30 **** <id>0xe22</id> <category>Professions\Healer\Bloody Bandages 1</category> ! <events>bandages</events> </item> --- 26,30 ---- <id>0xe22</id> <category>Professions\Healer\Bloody Bandages 1</category> ! <scripts>bandages</scripts> </item> *************** *** 32,36 **** <id>0xee9</id> <category>Professions\Healer\Clean Bandages 1</category> ! <events>bandages</events> </item> --- 32,36 ---- <id>0xee9</id> <category>Professions\Healer\Clean Bandages 1</category> ! <scripts>bandages</scripts> </item> Index: thieve.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/thieve.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** thieve.xml 26 May 2004 13:45:30 -0000 1.5 --- thieve.xml 25 Aug 2004 17:03:47 -0000 1.6 *************** *** 14,18 **** <id>0x14fb</id> <category>Professions\Thieve\Lockpick (W/E)</category> ! <events>lockpick</events> </item> --- 14,18 ---- <id>0x14fb</id> <category>Professions\Thieve\Lockpick (W/E)</category> ! <scripts>lockpick</scripts> </item> *************** *** 26,30 **** <id>0x14fd</id> <category>Professions\Thieve\Lockpicks (W/E)</category> ! <events>lockpick</events> </item> --- 26,30 ---- <id>0x14fd</id> <category>Professions\Thieve\Lockpicks (W/E)</category> ! <scripts>lockpick</scripts> </item> *************** *** 42,46 **** <item id="1ec1"> <id>0x1ec1</id> ! <events>pickpocket_dip</events> <category>Professions\Thieve\Pickpocket Dip (Animated)</category> </item> --- 42,46 ---- <item id="1ec1"> <id>0x1ec1</id> ! <scripts>pickpocket_dip</scripts> <category>Professions\Thieve\Pickpocket Dip (Animated)</category> </item> Index: mage.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/mage.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mage.xml 23 Jul 2004 19:42:11 -0000 1.13 --- mage.xml 25 Aug 2004 17:03:46 -0000 1.14 *************** *** 31,35 **** <value>30</value> <category>Professions\Mage\Spellbook (N/S)</category> ! <events>magic.spellbook</events> </item> --- 31,35 ---- <value>30</value> <category>Professions\Mage\Spellbook (N/S)</category> ! <scripts>magic.spellbook</scripts> </item> *************** *** 44,48 **** <sellprice>1250</sellprice> <category>Professions\Mage\Runebook </category> ! <events>magic.runebook</events> </item> --- 44,48 ---- <sellprice>1250</sellprice> <category>Professions\Mage\Runebook </category> ! <scripts>magic.runebook</scripts> </item> *************** *** 55,59 **** <buyprice>15</buyprice> <sellprice>8</sellprice> ! <events>magic.rune</events> </item> --- 55,59 ---- <buyprice>15</buyprice> <sellprice>8</sellprice> ! <scripts>magic.rune</scripts> </item> *************** *** 82,86 **** <id>0x1f2e</id> <decay/> ! <events>magic.scroll</events> <value>15</value> <buyprice>12</buyprice> --- 82,86 ---- <id>0x1f2e</id> <decay/> ! <scripts>magic.scroll</scripts> <value>15</value> <buyprice>12</buyprice> *************** *** 94,98 **** <id>0x1f2f</id> <decay/> ! <events>magic.scroll</events> <value>15</value> <buyprice>12</buyprice> --- 94,98 ---- <id>0x1f2f</id> <decay/> ! <scripts>magic.scroll</scripts> <value>15</value> <buyprice>12</buyprice> *************** *** 106,110 **** <id>0x1f30</id> <decay/> ! <events>magic.scroll</events> <value>15</value> <buyprice>12</buyprice> --- 106,110 ---- <id>0x1f30</id> <decay/> ! <scripts>magic.scroll</scripts> <value>15</value> <buyprice>12</buyprice> *************** *** 118,122 **** <id>0x1f31</id> <decay/> ! <events>magic.scroll</events> <value>15</value> <buyprice>12</buyprice> --- 118,122 ---- <id>0x1f31</id> <decay/> ! <scripts>magic.scroll</scripts> <value>15</value> <buyprice>12</buyprice> *************** *** 130,134 **** <id>0x1f32</id> <decay/> ! <events>magic.scroll</events> <value>15</value> <buyprice>12</buyprice> --- 130,134 ---- <id>0x1f32</id> <decay/> ! <scripts>magic.scroll</scripts> <value>15</value> <buyprice>12</buyprice> *************** *** 142,146 **** <id>0x1f33</id> <decay/> ! <events>magic.scroll</events> <value>15</value> <buyprice>12</buyprice> --- 142,146 ---- <id>0x1f33</id> <decay/> ! <scripts>magic.scroll</scripts> <value>15</value> <buyprice>12</buyprice> *************** *** 154,158 **** <id>0x1f2d</id> <decay/> ! <events>magic.scroll</events> <value>15</value> <buyprice>12</buyprice> --- 154,158 ---- <id>0x1f2d</id> <decay/> ! <scripts>magic.scroll</scripts> <value>15</value> <buyprice>12</buyprice> *************** *** 166,170 **** <id>0x1f34</id> <decay/> ! <events>magic.scroll</events> <value>15</value> <buyprice>12</buyprice> --- 166,170 ---- <id>0x1f34</id> <decay/> ! <scripts>magic.scroll</scripts> <value>15</value> <buyprice>12</buyprice> *************** *** 178,182 **** <id>0x1f35</id> <decay/> ! <events>magic.scroll</events> <value>30</value> <buyprice>22</buyprice> --- 178,182 ---- <id>0x1f35</id> <decay/> ! <scripts>magic.scroll</scripts> <value>30</value> <buyprice>22</buyprice> *************** *** 190,194 **** <id>0x1f36</id> <decay/> ! <events>magic.scroll</events> <value>30</value> <buyprice>22</buyprice> --- 190,194 ---- <id>0x1f36</id> <decay/> ! <scripts>magic.scroll</scripts> <value>30</value> <buyprice>22</buyprice> *************** *** 202,206 **** <id>0x1f37</id> <decay/> ! <events>magic.scroll</events> <value>30</value> <buyprice>22</buyprice> --- 202,206 ---- <id>0x1f37</id> <decay/> ! <scripts>magic.scroll</scripts> <value>30</value> <buyprice>22</buyprice> *************** *** 214,218 **** <id>0x1f38</id> <decay/> ! <events>magic.scroll</events> <value>30</value> <buyprice>22</buyprice> --- 214,218 ---- <id>0x1f38</id> <decay/> ! <scripts>magic.scroll</scripts> <value>30</value> <buyprice>22</buyprice> *************** *** 226,230 **** <id>0x1f39</id> <decay/> ! <events>magic.scroll</events> <value>30</value> <buyprice>22</buyprice> --- 226,230 ---- <id>0x1f39</id> <decay/> ! <scripts>magic.scroll</scripts> <value>30</value> <buyprice>22</buyprice> *************** *** 238,242 **** <id>0x1f3a</id> <decay/> ! <events>magic.scroll</events> <value>30</value> <buyprice>22</buyprice> --- 238,242 ---- <id>0x1f3a</id> <decay/> ! <scripts>magic.scroll</scripts> <value>30</value> <buyprice>22</buyprice> *************** *** 250,254 **** <id>0x1f3b</id> <decay/> ! <events>magic.scroll</events> <value>30</value> <buyprice>22</buyprice> --- 250,254 ---- <id>0x1f3b</id> <decay/> ! <scripts>magic.scroll</scripts> <value>30</value> <buyprice>22</buyprice> *************** *** 262,266 **** <id>0x1f3c</id> <decay/> ! <events>magic.scroll</events> <value>30</value> <buyprice>22</buyprice> --- 262,266 ---- <id>0x1f3c</id> <decay/> ! <scripts>magic.scroll</scripts> <value>30</value> <buyprice>22</buyprice> *************** *** 274,278 **** <id>0x1f3d</id> <decay/> ! <events>magic.scroll</events> <value>45</value> <buyprice>32</buyprice> --- 274,278 ---- <id>0x1f3d</id> <decay/> ! <scripts>magic.scroll</scripts> <value>45</value> <buyprice>32</buyprice> *************** *** 286,290 **** <id>0x1f3e</id> <decay/> ! <events>magic.scroll</events> <value>45</value> <buyprice>32</buyprice> --- 286,290 ---- <id>0x1f3e</id> <decay/> ! <scripts>magic.scroll</scripts> <value>45</value> <buyprice>32</buyprice> *************** *** 298,302 **** <id>0x1f3f</id> <decay/> ! <events>magic.scroll</events> <value>45</value> <buyprice>32</buyprice> --- 298,302 ---- <id>0x1f3f</id> <decay/> ! <scripts>magic.scroll</scripts> <value>45</value> <buyprice>32</buyprice> *************** *** 310,314 **** <id>0x1f40</id> <decay/> ! <events>magic.scroll</events> <value>45</value> <buyprice>32</buyprice> --- 310,314 ---- <id>0x1f40</id> <decay/> ! <scripts>magic.scroll</scripts> <value>45</value> <buyprice>32</buyprice> *************** *** 322,326 **** <id>0x1f41</id> <decay/> ! <events>magic.scroll</events> <value>45</value> <buyprice>32</buyprice> --- 322,326 ---- <id>0x1f41</id> <decay/> ! <scripts>magic.scroll</scripts> <value>45</value> <buyprice>32</buyprice> *************** *** 334,338 **** <id>0x1f42</id> <decay/> ! <events>magic.scroll</events> <value>45</value> <buyprice>32</buyprice> --- 334,338 ---- <id>0x1f42</id> <decay/> ! <scripts>magic.scroll</scripts> <value>45</value> <buyprice>32</buyprice> *************** *** 346,350 **** <id>0x1f43</id> <decay/> ! <events>magic.scroll</events> <value>45</value> <buyprice>32</buyprice> --- 346,350 ---- <id>0x1f43</id> <decay/> ! <scripts>magic.scroll</scripts> <value>45</value> <buyprice>32</buyprice> *************** *** 358,362 **** <id>0x1f44</id> <decay/> ! <events>magic.scroll</events> <value>45</value> <buyprice>32</buyprice> --- 358,362 ---- <id>0x1f44</id> <decay/> ! <scripts>magic.scroll</scripts> <value>45</value> <buyprice>32</buyprice> *************** *** 370,374 **** <id>0x1f45</id> <decay/> ! <events>magic.scroll</events> <value>60</value> <buyprice>42</buyprice> --- 370,374 ---- <id>0x1f45</id> <decay/> ! <scripts>magic.scroll</scripts> <value>60</value> <buyprice>42</buyprice> *************** *** 382,386 **** <id>0x1f46</id> <decay/> ! <events>magic.scroll</events> <value>60</value> <buyprice>42</buyprice> --- 382,386 ---- <id>0x1f46</id> <decay/> ! <scripts>magic.scroll</scripts> <value>60</value> <buyprice>42</buyprice> *************** *** 394,398 **** <id>0x1f47</id> <decay/> ! <events>magic.scroll</events> <value>60</value> <buyprice>42</buyprice> --- 394,398 ---- <id>0x1f47</id> <decay/> ! <scripts>magic.scroll</scripts> <value>60</value> <buyprice>42</buyprice> *************** *** 406,410 **** <id>0x1f48</id> <decay/> ! <events>magic.scroll</events> <value>60</value> <buyprice>42</buyprice> --- 406,410 ---- <id>0x1f48</id> <decay/> ! <scripts>magic.scroll</scripts> <value>60</value> <buyprice>42</buyprice> *************** *** 418,422 **** <id>0x1f49</id> <decay/> ! <events>magic.scroll</events> <value>60</value> <buyprice>42</buyprice> --- 418,422 ---- <id>0x1f49</id> <decay/> ! <scripts>magic.scroll</scripts> <value>60</value> <buyprice>42</buyprice> *************** *** 430,434 **** <id>0x1f4a</id> <decay/> ! <events>magic.scroll</events> <value>60</value> <buyprice>42</buyprice> --- 430,434 ---- <id>0x1f4a</id> <decay/> ! <scripts>magic.scroll</scripts> <value>60</value> <buyprice>42</buyprice> *************** *** 442,446 **** <id>0x1f4b</id> <decay/> ! <events>magic.scroll</events> <value>60</value> <buyprice>42</buyprice> --- 442,446 ---- <id>0x1f4b</id> <decay/> ! <scripts>magic.scroll</scripts> <value>60</value> <buyprice>42</buyprice> *************** *** 454,458 **** <id>0x1f4c</id> <decay/> ! <events>magic.scroll</events> <value>60</value> <buyprice>42</buyprice> --- 454,458 ---- <id>0x1f4c</id> <decay/> ! <scripts>magic.scroll</scripts> <value>60</value> <buyprice>42</buyprice> *************** *** 466,470 **** <id>0x1f4d</id> <decay/> ! <events>magic.scroll</events> <value>75</value> <buyprice>52</buyprice> --- 466,470 ---- <id>0x1f4d</id> <decay/> ! <scripts>magic.scroll</scripts> <value>75</value> <buyprice>52</buyprice> *************** *** 478,482 **** <id>0x1f4e</id> <decay/> ! <events>magic.scroll</events> <value>75</value> <buyprice>52</buyprice> --- 478,482 ---- <id>0x1f4e</id> <decay/> ! <scripts>magic.scroll</scripts> <value>75</value> <buyprice>52</buyprice> *************** *** 490,494 **** <id>0x1f4f</id> <decay/> ! <events>magic.scroll</events> <value>75</value> <buyprice>52</buyprice> --- 490,494 ---- <id>0x1f4f</id> <decay/> ! <scripts>magic.scroll</scripts> <value>75</value> <buyprice>52</buyprice> *************** *** 502,506 **** <id>0x1f50</id> <decay/> ! <events>magic.scroll</events> <value>75</value> <buyprice>52</buyprice> --- 502,506 ---- <id>0x1f50</id> <decay/> ! <scripts>magic.scroll</scripts> <value>75</value> <buyprice>52</buyprice> *************** *** 514,518 **** <id>0x1f51</id> <decay/> ! <events>magic.scroll</events> <value>75</value> <buyprice>52</buyprice> --- 514,518 ---- <id>0x1f51</id> <decay/> ! <scripts>magic.scroll</scripts> <value>75</value> <buyprice>52</buyprice> *************** *** 526,530 **** <id>0x1f52</id> <decay/> ! <events>magic.scroll</events> <value>75</value> <buyprice>52</buyprice> --- 526,530 ---- <id>0x1f52</id> <decay/> ! <scripts>magic.scroll</scripts> <value>75</value> <buyprice>52</buyprice> *************** *** 538,542 **** <id>0x1f53</id> <decay/> ! <events>magic.scroll</events> <value>75</value> <buyprice>52</buyprice> --- 538,542 ---- <id>0x1f53</id> <decay/> ! <scripts>magic.scroll</scripts> <value>75</value> <buyprice>52</buyprice> *************** *** 550,554 **** <id>0x1f54</id> <decay/> ! <events>magic.scroll</events> <value>75</value> <buyprice>52</buyprice> --- 550,554 ---- <id>0x1f54</id> <decay/> ! <scripts>magic.scroll</scripts> <value>75</value> <buyprice>52</buyprice> *************** *** 562,566 **** <id>0x1f55</id> <decay/> ! <events>magic.scroll</events> <value>90</value> <buyprice>62</buyprice> --- 562,566 ---- <id>0x1f55</id> <decay/> ! <scripts>magic.scroll</scripts> <value>90</value> <buyprice>62</buyprice> *************** *** 574,578 **** <id>0x1f56</id> <decay/> ! <events>magic.scroll</events> <value>90</value> <buyprice>62</buyprice> --- 574,578 ---- <id>0x1f56</id> <decay/> ! <scripts>magic.scroll</scripts> <value>90</value> <buyprice>62</buyprice> *************** *** 586,590 **** <id>0x1f57</id> <decay/> ! <events>magic.scroll</events> <value>90</value> <buyprice>62</buyprice> --- 586,590 ---- <id>0x1f57</id> <decay/> ! <scripts>magic.scroll</scripts> <value>90</value> <buyprice>62</buyprice> *************** *** 598,602 **** <id>0x1f58</id> <decay/> ! <events>magic.scroll</events> <value>90</value> <buyprice>62</buyprice> --- 598,602 ---- <id>0x1f58</id> <decay/> ! <scripts>magic.scroll</scripts> <value>90</value> <buyprice>62</buyprice> *************** *** 610,614 **** <id>0x1f59</id> <decay/> ! <events>magic.scroll</events> <value>90</value> <buyprice>62</buyprice> --- 610,614 ---- <id>0x1f59</id> <decay/> ! <scripts>magic.scroll</scripts> <value>90</value> <buyprice>62</buyprice> *************** *** 622,626 **** <id>0x1f5a</id> <decay/> ! <events>magic.scroll</events> <value>90</value> <buyprice>62</buyprice> --- 622,626 ---- <id>0x1f5a</id> <decay/> ! <scripts>magic.scroll</scripts> <value>90</value> <buyprice>62</buyprice> *************** *** 634,638 **** <id>0x1f5b</id> <decay/> ! <events>magic.scroll</events> <value>90</value> <buyprice>62</buyprice> --- 634,638 ---- <id>0x1f5b</id> <decay/> ! <scripts>magic.scroll</scripts> <value>90</value> <buyprice>62</buyprice> *************** *** 646,650 **** <id>0x1f5c</id> <decay/> ! <events>magic.scroll</events> <value>90</value> <buyprice>62</buyprice> --- 646,650 ---- <id>0x1f5c</id> <decay/> ! <scripts>magic.scroll</scripts> <value>90</value> <buyprice>62</buyprice> *************** *** 658,662 **** <id>0x1f5d</id> <decay/> ! <events>magic.scroll</events> <value>105</value> <buyprice>72</buyprice> --- 658,662 ---- <id>0x1f5d</id> <decay/> ! <scripts>magic.scroll</scripts> <value>105</value> <buyprice>72</buyprice> *************** *** 670,674 **** <id>0x1f5e</id> <decay/> ! <events>magic.scroll</events> <value>105</value> <buyprice>72</buyprice> --- 670,674 ---- <id>0x1f5e</id> <decay/> ! <scripts>magic.scroll</scripts> <value>105</value> <buyprice>72</buyprice> *************** *** 682,686 **** <id>0x1f5f</id> <decay/> ! <events>magic.scroll</events> <value>105</value> <buyprice>72</buyprice> --- 682,686 ---- <id>0x1f5f</id> <decay/> ! <scripts>magic.scroll</scripts> <value>105</value> <buyprice>72</buyprice> *************** *** 694,698 **** <id>0x1f60</id> <decay/> ! <events>magic.scroll</events> <value>105</value> <buyprice>72</buyprice> --- 694,698 ---- <id>0x1f60</id> <decay/> ! <scripts>magic.scroll</scripts> <value>105</value> <buyprice>72</buyprice> *************** *** 706,710 **** <id>0x1f61</id> <decay/> ! <events>magic.scroll</events> <value>105</value> <buyprice>72</buyprice> --- 706,710 ---- <id>0x1f61</id> <decay/> ! <scripts>magic.scroll</scripts> <value>105</value> <buyprice>72</buyprice> *************** *** 718,722 **** <id>0x1f62</id> <decay/> ! <events>magic.scroll</events> <value>105</value> <buyprice>72</buyprice> --- 718,722 ---- <id>0x1f62</id> <decay/> ! <scripts>magic.scroll</scripts> <value>105</value> <buyprice>72</buyprice> *************** *** 730,734 **** <id>0x1f63</id> <decay/> ! <events>magic.scroll</events> <value>105</value> <buyprice>72</buyprice> --- 730,734 ---- <id>0x1f63</id> <decay/> ! <scripts>magic.scroll</scripts> <value>105</value> <buyprice>72</buyprice> *************** *** 742,746 **** <id>0x1f64</id> <decay/> ! <events>magic.scroll</events> <value>105</value> <buyprice>72</buyprice> --- 742,746 ---- <id>0x1f64</id> <decay/> ! <scripts>magic.scroll</scripts> <value>105</value> <buyprice>72</buyprice> *************** *** 754,758 **** <id>0x1f65</id> <decay/> ! <events>magic.scroll</events> <value>120</value> <buyprice>82</buyprice> --- 754,758 ---- <id>0x1f65</id> <decay/> ! <scripts>magic.scroll</scripts> <value>120</value> <buyprice>82</buyprice> *************** *** 766,770 **** <id>0x1f66</id> <decay/> ! <events>magic.scroll</events> <value>120</value> <buyprice>82</buyprice> --- 766,770 ---- <id>0x1f66</id> <decay/> ! <scripts>magic.scroll</scripts> <value>120</value> <buyprice>82</buyprice> *************** *** 778,782 **** <id>0x1f67</id> <decay/> ! <events>magic.scroll</events> <value>120</value> <buyprice>82</buyprice> --- 778,782 ---- <id>0x1f67</id> <decay/> ! <scripts>magic.scroll</scripts> <value>120</value> <buyprice>82</buyprice> *************** *** 790,794 **** <id>0x1f68</id> <decay/> ! <events>magic.scroll</events> <value>120</value> <buyprice>82</buyprice> --- 790,794 ---- <id>0x1f68</id> <decay/> ! <scripts>magic.scroll</scripts> <value>120</value> <buyprice>82</buyprice> *************** *** 802,806 **** <id>0x1f69</id> <decay/> ! <events>magic.scroll</events> <value>120</value> <buyprice>82</buyprice> --- 802,806 ---- <id>0x1f69</id> <decay/> ! <scripts>magic.scroll</scripts> <value>120</value> <buyprice>82</buyprice> *************** *** 814,818 **** <id>0x1f6a</id> <decay/> ! <events>magic.scroll</events> <value>120</value> <buyprice>82</buyprice> --- 814,818 ---- <id>0x1f6a</id> <decay/> ! <scripts>magic.scroll</scripts> <value>120</value> <buyprice>82</buyprice> *************** *** 826,830 **** <id>0x1f6b</id> <decay/> ! <events>magic.scroll</events> <value>120</value> <buyprice>82</buyprice> --- 826,830 ---- <id>0x1f6b</id> <decay/> ! <scripts>magic.scroll</scripts> <value>120</value> <buyprice>82</buyprice> *************** *** 838,842 **** <id>0x1f6c</id> <decay/> ! <events>magic.scroll</events> <value>120</value> <buyprice>82</buyprice> --- 838,842 ---- <id>0x1f6c</id> <decay/> ! <scripts>magic.scroll</scripts> <value>120</value> <buyprice>82</buyprice> *************** *** 980,984 **** <id>0xfbf</id> <category>Professions\Mage\Pen & Ink (N/S)</category> ! <events>skills.inscription</events> <weight>1.0</weight> </item> --- 980,984 ---- <id>0xfbf</id> <category>Professions\Mage\Pen & Ink (N/S)</category> ! <scripts>skills.inscription</scripts> <weight>1.0</weight> </item> Index: fisher.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/fisher.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** fisher.xml 17 Jul 2004 03:30:00 -0000 1.7 --- fisher.xml 25 Aug 2004 17:03:46 -0000 1.8 *************** *** 173,177 **** <category>Professions\Fisher\Tools\Fishing Pole (N/S)</category> <tag name="remaining_uses" type="int" value="50" /> ! <events>skills.fishing</events> </item> --- 173,177 ---- <category>Professions\Fisher\Tools\Fishing Pole (N/S)</category> <tag name="remaining_uses" type="int" value="50" /> ! <scripts>skills.fishing</scripts> </item> Index: miner.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/miner.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** miner.xml 29 May 2004 06:44:38 -0000 1.16 --- miner.xml 25 Aug 2004 17:03:47 -0000 1.17 *************** *** 340,344 **** <category>Professions\Miner\Ore\Merkite\Merkite Ore 1</category> <tag name="resname" value="merkite" /> ! <events>ore</events> <type>1102</type> </item> --- 340,344 ---- <category>Professions\Miner\Ore\Merkite\Merkite Ore 1</category> <tag name="resname" value="merkite" /> ! <scripts>ore</scripts> <type>1102</type> </item> *************** *** 356,360 **** <id>0x19b7</id> <category>Professions\Miner\Ore\Ore 1</category> ! <events>ore</events> <type>1102</type> </item> --- 356,360 ---- <id>0x19b7</id> <category>Professions\Miner\Ore\Ore 1</category> ! <scripts>ore</scripts> <type>1102</type> </item> *************** *** 469,473 **** <category>Professions\Miner\Ingots\Iron Ingot (N/S)</category> <tag name="resname" value="iron" /> ! <events>ingot</events> <weight>1.0</weight> </item> --- 469,473 ---- <category>Professions\Miner\Ingots\Iron Ingot (N/S)</category> <tag name="resname" value="iron" /> ! <scripts>ingot</scripts> <weight>1.0</weight> </item> *************** *** 535,539 **** <tag name="remaining_uses" type="int" value="35" /> <decay/> ! <events>equipment,pickaxe</events> <category>Professions\Miner\Tools\Shovel (E/W)</category> </item> --- 535,539 ---- <tag name="remaining_uses" type="int" value="35" /> <decay/> ! <scripts>equipment,pickaxe</scripts> <category>Professions\Miner\Tools\Shovel (E/W)</category> </item> Index: tailorer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/tailorer.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** tailorer.xml 21 Jul 2004 04:18:28 -0000 1.12 --- tailorer.xml 25 Aug 2004 17:03:47 -0000 1.13 *************** *** 236,240 **** <id>0xdf8</id> <category>Professions\Tailorer\Resources\Pile of Wool 1</category> ! <events>wool</events> </item> --- 236,240 ---- <id>0xdf8</id> <category>Professions\Tailorer\Resources\Pile of Wool 1</category> ! <scripts>wool</scripts> </item> *************** *** 242,246 **** <id>0x101f</id> <category>Professions\Tailorer\Resources\Pile of Wool 2</category> ! <events>wool</events> </item> --- 242,246 ---- <id>0x101f</id> <category>Professions\Tailorer\Resources\Pile of Wool 2</category> ! <scripts>wool</scripts> </item> *************** *** 249,253 **** <id>0xe1d</id> <category>Professions\Tailorer\Resources\Ball of Yarn 1</category> ! <events>yarn</events> </item> --- 249,253 ---- <id>0xe1d</id> <category>Professions\Tailorer\Resources\Ball of Yarn 1</category> ! <scripts>yarn</scripts> </item> *************** *** 255,259 **** <id>0xe1e</id> <category>Professions\Tailorer\Resources\Ball of Yarn 2</category> ! <events>yarn</events> </item> --- 255,259 ---- <id>0xe1e</id> <category>Professions\Tailorer\Resources\Ball of Yarn 2</category> ! <scripts>yarn</scripts> </item> *************** *** 261,265 **** <id>0xe1f</id> <category>Professions\Tailorer\Resources\Ball of Yarn 3</category> ! <events>yarn</events> </item> --- 261,265 ---- <id>0xe1f</id> <category>Professions\Tailorer\Resources\Ball of Yarn 3</category> ! <scripts>yarn</scripts> </item> *************** *** 309,313 **** <category>Professions\Tailorer\Sewing Kit</category> <tag name="remaining_uses" type="int" value="35" /> ! <events>skills.tailoring,equipment</events> </item> --- 309,313 ---- <category>Professions\Tailorer\Sewing Kit</category> <tag name="remaining_uses" type="int" value="35" /> ! <scripts>skills.tailoring,equipment</scripts> </item> *************** *** 315,319 **** <id>0xf9e</id> <category>Professions\Tailorer\Scissors (N/S)</category> ! <events>scissors</events> </item> --- 315,319 ---- <id>0xf9e</id> <category>Professions\Tailorer\Scissors (N/S)</category> ! <scripts>scissors</scripts> </item> *************** *** 327,331 **** <id>0xfa0</id> <category>Professions\Tailorer\Resources\Spool of Thread (N/S)</category> ! <events>yarn</events> </item> --- 327,331 ---- <id>0xfa0</id> <category>Professions\Tailorer\Resources\Spool of Thread (N/S)</category> ! <scripts>yarn</scripts> </item> *************** *** 333,337 **** <id>0xfa1</id> <category>Professions\Tailorer\Resources\Spool of Thread (W/E)</category> ! <events>yarn</events> </item> --- 333,337 ---- <id>0xfa1</id> <category>Professions\Tailorer\Resources\Spool of Thread (W/E)</category> ! <scripts>yarn</scripts> </item> *************** *** 340,344 **** <category>Professions\Tailorer\Dyes</category> <tag name="remaining_uses" type="int" value="10" /> ! <events>dyes</events> </item> --- 340,344 ---- <category>Professions\Tailorer\Dyes</category> <tag name="remaining_uses" type="int" value="10" /> ! <scripts>dyes</scripts> </item> *************** *** 346,350 **** <id>0xfab</id> <category>Professions\Tailorer\Dying Tub</category> ! <events>environment</events> </item> --- 346,350 ---- <id>0xfab</id> <category>Professions\Tailorer\Dying Tub</category> ! <scripts>environment</scripts> </item> Index: alchemist.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/alchemist.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** alchemist.xml 17 Jul 2004 03:29:59 -0000 1.15 --- alchemist.xml 25 Aug 2004 17:03:45 -0000 1.16 *************** *** 30,34 **** <name>hair dye</name> <category>Professions\Alchemist\Hair Dye 1</category> ! <events>environment</events> </item> --- 30,34 ---- <name>hair dye</name> <category>Professions\Alchemist\Hair Dye 1</category> ! <scripts>environment</scripts> </item> *************** *** 142,146 **** <name>hair dye</name> <category>Professions\Alchemist\Hair Dye 2</category> ! <events>environment</events> </item> --- 142,146 ---- <name>hair dye</name> <category>Professions\Alchemist\Hair Dye 2</category> ! <scripts>environment</scripts> </item> *************** *** 495,499 **** <tag name="remaining_uses" type="int" value="50" /> <type>1107</type> ! <events>equipment,skills.alchemy</events> </item> --- 495,499 ---- <tag name="remaining_uses" type="int" value="50" /> <type>1107</type> ! <scripts>equipment,skills.alchemy</scripts> </item> *************** *** 512,516 **** <buyprice>15</buyprice> <sellprice>7</sellprice> ! <events>potions</events> <weight>0.5</weight> </item> --- 512,516 ---- <buyprice>15</buyprice> <sellprice>7</sellprice> ! <scripts>potions</scripts> <weight>0.5</weight> </item> *************** *** 521,525 **** <category>Professions\Alchemist\Potions\Orange Potion</category> <tag name="potiontype" value="4,6" type="int" /> ! <events>potions</events> <weight>0.5</weight> </item> --- 521,525 ---- <category>Professions\Alchemist\Potions\Orange Potion</category> <tag name="potiontype" value="4,6" type="int" /> ! <scripts>potions</scripts> <weight>0.5</weight> </item> *************** *** 530,534 **** <category>Professions\Alchemist\Potions\Blue Potion</category> <tag name="potiontype" value="7,8" type="int" /> ! <events>potions</events> <weight>0.5</weight> </item> --- 530,534 ---- <category>Professions\Alchemist\Potions\Blue Potion</category> <tag name="potiontype" value="7,8" type="int" /> ! <scripts>potions</scripts> <weight>0.5</weight> </item> *************** *** 539,543 **** <category>Professions\Alchemist\Potions\White Potion</category> <tag name="potiontype" value="9,10" type="int" /> ! <events>potions</events> <weight>0.5</weight> </item> --- 539,543 ---- <category>Professions\Alchemist\Potions\White Potion</category> <tag name="potiontype" value="9,10" type="int" /> ! <scripts>potions</scripts> <weight>0.5</weight> </item> *************** *** 549,553 **** <tag name="potiontype" value="14,16" type="int" /> <!-- Lesser to greater, we don't want people buying deadly. --> ! <events>potions</events> <weight>0.5</weight> </item> --- 549,553 ---- <tag name="potiontype" value="14,16" type="int" /> <!-- Lesser to greater, we don't want people buying deadly. --> ! <scripts>potions</scripts> <weight>0.5</weight> </item> *************** *** 558,562 **** <category>Professions\Alchemist\Potions\Red Potion</category> <tag name="potiontype" value="18,19" type="int" /> ! <events>potions</events> <weight>0.5</weight> </item> --- 558,562 ---- <category>Professions\Alchemist\Potions\Red Potion</category> <tag name="potiontype" value="18,19" type="int" /> ! <scripts>potions</scripts> <weight>0.5</weight> </item> *************** *** 567,571 **** <category>Professions\Alchemist\Potions\Yellow Potion</category> <tag name="potiontype" value="1,3" type="int" /> ! <events>potions</events> <weight>0.5</weight> </item> --- 567,571 ---- <category>Professions\Alchemist\Potions\Yellow Potion</category> <tag name="potiontype" value="1,3" type="int" /> ! <scripts>potions</scripts> <weight>0.5</weight> </item> *************** *** 577,581 **** <tag name="potiontype" value="11,12" type="int" /> <!-- Lesser to normal explosion, greater is craft only. --> ! <events>potions</events> <weight>0.5</weight> </item> --- 577,581 ---- <tag name="potiontype" value="11,12" type="int" /> <!-- Lesser to normal explosion, greater is craft only. --> ! <scripts>potions</scripts> <weight>0.5</weight> </item> *************** *** 585,589 **** <id>0x1940</id> <weight>1.0</weight> ! <events>potionkeg</events> <movable /> <!-- Always movable --> </item> --- 585,589 ---- <id>0x1940</id> <weight>1.0</weight> ! <scripts>potionkeg</scripts> <movable /> <!-- Always movable --> </item> Index: barber.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/barber.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** barber.xml 26 May 2004 13:45:30 -0000 1.3 --- barber.xml 25 Aug 2004 17:03:46 -0000 1.4 *************** *** 109,113 **** <id>0x14f0</id> <category>Professions\Barber\Hairstyle Deed</category> ! <events>deeds.hairstyle</events> </item> --- 109,113 ---- <id>0x14f0</id> <category>Professions\Barber\Hairstyle Deed</category> ! <scripts>deeds.hairstyle</scripts> </item> Index: necromancer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/necromancer.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** necromancer.xml 26 May 2004 13:45:30 -0000 1.2 --- necromancer.xml 25 Aug 2004 17:03:47 -0000 1.3 *************** *** 20,24 **** <value>30</value> <category>Professions\Necromancer\Spellbook</category> ! <events>magic.necrospellbook</events> </item> </definitions> --- 20,24 ---- <value>30</value> <category>Professions\Necromancer\Spellbook</category> ! <scripts>magic.necrospellbook</scripts> </item> </definitions> Index: blacksmith.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/blacksmith.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** blacksmith.xml 21 Jul 2004 04:18:28 -0000 1.10 --- blacksmith.xml 25 Aug 2004 17:03:46 -0000 1.11 *************** *** 43,47 **** <item id="fbb"> <id>0xfbb</id> ! <events>skills.blacksmithing,equipment</events> <category>Professions\Blacksmith\Tongs (W/E)</category> <tag name="remaining_uses" type="int" value="35" /> --- 43,47 ---- <item id="fbb"> <id>0xfbb</id> ! <scripts>skills.blacksmithing,equipment</scripts> <category>Professions\Blacksmith\Tongs (W/E)</category> <tag name="remaining_uses" type="int" value="35" /> Index: cook.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/cook.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** cook.xml 23 Jul 2004 19:42:11 -0000 1.4 --- cook.xml 25 Aug 2004 17:03:46 -0000 1.5 *************** *** 401,405 **** <sellprice>4</sellprice> <weight>0.4</weight> ! <events>cooking</events> </item> --- 401,405 ---- <sellprice>4</sellprice> <weight>0.4</weight> ! <scripts>cooking</scripts> </item> *************** *** 456,460 **** <weight>0.1</weight> <category>Professions\Cook\Supplies\Cookie Mix</category> ! <events>cooking</events> </item> --- 456,460 ---- <weight>0.1</weight> <category>Professions\Cook\Supplies\Cookie Mix</category> ! <scripts>cooking</scripts> </item> *************** *** 463,467 **** <weight>0.1</weight> <category>Professions\Cook\Supplies\Unbaked Pie</category> ! <events>cooking</events> </item> --- 463,467 ---- <weight>0.1</weight> <category>Professions\Cook\Supplies\Unbaked Pie</category> ! <scripts>cooking</scripts> </item> *************** *** 470,474 **** <weight>0.1</weight> <category>Professions\Cook\Supplies\Unbaked Pizza</category> ! <events>cooking</events> </item> --- 470,474 ---- <weight>0.1</weight> <category>Professions\Cook\Supplies\Unbaked Pizza</category> ! <scripts>cooking</scripts> </item> *************** *** 521,525 **** <weight>0.2</weight> <category>Professions\Cook\Supplies\Raw Leg of Lamb</category> ! <events>cooking</events> </item> --- 521,525 ---- <weight>0.2</weight> <category>Professions\Cook\Supplies\Raw Leg of Lamb</category> ! <scripts>cooking</scripts> </item> *************** *** 531,535 **** <weight>0.1</weight> <category>Professions\Cook\Supplies\Raw Chicken Leg</category> ! <events>cooking</events> </item> --- 531,535 ---- <weight>0.1</weight> <category>Professions\Cook\Supplies\Raw Chicken Leg</category> ! <scripts>cooking</scripts> </item> Index: fletcher.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/fletcher.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** fletcher.xml 17 Jul 2004 03:30:00 -0000 1.6 --- fletcher.xml 25 Aug 2004 17:03:46 -0000 1.7 *************** *** 47,51 **** <category>Professions\Fletcher\Fletching Tools 1</category> <weight>2.0</weight> ! <events>skills.bowcraft,equipment</events> <tag name="remaining_uses" type="int" value="35" /> </item> --- 47,51 ---- <category>Professions\Fletcher\Fletching Tools 1</category> <weight>2.0</weight> ! <scripts>skills.bowcraft... [truncated message content] |
|
From: Sebastian H. <dar...@us...> - 2004-08-25 17:04:37
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12582/items/armory/hats Modified Files: bandana.xml bear_mask.xml bonnet.xml cap.xml deer_mask.xml feathered_hat.xml floppy_hat.xml jester_hat.xml jesters_cap.xml orc_masks.xml skull_cap.xml straw_hat.xml tall_straw_hat.xml tribal_masks.xml tricorne_hat.xml wide-brim_hat.xml wizards_hat.xml Log Message: Changed all references to "events" to "scripts" Index: tricorne_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/tricorne_hat.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tricorne_hat.xml 13 May 2004 07:02:40 -0000 1.2 --- tricorne_hat.xml 25 Aug 2004 17:03:40 -0000 1.3 *************** *** 21,25 **** <weight>1.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 21,25 ---- <weight>1.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: jester_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/jester_hat.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jester_hat.xml 13 May 2004 07:02:40 -0000 1.2 --- jester_hat.xml 25 Aug 2004 17:03:40 -0000 1.3 *************** *** 17,21 **** <durability><random min="20" max="25" /></durability> <type>1009</type> ! <events>equipment</events> </item> --- 17,21 ---- <durability><random min="20" max="25" /></durability> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: bandana.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/bandana.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bandana.xml 13 May 2004 07:02:40 -0000 1.3 --- bandana.xml 25 Aug 2004 17:03:40 -0000 1.4 *************** *** 21,25 **** <weight>1.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 21,25 ---- <weight>1.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: tall_straw_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/tall_straw_hat.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tall_straw_hat.xml 13 May 2004 07:02:40 -0000 1.2 --- tall_straw_hat.xml 25 Aug 2004 17:03:40 -0000 1.3 *************** *** 20,24 **** <weight>1.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 20,24 ---- <weight>1.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: bonnet.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/bonnet.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bonnet.xml 13 May 2004 07:02:40 -0000 1.2 --- bonnet.xml 25 Aug 2004 17:03:40 -0000 1.3 *************** *** 20,24 **** <weight>1.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 20,24 ---- <weight>1.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: wide-brim_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/wide-brim_hat.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wide-brim_hat.xml 13 May 2004 07:02:40 -0000 1.2 --- wide-brim_hat.xml 25 Aug 2004 17:03:40 -0000 1.3 *************** *** 20,24 **** <weight>1.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 20,24 ---- <weight>1.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: bear_mask.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/bear_mask.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** bear_mask.xml 13 May 2004 07:02:40 -0000 1.4 --- bear_mask.xml 25 Aug 2004 17:03:40 -0000 1.5 *************** *** 19,23 **** <value>40</value> <type>1009</type> ! <events>equipment</events> </item> --- 19,23 ---- <value>40</value> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: cap.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/cap.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cap.xml 13 May 2004 07:02:40 -0000 1.2 --- cap.xml 25 Aug 2004 17:03:40 -0000 1.3 *************** *** 20,24 **** <weight>1.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 20,24 ---- <weight>1.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: deer_mask.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/deer_mask.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** deer_mask.xml 13 May 2004 07:02:40 -0000 1.4 --- deer_mask.xml 25 Aug 2004 17:03:40 -0000 1.5 *************** *** 18,22 **** <weight>4.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 18,22 ---- <weight>4.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: feathered_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/feathered_hat.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** feathered_hat.xml 13 May 2004 07:02:40 -0000 1.2 --- feathered_hat.xml 25 Aug 2004 17:03:40 -0000 1.3 *************** *** 20,24 **** <weight>1.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 20,24 ---- <weight>1.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: straw_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/straw_hat.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** straw_hat.xml 13 May 2004 07:02:40 -0000 1.2 --- straw_hat.xml 25 Aug 2004 17:03:40 -0000 1.3 *************** *** 20,24 **** <weight>1.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 20,24 ---- <weight>1.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: wizards_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/wizards_hat.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wizards_hat.xml 13 May 2004 07:02:40 -0000 1.2 --- wizards_hat.xml 25 Aug 2004 17:03:40 -0000 1.3 *************** *** 20,24 **** <weight>1.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 20,24 ---- <weight>1.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: jesters_cap.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/jesters_cap.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jesters_cap.xml 13 May 2004 07:02:40 -0000 1.2 --- jesters_cap.xml 25 Aug 2004 17:03:40 -0000 1.3 *************** *** 20,24 **** <weight>1.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 20,24 ---- <weight>1.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: orc_masks.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/orc_masks.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** orc_masks.xml 13 May 2004 07:02:40 -0000 1.3 --- orc_masks.xml 25 Aug 2004 17:03:40 -0000 1.4 *************** *** 17,21 **** <weight>4.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 17,21 ---- <weight>4.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: floppy_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/floppy_hat.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** floppy_hat.xml 13 May 2004 07:02:40 -0000 1.3 --- floppy_hat.xml 25 Aug 2004 17:03:40 -0000 1.4 *************** *** 20,24 **** <weight>1.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 20,24 ---- <weight>1.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: skull_cap.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/skull_cap.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** skull_cap.xml 13 May 2004 07:02:40 -0000 1.3 --- skull_cap.xml 25 Aug 2004 17:03:40 -0000 1.4 *************** *** 14,18 **** <weight>1.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 14,18 ---- <weight>1.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> Index: tribal_masks.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/tribal_masks.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tribal_masks.xml 13 May 2004 07:02:40 -0000 1.3 --- tribal_masks.xml 25 Aug 2004 17:03:40 -0000 1.4 *************** *** 17,21 **** <weight>4.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 17,21 ---- <weight>4.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> *************** *** 35,39 **** <weight>4.0</weight> <type>1009</type> ! <events>equipment</events> </item> --- 35,39 ---- <weight>4.0</weight> <type>1009</type> ! <scripts>equipment</scripts> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-08-25 17:04:37
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12582/items/weaponry/fencing Modified Files: dagger.xml double_bladed_staff.xml kryss.xml lance.xml pike.xml pitchfork.xml short_spear.xml spear.xml war_fork.xml Log Message: Changed all references to "events" to "scripts" Index: war_fork.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/war_fork.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** war_fork.xml 13 May 2004 07:02:51 -0000 1.10 --- war_fork.xml 25 Aug 2004 17:03:55 -0000 1.11 *************** *** 20,24 **** <weight>1.0</weight> <tag name="resname" value="iron" /> ! <events>equipment</events> <type>1005</type> <category>Weapons\Fencing\War Fork (N/S)</category> --- 20,24 ---- <weight>1.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1005</type> <category>Weapons\Fencing\War Fork (N/S)</category> Index: pike.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/pike.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pike.xml 13 May 2004 07:02:51 -0000 1.10 --- pike.xml 25 Aug 2004 17:03:50 -0000 1.11 *************** *** 20,24 **** <weight>10.0</weight> <tag name="resname" value="iron" /> ! <events>equipment,blades</events> <type>1005</type> <category>Weapons\Fencing\Pike (N/S)</category> --- 20,24 ---- <weight>10.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment,blades</scripts> <type>1005</type> <category>Weapons\Fencing\Pike (N/S)</category> Index: short_spear.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/short_spear.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** short_spear.xml 13 May 2004 07:02:51 -0000 1.10 --- short_spear.xml 25 Aug 2004 17:03:50 -0000 1.11 *************** *** 20,24 **** <weight>4.0</weight> <tag name="resname" value="iron" /> ! <events>equipment</events> <type>1005</type> <category>Weapons\Fencing\Short Spear (N/S)</category> --- 20,24 ---- <weight>4.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1005</type> <category>Weapons\Fencing\Short Spear (N/S)</category> Index: lance.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/lance.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** lance.xml 13 May 2004 07:02:51 -0000 1.10 --- lance.xml 25 Aug 2004 17:03:50 -0000 1.11 *************** *** 20,24 **** <weight>12.0</weight> <tag name="resname" value="iron" /> ! <events>equipment</events> <type>1005</type> <category>Weapons\Fencing\Lance (N/S)</category> --- 20,24 ---- <weight>12.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1005</type> <category>Weapons\Fencing\Lance (N/S)</category> Index: double_bladed_staff.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/double_bladed_staff.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** double_bladed_staff.xml 13 May 2004 07:02:51 -0000 1.10 --- double_bladed_staff.xml 25 Aug 2004 17:03:49 -0000 1.11 *************** *** 20,24 **** <weight>7.0</weight> <tag name="resname" value="iron" /> ! <events>equipment,blades</events> <type>1005</type> <category>Weapons\Fencing\Double Bladed Staff (N/S)</category> --- 20,24 ---- <weight>7.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment,blades</scripts> <type>1005</type> <category>Weapons\Fencing\Double Bladed Staff (N/S)</category> Index: pitchfork.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/pitchfork.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pitchfork.xml 13 May 2004 07:02:51 -0000 1.10 --- pitchfork.xml 25 Aug 2004 17:03:50 -0000 1.11 *************** *** 20,24 **** <weight>10.0</weight> <tag name="resname" value="iron" /> ! <events>equipment</events> <type>1005</type> <category>Weapons\Fencing\Pitchfork (N/S)</category> --- 20,24 ---- <weight>10.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1005</type> <category>Weapons\Fencing\Pitchfork (N/S)</category> Index: spear.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/spear.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** spear.xml 13 May 2004 07:02:51 -0000 1.10 --- spear.xml 25 Aug 2004 17:03:50 -0000 1.11 *************** *** 20,24 **** <weight>7.0</weight> <tag name="resname" value="iron" /> ! <events>equipment</events> <type>1005</type> <category>Weapons\Fencing\Spear (N/S)</category> --- 20,24 ---- <weight>7.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment</scripts> <type>1005</type> <category>Weapons\Fencing\Spear (N/S)</category> Index: kryss.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/kryss.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** kryss.xml 13 May 2004 07:02:51 -0000 1.10 --- kryss.xml 25 Aug 2004 17:03:50 -0000 1.11 *************** *** 20,24 **** <weight>1.0</weight> <tag name="resname" value="iron" /> ! <events>equipment,blades</events> <type>1005</type> <category>Weapons\Fencing\Kryss (N/S)</category> --- 20,24 ---- <weight>1.0</weight> <tag name="resname" value="iron" /> ! <scripts>equipment,blades</scripts> <type>1005</type> <category>Weapons\Fencing\Kryss (N/S)</category> Index: dagger.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/dagger.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** dagger.xml 13 May 2004 07:02:51 -0000 1.10 --- dagger.xml 25 Aug 2004 17:03:49 -0000 1.11 *************** *** 20,24 **** <durability><random min="30" max="39" /></durability> <weight>1.0</weight> ! <events>equipment,blades</events> <type>1005</type> <category>Weapons\Fencing\Dagger (N/S)</category> --- 20,24 ---- <durability><random min="30" max="39" /></durability> <weight>1.0</weight> ! <scripts>equipment,blades</scripts> <type>1005</type> <category>Weapons\Fencing\Dagger (N/S)</category> |
