[wpdev-commits] xmlscripts/definitions/resources ingots.xml,1.3,1.4 logs.xml,1.6,1.7 ores.xml,1.5,1.6 resgems.xml,1.3,1.4

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

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>