Skip to content

Commit

Permalink
new CHARBUFFS array
Browse files Browse the repository at this point in the history 
closes #92
  • Loading branch information
@Lady-Binary
Lady-Binary committed Aug 21, 2020
1 parent 7711c68 commit 62553bd
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 23 deletions.
38 changes: 20 additions & 18 deletions LOU/ClientStatus.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,42 +16,44 @@ public struct CharacterInfoStruct
[ProtoMember(1)]
public ulong? BACKPACKID;
[ProtoMember(2)]
public int? CHARDIR;
public string[] CHARBUFFS;
[ProtoMember(3)]
public bool? CHARGHOST;
public int? CHARDIR;
[ProtoMember(4)]
public ulong? CHARID;
public bool? CHARGHOST;
[ProtoMember(5)]
public string CHARNAME;
public ulong? CHARID;
[ProtoMember(6)]
public float? CHARPOSX;
public string CHARNAME;
[ProtoMember(7)]
public float? CHARPOSY;
public float? CHARPOSX;
[ProtoMember(8)]
public float? CHARPOSZ;
public float? CHARPOSY;
[ProtoMember(9)]
public string CHARSTATUS;
public float? CHARPOSZ;
[ProtoMember(10)]
public double? CHARWEIGHT;
public string CHARSTATUS;
[ProtoMember(11)]
public ulong? CHESTID;
public double? CHARWEIGHT;
[ProtoMember(12)]
public string CHESTNAME;
public ulong? CHESTID;
[ProtoMember(13)]
public ulong? HEADID;
public string CHESTNAME;
[ProtoMember(14)]
public string HEADNAME;
public ulong? HEADID;
[ProtoMember(15)]
public ulong? LEFTHANDID;
public string HEADNAME;
[ProtoMember(16)]
public string LEFTHANDNAME;
public ulong? LEFTHANDID;
[ProtoMember(17)]
public ulong? LEGSID;
public string LEFTHANDNAME;
[ProtoMember(18)]
public string LEGSNAME;
public ulong? LEGSID;
[ProtoMember(19)]
public ulong? RIGHTHANDID;
public string LEGSNAME;
[ProtoMember(20)]
public ulong? RIGHTHANDID;
[ProtoMember(21)]
public string RIGHTHANDNAME;
}
[ProtoMember(2)]
Expand Down
8 changes: 4 additions & 4 deletions LOU/Utils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static Dictionary<string, FloatingPanel> FindPanelByName(String name)
}
}

Log("Found total of " + FoundPanels.Count.ToString() + " panels.");
//Log("Found total of " + FoundPanels.Count.ToString() + " panels.");
return FoundPanels;
}

Expand All @@ -69,7 +69,7 @@ public static Dictionary<string, DynamicObject> FindDynamicObjectsByName(String
// break;
//}
}
Log("Found total of " + FoundObjects.Count.ToString() + " items.");
//Log("Found total of " + FoundObjects.Count.ToString() + " items.");
return FoundObjects;
}
public static Dictionary<string, DynamicObject> FindDynamicObjectsByName(String name, ulong containerId)
Expand All @@ -91,7 +91,7 @@ public static Dictionary<string, DynamicObject> FindDynamicObjectsByName(String
// break;
//}
}
Log("Found total of " + FoundObjects.Count.ToString() + " items.");
//Log("Found total of " + FoundObjects.Count.ToString() + " items.");
return FoundObjects;
}
public static ClientObject FindClientObject(ulong objectId)
Expand Down Expand Up @@ -173,7 +173,7 @@ public static Dictionary<string, ClientObject> FindPermanentObjectByName(String
// break;
//}
}
Log("Found total of " + FoundPermanents.Count.ToString() + " permanents.");
//Log("Found total of " + FoundPermanents.Count.ToString() + " permanents.");
return FoundPermanents;
}
public static ClientObject FindPermanentObject(int permanentId)
Expand Down
36 changes: 35 additions & 1 deletion LOU/Worker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ private void ProcessClientCommand(ClientCommand ClientCommand)
this.FindButtonResults[i] = KFFEBNDBIPA;
}

// Seems to be ToolTip Text
string ELGLAFGJGAO = (string)Utils.GetInstanceField(KAAFKBBECEF, casted, "ELGLAFGJGAO");
if (ELGLAFGJGAO != null && ELGLAFGJGAO.ToLower().Contains(_buttonName.ToLower()))
{
Expand Down Expand Up @@ -1255,6 +1256,40 @@ private void UpdateClientStatus()

// Character Info

ClientStatus.CharacterInfo.BACKPACKID = this.player?.GetEquippedObject("Backpack")?.DMCIODGEHCN;

List<String> Buffs = new List<string>();
FloatingPanel BuffBar = Utils.FindPanelByName("BuffBar")?.FirstOrDefault().Value;
if (BuffBar != null)
{
DynamicWindow window = BuffBar.GetComponent<DynamicWindow>();
if (window != null)
{
Type KAAFKBBECEF = AssemblyCSharp.GetType("KAAFKBBECEF");
if (KAAFKBBECEF != null)
{
object HGBANEEHBLH = Utils.GetInstanceField(window, "HGBANEEHBLH");
if (HGBANEEHBLH != null)
{
foreach (object o in (HGBANEEHBLH as IEnumerable))
{
object casted = Convert.ChangeType(o, KAAFKBBECEF);
if (casted != null)
{
string ELGLAFGJGAO = (string)Utils.GetInstanceField(KAAFKBBECEF, casted, "ELGLAFGJGAO");
if (!String.IsNullOrEmpty(ELGLAFGJGAO))
{
Buffs.Add(ELGLAFGJGAO.Replace('\n', '|'));
}
}

}
}
}
}
}
ClientStatus.CharacterInfo.CHARBUFFS = Buffs.ToArray();

ClientStatus.CharacterInfo.CHARNAME = this.player?.EBHEDGHBHGI;
ClientStatus.CharacterInfo.CHARID = this.player?.ObjectId;
ClientStatus.CharacterInfo.CHARPOSX = this.player?.transform?.position.x;
Expand All @@ -1272,7 +1307,6 @@ private void UpdateClientStatus()
ClientStatus.CharacterInfo.CHARSTATUS = null;
}
ClientStatus.CharacterInfo.CHARGHOST = (bool?)this.player?.GetObjectProperty("IsDead");
ClientStatus.CharacterInfo.BACKPACKID = this.player?.GetEquippedObject("Backpack")?.DMCIODGEHCN;

if (this.player != null)
{
Expand Down

0 comments on commit 62553bd

Please sign in to comment.