wpdev-commits Mailing List for Wolfpack Emu (Page 169)
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
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30869/definitions/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: I added resname tags to weapons/armor. This will be useful for smelting weapons and armor, and even cutting armor that gives leather. AoS has the four leather types. Also, wooden objects have 'plainwood' in case later there happens to be multiple wood types or something... Index: axe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/axe.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** axe.xml 27 Dec 2003 15:26:59 -0000 1.1 --- axe.xml 26 Jan 2004 07:02:30 -0000 1.2 *************** *** 19,22 **** --- 19,23 ---- <type>1002</type> <category>Weapons\Axes\Axe (N/S)</category> + <tag name="resname" value="iron" /> </item> Index: bardiche.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/bardiche.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bardiche.xml 14 Jan 2004 13:07:33 -0000 1.3 --- bardiche.xml 26 Jan 2004 07:02:30 -0000 1.4 *************** *** 16,19 **** --- 16,20 ---- <weight>7.0</weight> <tag name="req_str" value="45" type="int" /> + <tag name="resname" value="iron" /> <type>1002</type> <events>equipment,weapons.blades</events> Index: battle_axe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/battle_axe.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** battle_axe.xml 27 Dec 2003 15:26:59 -0000 1.1 --- battle_axe.xml 26 Jan 2004 07:02:30 -0000 1.2 *************** *** 16,19 **** --- 16,20 ---- <weight>4.0</weight> <tag name="req_str" value="35" type="int" /> + <tag name="resname" value="iron" /> <events>equipment</events> <type>1002</type> Index: bladed_staff.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/bladed_staff.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bladed_staff.xml 12 Jan 2004 05:00:49 -0000 1.2 --- bladed_staff.xml 26 Jan 2004 07:02:30 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <weight>12.0</weight> <tag name="req_str" value="40" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,weapons.blades</events> Index: bone_harvester.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/bone_harvester.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bone_harvester.xml 12 Jan 2004 05:00:49 -0000 1.2 --- bone_harvester.xml 26 Jan 2004 07:02:30 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <weight>5.0</weight> <tag name="req_str" value="25" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,weapons.blades</events> Index: broadsword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/broadsword.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** broadsword.xml 12 Jan 2004 05:00:49 -0000 1.2 --- broadsword.xml 26 Jan 2004 07:02:30 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <weight>6.0</weight> <tag name="req_str" value="30" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,weapons.blades</events> Index: butcher_knife.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/butcher_knife.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** butcher_knife.xml 12 Jan 2004 05:00:49 -0000 1.2 --- butcher_knife.xml 26 Jan 2004 07:02:30 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <weight>1.0</weight> <tag name="req_str" value="5" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,weapons.blades</events> Index: cleaver.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/cleaver.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cleaver.xml 12 Jan 2004 05:00:49 -0000 1.2 --- cleaver.xml 26 Jan 2004 07:02:30 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <weight>1.0</weight> <tag name="req_str" value="10" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,weapons.blades</events> Index: crescent_blade.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/crescent_blade.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** crescent_blade.xml 12 Jan 2004 05:00:49 -0000 1.2 --- crescent_blade.xml 26 Jan 2004 07:02:30 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <weight>8.0</weight> <tag name="req_str" value="55" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,weapons.blades</events> Index: cutlass.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/cutlass.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cutlass.xml 12 Jan 2004 05:00:49 -0000 1.2 --- cutlass.xml 26 Jan 2004 07:02:30 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <weight>8.0</weight> <tag name="req_str" value="25" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,weapons.blades</events> Index: double_axe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/double_axe.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** double_axe.xml 27 Dec 2003 15:26:59 -0000 1.1 --- double_axe.xml 26 Jan 2004 07:02:30 -0000 1.2 *************** *** 16,19 **** --- 16,20 ---- <weight>3.0</weight> <tag name="req_str" value="45" type="int" /> + <tag name="resname" value="iron" /> <events>equipment</events> <type>1002</type> Index: executioners_axe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/executioners_axe.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** executioners_axe.xml 27 Dec 2003 15:26:59 -0000 1.1 --- executioners_axe.xml 26 Jan 2004 07:02:30 -0000 1.2 *************** *** 16,19 **** --- 16,20 ---- <weight>3.0</weight> <tag name="req_str" value="40" type="int" /> + <tag name="resname" value="iron" /> <events>equipment</events> <category>Weapons\Axes\Executioner's Axe (N/S)</category> Index: halberd.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/halberd.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** halberd.xml 14 Jan 2004 13:07:33 -0000 1.3 --- halberd.xml 26 Jan 2004 07:02:30 -0000 1.4 *************** *** 16,19 **** --- 16,20 ---- <weight>16.0</weight> <tag name="req_str" value="95" type="int" /> + <tag name="resname" value="iron" /> <type>1002</type> <events>equipment,weapons.blades</events> Index: hatchet.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/hatchet.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hatchet.xml 27 Dec 2003 15:26:59 -0000 1.1 --- hatchet.xml 26 Jan 2004 07:02:30 -0000 1.2 *************** *** 16,19 **** --- 16,20 ---- <weight>4.0</weight> <tag name="req_str" value="20" type="int" /> + <tag name="resname" value="iron" /> <events>equipment</events> <category>Weapons\Axes\Hatchet (N/S)</category> Index: katana.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/katana.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** katana.xml 12 Jan 2004 05:00:49 -0000 1.2 --- katana.xml 26 Jan 2004 07:02:30 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <weight>6.0</weight> <tag name="req_str" value="25" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,weapons.blades</events> Index: large_battle_axe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/large_battle_axe.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** large_battle_axe.xml 27 Dec 2003 15:26:59 -0000 1.1 --- large_battle_axe.xml 26 Jan 2004 07:02:30 -0000 1.2 *************** *** 16,19 **** --- 16,20 ---- <weight>6.0</weight> <tag name="req_str" value="80" type="int" /> + <tag name="resname" value="iron" /> <events>equipment</events> <category>Weapons\Axes\Large Battle Axe (N/S)</category> Index: long_sword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/long_sword.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** long_sword.xml 12 Jan 2004 05:00:49 -0000 1.2 --- long_sword.xml 26 Jan 2004 07:02:30 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <weight>1.0</weight> <tag name="req_str" value="35" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,weapons.blades</events> Index: longsword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/longsword.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** longsword.xml 12 Jan 2004 05:00:49 -0000 1.2 --- longsword.xml 26 Jan 2004 07:02:30 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <weight>7.0</weight> <tag name="req_str" value="35" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,weapons.blades</events> Index: paladin_sword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/paladin_sword.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** paladin_sword.xml 12 Jan 2004 05:00:49 -0000 1.2 --- paladin_sword.xml 26 Jan 2004 07:02:30 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <weight>6.0</weight> <tag name="req_str" value="30" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,weapons.blades</events> Index: pickaxe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/pickaxe.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pickaxe.xml 25 Jan 2004 01:26:00 -0000 1.4 --- pickaxe.xml 26 Jan 2004 07:02:30 -0000 1.5 *************** *** 16,19 **** --- 16,20 ---- <weight>11.0</weight> <tag name="req_str" value="50" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,tools.pickaxe</events> Index: scimitar.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/scimitar.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** scimitar.xml 12 Jan 2004 05:00:49 -0000 1.2 --- scimitar.xml 26 Jan 2004 07:02:30 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <weight>6.0</weight> <tag name="req_str" value="25" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,weapons.blades</events> Index: scythe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/scythe.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** scythe.xml 14 Jan 2004 13:07:33 -0000 1.3 --- scythe.xml 26 Jan 2004 07:02:30 -0000 1.4 *************** *** 16,19 **** --- 16,20 ---- <weight>10.0</weight> <tag name="req_str" value="45" type="int" /> + <tag name="resname" value="iron" /> <type>1002</type> <events>equipment,weapons.blades</events> Index: skinning_knife.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/skinning_knife.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** skinning_knife.xml 12 Jan 2004 05:00:49 -0000 1.2 --- skinning_knife.xml 26 Jan 2004 07:02:30 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <weight>1.0</weight> <tag name="req_str" value="5" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,weapons.blades</events> Index: two_handed_axe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/two_handed_axe.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** two_handed_axe.xml 27 Dec 2003 15:26:59 -0000 1.1 --- two_handed_axe.xml 26 Jan 2004 07:02:30 -0000 1.2 *************** *** 16,19 **** --- 16,20 ---- <weight>8.0</weight> <tag name="req_str" value="40" type="int" /> + <tag name="resname" value="iron" /> <events>equipment</events> <category>Weapons\Axes\Two Handed Axe (N/S)</category> Index: viking_sword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/viking_sword.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** viking_sword.xml 12 Jan 2004 05:00:49 -0000 1.2 --- viking_sword.xml 26 Jan 2004 07:02:30 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <weight>6.0</weight> <tag name="req_str" value="40" type="int" /> + <tag name="resname" value="iron" /> <type>1001</type> <events>equipment,weapons.blades</events> |
|
From: <dr...@pr...> - 2004-01-26 21:52:09
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30869/definitions/items/armory/leather Modified Files: leather_armor.xml leather_bustier.xml leather_cap.xml leather_gloves.xml leather_gorget.xml leather_leggings.xml leather_shorts.xml leather_skirt.xml leather_sleeves.xml leather_tunic.xml Log Message: I added resname tags to weapons/armor. This will be useful for smelting weapons and armor, and even cutting armor that gives leather. AoS has the four leather types. Also, wooden objects have 'plainwood' in case later there happens to be multiple wood types or something... Index: leather_armor.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_armor.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** leather_armor.xml 29 Dec 2003 12:09:12 -0000 1.4 --- leather_armor.xml 26 Jan 2004 07:02:26 -0000 1.5 *************** *** 24,27 **** --- 24,28 ---- <tag name="res_poison" value="3" type="int" /> <tag name="res_energy" value="3" type="int" /> + <tag name="resname" value="leather" /> <restock>10</restock> <weight>1.0</weight> Index: leather_bustier.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_bustier.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** leather_bustier.xml 29 Dec 2003 12:09:12 -0000 1.3 --- leather_bustier.xml 26 Jan 2004 07:02:26 -0000 1.4 *************** *** 24,27 **** --- 24,28 ---- <tag name="res_poison" value="3" type="int" /> <tag name="res_energy" value="3" type="int" /> + <tag name="resname" value="leather" /> <restock>10</restock> <weight>2.0</weight> Index: leather_cap.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_cap.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** leather_cap.xml 29 Dec 2003 12:09:12 -0000 1.3 --- leather_cap.xml 26 Jan 2004 07:02:26 -0000 1.4 *************** *** 24,27 **** --- 24,28 ---- <tag name="res_poison" value="3" type="int" /> <tag name="res_energy" value="3" type="int" /> + <tag name="resname" value="leather" /> <restock>10</restock> <weight>2.0</weight> Index: leather_gloves.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_gloves.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** leather_gloves.xml 29 Dec 2003 12:09:12 -0000 1.3 --- leather_gloves.xml 26 Jan 2004 07:02:26 -0000 1.4 *************** *** 24,27 **** --- 24,28 ---- <tag name="res_poison" value="3" type="int" /> <tag name="res_energy" value="3" type="int" /> + <tag name="resname" value="leather" /> <restock>10</restock> <weight>1.0</weight> Index: leather_gorget.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_gorget.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** leather_gorget.xml 29 Dec 2003 12:09:12 -0000 1.3 --- leather_gorget.xml 26 Jan 2004 07:02:26 -0000 1.4 *************** *** 24,27 **** --- 24,28 ---- <tag name="res_poison" value="3" type="int" /> <tag name="res_energy" value="3" type="int" /> + <tag name="resname" value="leather" /> <restock>10</restock> <weight>2.0</weight> Index: leather_leggings.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_leggings.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** leather_leggings.xml 29 Dec 2003 12:09:12 -0000 1.3 --- leather_leggings.xml 26 Jan 2004 07:02:26 -0000 1.4 *************** *** 24,27 **** --- 24,28 ---- <tag name="res_poison" value="3" type="int" /> <tag name="res_energy" value="3" type="int" /> + <tag name="resname" value="leather" /> <restock>10</restock> <weight>4.0</weight> Index: leather_shorts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_shorts.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** leather_shorts.xml 29 Dec 2003 12:09:12 -0000 1.3 --- leather_shorts.xml 26 Jan 2004 07:02:26 -0000 1.4 *************** *** 24,27 **** --- 24,28 ---- <tag name="res_poison" value="3" type="int" /> <tag name="res_energy" value="3" type="int" /> + <tag name="resname" value="leather" /> <restock>10</restock> <weight>2.0</weight> Index: leather_skirt.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_skirt.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** leather_skirt.xml 29 Dec 2003 12:09:12 -0000 1.3 --- leather_skirt.xml 26 Jan 2004 07:02:26 -0000 1.4 *************** *** 24,27 **** --- 24,28 ---- <tag name="res_poison" value="3" type="int" /> <tag name="res_energy" value="3" type="int" /> + <tag name="resname" value="leather" /> <restock>10</restock> <weight>1.0</weight> Index: leather_sleeves.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_sleeves.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** leather_sleeves.xml 29 Dec 2003 12:09:12 -0000 1.3 --- leather_sleeves.xml 26 Jan 2004 07:02:26 -0000 1.4 *************** *** 24,27 **** --- 24,28 ---- <tag name="res_poison" value="3" type="int" /> <tag name="res_energy" value="3" type="int" /> + <tag name="resname" value="leather" /> <restock>10</restock> <weight>2.0</weight> Index: leather_tunic.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_tunic.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** leather_tunic.xml 29 Dec 2003 12:09:12 -0000 1.3 --- leather_tunic.xml 26 Jan 2004 07:02:26 -0000 1.4 *************** *** 24,27 **** --- 24,28 ---- <tag name="res_poison" value="3" type="int" /> <tag name="res_energy" value="3" type="int" /> + <tag name="resname" value="leather" /> <restock>10</restock> <weight>2.0</weight> |
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/ring In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30869/definitions/items/armory/ring Modified Files: ringmail_gloves.xml ringmail_leggings.xml ringmail_sleeves.xml ringmail_tunic.xml Log Message: I added resname tags to weapons/armor. This will be useful for smelting weapons and armor, and even cutting armor that gives leather. AoS has the four leather types. Also, wooden objects have 'plainwood' in case later there happens to be multiple wood types or something... Index: ringmail_gloves.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/ring/ringmail_gloves.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ringmail_gloves.xml 29 Dec 2003 12:09:12 -0000 1.3 --- ringmail_gloves.xml 26 Jan 2004 07:02:27 -0000 1.4 *************** *** 26,29 **** --- 26,30 ---- <tag name="res_poison" value="5" type="int" /> <tag name="res_energy" value="3" type="int" /> + <tag name="resname" value="iron" /> <restock>10</restock> <smelt>8</smelt> Index: ringmail_leggings.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/ring/ringmail_leggings.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ringmail_leggings.xml 29 Dec 2003 12:09:12 -0000 1.3 --- ringmail_leggings.xml 26 Jan 2004 07:02:27 -0000 1.4 *************** *** 26,29 **** --- 26,30 ---- <tag name="res_poison" value="5" type="int" /> <tag name="res_energy" value="3" type="int" /> + <tag name="resname" value="iron" /> <restock>10</restock> <smelt>13</smelt> Index: ringmail_sleeves.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/ring/ringmail_sleeves.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ringmail_sleeves.xml 29 Dec 2003 12:09:12 -0000 1.3 --- ringmail_sleeves.xml 26 Jan 2004 07:02:27 -0000 1.4 *************** *** 25,28 **** --- 25,29 ---- <tag name="res_poison" value="5" type="int" /> <tag name="res_energy" value="3" type="int" /> + <tag name="resname" value="iron" /> <restock>10</restock> <smelt>11</smelt> Index: ringmail_tunic.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/ring/ringmail_tunic.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ringmail_tunic.xml 29 Dec 2003 12:09:12 -0000 1.3 --- ringmail_tunic.xml 26 Jan 2004 07:02:27 -0000 1.4 *************** *** 26,29 **** --- 26,30 ---- <tag name="res_poison" value="5" type="int" /> <tag name="res_energy" value="3" type="int" /> + <tag name="resname" value="iron" /> <restock>10</restock> <smelt>11</smelt> |
|
From: <dar...@pr...> - 2004-01-26 21:21:47
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22297/items/misc Modified Files: misc.xml Log Message: Started implementation of keyrings. Index: misc.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/misc/misc.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** misc.xml 22 Jan 2004 03:52:21 -0000 1.8 --- misc.xml 26 Jan 2004 03:21:06 -0000 1.9 *************** *** 170,173 **** --- 170,174 ---- <id>0x1011</id> <category>Misc\Keys\Keyring 1</category> + <events>keyring</events> </item> *************** *** 175,178 **** --- 176,180 ---- <id>0x1769</id> <category>Misc\Keys\Keyring 2</category> + <events>keyring</events> </item> *************** *** 180,183 **** --- 182,186 ---- <id>0x176a</id> <category>Misc\Keys\Keyring 3</category> + <events>keyring</events> </item> *************** *** 185,188 **** --- 188,192 ---- <id>0x176b</id> <category>Misc\Keys\Keyring 4</category> + <events>keyring</events> </item> |
|
From: <dr...@pr...> - 2004-01-26 21:02:48
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21903/scripts/skills Modified Files: __init__.py mining.py Log Message: I found cliloc messages. Woo! (Should probably make an index or something... Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/__init__.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** __init__.py 25 Jan 2004 01:26:04 -0000 1.9 --- __init__.py 26 Jan 2004 21:00:41 -0000 1.10 *************** *** 4,7 **** --- 4,8 ---- import wolfpack.settings from wolfpack.consts import * + from random import randrange STRGAIN = 0 *************** *** 16,23 **** { ALCHEMY: [0, 0.5, 0.5, 1, 1000, FALSE], ! ANATOMY: [0.15, 0.15, 0.7, 1, 1000, FALSE ], ANIMALLORE: [0, 0, 1, 1, 1000, FALSE ], ITEMID: [0, 0, 1, 1, 1000, FALSE ], ! ARMSLORE: [0.75, 0.15, 0.1, 1, 1000, FALSE ], PARRYING: [0.75, 0.25, 0, 1, 1000, FALSE], BEGGING: [0, 0, 0, 1, 1000, FALSE ], --- 17,24 ---- { ALCHEMY: [0, 0.5, 0.5, 1, 1000, FALSE], ! ANATOMY: [0.1, 0.1, 0.8, 1, 1000, FALSE ], ANIMALLORE: [0, 0, 1, 1, 1000, FALSE ], ITEMID: [0, 0, 1, 1, 1000, FALSE ], ! ARMSLORE: [0.8, 0.1, 0.1, 1, 1000, FALSE ], PARRYING: [0.75, 0.25, 0, 1, 1000, FALSE], BEGGING: [0, 0, 0, 1, 1000, FALSE ], *************** *** 100,105 **** mult = 0.2 ! gainchance = float( skillscap - chartotalskills ) / skillscap ! gainchance += float( charskillcap - skillvalue ) / charskillcap / 2 gainchance = ( ( gainchance + ( 1.0 - chance ) * mult ) / 2 ) * skilltable[ skillid ][ GAINFACTOR ] --- 101,106 ---- mult = 0.2 ! gainchance = ( float( skillscap - chartotalskills ) / skillscap ) ! gainchance += ( ( float( charskillcap - skillvalue ) / charskillcap ) / 2 ) gainchance = ( ( gainchance + ( 1.0 - chance ) * mult ) / 2 ) * skilltable[ skillid ][ GAINFACTOR ] *************** *** 108,112 **** #If you lucky and antimacro is agree so let's gain this skill ! if ( gainchance >= whrandom.random() ) or skillvalue < 100: skillgain( char, skillid ) --- 109,114 ---- #If you lucky and antimacro is agree so let's gain this skill ! # 3/5 chance to gain if below 10.0 skill. ! if ( gainchance >= whrandom.random() ) or ( ( skillvalue < 100 ) and ( randrange( 1, 5 ) > 2 ) ): skillgain( char, skillid ) Index: mining.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mining.py 26 Jan 2004 13:48:49 -0000 1.11 --- mining.py 26 Jan 2004 21:00:47 -0000 1.12 *************** *** 99,103 **** # Player can reach that ? if char.pos.map != pos.map or char.pos.distance( pos ) > MINING_MAX_DISTANCE: ! socket.clilocmessage( 500446, "", GRAY, NORMAL ) # That is too far away return OK --- 99,104 ---- # Player can reach that ? if char.pos.map != pos.map or char.pos.distance( pos ) > MINING_MAX_DISTANCE: ! # That is too far away ! socket.clilocmessage( 500446, "", GRAY ) return OK *************** *** 107,111 **** #Mine char ?! if target.char: ! socket.clilocmessage( 501863, "", GRAY, NORMAL ) # You can't mine that. return OK --- 108,113 ---- #Mine char ?! if target.char: ! # You can't mine that. ! socket.clilocmessage( 501863, "", GRAY ) return OK *************** *** 123,127 **** mining( char, target.pos, tool ) else: ! socket.clilocmessage( 501862, "", GRAY, NORMAL ) # You can't mine there. return OK --- 125,130 ---- mining( char, target.pos, tool ) else: ! # You can't mine there. ! socket.clilocmessage( 501862, "", GRAY ) return OK *************** *** 132,136 **** mining( char, target.pos, tool ) else: ! socket.clilocmessage( 501862, "", GRAY, NORMAL ) # You can't mine there. return OK else: --- 135,139 ---- mining( char, target.pos, tool ) else: ! socket.clilocmessage( 501862, "", GRAY ) # You can't mine there. return OK else: *************** *** 189,210 **** # Are you skilled enough ? And here is ore ? if ( resourcecount >= 1 ) and ( char.skill[ MINING ] >= reqskill ): ! skills.checkskill( char, veingem, MINING, 0 ) ! if resourcecount >= 5: # Digs up the large ore. ! successmining( char, veingem, oretable, resname, 1, oredefs[3] ) ! elif resourcecount == 3 or resourcecount == 4: # Picks one of the smaller ore types ! randomore = randrange( 1, 2 ) ! successmining( char, veingem, oretable, resname, 1, oredefs[randomore] ) ! elif resourcecount == 1 or resourcecount == 2: # Smallest ore only ! successmining( char, veingem, oretable, resname, 1, oredefs[0] ) ! # tool durability drain ! if tool.health > 1: ! tool.health -= 1 ! tool.update() ! elif tool.health == 1: ! tool.delete() ! success = 1 elif resourcecount == 0: ! socket.sysmessage( "There is no ore left here to mine...", GRAY, NORMAL ) if not veingem.hastag( 'resource_empty' ): wolfpack.addtimer( orerespawndelay, "skills.mining.respawnvein", [ veingem ] ) --- 192,220 ---- # Are you skilled enough ? And here is ore ? if ( resourcecount >= 1 ) and ( char.skill[ MINING ] >= reqskill ): ! if not skills.checkskill( char, veingem, MINING, 0 ): ! # You loosen some rocks but fail to find any usable ore. ! socket.clilocmessage( 501869, "", GRAY ) ! success = 0 ! return ! else: ! if resourcecount >= 5: # Digs up the large ore. ! successmining( char, veingem, oretable, resname, 1, oredefs[3] ) ! elif resourcecount == 3 or resourcecount == 4: # Picks one of the smaller ore types ! randomore = randrange( 1, 2 ) ! successmining( char, veingem, oretable, resname, 1, oredefs[randomore] ) ! elif resourcecount == 1 or resourcecount == 2: # Smallest ore only ! successmining( char, veingem, oretable, resname, 1, oredefs[0] ) ! # tool durability drain ! if tool.health > 1: ! tool.health -= 1 ! tool.update() ! elif tool.health == 1: ! tool.delete() ! # You have worn out your tool! ! socket.clilocmessage( 1044038, '', GRAY ) ! success = 1 elif resourcecount == 0: ! socket.sysmessage( "There is no metal here to mine.", GRAY ) if not veingem.hastag( 'resource_empty' ): wolfpack.addtimer( orerespawndelay, "skills.mining.respawnvein", [ veingem ] ) *************** *** 214,218 **** if success == 0: ! socket.clilocmessage( 501869, "", GRAY, NORMAL ) # You loosen some rocks but fail to find any usable ore. char.deltag('is_mining') --- 224,229 ---- if success == 0: ! # You loosen some rocks but fail to find any usable ore. ! socket.clilocmessage( 501869, "", GRAY ) char.deltag('is_mining') *************** *** 247,253 **** if resname == 'silver' or resname == 'merkite' or resname == 'mythril': ! socket.sysmessage( "You dig some " + table[ resname ][ RESOURCENAME ] + " and put it in your backpack.", GRAY, NORMAL ) else: ! socket.clilocmessage( message, "", GRAY, NORMAL ) return OK --- 258,265 ---- if resname == 'silver' or resname == 'merkite' or resname == 'mythril': ! socket.sysmessage( "You dig some " + table[ resname ][ RESOURCENAME ] + " and put it in your backpack.", GRAY ) else: ! # You dig some %s and put it in your backpack. ! socket.clilocmessage( message, "", GRAY ) return OK |
|
From: <dr...@pr...> - 2004-01-26 21:02:42
|
Update of /cvsroot/wpdev/xmlscripts/scripts/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21903/scripts/tools Modified Files: pickaxe.py Log Message: I found cliloc messages. Woo! (Should probably make an index or something... Index: pickaxe.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/tools/pickaxe.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pickaxe.py 25 Jan 2004 01:26:14 -0000 1.7 --- pickaxe.py 26 Jan 2004 21:01:01 -0000 1.8 *************** *** 18,40 **** #Already digging ? if char.hastag( 'is_mining' ) and ( int( char.gettag( 'is_mining' ) ) > servertime() ): ! char.socket.clilocmessage( 503029, "", GRAY, NORMAL ) # You are already digging. return OK # Can't mine on horses if char.itemonlayer( LAYER_MOUNT ): ! char.socket.clilocmessage( 501864, "", GRAY, NORMAL ) # You can't mine while riding. return OK # Who is tool owner ? if tool.getoutmostchar() != char: ! char.socket.clilocmessage( 500364, "", GRAY, NORMAL ) # You can't use that, it belongs to someone else return OK # Is that mining tool ? if isminingtool( tool ): ! char.socket.clilocmessage( 503033, "", GRAY, NORMAL ) # Where do you wish to dig? char.socket.attachtarget( "skills.mining.response", [ tool ] ) else: ! char.socket.clilocmessage( 500735, "", GRAY, NORMAL ) # Don't play with things you don't know about. :) return OK --- 18,44 ---- #Already digging ? if char.hastag( 'is_mining' ) and ( int( char.gettag( 'is_mining' ) ) > servertime() ): ! # You are already digging. ! char.socket.clilocmessage( 503029, "", GRAY ) return OK # Can't mine on horses if char.itemonlayer( LAYER_MOUNT ): ! # You can't mine while riding. ! char.socket.clilocmessage( 501864, "", GRAY ) return OK # Who is tool owner ? if tool.getoutmostchar() != char: ! # You can't use that, it belongs to someone else ! char.socket.clilocmessage( 500364, "", GRAY ) return OK # Is that mining tool ? if isminingtool( tool ): ! # Where do you wish to dig? ! char.socket.clilocmessage( 503033, "", GRAY) char.socket.attachtarget( "skills.mining.response", [ tool ] ) else: ! char.socket.clilocmessage( 500735, "", GRAY) # Don't play with things you don't know about. :) return OK |
|
From: <dr...@pr...> - 2004-01-26 21:02:36
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21903/scripts Modified Files: ore.py potions.py Log Message: I found cliloc messages. Woo! (Should probably make an index or something... Index: ore.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/ore.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ore.py 26 Jan 2004 13:48:49 -0000 1.3 --- ore.py 26 Jan 2004 21:00:40 -0000 1.4 *************** *** 50,69 **** if ore.getoutmostchar() != char: if char.pos.distance( ore.pos ) > 2: ! char.socket.clilocmessage( 0x7A258 ) # You can't reach... return OK else: if not ore.hastag( 'resname' ): ! char.socket.sysmessage( "This ore is not of workable quality...", GRAY ) return OK else: ! char.socket.sysmessage( "Where do you want to smelt the ore?", GRAY ) char.socket.attachtarget( "ore.response", [ ore.serial ] ) return OK else: if not ore.hastag( 'resname' ): ! char.socket.sysmessage( "This ore is not of workable quality...", GRAY ) return OK else: ! char.socket.sysmessage( "Where do you want to smelt the ore?", GRAY ) char.socket.attachtarget( "ore.response", [ ore.serial ] ) return OK --- 50,71 ---- if ore.getoutmostchar() != char: if char.pos.distance( ore.pos ) > 2: ! char.socket.clilocmessage( 501976, '', GRAY ) # You can't reach... return OK else: if not ore.hastag( 'resname' ): ! char.socket.clilocmessage( 501986, '', GRAY ) # Strange ore. return OK else: ! # Where do you want to smelt the ore? ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) char.socket.attachtarget( "ore.response", [ ore.serial ] ) return OK else: if not ore.hastag( 'resname' ): ! char.socket.clilocmessage( 501986, '', GRAY ) return OK else: ! # Where do you want to smelt the ore? ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) char.socket.attachtarget( "ore.response", [ ore.serial ] ) return OK *************** *** 105,112 **** elif target.item.id in oreids: if targetitem.serial == item.serial: - char.socket.sysmessage( "You can not combine a pile of ore with itself...", GRAY ) return OOPS if not targetitem.hastag('resname'): ! char.socket.sysmessage( "That ore is not of workable quality...", GRAY ) return OOPS # Largest Ore Pile --- 107,113 ---- elif target.item.id in oreids: if targetitem.serial == item.serial: return OOPS if not targetitem.hastag('resname'): ! char.socket.clilocmessage( 501986, '', GRAY ) return OOPS # Largest Ore Pile *************** *** 114,118 **** if targetitem.getoutmostchar() != char: if char.pos.distance( target.pos ) > 2: ! char.socket.clilocmessage( 0x7A258 ) # You can't reach... return OK else: --- 115,120 ---- if targetitem.getoutmostchar() != char: if char.pos.distance( target.pos ) > 2: ! # The ore is too far away. ! char.socket.clilocmessage( 501976, '', GRAY) return OK else: *************** *** 122,136 **** targetitem.update() item.delete() ! char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 4 ) targetitem.update() item.delete() ! char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) elif targetitem.id == item.id: targetitem.amount += item.amount targetitem.update() item.delete() ! char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) return OK else: --- 124,141 ---- targetitem.update() item.delete() ! # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 4 ) targetitem.update() item.delete() ! # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) elif targetitem.id == item.id: targetitem.amount += item.amount targetitem.update() item.delete() ! # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) return OK else: *************** *** 140,154 **** targetitem.update() item.delete() ! char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 4 ) targetitem.update() item.delete() ! char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) elif targetitem.id == item.id: ! targetitem.amount += item.amount ! targetitem.update() ! item.delete() ! char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) return OK --- 145,162 ---- targetitem.update() item.delete() ! # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 4 ) targetitem.update() item.delete() ! # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) elif targetitem.id == item.id: ! targetitem.amount += item.amount ! targetitem.update() ! item.delete() ! # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) return OK *************** *** 157,161 **** if targetitem.getoutmostchar() != char: if char.pos.distance( target.pos ) > 2: ! char.socket.clilocmessage( 0x7A258 ) # You can't reach... return OK else: --- 165,170 ---- if targetitem.getoutmostchar() != char: if char.pos.distance( target.pos ) > 2: ! # The ore is too far away. ! char.socket.clilocmessage( 501976, '', GRAY) return OK else: *************** *** 165,176 **** targetitem.update() item.delete() ! char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) elif targetitem.id == oreids[3]: ! char.socket.sysmessage( "You can not create a larger pile from a small pile of ore.", GRAY ) return OK else: --- 174,185 ---- targetitem.update() item.delete() ! return OK elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! return OK elif targetitem.id == oreids[3]: ! return OOPS return OK else: *************** *** 180,191 **** targetitem.update() item.delete() ! char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) elif targetitem.id == oreids[3]: ! char.socket.sysmessage( "You can not create a larger pile from a small pile of ore.", GRAY ) return OK --- 189,200 ---- targetitem.update() item.delete() ! return OK elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! return OK elif targetitem.id == oreids[3]: ! return OOPS return OK *************** *** 197,213 **** return OK else: - # Merge the ore piles if targetitem.id == oreids[1]: targetitem.amount += item.amount targetitem.update() item.delete() ! char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) elif targetitem.id == oreids[2] or targetitem.id == oreids[3]: ! char.socket.sysmessage( "You can not create a larger pile from a small pile of ore.", GRAY ) return OK else: --- 206,221 ---- return OK else: if targetitem.id == oreids[1]: targetitem.amount += item.amount targetitem.update() item.delete() ! return OK elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! return OK elif targetitem.id == oreids[2] or targetitem.id == oreids[3]: ! return OOPS return OK else: *************** *** 217,228 **** targetitem.update() item.delete() ! char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) elif targetitem.id == oreids[2] or targetitem.id == oreids[3]: ! char.socket.sysmessage( "You can not create a larger pile from a small pile of ore.", GRAY ) return OK --- 225,236 ---- targetitem.update() item.delete() ! return OK elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! return OK elif targetitem.id == oreids[2] or targetitem.id == oreids[3]: ! return OOPS return OK *************** *** 231,235 **** if targetitem.getoutmostchar() != char: if char.pos.distance( target.pos ) > 2: ! char.socket.clilocmessage( 0x7A258 ) # You can't reach... return OK else: --- 239,244 ---- if targetitem.getoutmostchar() != char: if char.pos.distance( target.pos ) > 2: ! # The ore is too far away. ! char.socket.clilocmessage( 501976 ) return OK else: *************** *** 262,294 **** reqskill = ingottable[ resname ][ REQSKILL ] if ore.amount >= 1 and char.skill[ MINING ] >= reqskill: ! skills.checkskill( char, forge, MINING, 0 ) ! if ore.id == oreids[3]: ! amount = ( ore.amount * 2 ) ! successsmelt( char, ingottable, resname, amount, ingotdef ) ! ore.delete() ! elif ore.id == oreids[2] or ore.id == oreids[1]: ! amount = ore.amount ! successsmelt( char, ingottable, resname, amount, ingotdef ) ! ore.delete() ! elif ore.id == oreids[0]: ! if evenorodd( ore.amount ) == "even": ! amount = ( ore.amount / 2 ) successsmelt( char, ingottable, resname, amount, ingotdef ) ore.delete() ! elif evenorodd( ore.amount ) == "odd" and ore.amount > 1: ! amount = ( ( ore.amount - 1 ) / 2 ) successsmelt( char, ingottable, resname, amount, ingotdef ) ! ore.amount = 1 ! ore.update() ! elif ore.amount == 1: ! char.socket.sysmessage( "You require more ore to produce any ingots.", GRAY ) ! success = 1 if success == 0: ! char.socket.sysmessage( "You smelt the ore but fail to produce any ingots.", GRAY ) ! ore.amount -= ( ore.amount / 2 ) ! ore.update() ! return OK --- 271,318 ---- reqskill = ingottable[ resname ][ REQSKILL ] + if not char.skill[ MINING ] >= reqskill: + # You have no idea how to smelt this strange ore! + char.socket.clilocmessage( 501986, '', GRAY ) + return OOPS + if ore.amount >= 1 and char.skill[ MINING ] >= reqskill: ! if not skills.checkskill( char, forge, MINING, 0 ): ! success = 0 ! return ! else: ! if ore.id == oreids[3]: ! amount = ( ore.amount * 2 ) successsmelt( char, ingottable, resname, amount, ingotdef ) ore.delete() ! elif ore.id == oreids[2] or ore.id == oreids[1]: ! amount = ore.amount successsmelt( char, ingottable, resname, amount, ingotdef ) ! ore.delete() ! elif ore.id == oreids[0]: ! if evenorodd( ore.amount ) == "even": ! amount = ( ore.amount / 2 ) ! successsmelt( char, ingottable, resname, amount, ingotdef ) ! ore.delete() ! elif evenorodd( ore.amount ) == "odd" and ore.amount > 1: ! amount = ( ( ore.amount - 1 ) / 2 ) ! successsmelt( char, ingottable, resname, amount, ingotdef ) ! ore.amount = 1 ! ore.update() ! elif ore.amount == 1: ! successsmelt( char, ingottable, resname, amount, ingotdef ) ! ore.delete() ! success = 1 if success == 0: ! if ore.amount >= 2: ! # You burn away the impurities but are left with less useable metal. ! char.socket.clilocmessage( 501990, '', GRAY ) ! ore.amount -= ( ore.amount / 2 ) ! ore.update() ! else: ! # You burn away the impurities but are left with no useable metal. ! char.socket.clilocmessage( 501989, '', GRAY ) ! ore.delete() ! return OK *************** *** 304,313 **** resourceitem.amount = amount resourceitem.settag( 'resname', str( resname ) ) # Used when smelting - message = "You smelt the ore and place some " + table[ resname ][ NAME] + "s into your backpack." if not wolfpack.utilities.tocontainer( resourceitem, char.getbackpack() ): resourceitem.update() ! socket.sysmessage( message, GRAY ) char.soundeffect( SOUND_HAMMER_1 ) --- 328,337 ---- resourceitem.amount = amount resourceitem.settag( 'resname', str( resname ) ) # Used when smelting if not wolfpack.utilities.tocontainer( resourceitem, char.getbackpack() ): resourceitem.update() ! # You smelt the ore removing the impurities and put the metal in your backpack. ! char.socket.clilocmessage( 501988, '', GRAY ) char.soundeffect( SOUND_HAMMER_1 ) Index: potions.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** potions.py 26 Jan 2004 11:40:42 -0000 1.8 --- potions.py 26 Jan 2004 21:00:41 -0000 1.9 *************** *** 75,80 **** if potiontype == 'lesser_heal' or potiontype == 'heal' or potiontype == 'greater_heal': if canUsePotion( char, item ): if char.hitpoints >= char.maxhitpoints: ! socket.sysmessage( 'You are already at full health!' ) else: healPotion( char, item, potiontype ) --- 75,85 ---- if potiontype == 'lesser_heal' or potiontype == 'heal' or potiontype == 'greater_heal': if canUsePotion( char, item ): + if char.hastag( 'poisoned' ): + # You can not heal yourself in your current state. + char.socket.clilocmessage( 1005000, '', GRAY ) + return OOPS if char.hitpoints >= char.maxhitpoints: ! # You decide against drinking this potion, as you are already at full health. ! char.socket.clilocmessage( 1049547, '', GRAY ) else: healPotion( char, item, potiontype ) *************** *** 91,95 **** agilityPotion( char, item, potiontype ) else: ! char.socket.sysmessage( 'You are already under a similar effect!', GRAY ) # Strength Potions --- 96,101 ---- agilityPotion( char, item, potiontype ) else: ! # You are already under a similar effect. ! char.socket.clilocmessage( 502173, '', GRAY ) # Strength Potions *************** *** 99,103 **** strengthPotion( char, item, potiontype ) else: ! char.socket.sysmessage( 'You are already under a similar effect!', GRAY ) # Poison Potions --- 105,110 ---- strengthPotion( char, item, potiontype ) else: ! # You are already under a similar effect. ! char.socket.clilocmessage( 502173, '', GRAY ) # Poison Potions *************** *** 170,174 **** elapsed = int( char.gettag( "heal_timer" ) ) if elapsed > wolfpack.time.servertime(): ! char.socket.clilocmessage( 0x7A20B, GRAY ) # You must wait 10 seconds before using another healing potion. return OOPS else: --- 177,181 ---- elapsed = int( char.gettag( "heal_timer" ) ) if elapsed > wolfpack.time.servertime(): ! char.socket.clilocmessage( 500235, '', GRAY ) # You must wait 10 seconds before using another healing potion. return OOPS else: *************** *** 200,204 **** # Resend Health char.updatehealth() ! char.socket.sysmessage( 'You healed ' + str( amount ) + ' hitpoints.', GRAY ) drinkAnim( char ) --- 207,212 ---- # Resend Health char.updatehealth() ! #char.socket.clilocmessage( 1060203, str(amount) , GRAY, NORMAL ) # broken ! char.socket.sysmessage( 'You have had ' + str( amount ) + ' hit points of damage healed.', GRAY ) drinkAnim( char ) |
|
From: <as...@pr...> - 2004-01-26 19:22:32
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3588 Modified Files: dragdrop.cpp Log Message: fixed pile splitting Index: dragdrop.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v retrieving revision 1.209 retrieving revision 1.210 diff -C2 -d -r1.209 -r1.210 *** dragdrop.cpp 26 Jan 2004 03:48:40 -0000 1.209 --- dragdrop.cpp 26 Jan 2004 09:43:15 -0000 1.210 *************** *** 164,167 **** --- 164,177 ---- splitItem->setSerial( World::instance()->findItemSerial() ); splitItem->setAmount( pItem->amount() - pickedAmount ); + + // Add tags to the splitted item + QStringList keys = pItem->getTags(); + QStringList::const_iterator it = keys.begin(); + while( it != keys.end() ) + { + splitItem->setTag( *it, pItem->getTag( *it ) ); + it++; + } + P_ITEM pContainer = dynamic_cast<P_ITEM>(pItem->container()); if ( pContainer ) |
|
From: <dr...@pr...> - 2004-01-26 18:29:15
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23448/scripts Modified Files: equipment.py Log Message: This fixes a glitch where it wouldn't update the stats on Unequip. Index: equipment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** equipment.py 14 Sep 2003 21:41:36 -0000 1.3 --- equipment.py 26 Jan 2004 06:23:08 -0000 1.4 *************** *** 1,3 **** --- 1,6 ---- + import wolfpack + from wolfpack.utilities import * + # Check for Strength Requirements def onWearItem( player, wearer, item, layer ): *************** *** 16,20 **** else: player.message( 'You cannot wear that item, you seem not agile enough.' ) ! return 1 if item.hastag( 'req_int' ) and wearer.intelligence < int( item.gettag( 'req_int' ) ): --- 19,23 ---- else: player.message( 'You cannot wear that item, you seem not agile enough.' ) ! return 1 if item.hastag( 'req_int' ) and wearer.intelligence < int( item.gettag( 'req_int' ) ): *************** *** 24,49 **** else: player.message( 'You cannot wear that item, you seem not smart enough.' ) ! return 1 return 0 def onEquip( char, item, layer ): ! # Boni? if item.hastag( 'boni_str' ): char.strength = char.strength + int( item.gettag( 'boni_str' ) ) ! if item.hastag( 'boni_dex' ): char.dexterity = char.dexterity + int( item.gettag( 'boni_dex' ) ) ! if item.hastag( 'boni_int' ): char.intelligence = char.intelligence + int( item.gettag( 'boni_int' ) ) ! def onUnequip( char, item, layer ): if item.hastag( 'boni_str' ): char.strength = char.strength - int( item.gettag( 'boni_str' ) ) ! if item.hastag( 'boni_dex' ): char.dexterity = char.dexterity - int( item.gettag( 'boni_dex' ) ) ! if item.hastag( 'boni_int' ): char.intelligence = char.intelligence - int( item.gettag( 'boni_int' ) ) --- 27,57 ---- else: player.message( 'You cannot wear that item, you seem not smart enough.' ) ! return 1 return 0 def onEquip( char, item, layer ): ! # Bonus Strength if item.hastag( 'boni_str' ): char.strength = char.strength + int( item.gettag( 'boni_str' ) ) ! # Bonus Dex if item.hastag( 'boni_dex' ): char.dexterity = char.dexterity + int( item.gettag( 'boni_dex' ) ) ! # Bonus Int if item.hastag( 'boni_int' ): char.intelligence = char.intelligence + int( item.gettag( 'boni_int' ) ) ! # Update Stats ! char.updatestats() ! def onUnequip( char, item, layer ): + # Bonus Str if item.hastag( 'boni_str' ): char.strength = char.strength - int( item.gettag( 'boni_str' ) ) ! # Bonus Dex if item.hastag( 'boni_dex' ): char.dexterity = char.dexterity - int( item.gettag( 'boni_dex' ) ) ! # Bonus Int if item.hastag( 'boni_int' ): char.intelligence = char.intelligence - int( item.gettag( 'boni_int' ) ) + # Update Stats + char.updatestats() |
|
From: <as...@pr...> - 2004-01-26 17:40:13
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3333 Modified Files: items.cpp Log Message: fixed a comment ;) Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.364 retrieving revision 1.365 diff -C2 -d -r1.364 -r1.365 *** items.cpp 25 Jan 2004 18:48:15 -0000 1.364 --- items.cpp 26 Jan 2004 09:42:30 -0000 1.365 *************** *** 775,779 **** pItem->setGateTime(currenttime + ( RandomNum( pItem->morex(), pItem->morey() ) * MY_CLOCKS_PER_SEC )); ! /* // Chest spawner --- 775,779 ---- pItem->setGateTime(currenttime + ( RandomNum( pItem->morex(), pItem->morey() ) * MY_CLOCKS_PER_SEC )); ! *//* // Chest spawner |
|
From: <dar...@pr...> - 2004-01-26 17:39:09
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16632/python Modified Files: char.cpp item.cpp Log Message: Fixed and cleaned python settag code for items. Index: char.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** char.cpp 22 Jan 2004 05:59:46 -0000 1.113 --- char.cpp 25 Jan 2004 00:51:35 -0000 1.114 *************** *** 659,679 **** PyObject *object; ! if( !PyArg_ParseTuple( args, "sO:char.settag( name, value )", &key, &object ) ) return 0; ! if( PyString_Check( object ) ) ! { ! self->pChar->removeTag( key ); ! self->pChar->setTag( key, cVariant( PyString_AsString( object ) ) ); ! } ! else if( PyInt_Check( object ) ) ! { ! self->pChar->removeTag( key ); ! self->pChar->setTag( key, cVariant( (int)PyInt_AsLong( object ) ) ); ! } ! else if( PyFloat_Check( object ) ) ! { ! self->pChar->removeTag( key ); ! self->pChar->setTag( key, cVariant( (double)PyFloat_AsDouble( object ) ) ); } --- 659,671 ---- PyObject *object; ! if (!PyArg_ParseTuple( args, "sO:char.settag( name, value )", &key, &object )) return 0; ! if (PyString_Check(object)) { ! self->pChar->setTag(key, cVariant(PyString_AsString(object))); ! } else if (PyInt_Check(object)) { ! self->pChar->setTag(key, cVariant((int)PyInt_AsLong(object))); ! } else if (PyFloat_Check(object)) { ! self->pChar->setTag(key, cVariant((double)PyFloat_AsDouble(object))); } Index: item.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** item.cpp 12 Jan 2004 04:58:15 -0000 1.78 --- item.cpp 25 Jan 2004 00:51:39 -0000 1.79 *************** *** 366,390 **** static PyObject* wpItem_settag( wpItem* self, PyObject* args ) { ! if( !self->pItem || self->pItem->free ) return PyFalse; ! char* pKey = 0, *pTag = 0; ! int iTag; ! cVariant tag; ! if( PyArg_ParseTuple( args, "ss:item.settag( key, tag )", &pKey, &pTag ) ) ! { ! tag = cVariant( QString( pTag ) ); ! } ! else if ( PyArg_ParseTuple( args, "si:item.settag( key, tag )", &pKey, &iTag ) ) ! { ! tag = cVariant( iTag ); ! }else ! return 0; ! ! QString key = pKey; ! self->pItem->removeTag( key ); ! self->pItem->setTag( key, tag ); return PyTrue; --- 366,385 ---- static PyObject* wpItem_settag( wpItem* self, PyObject* args ) { ! if (self->pItem->free) return PyFalse; ! char *key; ! PyObject *object; ! if (!PyArg_ParseTuple( args, "sO:char.settag( name, value )", &key, &object )) ! return 0; ! if (PyString_Check(object)) { ! self->pItem->setTag(key, cVariant(PyString_AsString(object))); ! } else if (PyInt_Check(object)) { ! self->pItem->setTag(key, cVariant((int)PyInt_AsLong(object))); ! } else if (PyFloat_Check(object)) { ! self->pItem->setTag(key, cVariant((double)PyFloat_AsDouble(object))); ! } return PyTrue; |
|
From: <dr...@pr...> - 2004-01-26 15:19:32
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23194/scripts/skills Modified Files: __init__.py mining.py Log Message: Mining now works great, all four ore types can be dug up. 12 ore types (silver, merkite and mythril are added ontop of OSI ones.) There is a few bugs that I noticed when clicking mountain tiles that are of certain angles but I think that is hard coded... I'll look into it later. Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/__init__.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** __init__.py 16 Jan 2004 21:14:20 -0000 1.8 --- __init__.py 25 Jan 2004 01:26:04 -0000 1.9 *************** *** 15,19 **** skilltable = \ { - ALCHEMY: [0, 0.5, 0.5, 1, 1000, FALSE], ANATOMY: [0.15, 0.15, 0.7, 1, 1000, FALSE ], --- 15,18 ---- *************** *** 88,111 **** return 0 - # table structure - look mining.py - def successharvest( char, gem, table, resname, amount ): - socket = char.socket - message = table[ resname ][ SUCCESSCLILOC ] - backpack = char.getbackpack() - if not backpack: - return OOPS - resourceitem = wolfpack.newitem( 1 ) # Get new serial - resourceitem.decay = 1 - resourceitem.color = table[ resname ][ COLORID ] - resourceitem.id = table[ resname ][ RESOURCEID ] - resourceitem.amount = amount - gem.settag( 'resourcecount', str( int( gem.gettag( 'resourcecount' ) ) - amount ) ) - - backpack.additem( resourceitem ) - - socket.clilocmessage( table[ resname ][ SUCCESSCLILOC ], "", GREEN, NORMAL ) - return OK - - def checkskill( char, targetobject, skillid, chance ): if char.dead: --- 87,90 ---- *************** *** 174,178 **** def statgain( char, stat ): #STATGAINDELAY is not over ? ! if char.hastag( 'laststatgain' ) and ( time.time() - int(char.gettag( 'laststatgain' ) ) ) < STATGAINDELAY: return OOPS --- 153,157 ---- def statgain( char, stat ): #STATGAINDELAY is not over ? ! if char.hastag( 'laststatgain' ) and ( time.time() - float(char.gettag( 'laststatgain' ) ) ) < STATGAINDELAY: return OOPS Index: mining.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mining.py 16 Jan 2004 21:14:20 -0000 1.7 --- mining.py 25 Jan 2004 01:26:05 -0000 1.8 *************** *** 12,15 **** --- 12,16 ---- from wolfpack.time import * from wolfpack.utilities import * + from random import randrange #mining calling from pickaxe.py and shovel.py *************** *** 17,34 **** oresound = 0x126 #in seconds ! miningdelay = 1600 # Name, reqSkill, minSkill, maxSkill, successClilocId, itemId, color, mutateVeinChance%, VeinChanceToFallback% oretable = \ { ! 'iron': [ 0, 0, 1000, 1007072, 0x19b9, 0x0, 49.6, 0 ], ! 'dullcopper': [ 650, 250, 1050, 1007073, 0x19b9, 0x973, 11.2, 50 ], ! 'shadowiron': [ 700, 300, 1100, 1007074, 0x19b9, 0x966, 9.8, 50 ], ! 'copper': [ 750, 350, 1150, 1007075, 0x19b9, 0x960, 8.4, 50 ], ! 'bronze': [ 800, 400, 1200, 1007076, 0x19b9, 0x972, 7, 50 ], ! 'gold': [ 850, 450, 1250, 1007077, 0x19b9, 0x8a5, 5.6, 50 ], ! 'agapite': [ 900, 500, 1300, 1007078, 0x19b9, 0x979, 4.2, 50 ], ! 'verite': [ 950, 550, 1350, 1007079, 0x19b9, 0x89f, 2.8, 50 ], ! 'valorite': [ 990, 590, 1390, 1007080, 0x19b9, 0x8ab, 1.4, 50 ] } --- 18,43 ---- oresound = 0x126 #in seconds ! miningdelay = 1000 ! orerespawndelay = randrange( 5, 10 ) * 60000 # 5 - 10 minutes # Name, reqSkill, minSkill, maxSkill, successClilocId, itemId, color, mutateVeinChance%, VeinChanceToFallback% + # 0x19b7, 0x19b8, 0x19ba give 1 ingot. + # 0x19b9 gives 2 ingots. + oreids = [ 0x19b7, 0x19b8, 0x19ba, 0x19b9 ] + oredefs = [ '19b7', '19b8', '19ba', '19b9' ] oretable = \ { ! 'iron': [ 0, 0, 1000, 1007072, 0x0, 'iron ore' ], ! 'dullcopper': [ 650, 250, 1050, 1007073, 0x973, 'dull copper ore' ], ! 'shadowiron': [ 700, 300, 1100, 1007074, 0x966, 'shadow iron ore' ], ! 'copper': [ 750, 350, 1150, 1007075, 0x96d, 'copper ore' ], ! 'bronze': [ 800, 400, 1200, 1007076, 0x972, 'bronze ore' ], ! 'gold': [ 850, 450, 1250, 1007077, 0x8a5, 'gold ore' ], ! 'silver': [ 875, 475, 1275, 1007077, 0x430, 'silver ore' ], ! 'agapite': [ 900, 500, 1300, 1007078, 0x979, 'agapite ore' ], ! 'verite': [ 950, 550, 1350, 1007079, 0x89f, 'verite ore' ], ! 'valorite': [ 990, 590, 1390, 1007080, 0x8ab, 'valorite ore' ], ! 'merkite': [ 995, 600, 1400, 1007080, 0x8b0, 'merkite ore' ], ! 'mythril': [ 1000, 605, 1405, 1007080, 0x84c, 'mythril ore' ] } *************** *** 38,45 **** char.turnto( pos ) char.action( ANIM_ATTACK3 ) - return OK - def getvein( socket, pos ): #Check if we have ore_gems near ( range = 4 ) --- 47,52 ---- *************** *** 47,52 **** if len( gems ) < 1: gem = wolfpack.additem( 'ore_gem' ) ! gem.settag( 'resourcecount', str( whrandom.randint( 10, 34 ) ) ) ! gem.settag( 'resname', 'iron' ) gem.moveto( pos ) gem.visible = 0 --- 54,85 ---- if len( gems ) < 1: gem = wolfpack.additem( 'ore_gem' ) ! gem.settag( 'resourcecount', str( randrange( 10, 34 ) ) ) # 10 - 34 ore ! gem.settag( 'resname', 'iron' ) # All veins should default to iron ore. ! ! # This will give it a chance to be a random ore type, this can change later. ! colorchance = randrange( 0, 100 ) ! if colorchance >= 99 and colorchance <= 100: # %2 chance for merkite (99 - 100) ! gem.settag( 'resname2', 'mythril' ) ! elif colorchance >= 96 and colorchance <= 98: # %3 chance for merkite (96 - 99) ! gem.settag( 'resname2', 'merkite') ! elif colorchance >= 92 and colorchance <= 95: # 4% chance for valorite (92 - 95) ! gem.settag( 'resname2', 'valorite' ) ! elif colorchance >= 87 and colorchance <= 91: # 5% chance for verite (87 - 91) ! gem.settag( 'resname2', 'verite') ! elif colorchance >= 81 and colorchance <= 86: # 6% chance for agapite (81 - 86) ! gem.settag( 'resname2', 'agapite') ! elif colorchance >= 74 and colorchance <= 80: # 7% chance for silver (74 - 80) ! gem.settag( 'resname2', 'silver') ! elif colorchance >= 66 and colorchance <= 73: # 8% chance for gold (66 - 73) ! gem.settag( 'resname2', 'gold') ! elif colorchance >= 57 and colorchance <= 65: # 9% chance for bronze (57 - 65) ! gem.settag( 'resname2', 'bronze') ! elif colorchance >= 47 and colorchance <= 56: # 10% chance for copper (47 - 56) ! gem.settag( 'resname2', 'copper') ! elif colorchance >= 36 and colorchance <= 46: # 11% chance for shadow iron (36 - 46) ! gem.settag( 'resname2', 'shadowiron') ! elif colorchance >= 24 and colorchance <= 35: # 12% chance for dull copper (24 - 35) ! gem.settag( 'resname2', 'dullcopper') ! gem.moveto( pos ) gem.visible = 0 *************** *** 56,60 **** return gems[0] - #Response from mining tool def response( char, args, target ): --- 89,92 ---- *************** *** 67,71 **** # Player can reach that ? if char.pos.map != pos.map or char.pos.distance( pos ) > MINING_MAX_DISTANCE: ! socket.clilocmessage( 500446, "", RED, NORMAL ) # That is too far away return OK --- 99,103 ---- # Player can reach that ? if char.pos.map != pos.map or char.pos.distance( pos ) > MINING_MAX_DISTANCE: ! socket.clilocmessage( 500446, "", GRAY, NORMAL ) # That is too far away return OK *************** *** 75,82 **** #Mine char ?! if target.char: ! socket.clilocmessage( 501863, "", RED, NORMAL ) # You can't mine that. return OK - #Check if item is ore gem elif target.item and isoregem( target.item ): --- 107,113 ---- #Mine char ?! if target.char: ! socket.clilocmessage( 501863, "", GRAY, NORMAL ) # You can't mine that. return OK #Check if item is ore gem elif target.item and isoregem( target.item ): *************** *** 92,96 **** mining( char, target.pos, tool ) else: ! socket.clilocmessage( 501862, "", RED, NORMAL ) # You can't mine there. return OK --- 123,127 ---- mining( char, target.pos, tool ) else: ! socket.clilocmessage( 501862, "", GRAY, NORMAL ) # You can't mine there. return OK *************** *** 101,105 **** mining( char, target.pos, tool ) else: ! socket.clilocmessage( 501862, "", RED, NORMAL ) # You can't mine there. return OK else: --- 132,136 ---- mining( char, target.pos, tool ) else: ! socket.clilocmessage( 501862, "", GRAY, NORMAL ) # You can't mine there. return OK else: *************** *** 115,124 **** socket = char.socket ! if char.hastag( 'mining_gem' ): ! veingem = wolfpack.finditem( char.gettag( 'mining_gem' ) ) if not veingem: veingem = getvein( socket, pos ) if not veingem: ! char.deltag( 'mining_gem' ) return OOPS else: --- 146,155 ---- socket = char.socket ! if char.hastag( 'ore_gem' ): ! veingem = wolfpack.finditem( char.gettag( 'ore_gem' ) ) if not veingem: veingem = getvein( socket, pos ) if not veingem: ! char.deltag( 'ore_gem' ) return OOPS else: *************** *** 127,131 **** return OOPS else: ! char.settag( 'mining_gem', str( veingem.serial ) ) if char.distanceto( veingem ) > MINING_MAX_DISTANCE: --- 158,162 ---- return OOPS else: ! char.settag( 'ore_gem', str( veingem.serial ) ) if char.distanceto( veingem ) > MINING_MAX_DISTANCE: *************** *** 138,145 **** return OOPS ! resname = veingem.gettag( 'resname' ) # Sometimes mutated in colored ore and back resourcecount = int( veingem.gettag( 'resourcecount' ) ) reqskill = oretable[ resname ][ REQSKILL ] ! success = 0 char.update() --- 169,185 ---- return OOPS ! if veingem.hastag( 'resname2' ): ! chance = randrange( 0, 10 ) ! if chance >= 6: # 50% chance to dig up whatever colored ore may exist. ! resname = veingem.gettag( 'resname2' ) ! else: # Default to the iron if failed to find color. ! resname = veingem.gettag( 'resname' ) ! ! elif not veingem.hastag( 'resname2' ) and veingem.hastag( 'resname' ): ! resname = veingem.gettag( 'resname' ) ! resourcecount = int( veingem.gettag( 'resourcecount' ) ) reqskill = oretable[ resname ][ REQSKILL ] ! success = 0 char.update() *************** *** 147,160 **** # Are you skilled enough ? And here is ore ? ! if resourcecount > 2 and ( char.skill[ MINING ] >= reqskill or char.skill[ MINING ] <= 100 ): ! skills.checkskill( char, veingem, MINING, 0 ) ! if whrandom.random() > 0.7: ! skills.successharvest( char, veingem, oretable, resname, 1 ) # 1 - amount of ore ! success = 1 if success == 0: socket.clilocmessage( 501869, "", GRAY, NORMAL ) # You loosen some rocks but fail to find any usable ore. ! char.deltag('is_mining') return OK --- 187,258 ---- # Are you skilled enough ? And here is ore ? ! if ( resourcecount >= 1 ) and ( char.skill[ MINING ] >= reqskill ): ! skills.checkskill( char, veingem, MINING, 0 ) ! if resourcecount >= 5: # Digs up the large ore. ! successmining( char, veingem, oretable, resname, 1, oredefs[3] ) ! elif resourcecount == 3 or resourcecount == 4: # Picks one of the smaller ore types ! randomore = randrange( 1, 2 ) ! successmining( char, veingem, oretable, resname, 1, oredefs[randomore] ) ! elif resourcecount == 1 or resourcecount == 2: # Smallest ore only ! successmining( char, veingem, oretable, resname, 1, oredefs[0] ) ! # tool durability drain ! if tool.health > 1: ! tool.health -= 1 ! tool.update() ! elif tool.health == 1: ! tool.delete() ! success = 1 ! ! elif resourcecount == 0: ! socket.sysmessage( "There is no ore left here to mine...", GRAY, NORMAL ) ! if not veingem.hastag( 'resource_empty' ): ! wolfpack.addtimer( orerespawndelay, "skills.mining.respawnvein", [ veingem ] ) ! veingem.settag( 'resource_empty', 'true') ! # veingem ! success = 1 if success == 0: socket.clilocmessage( 501869, "", GRAY, NORMAL ) # You loosen some rocks but fail to find any usable ore. ! char.deltag('is_mining') return OK + + def successmining( char, gem, table, resname, amount, ore ): + socket = char.socket + message = table[ resname ][ SUCCESSCLILOC ] + backpack = char.getbackpack() + if not backpack: + return OOPS + resourceitem = wolfpack.additem( ore ) + resourceitem.decay = 1 + resourceitem.name = str( table[ resname ][ RESOURCENAME ] ) + resourceitem.color = table[ resname ][ COLORID ] + resourceitem.amount = amount + resourceitem.settag( 'resname', str( resname ) ) # Used when smelting + + if not gem.hastag('resourcecount'): + return OOPS + + gem.settag( 'resourcecount', str( int( gem.gettag( 'resourcecount' ) ) - amount ) ) + + if int( gem.gettag( 'resourcecount' ) ) == 0: + if not gem.hastag ('resource_empty') and int( gem.gettag( 'resourcecount' ) ) == 0: + gem.settag( 'resource_empty', 'true' ) + wolfpack.addtimer( orerespawndelay, "skills.mining.respawnvein", [ gem ] ) + + if not wolfpack.utilities.tocontainer( resourceitem, backpack ): + resourceitem.update() + + if resname == 'silver' or resname == 'merkite' or resname == 'mythril': + socket.sysmessage( "You dig some " + table[ resname ][ RESOURCENAME ] + " and put it in your backpack.", GRAY, NORMAL ) + else: + socket.clilocmessage( message, "", GRAY, NORMAL ) + return OK + + def respawnvein( time, args ): + vein = args[0] + if vein.hastag ('resource_empty') and int( gem.gettag( 'resourcecount' ) ) == 0: + vein.settag( 'resourcecount', str( randrange( 10, 34 ) ) ) + vein.deltag('resource_empty') + return OK |
|
From: <dr...@pr...> - 2004-01-26 15:15:24
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4758 Added Files: dye.py sound.py Log Message: Usefull commands! --- NEW FILE: dye.py --- #===============================================================# # ) (\_ | WOLFPACK 13.0.0 Scripts # (( _/{ "-; | Created by: Dreoth # )).-' {{ ;'` | Revised by: # ( ( ;._ \\ ctr | Last Modification: Created #===============================================================# # .dye Command #===============================================================# import wolfpack from wolfpack.utilities import * def dye( socket, command, arguments ): try: color = int( hex2dec( str(arguments) ) ) socket.attachtarget( "wolfpack.commands.dye.response", [color] ) except: socket.sysmessage( 'Usage: dye <color-id>' ) def response( char, args, target ): if target.item: color = args[0] paint( char.socket, target.item, [color] ) else: char.socket.sysmessage( 'That was not a valid object.', GRAY ) def paint( socket, item, args ): item.color = hex(args[0]) item.update() def onLoad(): wolfpack.registercommand( "dye", dye ) --- NEW FILE: sound.py --- #===============================================================# # ) (\_ | WOLFPACK 13.0.0 Scripts # (( _/{ "-; | Created by: dreoth # )).-' {{ ;'` | Revised by: # ( ( ;._ \\ ctr | Last Modification: Created #===============================================================# # .sound Command # #===============================================================# import wolfpack from wolfpack.utilities import * def sound( socket, command, arguments ): try: sound = hex2dec( str(arguments) ) socket.player.soundeffect( sound ) except: socket.sysmessage( 'Usage: sound <sound-id>' ) def onLoad(): wolfpack.registercommand( "sound", sound ) |
|
From: <dr...@pr...> - 2004-01-26 14:58:08
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/chain In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24376/chain Added Files: mythril.xml silver.xml Log Message: Armor for silver/merkite/mythril. --- NEW FILE: mythril.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: Kosh | | )).-' {{ ;'` | Revised by: Viper, Dreoth | | ( ( ;._ \\ ctr | Last Modification: Color Split, both IDs | ================================================================= --> <definitions> <!-- chainmail armor --> <!-- chainmail coif --> <item id="mythril_armor_chain_coif"> <inherit id="13bb" /> <mythril_armor /> <category>Armor\Mythril\Chainmail\Coif (N/S)</category> </item> <item id="mythril_armor_chain_coif_2"> <inherit id="13c0" /> <mythril_armor /> <category>Armor\Mythril\Chainmail\Coif (E/W)</category> </item> <!-- chainmail leggings --> <item id="mythril_armor_chain_leggings"> <inherit id="13be" /> <mythril_armor /> <category>Armor\Mythril\Chainmail\Leggings (N/S)</category> </item> <item id="mythril_armor_chain_leggings_2"> <inherit id="13c3" /> <mythril_armor /> <category>Armor\Mythril\Chainmail\Leggings (E/W)</category> </item> <!-- chainmail tunic --> <item id="mythril_armor_chain_tunic"> <inherit id="13bf" /> <mythril_armor /> <category>Armor\Mythril\Chainmail\Tunic (N/S)</category> </item> <item id="mythril_armor_chain_tunic_2"> <inherit id="13c4" /> <mythril_armor /> <category>Armor\Mythril\Chainmail\Tunic (E/W)</category> </item> </definitions> --- NEW FILE: silver.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: Kosh | | )).-' {{ ;'` | Revised by: Viper, Dreoth | | ( ( ;._ \\ ctr | Last Modification: Color Split, both IDs | ================================================================= --> <definitions> <!-- chainmail armor --> <!-- chainmail coif --> <item id="silver_armor_chain_coif"> <inherit id="13bb" /> <silver_armor /> <category>Armor\Silver\Chainmail\Coif (N/S)</category> </item> <item id="silver_armor_chain_coif_2"> <inherit id="13c0" /> <silver_armor /> <category>Armor\Silver\Chainmail\Coif (E/W)</category> </item> <!-- chainmail leggings --> <item id="silver_armor_chain_leggings"> <inherit id="13be" /> <silver_armor /> <category>Armor\Silver\Chainmail\Leggings (N/S)</category> </item> <item id="silver_armor_chain_leggings_2"> <inherit id="13c3" /> <silver_armor /> <category>Armor\Silver\Chainmail\Leggings (E/W)</category> </item> <!-- chainmail tunic --> <item id="silver_armor_chain_tunic"> <inherit id="13bf" /> <silver_armor /> <category>Armor\Silver\Chainmail\Tunic (N/S)</category> </item> <item id="silver_armor_chain_tunic_2"> <inherit id="13c4" /> <silver_armor /> <category>Armor\Silver\Chainmail\Tunic (E/W)</category> </item> </definitions> |
|
From: <dar...@pr...> - 2004-01-26 14:52:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9172 Modified Files: key.py lock.py Log Message: Improved keys and locks. Index: key.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/key.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** key.py 25 Jan 2004 00:45:38 -0000 1.3 --- key.py 25 Jan 2004 20:26:54 -0000 1.4 *************** *** 1,12 **** - # TODO: implementation of renaming and unlocking/locking etc. - from wolfpack.consts import * import wolfpack ! import wolfpack.gumps import random ! def onLoad(): ! pass def lock_response(char, args, target): --- 1,70 ---- from wolfpack.consts import * import wolfpack ! from wolfpack.gumps import cGump import random ! def gump_response(char, args, response): ! if len(args) < 1: ! return ! ! key = wolfpack.finditem(args[0]) ! ! if not char.canreach(key, 5): ! char.socket.clilocmessage(501661) ! return ! ! # Rename ! new_name = response.text[1][:30] # 30 Chars max. ! key.name = new_name ! ! # Rekey ! if char.gm: ! new_lock = response.text[2] ! ! if len(new_lock) != 0: ! key.settag(new_lock) ! char.socket.sysmessage('This key now unlocks:' + new_lock) ! else: ! key.deltag('lock') ! char.socket.sysmessage('You erase the lock information.') ! ! def rename_key(char, key): ! ! # Build the lock gump ! gump = cGump(x=100, y=100, callback="key.gump_response") ! gump.setArgs([key.serial]) ! ! # Renaming, blanking and modification of keys allowed for gms ! gump.addBackground(id=0x2436, width=425, height=285) ! ! if char.gm: ! text = '<basefont color="#FECECE"><h3>Manage Key</h3><br><basefont color="#FEFEFE">This dialog will help you to manage or rename this key.' ! else: ! text = '<basefont color="#FECECE"><h3>Manage Key</h3><br><basefont color="#FEFEFE">This dialog will help you to rename this key.' ! ! gump.addHtmlGump(x=20, y=20, width=410, height=90, html=text) ! ! gump.addText(x=20, y=65, text='The name of this key:', hue=0x835) ! gump.addResizeGump(x=20, y=88, id=0xBB8, width=200, height=25) ! gump.addInputField(x=25, y=90, width=190, height=20, hue=0x834, id=1, starttext=key.name) ! ! # InputField for the key id ! if char.gm: ! lock = '' ! if key.hastag('lock'): ! lock = str(key.gettag('lock')) ! ! gump.addText(x=235, y=65, text='The lock id of this key:', hue=0x835) ! gump.addResizeGump(x=235, y=88, id=0xBB8, width=160, height=25) ! gump.addInputField(x=240, y=90, width=150, height=20, hue=0x834, id=2, starttext=lock) ! ! gump.addText(x=50, y=130, text='Modify key', hue=0x835) ! gump.addButton(x=20, y=130, up=0x26af, down=0x26b1, returncode=1) ! ! gump.addText(x=50, y=170, text='Cancel', hue=0x835) ! gump.addButton(x=20, y=170, up=0x26af, down=0x26b1, returncode=0) ! ! gump.send(char) def lock_response(char, args, target): *************** *** 24,31 **** return - # a) Targetted a lockable item if target.item == key: ! char.socket.sysmessage('rename key') ! # Gump... elif 'lock' in target.item.events: --- 82,87 ---- return if target.item == key: ! rename_key(char,key) elif 'lock' in target.item.events: *************** *** 33,37 **** target.item.deltag('locked') else: ! target.item.settag('locked','1') char.soundeffect(0x241) --- 89,93 ---- target.item.deltag('locked') else: ! target.item.settag('locked',1) char.soundeffect(0x241) *************** *** 92,95 **** --- 148,155 ---- tooltip.add(0xF9060 + item.id, '') + # The user defined name + if len(item.name) != 0: + tooltip.add(1050045, " \t" + item.name + "\t ") + # Add the lock id for gms if char.gm: Index: lock.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/lock.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lock.py 25 Jan 2004 00:45:39 -0000 1.4 --- lock.py 25 Jan 2004 20:26:54 -0000 1.5 *************** *** 157,188 **** wolfpack.registercommand("lock", commandLock) ! # ! # Event for Locking Items ! # ! def onUse( char, item ): ! events = item.events ! if not item.hastag( 'lock' ): ! return 0 ! lock = item.gettag( 'lock' ) ! ! if lock != 'magic': ! if item.hastag('locked'): ! locked = int(item.gettag('locked')) ! else: ! locked = 0 ! ! if locked == 0: ! return 0 ! ! # Search for a key in the users backpack ! #backpack = char.getbackpack() ! ! #if searchkey(backpack, lock): ! # if 'door' in events: ! # char.message(501282) # quickly open / relock ! # return 0 ! ! char.message(502503) # Thats locked ! return 1 --- 157,203 ---- wolfpack.registercommand("lock", commandLock) ! def searchkey(item, lock): ! # It's a key. ! if 'key' in item.events and item.hastag('lock'): ! if lock == str(item.gettag('lock')): ! return 1 ! for subitem in item.content: ! if searchkey(subitem, lock): ! return 1 ! return 0 ! ! def onUse(char, item): ! # The item is not locked ! if not item.hastag('lock'): ! return 0 ! ! # The magic lock spell has the lock id 'magic' ! lock = str(item.gettag('lock')) ! locked = 0 ! ! if item.hastag('locked'): ! locked = int(item.gettag('locked')) ! ! # For magic locks, the locked flag is irrelevant ! if lock != 'magic' and locked == 0: ! return 0 ! ! # GMs ignore locks but their access should be logged ! if char.gm: ! char.socket.clilocmessage(501281) ! return 0 ! ! # Only doors can be opened without unlocking them ! # if the user has the key in his posession. ! if 'door' in item.events: ! if searchkey(char.getbackpack(), lock): ! char.socket.clilocmessage(501282) ! return 0 ! ! char.socket.clilocmessage(500788) ! else: ! char.socket.clilocmessage(501746) ! ! return 1 \ No newline at end of file |
|
From: <dar...@pr...> - 2004-01-26 14:33:42
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27383/network Modified Files: uosocket.cpp Log Message: Fixed an issue with onDropOnItem... Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.302 retrieving revision 1.303 diff -C2 -d -r1.302 -r1.303 *** uosocket.cpp 22 Jan 2004 04:48:12 -0000 1.302 --- uosocket.cpp 26 Jan 2004 03:48:40 -0000 1.303 *************** *** 1085,1089 **** void cUOSocket::handleToolTip( cUORxRequestToolTip *packet ) { - P_CHAR pChar; P_ITEM pItem; --- 1085,1088 ---- *************** *** 1094,1101 **** if( pItem ) { ! tooltips.setSerial( pItem->serial() ); ! tooltips.setId( pItem->getTooltip() ); ! if( !pItem->onShowTooltip( this->player(), &tooltips ) ) // just for test if object haven't tooltip { if( pItem->name().isNull() || pItem->name().isEmpty() ) --- 1093,1100 ---- if( pItem ) { ! tooltips.setSerial(pItem->serial()); ! tooltips.setId(pItem->getTooltip()); ! if(!pItem->onShowTooltip(this->player(),&tooltips)) // just for test if object haven't tooltip { if( pItem->name().isNull() || pItem->name().isEmpty() ) |
|
From: <dar...@pr...> - 2004-01-26 14:26:47
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15312 Modified Files: key.py lock.py Log Message: Fixed locks and added unlocking/locking functionality to keys. Index: key.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/key.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** key.py 24 Jan 2004 22:33:25 -0000 1.2 --- key.py 25 Jan 2004 00:45:38 -0000 1.3 *************** *** 11,14 **** --- 11,42 ---- def lock_response(char, args, target): + if len(args) != 1: + return + + key = wolfpack.finditem(args[0]) + if not key or not char.canreach(key,5): + char.socket.clilocmessage(501661) + return + + # Check for an item target. + if not target.item or not char.canreach(target.item,5): + char.socket.clilocmessage(501666) + return + + # a) Targetted a lockable item + if target.item == key: + char.socket.sysmessage('rename key') + # Gump... + + elif 'lock' in target.item.events: + if target.item.hastag('locked') and int(target.item.gettag('locked')) == 1: + target.item.deltag('locked') + else: + target.item.settag('locked','1') + char.soundeffect(0x241) + + else: + char.socket.clilocmessage(501666) + return Index: lock.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/lock.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lock.py 23 Jan 2004 00:39:03 -0000 1.3 --- lock.py 25 Jan 2004 00:45:39 -0000 1.4 *************** *** 178,187 **** # Search for a key in the users backpack ! backpack = char.getbackpack() ! if searchkey(backpack, lock): ! if 'door' in events: ! char.message(501282) # quickly open / relock ! return 0 char.message(502503) # Thats locked --- 178,187 ---- # Search for a key in the users backpack ! #backpack = char.getbackpack() ! #if searchkey(backpack, lock): ! # if 'door' in events: ! # char.message(501282) # quickly open / relock ! # return 0 char.message(502503) # Thats locked |
|
From: <dr...@pr...> - 2004-01-26 13:49:51
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27237/scripts/skills Modified Files: mining.py Added Files: lumberjacking.py Log Message: Slight tweaks, updates, syncs, etc. Split the lumberjacking code from weapons.blades to skills.lumberjacking. Later today I'll work on the rest of the potions. --- NEW FILE: lumberjacking.py --- import wolfpack import wolfpack.time from wolfpack.consts import * from wolfpack.utilities import hex2dec import wolfpack.utilities import whrandom import weapons.blades import skills trees = [] trees = wolfpack.list( "IDS_TREE" ) # Check for Wood at a specific position def check_wood( pos ): statics = wolfpack.statics( pos.x, pos.y, pos.map ) for item in statics: id = item[ "id" ] if is_tree( id ): return 1 # Check normal items dynamics = wolfpack.items( pos.x, pos.y, pos.map ) for item in dynamics: if is_tree( item.id ): return 1 return 0 # Delay for chopping trees and getting the logs def chop_delay( time, args ): char = args[0] pos = args[1] resource = args[2] amount = args[3] # Skill Check against LUMBERJACKING if not char.checkskill( LUMBERJACKING, LUMBERJACKING_MIN_SKILL, LUMBERJACKING_MAX_SKILL ): char.socket.clilocmessage( 0x7A30F, "", 0x3b2, 3, char ) # You hack at the tree for a while but fail to produce... return char.socket.clilocmessage( 0x7A312, "", 0x3b2, 3, char ) # You put some logs into your backpack # Create an item in my pack (logs to be specific) item = wolfpack.additem( "1bdd" ) item.amount = 10 item.settag( 'resname', 'plainwood' ) if not wolfpack.utilities.tobackpack( item, char ): item.update() # Create a resource item if neccesary if not resource: resource = wolfpack.additem( "1ea7" ) resource.name = 'Resource Item: logs' resource.settag( 'resourcecount', str( amount - 1 ) ) resource.settag( 'resource', 'logs' ) resource.visible = 0 # GM Visible only resource.moveto( pos ) resource.decay = 1 resource.decaytime = wolfpack.time.servertime() + ( LUMBERJACKING_REFILLTIME * 1000 ) resource.update() # Send to GMs else: resource.settag( 'resourcecount', amount - 1 ) return OK # Animation Sequence def chop_tree_two( time, args ): char = args[0] pos = args[1] # Turn to our lumberjacking position direction = char.directionto( pos ) if char.direction != direction: char.direction = direction char.updateflags() # Let him hack char.action( 0xd ) char.soundeffect( 0x13e ) return OK def chop_tree_three( time, args ): char = args[0] pos = args[1] # Turn to our lumberjacking position direction = char.directionto( pos ) if char.direction != direction: char.direction = direction char.updateflags() # Let him hack char.action( 0xd ) char.soundeffect( 0x13e ) return OK # Is "model" a Tree art-tile? def is_tree( model ): # List consists of hexadecimal integers for tree in trees: tree = hex2dec( tree ) if tree == model: return 1 return 0 # HACK LOGS def hack_logs( char, pos ): # Try to find a resource item resource = None dynamics = wolfpack.items( pos.x, pos.y, pos.map ) for item in dynamics: if item.id == 0x1ea7 and item.hastag( 'resourcecount' ) and item.hastag( 'resource' ) and item.gettag( 'resource' ) == 'logs': # Check if the resource item didn't expire already (could be a bug!) if item.decaytime <= wolfpack.time.servertime(): item.delete() else: resource = item break # Default Range for each tree is 10 to 15 Logs if not resource: amount = whrandom.randint( LUMBERJACKING_MIN_LOGS, LUMBERJACKING_MAX_LOGS ) else: amount = int( resource.gettag( 'resourcecount' ) ) # No resource left to harvest? if amount < 1: char.socket.clilocmessage( 0x7A30D, "", 0x3b2, 3, char ) # There's not enough wood here to harvest. return # Turn to our lumberjacking position direction = char.directionto( pos ) if char.direction != direction: char.direction = direction char.updateflags() # Let him hack char.action( 0xd ) char.soundeffect( 0x13e ) wolfpack.addtimer( 2000, "weapons.blades.chop_tree_two", [char, pos] ) wolfpack.addtimer( 3500, "weapons.blades.chop_tree_three", [char, pos] ) wolfpack.addtimer( 4000, "weapons.blades.chop_delay", [char, pos, resource, amount ] ) return # HACK KINDLINGS def hack_kindling( char, pos ): if pos.distance( char.pos ) > 3: char.socket.clilocmessage( 0x7A258 ) # You cannot reach that return 1 direction = char.directionto( pos ) if char.direction != direction: char.direction = direction char.updateflags() # Let's add some Kindling item = wolfpack.additem( "de1" ) if not wolfpack.utilities.tobackpack( item, char ): item.update() # Let him hack char.action( 0x9 ) char.soundeffect( 0x13e ) char.socket.clilocmessage( 0x7A30B ) # You put some kindlings in your pack Index: mining.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mining.py 26 Jan 2004 06:02:24 -0000 1.10 --- mining.py 26 Jan 2004 13:48:49 -0000 1.11 *************** *** 1,7 **** ################################################################# ! # ) (\_ # WOLFPACK 13.0.0 Scripts # ! # (( _/{ "-; # Created by: codex # ! # )).-' {{ ;'` # Revised by: # ! # ( ( ;._ \\ ctr # Last Modification: Sep, 30 '03 # ################################################################# --- 1,7 ---- ################################################################# ! # ) (\_ # WOLFPACK 13.0.0 Scripts ! # (( _/{ "-; # Created by: codex ! # )).-' {{ ;'` # Revised by: Dreoth ! # ( ( ;._ \\ ctr # Last Modification: Jan 26 2004 ################################################################# *************** *** 16,24 **** #mining calling from pickaxe.py and shovel.py - oresound = 0x126 #in seconds miningdelay = 1000 orerespawndelay = randrange( 5, 10 ) * 60000 # 5 - 10 minutes - # Name, reqSkill, minSkill, maxSkill, successClilocId, itemId, color, mutateVeinChance%, VeinChanceToFallback% # 0x19b7, 0x19b8, 0x19ba give 1 ingot. --- 16,22 ---- *************** *** 26,29 **** --- 24,29 ---- oreids = [ 0x19b7, 0x19b8, 0x19ba, 0x19b9 ] oredefs = [ '19b7', '19b8', '19ba', '19b9' ] + + # resname, reqSkill, minSkill, maxSkill, successClilocId, color, 'ore name' oretable = \ { *************** *** 43,47 **** def mining( char, pos, tool ): ! wolfpack.addtimer( 1300, "skills.mining.domining", [ char, oresound, tool, pos ] ) char.settag( 'is_mining', str( servertime() + miningdelay ) ) char.turnto( pos ) --- 43,47 ---- def mining( char, pos, tool ): ! wolfpack.addtimer( 1300, "skills.mining.domining", [ char, SOUND_MINING, tool, pos ] ) char.settag( 'is_mining', str( servertime() + miningdelay ) ) char.turnto( pos ) |
|
From: <dr...@pr...> - 2004-01-26 13:49:51
|
Update of /cvsroot/wpdev/xmlscripts/scripts/weapons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27237/scripts/weapons Modified Files: blades.py Log Message: Slight tweaks, updates, syncs, etc. Split the lumberjacking code from weapons.blades to skills.lumberjacking. Later today I'll work on the rest of the potions. Index: blades.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/weapons/blades.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** blades.py 14 Jan 2004 17:53:38 -0000 1.11 --- blades.py 26 Jan 2004 13:48:50 -0000 1.12 *************** *** 12,15 **** --- 12,16 ---- from wolfpack.consts import * from wolfpack.utilities import hex2dec + from skills.lumberjacking import * import wolfpack.utilities import whrandom *************** *** 18,28 **** # Lists of IDs blood = [ "122a", "122b", "122d", "122f" ] - trees = [] fish = [ 0x9cc, 0x9cd, 0x9ce, 0x9cf ] - def onLoad(): - # Load the list of valid trees just once - weapons.blades.trees = wolfpack.list( "IDS_TREE" ) - def onUse( char, item ): char.socket.clilocmessage( 0xF69A6 ) # What do you want to use this on? --- 19,24 ---- *************** *** 79,86 **** # Check for Trees ! if not is_tree( model ): char.socket.clilocmessage( 0x7A30E ) # You can't use a bladed item on that else: ! if not check_wood( target.pos ): char.clilocmessage( 0x7A7C4 ) # Cheaters never win. return --- 75,82 ---- # Check for Trees ! if not skills.lumberjacking.is_tree( model ): char.socket.clilocmessage( 0x7A30E ) # You can't use a bladed item on that else: ! if not skills.lumberjacking.check_wood( target.pos ): char.clilocmessage( 0x7A7C4 ) # Cheaters never win. return *************** *** 93,227 **** return else: ! hack_logs( char, target.pos ) # Swords and Fencing Weapons: Get kindling elif item.type == 1001 or item.type == 1005: ! hack_kindling( char, target.pos ) ! ! # Check for Wood at a specific position ! def check_wood( pos ): ! statics = wolfpack.statics( pos.x, pos.y, pos.map ) ! ! for item in statics: ! id = item[ "id" ] ! ! if is_tree( id ): ! return 1 ! ! # Check normal items ! dynamics = wolfpack.items( pos.x, pos.y, pos.map ) ! ! for item in dynamics: ! if is_tree( item.id ): ! return 1 ! ! return 0 ! ! # Delay for chopping trees and getting the logs ! def chop_delay( time, args ): ! char = args[0] ! pos = args[1] ! resource = args[2] ! amount = args[3] ! ! # Skill Check against LUMBERJACKING ! if not char.checkskill( LUMBERJACKING, LUMBERJACKING_MIN_SKILL, LUMBERJACKING_MAX_SKILL ): ! char.socket.clilocmessage( 0x7A30F, "", 0x3b2, 3, char ) # You hack at the tree for a while but fail to produce... ! return ! ! char.socket.clilocmessage( 0x7A312, "", 0x3b2, 3, char ) # You put some logs into your backpack ! ! # Create an item in my pack (logs to be specific) ! item = wolfpack.additem( "1be0" ) ! item.amount = 10 ! if not wolfpack.utilities.tobackpack( item, char ): ! item.update() ! ! # Create a resource item if neccesary ! if not resource: ! resource = wolfpack.additem( "1ea7" ) ! resource.name = 'Resource Item: logs' ! resource.settag( 'resourcecount', str( amount - 1 ) ) ! resource.settag( 'resource', 'logs' ) ! resource.visible = 0 # GM Visible only ! resource.moveto( pos ) ! resource.decay = 1 ! resource.decaytime = wolfpack.time.servertime() + ( LUMBERJACKING_REFILLTIME * 1000 ) ! resource.update() # Send to GMs ! else: ! resource.settag( 'resourcecount', amount - 1 ) ! ! return OK ! ! # Animation Sequence ! def chop_tree_two( time, args ): ! char = args[0] ! pos = args[1] ! # Turn to our lumberjacking position ! direction = char.directionto( pos ) ! if char.direction != direction: ! char.direction = direction ! char.updateflags() ! ! # Let him hack ! char.action( 0xd ) ! char.soundeffect( 0x13e ) ! return OK ! ! def chop_tree_three( time, args ): ! char = args[0] ! pos = args[1] ! # Turn to our lumberjacking position ! direction = char.directionto( pos ) ! if char.direction != direction: ! char.direction = direction ! char.updateflags() ! ! # Let him hack ! char.action( 0xd ) ! char.soundeffect( 0x13e ) ! return OK ! ! # HACK LOGS ! def hack_logs( char, pos ): ! # Try to find a resource item ! resource = None ! ! dynamics = wolfpack.items( pos.x, pos.y, pos.map ) ! ! for item in dynamics: ! if item.id == 0x1ea7 and item.hastag( 'resourcecount' ) and item.hastag( 'resource' ) and item.gettag( 'resource' ) == 'logs': ! ! # Check if the resource item didn't expire already (could be a bug!) ! if item.decaytime <= wolfpack.time.servertime(): ! item.delete() ! else: ! resource = item ! break ! ! # Default Range for each tree is 10 to 15 Logs ! if not resource: ! amount = whrandom.randint( LUMBERJACKING_MIN_LOGS, LUMBERJACKING_MAX_LOGS ) ! else: ! amount = int( resource.gettag( 'resourcecount' ) ) ! ! # No resource left to harvest? ! if amount < 1: ! char.socket.clilocmessage( 0x7A30D, "", 0x3b2, 3, char ) # There's not enough wood here to harvest. ! return ! ! # Turn to our lumberjacking position ! direction = char.directionto( pos ) ! if char.direction != direction: ! char.direction = direction ! char.updateflags() ! ! # Let him hack ! char.action( 0xd ) ! char.soundeffect( 0x13e ) ! ! wolfpack.addtimer( 2000, "weapons.blades.chop_tree_two", [char, pos] ) ! wolfpack.addtimer( 3500, "weapons.blades.chop_tree_three", [char, pos] ) ! wolfpack.addtimer( 4000, "weapons.blades.chop_delay", [char, pos, resource, amount ] ) ! return # CARVE CORPSE --- 89,96 ---- return else: ! skills.lumberjacking.hack_logs( char, target.pos ) # Swords and Fencing Weapons: Get kindling elif item.type == 1001 or item.type == 1005: ! skills.lumberjacking.hack_kindling( char, target.pos ) # CARVE CORPSE *************** *** 272,309 **** corpse.carve = '' - # HACK KINDLINGS - def hack_kindling( char, pos ): - if pos.distance( char.pos ) > 3: - char.socket.clilocmessage( 0x7A258 ) # You cannot reach that - return 1 - - direction = char.directionto( pos ) - if char.direction != direction: - char.direction = direction - char.updateflags() - - # N O T E: For anti-cheat prevention we have to check - # if the statics REALLY contain the tree - - # Let's add some Kindling - item = wolfpack.additem( "de1" ) - if not wolfpack.utilities.tobackpack( item, char ): - item.update() - - # Let him hack - char.action( 0x9 ) - char.soundeffect( 0x13e ) - char.socket.clilocmessage( 0x7A30B ) # You put some kindlings in your pack - - # Is "model" a Tree art-tile? - def is_tree( model ): - # List consists of hexadecimal integers - for tree in trees: - tree = hex2dec( tree ) - if tree == model: - return 1 - - return 0 - # CUT FISH def cut_fish( char, item ): --- 141,144 ---- |
|
From: <dr...@pr...> - 2004-01-26 13:49:50
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27237/definitions Modified Files: scripts.xml Log Message: Slight tweaks, updates, syncs, etc. Split the lumberjacking code from weapons.blades to skills.lumberjacking. Later today I'll work on the rest of the potions. Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** scripts.xml 26 Jan 2004 03:21:07 -0000 1.74 --- scripts.xml 26 Jan 2004 13:48:49 -0000 1.75 *************** *** 6,9 **** --- 6,10 ---- --> <definitions> + <definitions> <script>trading</script> <script>npc.healer</script> *************** *** 33,38 **** <script>equipment</script> <script>bandages</script> ! <script>key</script> ! <script>keyring</script> <script>ore</script> --- 34,39 ---- <script>equipment</script> <script>bandages</script> ! <script>key</script> ! <script>keyring</script> <script>ore</script> *************** *** 130,133 **** --- 131,135 ---- <script>skills.provocation</script> <script>skills.mining</script> + <script>skills.lumberjacking</script> </definitions> |
|
From: <dr...@pr...> - 2004-01-26 13:49:50
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27237/scripts/wolfpack Modified Files: consts.py Log Message: Slight tweaks, updates, syncs, etc. Split the lumberjacking code from weapons.blades to skills.lumberjacking. Later today I'll work on the rest of the potions. Index: consts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** consts.py 26 Jan 2004 11:40:42 -0000 1.39 --- consts.py 26 Jan 2004 13:48:50 -0000 1.40 *************** *** 107,163 **** skillnamesids = \ ! { ! 'alchemy' : ALCHEMY, ! 'anatomy' : ANATOMY, ! 'animallore' : ANIMALLORE, ! 'itemid' : ITEMID, ! 'armslore' : ARMSLORE, 'parrying' : PARRYING, ! 'begging' : BEGGING, ! 'blacksmithing' : BLACKSMITHING, ! 'bowcraft' : BOWCRAFT, ! 'peacemaking' : PEACEMAKING, ! 'camping' : CAMPING, 'carpentry' : CARPENTRY, ! 'cartography' : CARTOGRAPHY, ! 'cooking' : COOKING, ! 'detectinghidden' : DETECTINGHIDDEN, ! 'enticement' : ENTICEMENT, 'evaluatingintel' : EVALUATINGINTEL, ! 'healing' : HEALING, ! 'fishing' : FISHING, ! 'forensics' : FORENSICS, ! 'herding' : HERDING, ! 'hiding' : HIDING, 'provocation' : PROVOCATION, ! 'inscription' : INSCRIPTION, ! 'lockpicking' : LOCKPICKING, ! 'magery' : MAGERY, ! 'magicresistance' : MAGICRESISTANCE, ! 'tactics' : TACTICS, 'snooping' : SNOOPING, ! 'musicianship' : MUSICIANSHIP, ! 'poisoning' : POISONING, ! 'archery' : ARCHERY, ! 'spiritspeak' : SPIRITSPEAK, ! 'stealing' : STEALING, 'tailoring' : TAILORING, ! 'taming' : TAMING, ! 'tasteid' : TASTEID, ! 'tinkering' : TINKERING, ! 'tracking' : TRACKING, ! 'veterinary' : VETERINARY, 'swordsmanship' : SWORDSMANSHIP, ! 'macefighting' : MACEFIGHTING, ! 'fencing' : FENCING, ! 'wrestling' : WRESTLING, ! 'lumberjacking' : LUMBERJACKING, ! 'mining' : MINING, 'meditation' : MEDITATION, ! 'stealth' : STEALTH, ! 'removetraps' : REMOVETRAPS, ! 'necromancy' : NECROMANCY, ! 'focus' : FOCUS, ! 'chivalry' : CHIVALRY } --- 107,163 ---- skillnamesids = \ ! { ! 'alchemy' : ALCHEMY, ! 'anatomy' : ANATOMY, ! 'animallore' : ANIMALLORE, ! 'itemid' : ITEMID, ! 'armslore' : ARMSLORE, 'parrying' : PARRYING, ! 'begging' : BEGGING, ! 'blacksmithing' : BLACKSMITHING, ! 'bowcraft' : BOWCRAFT, ! 'peacemaking' : PEACEMAKING, ! 'camping' : CAMPING, 'carpentry' : CARPENTRY, ! 'cartography' : CARTOGRAPHY, ! 'cooking' : COOKING, ! 'detectinghidden' : DETECTINGHIDDEN, ! 'enticement' : ENTICEMENT, 'evaluatingintel' : EVALUATINGINTEL, ! 'healing' : HEALING, ! 'fishing' : FISHING, ! 'forensics' : FORENSICS, ! 'herding' : HERDING, ! 'hiding' : HIDING, 'provocation' : PROVOCATION, ! 'inscription' : INSCRIPTION, ! 'lockpicking' : LOCKPICKING, ! 'magery' : MAGERY, ! 'magicresistance' : MAGICRESISTANCE, ! 'tactics' : TACTICS, 'snooping' : SNOOPING, ! 'musicianship' : MUSICIANSHIP, ! 'poisoning' : POISONING, ! 'archery' : ARCHERY, ! 'spiritspeak' : SPIRITSPEAK, ! 'stealing' : STEALING, 'tailoring' : TAILORING, ! 'taming' : TAMING, ! 'tasteid' : TASTEID, ! 'tinkering' : TINKERING, ! 'tracking' : TRACKING, ! 'veterinary' : VETERINARY, 'swordsmanship' : SWORDSMANSHIP, ! 'macefighting' : MACEFIGHTING, ! 'fencing' : FENCING, ! 'wrestling' : WRESTLING, ! 'lumberjacking' : LUMBERJACKING, ! 'mining' : MINING, 'meditation' : MEDITATION, ! 'stealth' : STEALTH, ! 'removetraps' : REMOVETRAPS, ! 'necromancy' : NECROMANCY, ! 'focus' : FOCUS, ! 'chivalry' : CHIVALRY } *************** *** 315,334 **** # Some nice animation definitions ! ANIM_WALKUNARMED = 0x00 ! ANIM_WALKARMED = 0x01 ! ANIM_RUNUNARMED = 0x02 ! ANIM_RUNARMED = 0x03 ! ANIM_STAND = 0x04 ! ANIM_FIDGET1 = 0x05 ! ANIM_FIDGET2 = 0x06 ! ANIM_ATTACKREADY1 = 0x07 ! ANIM_ATTACKREADY2 = 0x08 ! ANIM_ATTACK1=0x09 ! ANIM_ATTACK2=0x0a ! ANIM_ATTACK3=0x0b ! ANIM_ATTACK4=0x0c ! ANIM_ATTACK5=0x0d ! ANIM_ATTACK6=0x0e ! ANIM_ATTACKWALK=0x0f ANIM_CASTDIRECTED=0x10 ANIM_CASTAREA=0x11 --- 315,334 ---- # Some nice animation definitions ! ANIM_WALKUNARMED = 0x0 ! ANIM_WALKARMED = 0x1 ! ANIM_RUNUNARMED = 0x2 ! ANIM_RUNARMED = 0x3 ! ANIM_STAND = 0x4 ! ANIM_FIDGET1 = 0x5 ! ANIM_FIDGET2 = 0x6 ! ANIM_ATTACKREADY1 = 0x7 ! ANIM_ATTACKREADY2 = 0x8 ! ANIM_ATTACK1=0x9 ! ANIM_ATTACK2=0xa ! ANIM_ATTACK3=0xb ! ANIM_ATTACK4=0xc ! ANIM_ATTACK5=0xd ! ANIM_ATTACK6=0xe ! ANIM_ATTACKWALK=0xf ANIM_CASTDIRECTED=0x10 ANIM_CASTAREA=0x11 *************** *** 465,468 **** --- 465,470 ---- SOUND_DRINK3 = 0x50 + SOUND_MINING = 0x126 + SOUND_AGILITY_DOWN = 0x1ee SOUND_AGILITY_UP = 0x1ed *************** *** 487,491 **** SOUND_WARP_01 = 0x474 # A more modern recall sound? ! SOUND_FIREBALL_01 = 0x44b # SOUND_BREAKING_1 = 0x38d --- 489,493 ---- SOUND_WARP_01 = 0x474 # A more modern recall sound? ! SOUND_FIREBALL_01 = 0x44b # SOUND_BREAKING_1 = 0x38d *************** *** 587,591 **** SOUND_FEMALE_30 = 0x328 # "Urraghh!" SOUND_FEMALE_31 = 0x329 # "Uhh!" ! SOUND_FEMALE_32 = 0x32a # Ugh! SOUND_FEMALE_33 = 0x32b # ooooooooo! SOUND_FEMALE_34 = 0x32c # Ooops! --- 589,593 ---- SOUND_FEMALE_30 = 0x328 # "Urraghh!" SOUND_FEMALE_31 = 0x329 # "Uhh!" ! SOUND_FEMALE_32 = 0x32a # Ugh! SOUND_FEMALE_33 = 0x32b # ooooooooo! SOUND_FEMALE_34 = 0x32c # Ooops! |
|
From: <dr...@pr...> - 2004-01-26 13:49:50
|
Update of /cvsroot/wpdev/xmlscripts/definitions/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27237/definitions/resources Modified Files: ingots.xml logs.xml ores.xml resgems.xml Log Message: Slight tweaks, updates, syncs, etc. Split the lumberjacking code from weapons.blades to skills.lumberjacking. Later today I'll work on the rest of the potions. Index: ingots.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/resources/ingots.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ingots.xml 11 Sep 2002 14:52:55 -0000 1.3 --- ingots.xml 26 Jan 2004 13:48:49 -0000 1.4 *************** *** 9,27 **** <definitions> <resource id="RESOURCE_INGOT"> ! <name>ingot</name> <convertsource /> <artid>0x0FB1,0x012EE-0x134D,0x197A-0x19A9</artid> <skillid>45</skillid> ! <stamina min="1" max="2" /> ! <charaction>0x0B</charaction> ! <sound>0x0125</sound> <failmsg>You failed smelting the ore!</failmsg> <succmsg>You succeeded in smelting</succmsg> <emptymsg>You can't smelt this here</emptymsg> <item> ! <name>Iron</name> ! <id>0x1BF2</id> ! <color>0x0961</color> ! <conversion srccolors="0" srcids="0x19BA" rate="2" /> <skill min="0" max="400" /> <modifier type="useamount">1.0</modifier> --- 9,24 ---- <definitions> <resource id="RESOURCE_INGOT"> ! <name>%s ingot</name> <convertsource /> <artid>0x0FB1,0x012EE-0x134D,0x197A-0x19A9</artid> <skillid>45</skillid> ! <sound>0x2a</sound> <failmsg>You failed smelting the ore!</failmsg> <succmsg>You succeeded in smelting</succmsg> <emptymsg>You can't smelt this here</emptymsg> <item> ! <name>iron</name> ! <definition>iron_ingot</definition> ! <conversion srccolors="0" srcids="0x19ba" rate="2" /> <skill min="0" max="400" /> <modifier type="useamount">1.0</modifier> *************** *** 30,37 **** </item> <item> ! <name>Shadow</name> ! <id>0x1BF2</id> ! <color>0x0386</color> ! <conversion srccolors="0x0386" srcids="0x19BA" rate="1.9" /> <skill min="650" max="900" /> <modifier type="useamount">1.2</modifier> --- 27,42 ---- </item> <item> ! <name>dull copper</name> ! <definition>dullcopper_ingot</definition> ! <conversion srccolors="0" srcids="0x19ba" rate="2" /> ! <skill min="0" max="400" /> ! <modifier type="useamount">1.0</modifier> ! <modifier type="skill">1.0</modifier> ! <quota>630</quota> ! </item> ! <item> ! <name>shadow iron</name> ! <definition>shadowiron_ingot</definition> ! <conversion srccolors="0x0386" srcids="0x19ba" rate="1.9" /> <skill min="650" max="900" /> <modifier type="useamount">1.2</modifier> *************** *** 40,57 **** </item> <item> ! <name>Merkite</name> ! <id>0x1BF2</id> ! <color>0x02C3</color> ! <conversion srccolors="0x02C3" srcids="0x19BA" rate="1.7" /> ! <skill min="700" max="910" /> ! <modifier type="useamount">1.4</modifier> ! <modifier type="skill">1.2</modifier> ! <quota>112</quota> ! </item> ! <item> ! <name>Copper</name> ! <id>0x1BF2</id> ! <color>0x046E</color> ! <conversion srccolors="0x046E" srcids="0x19BA" rate="1.5" /> <skill min="750" max="940" /> <modifier type="useamount">1.6</modifier> --- 45,51 ---- </item> <item> ! <name>copper</name> ! <definition>copper_ingot</definition> ! <conversion srccolors="0x046E" srcids="0x19ba" rate="1.5" /> <skill min="750" max="940" /> <modifier type="useamount">1.6</modifier> *************** *** 60,77 **** </item> <item> ! <name>Silver</name> ! <id>0x1BF2</id> ! <color>0</color> ! <conversion srccolors="0x0961" srcids="0x19BA" rate="1.3" /> ! <skill min="790" max="955" /> ! <modifier type="useamount">1.8</modifier> ! <modifier type="skill">1.5</modifier> ! <quota>84</quota> ! </item> ! <item> ! <name>Bronze</name> ! <id>0x1BF2</id> ! <color>0x02E7</color> ! <conversion srccolors="0x02E7" srcids="0x19BA" rate="1.0" /> <skill min="800" max="960" /> <modifier type="useamount">1.9</modifier> --- 54,60 ---- </item> <item> ! <name>bronze</name> ! <definition>bronze_ingot</definition> ! <conversion srccolors="0x02E7" srcids="0x19ba" rate="1.0" /> <skill min="800" max="960" /> <modifier type="useamount">1.9</modifier> *************** *** 80,87 **** </item> <item> ! <name>Golden</name> ! <id>0x1BF2</id> ! <color>0x0466</color> ! <conversion srccolors="0x0466" srcids="0x19BA" rate="0.8" /> <modifier type="useamount">2.1</modifier> <modifier type="skill">1.7</modifier> --- 63,69 ---- </item> <item> ! <name>gold</name> ! <definition>gold_ingot</definition> ! <conversion srccolors="0x0466" srcids="0x19ba" rate="0.8" /> <modifier type="useamount">2.1</modifier> <modifier type="skill">1.7</modifier> *************** *** 90,118 **** </item> <item> ! <name>Agapite</name> ! <id>0x1BF2</id> ! <color>0x0150</color> ! <conversion srccolors="0x0150" srcids="0x19BA" rate="0.7" /> <modifier type="useamount">2.3</modifier> <modifier type="skill">1.75</modifier> <skill min="900" max="975" /> <quota>42</quota> ! </item> <item> ! <name>Verite</name> ! <id>0x1BF2</id> ! <color>0x022F</color> ! <conversion srccolors="0x022F" srcids="0x19BA" rate="0.5" /> <skill min="950" max="985" /> <modifier type="useamount">2.5</modifier> <modifier type="skill">1.8</modifier> <quota>28</quota> ! </item> <item> ! <name>Mythril</name> <id>0x1BF2</id> ! <color>0x0191</color> ! <conversion srccolors="0x0191" srcids="0x19BA" rate="0.3" /> ! <skill min="990" max="999" /> <modifier type="useamount">2.7</modifier> <modifier type="skill">1.9</modifier> --- 72,124 ---- </item> <item> ! <name>silver</name> ! <definition>silver_ingot</definition> ! <conversion srccolors="0x0961" srcids="0x19ba" rate="1.3" /> ! <skill min="790" max="955" /> ! <modifier type="useamount">1.8</modifier> ! <modifier type="skill">1.5</modifier> ! <quota>84</quota> ! </item> ! <item> ! <name>agapite</name> ! <definition>agapite_ingot</definition> ! <conversion srccolors="0x0150" srcids="0x19ba" rate="0.7" /> <modifier type="useamount">2.3</modifier> <modifier type="skill">1.75</modifier> <skill min="900" max="975" /> <quota>42</quota> ! </item> <item> ! <name>verite</name> ! <definition>verite_ingot</definition> ! <conversion srccolors="0x022F" srcids="0x19ba" rate="0.5" /> <skill min="950" max="985" /> <modifier type="useamount">2.5</modifier> <modifier type="skill">1.8</modifier> <quota>28</quota> ! </item> <item> ! <name>valorite</name> <id>0x1BF2</id> ! <color>0x022F</color> ! <conversion srccolors="0x022F" srcids="0x19ba" rate="0.5" /> ! <skill min="990" max="1000" /> ! <modifier type="useamount">2.5</modifier> ! <modifier type="skill">1.8</modifier> ! <quota>28</quota> ! </item> ! <item> ! <name>merkite</name> ! <definition>merkite_ingot</definition> ! <conversion srccolors="0x02C3" srcids="0x19ba" rate="1.7" /> ! <skill min="995" max="1000" /> ! <modifier type="useamount">1.4</modifier> ! <modifier type="skill">1.2</modifier> ! <quota>112</quota> ! </item> ! <item> ! <name>mythril</name> ! <definition>mythril_ingot</definition> ! <skill min="995" max="1000" /> <modifier type="useamount">2.7</modifier> <modifier type="skill">1.9</modifier> Index: logs.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/resources/logs.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** logs.xml 31 Dec 2002 02:39:09 -0000 1.6 --- logs.xml 26 Jan 2004 13:48:49 -0000 1.7 *************** *** 9,40 **** <definitions> <list id="IDS_TREE"> ! <item>0x0CD0</item> ! <item>0x0CD3</item> ! <item>0x0CD6</item> ! <item>0x0CD8</item> ! <item>0x0CDA</item> ! <item>0x0CDD</item> ! <item>0x0CE0</item> ! <item>0x0CE3</item> ! <item>0x0CE6</item> ! <item>0x0CCA</item> ! <item>0x0CCB</item> ! <item>0x0CCC</item> ! <item>0x0CCD</item> <item>0x12B8</item> <item>0x12B9</item> <item>0x12BA</item> <item>0x12BB</item> ! <item>0x0D42</item> ! <item>0x0D43</item> ! <item>0x0D58</item> ! <item>0x0D59</item> ! <item>0x0D70</item> ! <item>0x0D85</item> ! <item>0x0D94</item> ! <item>0x0D95</item> ! <item>0x0D98</item> ! <item>0x0DA4</item> ! <item>0x0DA8</item> </list> </definitions> --- 9,40 ---- <definitions> <list id="IDS_TREE"> ! <item>0xCD0</item> ! <item>0xCD3</item> ! <item>0xCD6</item> ! <item>0xCD8</item> ! <item>0xCDA</item> ! <item>0xCDD</item> ! <item>0xCE0</item> ! <item>0xCE3</item> ! <item>0xCE6</item> ! <item>0xCCA</item> ! <item>0xCCB</item> ! <item>0xCCC</item> ! <item>0xCCD</item> <item>0x12B8</item> <item>0x12B9</item> <item>0x12BA</item> <item>0x12BB</item> ! <item>0xD42</item> ! <item>0xD43</item> ! <item>0xD58</item> ! <item>0xD59</item> ! <item>0xD70</item> ! <item>0xD85</item> ! <item>0xD94</item> ! <item>0xD95</item> ! <item>0xD98</item> ! <item>0xDA4</item> ! <item>0xDA8</item> </list> </definitions> Index: ores.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/resources/ores.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ores.xml 13 Mar 2003 08:57:45 -0000 1.5 --- ores.xml 26 Jan 2004 13:48:49 -0000 1.6 *************** *** 9,13 **** <definitions> <resource id="RESOURCE_ORE"> ! <name>ore</name> <amount min="30" max="40" /> <veinchance>5</veinchance> --- 9,13 ---- <definitions> <resource id="RESOURCE_ORE"> ! <name>%s ore</name> <amount min="30" max="40" /> <veinchance>5</veinchance> *************** *** 15,124 **** <skillid>45</skillid> <refreshtime>120</refreshtime> ! <stamina min="1" max="2" /> ! <charaction>0x0B</charaction> ! <sound>0x0125</sound> <failmsg>You couldnt find anything!</failmsg> ! <succmsg>You have found</succmsg> <emptymsg>It seems as if no resources were left!</emptymsg> <item> <name>iron</name> <amount min="1" max="5" /> ! <definition>19ba</definition> ! <id>0x19BA</id> ! <color>0</color> <vein min="50" max="80" quota="630" /> ! <skill min="0" max="400" /> <quota>630</quota> </item> <item> ! <name>shadow</name> ! <amount min="1" max="4" /> ! <definition>19ba</definition> ! <id>0x19BA</id> ! <color>0x0386</color> ! <vein min="50" max="70" quota="126" /> ! <skill min="650" max="900" /> ! <quota>126</quota> </item> <item> ! <name>merkite</name> ! <definition>19ba</definition> <amount min="1" max="4" /> ! <id>0x19BA</id> ! <color>0x02C3</color> ! <vein min="37" max="65" quota="112" /> ! <skill min="700" max="910" /> ! <quota>112</quota> </item> <item> <name>copper</name> ! <definition>19ba</definition> <amount min="1" max="4" /> ! <id>0x19BA</id> ! <color>0x046E</color> ! <vein min="35" max="62" quota="98" /> ! <skill min="750" max="940" /> <quota>98</quota> </item> <item> - <name>silver</name> - <definition>19ba</definition> - <amount min="1" max="3" /> - <id>0x19BA</id> - <color>0x0961</color> - <vein min="30" max="57" quota="84" /> - <skill min="790" max="955" /> - <quota>84</quota> - </item> - <item> <name>bronze</name> ! <definition>19ba</definition> <amount min="1" max="3" /> ! <id>0x19BA</id> ! <color>0x02E7</color> ! <vein min="30" max="55" quota="70" /> ! <skill min="800" max="960" /> <quota>70</quota> </item> <item> ! <name>golden</name> ! <definition>19ba</definition> <amount min="1" max="2" /> ! <id>0x19BA</id> ! <color>0x0466</color> ! <vein min="30" max="52" quota="56" /> ! <skill min="850" max="965" /> <quota>56</quota> </item> <item> <name>agapite</name> ! <definition>19ba</definition> <amount min="1" max="2" /> ! <id>0x19BA</id> ! <color>0x0150</color> ! <vein min="30" max="50" quota="42" /> ! <skill min="900" max="975" /> <quota>42</quota> </item> <item> <name>verite</name> ! <definition>19ba</definition> <amount min="1" max="2" /> ! <id>0x19BA</id> <color>0x022F</color> ! <vein min="30" max="47" quota="28" /> ! <skill min="950" max="985" /> <quota>28</quota> ! </item> <item> <name>mythril</name> ! <definition>19ba</definition> ! <amount>1</amount> ! <id>0x19BA</id> ! <color>0x0191</color> ! <vein min="30" max="45" quota="14" /> ! <skill min="990" max="999" /> ! <quota>14</quota> ! </item> </resource> </definitions> --- 15,121 ---- <skillid>45</skillid> <refreshtime>120</refreshtime> ! <charaction>0xb</charaction> ! <sound>0x125</sound> <failmsg>You couldnt find anything!</failmsg> ! <succmsg>You have found </succmsg> <emptymsg>It seems as if no resources were left!</emptymsg> <item> <name>iron</name> <amount min="1" max="5" /> ! <definition>iron_ore_3</definition> <vein min="50" max="80" quota="630" /> ! <skill min="0" max="1000" /> <quota>630</quota> </item> <item> ! <name>dull copper</name> ! <amount min="1" max="5" /> ! <definition>dullcopper_ore_3</definition> ! <vein min="45" max="55" quota="630" /> ! <skill min="650" max="1050" /> ! <quota>630</quota> </item> <item> ! <name>shadow iron</name> <amount min="1" max="4" /> ! <definition>shadowiron_ore_3</definition> ! <vein min="40" max="50" quota="126" /> ! <skill min="700" max="1100" /> ! <quota>126</quota> </item> <item> <name>copper</name> ! <definition>copper_ore_3</definition> <amount min="1" max="4" /> ! <vein min="35" max="45" quota="98" /> ! <skill min="750" max="1150" /> <quota>98</quota> </item> <item> <name>bronze</name> ! <definition>bronze_ore_3</definition> <amount min="1" max="3" /> ! <vein min="30" max="40" quota="70" /> ! <skill min="800" max="1200" /> <quota>70</quota> </item> <item> ! <name>gold</name> ! <definition>gold_ore_3</definition> <amount min="1" max="2" /> ! <vein min="25" max="35" quota="56" /> ! <skill min="850" max="1250" /> ! <quota>56</quota> ! </item> ! <item> ! <name>silver</name> ! <definition>silver_ore_3</definition> ! <amount min="1" max="2" /> ! <vein min="25" max="35" quota="56" /> ! <skill min="850" max="1250" /> <quota>56</quota> </item> <item> <name>agapite</name> ! <definition>agapite_ore_3</definition> <amount min="1" max="2" /> ! <vein min="20" max="30" quota="42" /> ! <skill min="900" max="1300" /> <quota>42</quota> </item> <item> <name>verite</name> ! <definition>verite_ore_3</definition> <amount min="1" max="2" /> ! <id>0x19ba</id> <color>0x022F</color> ! <vein min="15" max="25" quota="28" /> ! <skill min="950" max="1350" /> <quota>28</quota> ! </item> ! <item> ! <name>valorite</name> ! <definition>valorite_ore_3</definition> ! <amount min="1" max="2" /> ! <vein min="10" max="20" quota="28" /> ! <skill min="990" max="1390" /> ! <quota>28</quota> ! </item> ! <item> ! <name>merkite</name> ! <definition>merkite_ore_3</definition> ! <amount min="1" max="2" /> ! <vein min="10" max="20" quota="28" /> ! <skill min="990" max="1390" /> ! <quota>28</quota> ! </item> <item> <name>mythril</name> ! <definition>mythril_ore_3</definition> ! <amount min="1" max="2" /> ! <vein min="10" max="20" quota="28" /> ! <skill min="990" max="1390" /> ! <quota>28</quota> ! </item> </resource> </definitions> Index: resgems.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/resources/resgems.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** resgems.xml 29 Sep 2003 17:14:17 -0000 1.3 --- resgems.xml 26 Jan 2004 13:48:49 -0000 1.4 *************** *** 8,11 **** --- 8,12 ---- --> <definitions> + <item id="gem"> <id>0x1ea7</id> |
|
From: <dr...@pr...> - 2004-01-26 13:49:50
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27237/scripts Modified Files: ore.py Log Message: Slight tweaks, updates, syncs, etc. Split the lumberjacking code from weapons.blades to skills.lumberjacking. Later today I'll work on the rest of the potions. Index: ore.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/ore.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ore.py 25 Jan 2004 01:26:00 -0000 1.2 --- ore.py 26 Jan 2004 13:48:49 -0000 1.3 *************** *** 310,314 **** socket.sysmessage( message, GRAY ) ! char.soundeffect( 0x2a ) return OK --- 310,314 ---- socket.sysmessage( message, GRAY ) ! char.soundeffect( SOUND_HAMMER_1 ) return OK |
|
From: <dar...@pr...> - 2004-01-26 13:36:56
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19993 Modified Files: uobject.cpp Log Message: Fixed a bug where ONSHOWTOOLTIP was called instead of ONCREATE Index: uobject.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** uobject.cpp 22 Jan 2004 04:48:12 -0000 1.122 --- uobject.cpp 25 Jan 2004 01:07:49 -0000 1.123 *************** *** 730,734 **** PyObject *args = Py_BuildValue( "O&s", PyGetObjectObject, this, definition.latin1() ); ! result = cPythonScript::callChainedEventHandler( EVENT_SHOWTOOLTIP, scriptChain, args ); if( !result && global ) --- 730,734 ---- PyObject *args = Py_BuildValue( "O&s", PyGetObjectObject, this, definition.latin1() ); ! result = cPythonScript::callChainedEventHandler( EVENT_CREATE, scriptChain, args ); if( !result && global ) |
|
From: <dar...@pr...> - 2004-01-26 12:27:09
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22297 Modified Files: scripts.xml Log Message: Started implementation of keyrings. Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** scripts.xml 25 Jan 2004 01:25:42 -0000 1.73 --- scripts.xml 26 Jan 2004 03:21:07 -0000 1.74 *************** *** 33,37 **** <script>equipment</script> <script>bandages</script> ! <script>key</script> <script>ore</script> --- 33,38 ---- <script>equipment</script> <script>bandages</script> ! <script>key</script> ! <script>keyring</script> <script>ore</script> |
