Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

FIX: traveler: I have no idea how traveler was working for me earlier…

…... but it is now actually traveling!

There is still a bit of a delay when engaging traveler, but I'm not certain at this point that its a travler issue so much as a switching states issue.
  • Loading branch information...
commit d0f2dec0696374189b67823e6d5f1365cdef4206 1 parent dd8619f
@ISeeDEDPpl authored
View
13 Questor.Modules/Activities/Traveler.cs
@@ -148,10 +148,15 @@ private void NagivateToBookmarkSystem(long solarSystemId)
{
if (DateTime.Now > Cache.Instance.NextWarpTo)
{
- Logging.Log("Traveler", "Warping to [" + Logging.yellow + locationName + Logging.green + "][" + Math.Round((stargate.Distance / 1000) / 149598000, 2) + " AU away]", Logging.green);
- stargate.WarpTo();
- Combat.ReloadAll();
- Cache.Instance.NextWarpTo = DateTime.Now.AddSeconds((int)Time.WarptoDelay_seconds);
+ if (Cache.Instance.InSpace && !Cache.Instance.TargetedBy.Any(t => t.IsWarpScramblingMe))
+ {
+ Logging.Log("Traveler",
+ "Warping to [" + Logging.yellow + locationName + Logging.green + "][" +
+ Math.Round((stargate.Distance/1000)/149598000, 2) + " AU away]", Logging.green);
+ stargate.WarpTo();
+ Combat.ReloadAll();
+ Cache.Instance.NextWarpTo = DateTime.Now.AddSeconds((int)Time.WarptoDelay_seconds);
+ }
}
}
}
View
15 Questor/Behaviors/CombatMissionsBehavior.cs
@@ -186,15 +186,16 @@ private void TravelToAgentsStation()
{
var baseDestination = _traveler.Destination as StationDestination;
if (baseDestination == null || baseDestination.StationId != Cache.Instance.Agent.StationId)
- _traveler.Destination = new StationDestination(Cache.Instance.Agent.SolarSystemId, Cache.Instance.Agent.StationId, Cache.Instance.AgentStationID);
-
- _combat.ProcessState();
- _drones.ProcessState(); //do we really want to use drones here?
+ _traveler.Destination = new StationDestination(Cache.Instance.Agent.SolarSystemId, Cache.Instance.Agent.StationId, Cache.Instance.DirectEve.GetLocationName(Cache.Instance.Agent.StationId));
+
+ _combat.ProcessState();
+ _drones.ProcessState(); //do we really want to use drones here?
if (Cache.Instance.InSpace && !Cache.Instance.TargetedBy.Any(t => t.IsWarpScramblingMe))
- {
- Cache.Instance.IsMissionPocketDone = true; //tells drones.cs that we can pull drones
- _traveler.ProcessState();
+ {
+ Cache.Instance.IsMissionPocketDone = true; //tells drones.cs that we can pull drones
+ //Logging.Log("CombatmissionBehavior","TravelToAgentStation: not pointed",Logging.white);
}
+ _traveler.ProcessState();
if (Settings.Instance.DebugStates)
{
Logging.Log("Traveler.State", "is " + _States.CurrentTravelerState, Logging.white);
Please sign in to comment.
Something went wrong with that request. Please try again.