Index: BookMark.cs =================================================================== --- BookMark.cs (revision 90) +++ BookMark.cs (working copy) @@ -143,6 +143,13 @@ } } + public int ItemID + { + get + { + return GetMember("ItemID"); + } + } #endregion #region Methods Index: Character.cs =================================================================== --- Character.cs (revision 90) +++ Character.cs (working copy) @@ -68,22 +68,18 @@ } } - /// - /// Your current standing towards any CharID, CorporationID, or AllianceID - /// - public int Standing(int ID) - { - return GetMember("Standing", ID.ToString()); - } + /// + /// Your current standing towards any CharID, CorporationID, or AllianceID. All 3 IDs are required. 0 or -1 are valid arguments for those without corporation or alliance. + /// + /// CharID + /// CorporationID + /// AllianceID + /// + public Standing StandingTo(int charID, int corpID, int allianceID) + { + return new Standing(GetMember("StandingTo", charID.ToString(), corpID.ToString(), allianceID.ToString())); + } - /// - /// Your current standing towards any CharID, CorporationID, or AllianceID - /// - public int StandingTo(int ID) - { - return GetMember("StandingTo", ID.ToString()); - } - public bool AutoPilotOn { get @@ -224,6 +220,14 @@ } } + public bool InSpace + { + get + { + return GetMember("InSpace"); + } + } + public int StationID { get Index: EVE.ISXEVE.vs2008.csproj =================================================================== --- EVE.ISXEVE.vs2008.csproj (revision 90) +++ EVE.ISXEVE.vs2008.csproj (working copy) @@ -2,7 +2,7 @@ Debug AnyCPU - 9.0.30729 + 9.0.21022 2.0 {A9583204-C40D-4496-BB62-0F9546E5D613} Library @@ -88,6 +88,7 @@ + Index: ISXEVEWrapperTest/Form1.cs =================================================================== --- ISXEVEWrapperTest/Form1.cs (revision 90) +++ ISXEVEWrapperTest/Form1.cs (working copy) @@ -173,5 +173,17 @@ } InnerSpace.Echo("ISXEVEWrapperTest (MoveItemsTo): End"); } + + private void buttonToggleAutoPilot_Click(object sender, EventArgs e) + { + using (new FrameLock(true)) + { + EVE.ISXEVE.EVE _eve = new EVE.ISXEVE.EVE(); + + InnerSpace.Echo("Toggling auto pilot"); + _eve.Execute(ExecuteCommand.CmdToggleAutopilot); + InnerSpace.Echo("Auto pilot toggled. Enjoy your broken warp."); + } + } } } \ No newline at end of file Index: ISXEVEWrapperTest/Form1.Designer.cs =================================================================== --- ISXEVEWrapperTest/Form1.Designer.cs (revision 90) +++ ISXEVEWrapperTest/Form1.Designer.cs (working copy) @@ -34,6 +34,7 @@ this.btn_MyOrderTest = new System.Windows.Forms.Button(); this.btn_MarketOrderTest = new System.Windows.Forms.Button(); this.btnMoveItemsTo = new System.Windows.Forms.Button(); + this.buttonToggleAutoPilot = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.SuspendLayout(); // @@ -102,11 +103,22 @@ this.btnMoveItemsTo.UseVisualStyleBackColor = true; this.btnMoveItemsTo.Click += new System.EventHandler(this.btnMoveItemsTo_Click); // + // buttonToggleAutoPilot + // + this.buttonToggleAutoPilot.Location = new System.Drawing.Point(12, 158); + this.buttonToggleAutoPilot.Name = "buttonToggleAutoPilot"; + this.buttonToggleAutoPilot.Size = new System.Drawing.Size(116, 23); + this.buttonToggleAutoPilot.TabIndex = 6; + this.buttonToggleAutoPilot.Text = "Toggle Auto Pilot"; + this.buttonToggleAutoPilot.UseVisualStyleBackColor = true; + this.buttonToggleAutoPilot.Click += new System.EventHandler(this.buttonToggleAutoPilot_Click); + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(381, 266); + this.Controls.Add(this.buttonToggleAutoPilot); this.Controls.Add(this.btnMoveItemsTo); this.Controls.Add(this.btn_MarketOrderTest); this.Controls.Add(this.btn_MyOrderTest); @@ -128,5 +140,6 @@ private System.Windows.Forms.Button btn_MyOrderTest; private System.Windows.Forms.Button btn_MarketOrderTest; private System.Windows.Forms.Button btnMoveItemsTo; + private System.Windows.Forms.Button buttonToggleAutoPilot; } } \ No newline at end of file Index: ISXEVEWrapperTest/ISXEVEWrapperTest.vs2008.csproj =================================================================== --- ISXEVEWrapperTest/ISXEVEWrapperTest.vs2008.csproj (revision 90) +++ ISXEVEWrapperTest/ISXEVEWrapperTest.vs2008.csproj (working copy) @@ -49,6 +49,10 @@ 4 + + False + ..\..\..\..\..\..\..\Program Files\InnerSpace\.NET Programs\ISXEVEWrapper.dll + False ..\Lavish.InnerSpace.dll @@ -98,12 +102,6 @@ - - {A9583204-C40D-4496-BB62-0F9546E5D613} - EVE.ISXEVE.vs2008 - - - False .NET Framework 2.0 %28x86%29 Index: ISXEVEWrapperTest/Program.cs =================================================================== --- ISXEVEWrapperTest/Program.cs (revision 90) +++ ISXEVEWrapperTest/Program.cs (working copy) @@ -22,33 +22,6 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new Form1()); - - InnerSpace.Echo("ISXEVEWrapperTest: Begin"); - - using (new FrameLock(true)) - { - LavishScriptObject _Me = LavishScript.Objects.GetObject("Me"); - InnerSpace.Echo("Name: " + _Me.GetMember("Name")); - - //Extension Ext = new Extension(); - //InnerSpace.Echo("Name: " + Ext.Me.Name); - // InnerSpace.Echo("Nearest Stargate (fails in station): " + Ext.Entity("Stargate").Name); - - // InnerSpace.Echo("Undocking Method 1..."); - // //Ext.EVE().Execute(ExecuteCommand.CmdExitStation); - - // InnerSpace.Echo("Undocking Method 2..."); - // //Ext.EVE().Execute("CmdExitStation"); - - // InnerSpace.Echo(Ext.ISXEVE().SecsToString(500)); - - //Extension Ext = new Extension(); - //InnerSpace.Echo(Ext.Me.Name.ToString()); - //InnerSpace.Echo(Me.Ship.ToString()); - - - } - InnerSpace.Echo("ISXEVEWrapperTest: End"); } } } \ No newline at end of file Index: Item.cs =================================================================== --- Item.cs (revision 90) +++ Item.cs (working copy) @@ -185,6 +185,22 @@ } } + public double MaxFlightTime + { + get + { + return GetMember("MaxFlightTime"); + } + } + + public double MaxVelocity + { + get + { + return GetMember("MaxVelocity"); + } + } + public string Name { get Index: MyOrder.cs =================================================================== --- MyOrder.cs (revision 90) +++ MyOrder.cs (working copy) @@ -6,32 +6,32 @@ -//* Added new DATATYPE: 'myorder' (ie, "My Orders" tab) with the following MEMBERS: -// 1. Price (double type) -// 2. InitialQuantity (int type) -// 3. QuantityRemaining (double type) -// 4. MinQuantityToBuy (int type) -// 5. ID (int type) -// 6. TimeStampWhenIssued (uint64 type) -// 7. DateWhenIssued (string type) -// 8. TimeWhenIssued (string type) -// 9. Duration (int type) [The max length of the order, in days] -// 10. StationID (int type) [Station where the order is located] -// 11. Station (string type) -// 12. RegionID (int type) [Region where the order is located] -// 13. Region (string type) -// 14. SolarSystemID (int type) [Solar System where the order is located] -// 15. SolarSystem (string type) -// 16. Range (int type) -// 17. TypeID (int type) -// 18. Name (string type) -// 19. IsContraband (bool type) -// 20. IsCorp (bool type) -// 21. IsSellOrder (bool type) -// 22. IsBuyOrder (bool type) -//* Added the following METHODS to the 'myorder' datatype: -// 1. Cancel -// 2. Modify[#] {# = new price of the item in isk} +//* Added new DATATYPE: 'myorder' (ie, "My Orders" tab) with the following MEMBERS: +// 1. Price (double type) +// 2. InitialQuantity (int type) +// 3. QuantityRemaining (double type) +// 4. MinQuantityToBuy (int type) +// 5. ID (int type) +// 6. TimeStampWhenIssued (uint64 type) +// 7. DateWhenIssued (string type) +// 8. TimeWhenIssued (string type) +// 9. Duration (int type) [The max length of the order, in days] +// 10. StationID (int type) [Station where the order is located] +// 11. Station (string type) +// 12. RegionID (int type) [Region where the order is located] +// 13. Region (string type) +// 14. SolarSystemID (int type) [Solar System where the order is located] +// 15. SolarSystem (string type) +// 16. Range (int type) +// 17. TypeID (int type) +// 18. Name (string type) +// 19. IsContraband (bool type) +// 20. IsCorp (bool type) +// 21. IsSellOrder (bool type) +// 22. IsBuyOrder (bool type) +//* Added the following METHODS to the 'myorder' datatype: +// 1. Cancel +// 2. Modify[#] {# = new price of the item in isk} namespace EVE.ISXEVE { Index: Ship.cs =================================================================== --- Ship.cs (revision 90) +++ Ship.cs (working copy) @@ -16,7 +16,7 @@ } public Ship() - : base(LavishScript.Objects.GetObject("Ship")) + : base(LavishScript.Objects.GetObject("MyShip")) { } #endregion Index: Util.cs =================================================================== --- Util.cs (revision 90) +++ Util.cs (working copy) @@ -128,6 +128,23 @@ return IndexToList(Index); } + internal static List GetListFromPersistentMember(ILSObject Obj, string MemberName, string LSTypeName, params string[] Args) + { + if (Obj == null || !Obj.IsValid) + return null; + + LavishScriptObject Index = LavishScript.Objects.NewObject("index:" + LSTypeName); + + string[] allargs = PrefixArray(Index.LSReference, Args); + + LavishScriptPersistentObject retval = Obj.GetPersistentMember(MemberName, allargs); + + if (LavishScriptPersistentObject.IsNullOrInvalid(retval)) + return null; + + return IndexToList(Index); + } + internal static T GetFromIndexMember(ILSObject Obj, string MemberName, string LSTypeName, int number, params string[] Args) { // argument is 0-based