Menu
▾
▴
[Babbot-svn] SF.net SVN: babbot:[475] trunk/BabBot/BabBot
|
From: <at...@us...> - 2010-01-13 01:16:47
|
Revision: 475
http://babbot.svn.sourceforge.net/babbot/?rev=475&view=rev
Author: attn99
Date: 2010-01-13 01:16:40 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
Development on TravelState
Modified Paths:
--------------
trunk/BabBot/BabBot/Common/Serializer.cs
trunk/BabBot/BabBot/Data/GameObjectData.xml
trunk/BabBot/BabBot/Data/RouteList.xml
trunk/BabBot/BabBot/Manager/DataManager.cs
trunk/BabBot/BabBot/Scripts/Common/NavigationState.cs
trunk/BabBot/BabBot/Scripts/Common/QuestExecState.cs
trunk/BabBot/BabBot/Scripts/Common/RouteRecordingState.cs
trunk/BabBot/BabBot/Scripts/Common/TravelState.cs
trunk/BabBot/BabBot/Wow/GameObjectData.cs
Added Paths:
-----------
trunk/BabBot/BabBot/Data/Routes/433015755FB304C.wp
trunk/BabBot/BabBot/Data/Routes/9D753283EA107840.wp
Removed Paths:
-------------
trunk/BabBot/BabBot/Data/Routes/27487C946FD4794C.wp
Modified: trunk/BabBot/BabBot/Common/Serializer.cs
===================================================================
--- trunk/BabBot/BabBot/Common/Serializer.cs 2010-01-12 17:34:50 UTC (rev 474)
+++ trunk/BabBot/BabBot/Common/Serializer.cs 2010-01-13 01:16:40 UTC (rev 475)
@@ -207,6 +207,7 @@
/// <summary>
/// Class with collection item that includes a mergeable list, for ex WoWVersion
+ /// Used by: QuestObjectives, GameObject
/// </summary>
public abstract class CommonMergeListItem : CommonMergeItem
{
Modified: trunk/BabBot/BabBot/Data/GameObjectData.xml
===================================================================
--- trunk/BabBot/BabBot/Data/GameObjectData.xml 2010-01-12 17:34:50 UTC (rev 474)
+++ trunk/BabBot/BabBot/Data/GameObjectData.xml 2010-01-13 01:16:40 UTC (rev 475)
@@ -10,9 +10,11 @@
The spring rains were particularly heavy this year, causing some of the forest's beasts to flourish while others suffered.
Unfortunately, the nightsaber and thistle boar populations grew too large. Shadowglen can only produce so much food for the beasts. Journey forth, young priest, and thin the boar and saber populations so that nature's harmony will be preserved.]]></text>
- <objectives>
- <objective d3p1:type="MonsterQuestObjective" type="monster" name="Young Nightsaber slain" qty="7" />
- <objective d3p1:type="MonsterQuestObjective" type="monster" name="Young Thistle Boar slain" qty="4" />
+ <objectives name="456">
+ <obj_list>
+ <objective d3p1:type="MonsterQuestObjective" type="monster" name="Young Nightsaber slain" qty="7" />
+ <objective d3p1:type="MonsterQuestObjective" type="monster" name="Young Thistle Boar slain" qty="4" />
+ </obj_list>
</objectives>
<choice_items>
<item name="Archery Training Gloves" qty="1" />
@@ -58,12 +60,15 @@
<game_object d3p1:type="NPC" name="Melithar Staghelm" zone="Teldrassil" faction="Alliance" xmlns:d3p1="http://www.w3.org/2001/XMLSchema-instance">
<base_position x="10389.8" y="763.48" z="1319.95" type="0" />
<quests>
- <quest name="The Woodland Protector" id="458" link="|cffffff00|Hquest:458:1|h[The Woodland Protector]|h|r" level="1" bonus_spell="" num="0" dest_name="Tarindrella">
+ <quest name="The Woodland Protector" id="458" link="|cffffff00|Hquest:458:1|h[The Woodland Protector]|h|r" level="1" bonus_spell="" num="0" dest_name="">
<text><![CDATA[Thank goodness you are here, priest. Strange news has traveled to me through the whisperings of the forest spirits.
The mysterious woodland protector, Tarindrella, has returned to Shadowglen. The dryad's presence has not been felt in the forests of Kalimdor in years. Something is surely amiss if she has journeyed back to this land.
Seek out Tarindrella and see what business she tends to in our grove. One of the Sentinels reported seeing her to the southwest of Aldrassil.]]></text>
+ <objectives name="458">
+ <obj_list />
+ </objectives>
<objectives_text><![CDATA[Seek out the dryad known as Tarindrella.]]></objectives_text>
</quest>
</quests>
@@ -72,12 +77,15 @@
<gossips />
</game_object>
<game_object d3p1:type="NPC" name="Porthannius" zone="Teldrassil" faction="Alliance" xmlns:d3p1="http://www.w3.org/2001/XMLSchema-instance">
- <base_position x="10214.3" y="700.55" z="1360.6" type="0" />
+ <base_position x="10214.3" y="700.55" z="1360.61" type="0" />
<quests>
<quest name="Dolanaar Delivery" id="2159" link="|cffff8040|Hquest:2159:5|h[Dolanaar Delivery]|h|r" level="5" bonus_spell="" num="0" dest_name="">
<text><![CDATA[Greetings, young priest. Can you offer me aid? I have a package of herbs that I must deliver to the town of Dolanaar. But I still have business with the druids of Shadowglen and cannot yet leave.
Can you deliver this package for me? It must be sent to Innkeeper Keldamyr, at the Dolanaar inn. It lies along the road, to the south.]]></text>
+ <objectives name="2159">
+ <obj_list />
+ </objectives>
<choice_items>
<item name="Darnassian Bleu" qty="5" />
<item name="Refreshing Spring Water" qty="5" />
@@ -98,13 +106,6 @@
</services>
<gossips />
</game_object>
- <game_object d3p1:type="NPC" name="Tarindrella" zone="Teldrassil" faction="Alliance" xmlns:d3p1="http://www.w3.org/2001/XMLSchema-instance">
- <base_position x="10296.9" y="870.23" z="1335.89" type="0" />
- <quests />
- <coordinates />
- <services />
- <gossips />
- </game_object>
</wow_version>
<wow_version name="3.3.0.11159" />
</game_object_data>
\ No newline at end of file
Modified: trunk/BabBot/BabBot/Data/RouteList.xml
===================================================================
--- trunk/BabBot/BabBot/Data/RouteList.xml 2010-01-12 17:34:50 UTC (rev 474)
+++ trunk/BabBot/BabBot/Data/RouteList.xml 2010-01-13 01:16:40 UTC (rev 475)
@@ -1,15 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<route_list version="0">
<wow_version name="3.2.2.10505">
- <route name="27487C946FD4794C" reversible="true">
- <point_a d4p1:type="GameObjEndpoint" zone="Teldrassil" type="game_obj" game_obj_name="Innkeeper Keldamyr" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">
- <waypoint x="9802.23" y="980.46" z="1313.9" type="0" />
+ <route name="433015755FB304C" reversible="true">
+ <point_a d4p1:type="GameObjEndpoint" zone="Teldrassil" type="game_obj" game_obj_name="Porthannius" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">
+ <waypoint x="10214.67" y="700.7" z="1360.57" type="0" />
</point_a>
- <point_b d4p1:type="GameObjEndpoint" zone="Teldrassil" type="game_obj" game_obj_name="Porthannius" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">
- <waypoint x="10213.63" y="699.01" z="1360.44" type="0" />
+ <point_b d4p1:type="GameObjEndpoint" zone="Teldrassil" type="game_obj" game_obj_name="Innkeeper Keldamyr" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">
+ <waypoint x="9880.52" y="801.66" z="1309.88" type="0" />
</point_b>
<descr>Path to Dalaran</descr>
+ <length>0</length>
</route>
+ <route name="9D753283EA107840" reversible="true">
+ <point_a d4p1:type="GameObjEndpoint" zone="Teldrassil" type="game_obj" game_obj_name="Conservator Ilthalaine" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">
+ <waypoint x="10330.11" y="823.67" z="1326.41" type="0" />
+ </point_a>
+ <point_b d4p1:type="GameObjEndpoint" zone="Teldrassil" type="game_obj" game_obj_name="Porthannius" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">
+ <waypoint x="10225.92" y="700.62" z="1356.97" type="0" />
+ </point_b>
+ <descr />
+ <length>0</length>
+ </route>
<route name="B223A2FEF93A964A" reversible="true">
<point_a d4p1:type="GameObjEndpoint" zone="Teldrassil" type="game_obj" game_obj_name="Conservator Ilthalaine" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">
<waypoint x="10328.29" y="826.6" z="1326.38" type="0" />
@@ -18,6 +29,7 @@
<waypoint x="10307.94" y="871.77" z="1333.94" type="0" />
</point_b>
<descr />
+ <length>0</length>
</route>
<route name="BDCDBBF638B9F74C" reversible="true">
<point_a d4p1:type="QuestItemEndpoint" zone="Teldrassil" type="quest_obj" quest_id="456" item_name="Young Nightsaber slain" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">
@@ -27,6 +39,7 @@
<waypoint x="10282.16" y="742.78" z="1338.97" type="0" />
</point_b>
<descr>Same for Boars</descr>
+ <length>0</length>
</route>
<route name="E22C72F11FC2E41" reversible="true">
<point_a d4p1:type="QuestItemEndpoint" zone="Teldrassil" type="quest_obj" quest_id="456" item_name="Young Nightsaber slain" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">
@@ -36,6 +49,7 @@
<waypoint x="10382.55" y="757.25" z="1319.91" type="0" />
</point_b>
<descr>Turn in quest</descr>
+ <length>0</length>
</route>
</wow_version>
<wow_version name="3.3.0.11159" />
Deleted: trunk/BabBot/BabBot/Data/Routes/27487C946FD4794C.wp
===================================================================
--- trunk/BabBot/BabBot/Data/Routes/27487C946FD4794C.wp 2010-01-12 17:34:50 UTC (rev 474)
+++ trunk/BabBot/BabBot/Data/Routes/27487C946FD4794C.wp 2010-01-13 01:16:40 UTC (rev 475)
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<waypoints name="27487C946FD4794C">
- <waypoint x="9802.23" y="980.46" z="1313.9" type="0" />
- <waypoint x="9802.57" y="969.63" z="1313.89" type="0" />
- <waypoint x="9802.67" y="967.06" z="1313.13" type="0" />
- <waypoint x="9804.58" y="964.39" z="1312.23" type="0" />
- <waypoint x="9806.61" y="957.75" z="1308.79" type="0" />
- <waypoint x="9807.45" y="956.49" z="1308.79" type="0" />
- <waypoint x="9808.8" y="955.78" z="1308.79" type="0" />
- <waypoint x="9813.09" y="954.16" z="1308.79" type="0" />
- <waypoint x="9823.01" y="952.87" z="1308.78" type="0" />
- <waypoint x="9824.45" y="952.41" z="1308.77" type="0" />
- <waypoint x="9825.53" y="951.34" z="1308.77" type="0" />
- <waypoint x="9826.95" y="949.46" z="1309.04" type="0" />
- <waypoint x="9828.19" y="946.67" z="1309.2" type="0" />
- <waypoint x="9830.15" y="939.27" z="1306.77" type="0" />
- <waypoint x="9835.84" y="931.06" z="1306.03" type="0" />
- <waypoint x="9841.88" y="922.5" z="1305.3" type="0" />
- <waypoint x="9848.05" y="913.75" z="1305.09" type="0" />
- <waypoint x="9849.83" y="911.23" z="1305.34" type="0" />
- <waypoint x="9851.01" y="910.31" z="1305.48" type="0" />
- <waypoint x="9859.47" y="907.06" z="1305.97" type="0" />
- <waypoint x="9860.98" y="907.02" z="1306.07" type="0" />
- <waypoint x="9871.3" y="909.42" z="1306.85" type="0" />
- <waypoint x="9881.61" y="911.82" z="1307.38" type="0" />
- <waypoint x="9883.91" y="912.35" z="1307.42" type="0" />
- <waypoint x="9882.31" y="901.88" z="1307.9" type="0" />
- <waypoint x="9880.77" y="891.45" z="1308.35" type="0" />
- <waypoint x="9881.65" y="880.97" z="1307.09" type="0" />
- <waypoint x="9882.34" y="872.76" z="1307.22" type="0" />
- <waypoint x="9882.12" y="871.36" z="1307.22" type="0" />
- <waypoint x="9879.72" y="861.29" z="1307.22" type="0" />
- <waypoint x="9877.79" y="852.8" z="1307.22" type="0" />
- <waypoint x="9877.83" y="842.56" z="1307.22" type="0" />
- <waypoint x="9877.86" y="839.62" z="1307.22" type="0" />
- <waypoint x="9880.67" y="829.78" z="1307.37" type="0" />
- <waypoint x="9881.7" y="826.16" z="1307.33" type="0" />
- <waypoint x="9882.17" y="815.91" z="1308.58" type="0" />
- <waypoint x="9882.62" y="805.7" z="1309.69" type="0" />
- <waypoint x="9883.08" y="795.46" z="1309.88" type="0" />
- <waypoint x="9883.53" y="785.23" z="1309.88" type="0" />
- <waypoint x="9883.98" y="775" z="1309.88" type="0" />
- <waypoint x="9884.24" y="769.83" z="1309.88" type="0" />
- <waypoint x="9884.83" y="768.56" z="1309.87" type="0" />
- <waypoint x="9889.78" y="761.25" z="1309.96" type="0" />
- <waypoint x="9891.22" y="757.9" z="1309.87" type="0" />
- <waypoint x="9896.66" y="749.23" z="1309.69" type="0" />
- <waypoint x="9902.12" y="740.56" z="1309.87" type="0" />
- <waypoint x="9907.9" y="731.4" z="1309.88" type="0" />
- <waypoint x="9913.36" y="722.74" z="1309.88" type="0" />
- <waypoint x="9914.02" y="721.49" z="1309.88" type="0" />
- <waypoint x="9917.28" y="711.79" z="1309.89" type="0" />
- <waypoint x="9920.54" y="702.08" z="1309.89" type="0" />
- <waypoint x="9921.29" y="700.11" z="1309.87" type="0" />
- <waypoint x="9926.69" y="691.55" z="1309.7" type="0" />
- <waypoint x="9932.15" y="682.89" z="1309.87" type="0" />
- <waypoint x="9934.87" y="678.62" z="1309.9" type="0" />
- <waypoint x="9941.84" y="671.28" z="1309.88" type="0" />
- <waypoint x="9944.84" y="668.11" z="1309.88" type="0" />
- <waypoint x="9949.64" y="659.07" z="1309.94" type="0" />
- <waypoint x="9950.52" y="657.99" z="1309.98" type="0" />
- <waypoint x="9958.65" y="651.77" z="1310.38" type="0" />
- <waypoint x="9966.69" y="645.62" z="1311.78" type="0" />
- <waypoint x="9974.74" y="639.47" z="1312.65" type="0" />
- <waypoint x="9979.31" y="635.96" z="1313.46" type="0" />
- <waypoint x="9985.45" y="627.77" z="1314.47" type="0" />
- <waypoint x="9991.5" y="619.64" z="1314.98" type="0" />
- <waypoint x="9997.55" y="611.53" z="1315.85" type="0" />
- <waypoint x="10003.6" y="603.41" z="1315.7" type="0" />
- <waypoint x="10006.63" y="599.36" z="1315.7" type="0" />
- <waypoint x="10007.74" y="598.5" z="1315.7" type="0" />
- <waypoint x="10011.42" y="596.16" z="1315.7" type="0" />
- <waypoint x="10018.97" y="593.52" z="1315.7" type="0" />
- <waypoint x="10029.03" y="592.48" z="1315.76" type="0" />
- <waypoint x="10031.97" y="592.22" z="1315.7" type="0" />
- <waypoint x="10033.33" y="592.53" z="1315.7" type="0" />
- <waypoint x="10043" y="595.55" z="1316.1" type="0" />
- <waypoint x="10051.48" y="601.05" z="1317.6" type="0" />
- <waypoint x="10055.72" y="603.82" z="1318.9" type="0" />
- <waypoint x="10056.74" y="604.94" z="1319.37" type="0" />
- <waypoint x="10058.83" y="607.78" z="1320.58" type="0" />
- <waypoint x="10062.8" y="617.09" z="1324.18" type="0" />
- <waypoint x="10063.36" y="618.39" z="1324.76" type="0" />
- <waypoint x="10068.91" y="625.99" z="1328.37" type="0" />
- <waypoint x="10074.51" y="633.55" z="1331.94" type="0" />
- <waypoint x="10080.47" y="641.59" z="1335.6" type="0" />
- <waypoint x="10086.08" y="649.16" z="1338.97" type="0" />
- <waypoint x="10092.03" y="657.19" z="1342.51" type="0" />
- <waypoint x="10097.98" y="665.23" z="1345.83" type="0" />
- <waypoint x="10102.78" y="671.64" z="1348.54" type="0" />
- <waypoint x="10111.14" y="677.12" z="1351.46" type="0" />
- <waypoint x="10119.63" y="682.62" z="1354.3" type="0" />
- <waypoint x="10122.71" y="684.58" z="1355.36" type="0" />
- <waypoint x="10132.65" y="686.46" z="1357.82" type="0" />
- <waypoint x="10142.61" y="688.27" z="1359.62" type="0" />
- <waypoint x="10152.69" y="690.09" z="1361.07" type="0" />
- <waypoint x="10162.64" y="691.89" z="1361.42" type="0" />
- <waypoint x="10172.6" y="693.7" z="1361.84" type="0" />
- <waypoint x="10174" y="693.73" z="1361.8" type="0" />
- <waypoint x="10178.47" y="693.58" z="1361.61" type="0" />
- <waypoint x="10188.48" y="695.06" z="1361.05" type="0" />
- <waypoint x="10192.81" y="695.65" z="1361.1" type="0" />
- <waypoint x="10203.03" y="695.46" z="1361.08" type="0" />
- <waypoint x="10205.86" y="695.41" z="1360.94" type="0" />
- <waypoint x="10207.31" y="695.83" z="1360.83" type="0" />
- <waypoint x="10209.64" y="697.59" z="1360.73" type="0" />
- <waypoint x="10213.63" y="699.01" z="1360.44" type="0" />
-</waypoints>
\ No newline at end of file
Added: trunk/BabBot/BabBot/Data/Routes/433015755FB304C.wp
===================================================================
--- trunk/BabBot/BabBot/Data/Routes/433015755FB304C.wp (rev 0)
+++ trunk/BabBot/BabBot/Data/Routes/433015755FB304C.wp 2010-01-13 01:16:40 UTC (rev 475)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<waypoints name="433015755FB304C">
+ <waypoint x="10214.67" y="700.7" z="1360.57" type="0" />
+ <waypoint x="10209.77" y="696.86" z="1360.68" type="0" />
+ <waypoint x="10203.84" y="695.86" z="1360.99" type="0" />
+ <waypoint x="10191.79" y="695.5" z="1361.08" type="0" />
+ <waypoint x="10179.87" y="695.14" z="1361.63" type="0" />
+ <waypoint x="10175.73" y="694.94" z="1361.83" type="0" />
+ <waypoint x="10165.82" y="692.63" z="1361.66" type="0" />
+ <waypoint x="10155.71" y="692.26" z="1361.09" type="0" />
+ <waypoint x="10153.76" y="691.97" z="1361.01" type="0" />
+ <waypoint x="10144.22" y="688.86" z="1359.98" type="0" />
+ <waypoint x="10142.23" y="688.67" z="1359.58" type="0" />
+ <waypoint x="10132.25" y="687.78" z="1357.83" type="0" />
+ <waypoint x="10130.3" y="687.19" z="1357.41" type="0" />
+ <waypoint x="10124.89" y="684.38" z="1355.89" type="0" />
+ <waypoint x="10116.72" y="678.62" z="1353" type="0" />
+ <waypoint x="10108.63" y="672.79" z="1350.21" type="0" />
+ <waypoint x="10101.97" y="665.46" z="1347.07" type="0" />
+ <waypoint x="10095.36" y="658.18" z="1343.64" type="0" />
+ <waypoint x="10088.67" y="650.81" z="1340.15" type="0" />
+ <waypoint x="10082" y="643.46" z="1336.45" type="0" />
+ <waypoint x="10079.62" y="640.39" z="1335.1" type="0" />
+ <waypoint x="10074.54" y="631.81" z="1331.54" type="0" />
+ <waypoint x="10069.45" y="623.21" z="1327.86" type="0" />
+ <waypoint x="10064.32" y="614.67" z="1324.01" type="0" />
+ <waypoint x="10062.91" y="613.26" z="1323.17" type="0" />
+ <waypoint x="10055.83" y="606.23" z="1319.44" type="0" />
+ <waypoint x="10048.04" y="598.5" z="1316.88" type="0" />
+ <waypoint x="10041.63" y="592.21" z="1315.87" type="0" />
+ <waypoint x="10039.87" y="591.61" z="1315.8" type="0" />
+ <waypoint x="10034.5" y="590.65" z="1315.7" type="0" />
+ <waypoint x="10028.5" y="591.4" z="1315.7" type="0" />
+ <waypoint x="10018.5" y="595.62" z="1315.7" type="0" />
+ <waypoint x="10008.56" y="599.8" z="1315.71" type="0" />
+ <waypoint x="10002.8" y="602.23" z="1315.7" type="0" />
+ <waypoint x="10001.15" y="603.54" z="1315.7" type="0" />
+ <waypoint x="9999.3" y="605.3" z="1315.73" type="0" />
+ <waypoint x="9997.76" y="607.78" z="1315.79" type="0" />
+ <waypoint x="9996.46" y="609.55" z="1315.76" type="0" />
+ <waypoint x="9989.17" y="617.15" z="1315.17" type="0" />
+ <waypoint x="9981.08" y="625.59" z="1314.14" type="0" />
+ <waypoint x="9973.02" y="633.99" z="1312.7" type="0" />
+ <waypoint x="9965.02" y="642.33" z="1311.94" type="0" />
+ <waypoint x="9956.94" y="650.75" z="1310.36" type="0" />
+ <waypoint x="9953.98" y="654.32" z="1310.15" type="0" />
+ <waypoint x="9950.15" y="660.17" z="1309.93" type="0" />
+ <waypoint x="9942.6" y="669.07" z="1309.86" type="0" />
+ <waypoint x="9941.44" y="671.21" z="1309.88" type="0" />
+ <waypoint x="9936.55" y="681.95" z="1309.93" type="0" />
+ <waypoint x="9934.37" y="685.9" z="1309.92" type="0" />
+ <waypoint x="9927.94" y="692.69" z="1309.69" type="0" />
+ <waypoint x="9925.54" y="696.7" z="1309.72" type="0" />
+ <waypoint x="9924.03" y="698.44" z="1309.76" type="0" />
+ <waypoint x="9922.54" y="700.22" z="1309.83" type="0" />
+ <waypoint x="9916.63" y="710.15" z="1309.96" type="0" />
+ <waypoint x="9914.36" y="719.22" z="1309.88" type="0" />
+ <waypoint x="9913.08" y="721.21" z="1309.88" type="0" />
+ <waypoint x="9906.2" y="730.51" z="1309.94" type="0" />
+ <waypoint x="9899.06" y="740.16" z="1309.87" type="0" />
+ <waypoint x="9893.05" y="748.28" z="1309.76" type="0" />
+ <waypoint x="9892.49" y="749.16" z="1309.78" type="0" />
+ <waypoint x="9888.12" y="758.75" z="1309.83" type="0" />
+ <waypoint x="9885.63" y="764.24" z="1309.81" type="0" />
+ <waypoint x="9885.27" y="766.19" z="1309.83" type="0" />
+ <waypoint x="9883.75" y="776.15" z="1309.88" type="0" />
+ <waypoint x="9882.25" y="787.11" z="1309.88" type="0" />
+ <waypoint x="9881.99" y="793.75" z="1309.88" type="0" />
+ <waypoint x="9880.52" y="801.66" z="1309.88" type="0" />
+</waypoints>
\ No newline at end of file
Added: trunk/BabBot/BabBot/Data/Routes/9D753283EA107840.wp
===================================================================
--- trunk/BabBot/BabBot/Data/Routes/9D753283EA107840.wp (rev 0)
+++ trunk/BabBot/BabBot/Data/Routes/9D753283EA107840.wp 2010-01-13 01:16:40 UTC (rev 475)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<waypoints name="9D753283EA107840">
+ <waypoint x="10330.11" y="823.67" z="1326.41" type="0" />
+ <waypoint x="10325.31" y="819.79" z="1326.57" type="0" />
+ <waypoint x="10324.37" y="818.32" z="1327.34" type="0" />
+ <waypoint x="10319.8" y="810.47" z="1327.35" type="0" />
+ <waypoint x="10312.34" y="802.37" z="1329.09" type="0" />
+ <waypoint x="10311.33" y="800.83" z="1329.46" type="0" />
+ <waypoint x="10305.47" y="791.79" z="1331.92" type="0" />
+ <waypoint x="10299.55" y="782.65" z="1333.39" type="0" />
+ <waypoint x="10293.56" y="773.4" z="1335.36" type="0" />
+ <waypoint x="10287.7" y="764.36" z="1337.08" type="0" />
+ <waypoint x="10281.77" y="755.2" z="1338.16" type="0" />
+ <waypoint x="10275.86" y="746.09" z="1340.12" type="0" />
+ <waypoint x="10269.64" y="736.48" z="1342.24" type="0" />
+ <waypoint x="10263.62" y="727.33" z="1344.41" type="0" />
+ <waypoint x="10256.16" y="719.39" z="1346.15" type="0" />
+ <waypoint x="10248.72" y="711.46" z="1348.2" type="0" />
+ <waypoint x="10241.32" y="703.59" z="1351.57" type="0" />
+ <waypoint x="10238.66" y="700.75" z="1352.54" type="0" />
+ <waypoint x="10236.71" y="700.69" z="1353.18" type="0" />
+ <waypoint x="10225.92" y="700.62" z="1356.97" type="0" />
+</waypoints>
\ No newline at end of file
Modified: trunk/BabBot/BabBot/Manager/DataManager.cs
===================================================================
--- trunk/BabBot/BabBot/Manager/DataManager.cs 2010-01-12 17:34:50 UTC (rev 474)
+++ trunk/BabBot/BabBot/Manager/DataManager.cs 2010-01-13 01:16:40 UTC (rev 475)
@@ -690,12 +690,12 @@
}
}
- if (q.ObjList != null)
+ if (q.Objectives.ObjList != null)
{
// Add quest objectives
- for (int i = 0; i < q.ObjList.Count; i++)
+ for (int i = 0; i < q.Objectives.ObjList.Count; i++)
{
- AbstractQuestObjective qobj = q.ObjList[i];
+ AbstractQuestObjective qobj = q.Objectives.ObjList[i];
int qty = 0;
if (qobj.HasQty)
Modified: trunk/BabBot/BabBot/Scripts/Common/NavigationState.cs
===================================================================
--- trunk/BabBot/BabBot/Scripts/Common/NavigationState.cs 2010-01-12 17:34:50 UTC (rev 474)
+++ trunk/BabBot/BabBot/Scripts/Common/NavigationState.cs 2010-01-13 01:16:40 UTC (rev 475)
@@ -211,7 +211,7 @@
float z = vnext.Z - _player.Location.Z;
_player.ClickToMove(vnext);
- if ((_retry == 0) && (z > 2)|| (_retry > 0))
+ if ((_retry == 0) && (z > 3)|| (_retry > 0))
{
// Add jump if going too high up or trying unstack
Thread.Sleep(150);
Modified: trunk/BabBot/BabBot/Scripts/Common/QuestExecState.cs
===================================================================
--- trunk/BabBot/BabBot/Scripts/Common/QuestExecState.cs 2010-01-12 17:34:50 UTC (rev 474)
+++ trunk/BabBot/BabBot/Scripts/Common/QuestExecState.cs 2010-01-13 01:16:40 UTC (rev 475)
@@ -61,7 +61,7 @@
switch (_q.State)
{
case QuestStates.ACCEPTED:
- if ((_q.ObjList == null) ||
+ if ((_q.Objectives.ObjList == null) ||
_q.Completed) { }
// Go to each objective
Modified: trunk/BabBot/BabBot/Scripts/Common/RouteRecordingState.cs
===================================================================
--- trunk/BabBot/BabBot/Scripts/Common/RouteRecordingState.cs 2010-01-12 17:34:50 UTC (rev 474)
+++ trunk/BabBot/BabBot/Scripts/Common/RouteRecordingState.cs 2010-01-13 01:16:40 UTC (rev 475)
@@ -66,6 +66,12 @@
/// <param name="player"></param>
protected override void DoExecute(WowPlayer player)
{
+ if (player.IsDead)
+ {
+ Finish(player);
+ return;
+ }
+
Vector3D cur_loc = player.Location;
if (player.Orientation != _angle)
Modified: trunk/BabBot/BabBot/Scripts/Common/TravelState.cs
===================================================================
--- trunk/BabBot/BabBot/Scripts/Common/TravelState.cs 2010-01-12 17:34:50 UTC (rev 474)
+++ trunk/BabBot/BabBot/Scripts/Common/TravelState.cs 2010-01-13 01:16:40 UTC (rev 475)
@@ -33,6 +33,12 @@
private object _dest;
/// <summary>
+ /// Base coordinates for destination target
+ /// If dest has multiple coordinates see VList
+ /// </summary>
+ public Vector3D BaseCoord;
+
+ /// <summary>
/// List of coordinates if more than 1 (for NPC)
/// </summary>
public List<Vector3D> Vlist = null;
@@ -48,6 +54,11 @@
/// </summary>
AbstractCheck _check;
+ /// <summary>
+ /// List of used routes
+ /// </summary>
+ protected List<Route> UsedRoute = new List<Route>();
+
public WowPlayer Player;
public TravelState(GameObject obj, string lfs, string tooltip_text)
@@ -112,6 +123,8 @@
if (eps == null)
return;
+ // Only using atm based coord for game obj/quest item
+
if (CheckEndpoint(eps[1], r, player, cur_loc))
return;
@@ -121,13 +134,25 @@
float ddist_a = eps[0].Waypoint.GetDistanceTo(cur_loc);
// Calc min lenght for best route
- min_route_len = Math.Min(r.Length + ddist_b, min_route_len);
+ float cur_len = r.Length + ddist_b;
+ if (cur_len < min_route_len)
+ {
+ min_route = r;
+ min_route_len = cur_len;
+ }
}
- if (min_route == null)
+ if (min_route != null)
{
+ // Check if another route connected to given point
+ // This check is recursive
+
+ }
+ else
+ {
// Go with navigation state
}
+
// set calc flag if it direct path shorter than best route
// calc_route = (dist_a < min_route_len);
@@ -178,6 +203,7 @@
if (r.Reversible)
wp.List.Reverse();
+ UsedRoute.Add(r);
CallChangeStateEvent(player, new NavigationState(wp,
Lfs, "Traveling to " + _dest.ToString()));
}
@@ -229,8 +255,8 @@
return false;
// Check if obj has coordinates
- Vector3D v = NpcHelper.GetGameObjCoord(_obj, Parent.Lfs);
- if (v == null)
+ Parent.BaseCoord = NpcHelper.GetGameObjCoord(_obj, Parent.Lfs);
+ if (Parent.BaseCoord == null)
throw new GameObjectCoordNotFound(_obj.Name);
// Check for other coordinates
Modified: trunk/BabBot/BabBot/Wow/GameObjectData.cs
===================================================================
--- trunk/BabBot/BabBot/Wow/GameObjectData.cs 2010-01-12 17:34:50 UTC (rev 474)
+++ trunk/BabBot/BabBot/Wow/GameObjectData.cs 2010-01-13 01:16:40 UTC (rev 475)
@@ -623,7 +623,7 @@
/// List of objectives
/// </summary>
[XmlElement("objectives")]
- public QuestObjectives ObjList;
+ public QuestObjectives Objectives;
/// <summary>
/// Index in toon quest log if quest already accepted
@@ -664,6 +664,7 @@
Link = link;
Level = level;
BonusSpell = bonus_spell;
+ Objectives = new QuestObjectives(id.ToString());
XmlDocument doc = new XmlDocument();
TextObjectives = doc.CreateCDataSection(objectives);
@@ -704,7 +705,7 @@
}
if (!string.IsNullOrEmpty(objs))
- ObjList = new QuestObjectives(objs);
+ Objectives = new QuestObjectives(id.ToString(), objs);
}
@@ -1159,9 +1160,11 @@
#region Quest Objectives
- public class QuestObjectives : CommonList<AbstractQuestObjective>
+ public class QuestObjectivesList : CommonList<AbstractQuestObjective>
{
-
+ /// <summary>
+ /// List with quest objectives
+ /// </summary>
[XmlElement("objective")]
public AbstractQuestObjective[] ObjList
{
@@ -1169,18 +1172,58 @@
set { Items = value; }
}
+ public QuestObjectivesList() : base() { }
+ }
+
+ public class QuestObjectives : CommonMergeListItem
+ {
/// <summary>
+ /// List with quest objectives
+ /// </summary>
+ [XmlElement("obj_list")]
+ public QuestObjectivesList ObjList;
+
+ /// <summary>
+ /// List of hotspots where objectives can be "found"
+ /// </summary>
+ [XmlElement("hot_spots")]
+ public WpZones Coordinates
+ {
+ get { return (WpZones)MergeList[0]; }
+ set { MergeList[0] = value; }
+ }
+
+ /// <summary>
/// Paremetless class constructor
/// </summary>
- public QuestObjectives()
- : base() { }
+ public QuestObjectives() : base()
+ {
+ Init();
+ }
/// <summary>
/// Class constructor
/// </summary>
+ /// <param name="name">Quest Id</param>
+ public QuestObjectives(string id)
+ : base(id)
+ {
+ Init();
+ }
+
+ private void Init()
+ {
+ MergeList = new IMergeable[1];
+ ObjList = new QuestObjectivesList();
+ }
+
+ /// <summary>
+ /// Class constructor
+ /// </summary>
/// <param name="objs">List of objectives in format obj::obj
/// where each obj is comma delited list of item, qty, is_finished</param>
- public QuestObjectives(string objs)
+ public QuestObjectives(string id, string objs)
+ : this (id)
{
string[] obj = objs.Split(new string[] { "::" }, StringSplitOptions.None);
foreach (string s in obj)
@@ -1221,7 +1264,7 @@
"Unknown type of quest objectives '" + stype + "'");
}
- Add(qobj);
+ ObjList.Add(qobj);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|