Skip to content

Updating to 7.5 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VariableVixen merged 1 commit into from
May 16, 2026
Merged

Updating to 7.5 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions WoLua/Lua/Api/Game/ChocoboApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ private unsafe CompanionInfo? obj {
public bool? Unlocked => this ? (this.Rank ?? 0) > 0 : null;
public byte? Stars => this.obj?.Stars;
public byte? SkillPoints => this.obj?.SkillPoints;
public byte? DefenderLevel => this.obj?.DefenderLevel;
public byte? AttackerLevel => this.obj?.AttackerLevel;
public byte? HealerLevel => this.obj?.HealerLevel;
public byte? DefenderLevel => this.obj?.Levels[0];
public byte? AttackerLevel => this.obj?.Levels[1];
public byte? HealerLevel => this.obj?.Levels[2];
public unsafe string? Name => this.obj?.NameString;

public unsafe uint? CurrentHp => this.Summoned ?? false ? this.obj!.Value.Companion->CurrentHealth : null;
Expand Down
8 changes: 4 additions & 4 deletions WoLua/Lua/Api/Game/EntityWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,19 +124,19 @@ public string? TitleText {

#region Entity type

public bool IsPlayer => this && this.Entity?.ObjectKind is ObjectKind.Player;
public bool IsPlayer => this && this.Entity?.ObjectKind is ObjectKind.Pc;
public bool IsCombatNpc => this && this.Entity?.ObjectKind is ObjectKind.BattleNpc;
public bool IsTalkNpc => this && this.Entity?.ObjectKind is ObjectKind.EventNpc;
public bool IsNpc => this.IsCombatNpc || this.IsTalkNpc;
public bool IsTreasure => this && this.Entity?.ObjectKind is ObjectKind.Treasure;
public bool IsAetheryte => this && this.Entity?.ObjectKind is ObjectKind.Aetheryte;
public bool IsGatheringNode => this && this.Entity?.ObjectKind is ObjectKind.GatheringPoint;
public bool IsEventObject => this && this.Entity?.ObjectKind is ObjectKind.EventObj;
public bool IsMount => this && this.Entity?.ObjectKind is ObjectKind.MountType;
public bool IsMount => this && this.Entity?.ObjectKind is ObjectKind.Mount;
public bool IsMinion => this && this.Entity?.ObjectKind is ObjectKind.Companion;
public bool IsRetainer => this && this.Entity?.ObjectKind is ObjectKind.Retainer;
public bool IsArea => this && this.Entity?.ObjectKind is ObjectKind.Area;
public bool IsHousingObject => this && this.Entity?.ObjectKind is ObjectKind.Housing;
public bool IsArea => this && this.Entity?.ObjectKind is ObjectKind.AreaObject;
public bool IsHousingObject => this && this.Entity?.ObjectKind is ObjectKind.HousingEventObject;
public bool IsCutsceneObject => this && this.Entity?.ObjectKind is ObjectKind.Cutscene;
public bool IsCardStand => this && this.Entity?.ObjectKind is ObjectKind.CardStand;
public bool IsOrnament => this && this.Entity?.ObjectKind is ObjectKind.Ornament;
Expand Down
10 changes: 5 additions & 5 deletions WoLua/Lua/Api/Game/FateWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ public sealed record class FateWrapper(Fate? WorldFate): IWorldObjectWrapper {
"If this FATE has already ended, this will be `nil`.")]
public int? TimeLeft => this.Valid
? this.State switch {
FateState.Preparation => this.Duration,
FateState.Running or FateState.WaitingForEnd => (int)this.WorldFate!.TimeRemaining,
FateState.Preparing => this.Duration,
FateState.Running or FateState.Ending => (int)this.WorldFate!.TimeRemaining,
FateState.Ended or FateState.Failed => 0,
_ => null,
}
Expand All @@ -81,16 +81,16 @@ public sealed record class FateWrapper(Fate? WorldFate): IWorldObjectWrapper {
public FateState State => this.Valid ? this.WorldFate!.State : FateState.Ended;

[LuaDoc("Whether this FATE is in the preparation phase, before it is actually started.")]
public bool Waiting => this.State is FateState.Preparation;
public bool Waiting => this.State is FateState.Preparing;

[LuaDoc("Whether this FATE is currently running.")]
public bool Running => this.State is FateState.Running;

[LuaDoc("Whether this FATE is currently in its ending phase, as seen in item turnin FATEs.")]
public bool Ending => this.State is FateState.WaitingForEnd;
public bool Ending => this.State is FateState.Ending;

[LuaDoc("Whether this FATE is considered \"active\", either waiting to be started or currently in progress.")]
public bool Active => this.State is FateState.Preparation or FateState.Running;
public bool Active => this.State is FateState.Preparing or FateState.Running;

#endregion

Expand Down
9 changes: 7 additions & 2 deletions WoLua/WoLua.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Dalamud.NET.Sdk/14.0.1">
<Project Sdk="Dalamud.NET.Sdk/15.0.0">
<PropertyGroup>
<Product>WoLua</Product>
<Version>4.3.2</Version>
<Version>4.3.3</Version>
<Description>Warrior of... Lua? Write your own chat commands in lua for FFXIV/Dalamud!</Description>
<Copyright>Copyleft VariableVixen 2022</Copyright>
</PropertyGroup>
Expand All @@ -14,4 +14,9 @@
<PackageReference Include="XivCommon" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="DalamudPackager" Version="15.0.0" />
<PackageReference Update="DotNet.ReproducibleBuilds" Version="2.0.2" />
</ItemGroup>

</Project>
18 changes: 9 additions & 9 deletions WoLua/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
"net10.0-windows7.0": {
"DalamudPackager": {
"type": "Direct",
"requested": "[14.0.1, )",
"resolved": "14.0.1",
"contentHash": "y0WWyUE6dhpGdolK3iKgwys05/nZaVf4ZPtIjpLhJBZvHxkkiE23zYRo7K7uqAgoK/QvK5cqF6l3VG5AbgC6KA=="
"requested": "[15.0.0, )",
"resolved": "15.0.0",
"contentHash": "411vwC8/X8Z/sQ2TI6v3SvOn66xFPeOjFn3Zn+h0d3Ox2t1kFm66AhDvmx/qcMwVrR+Hidxj0dadpQ2dgyXMBQ=="
},
"DotNet.ReproducibleBuilds": {
"type": "Direct",
"requested": "[1.2.39, )",
"resolved": "1.2.39",
"contentHash": "fcFN01tDTIQqDuTwr1jUQK/geofiwjG5DycJQOnC72i1SsLAk1ELe+apBOuZ11UMQG8YKFZG1FgvjZPbqHyatg=="
"requested": "[2.0.2, )",
"resolved": "2.0.2",
"contentHash": "VaHoEN6YHp0jXucxm67vfuRy8zo9ufiKSuaZ4ZudRi8xmWcEFMKxfCsg2nvYNvdISFTURDu+IHqADGh53+Bamw=="
},
"Microsoft.NET.ILLink.Tasks": {
"type": "Direct",
"requested": "[10.0.1, )",
"resolved": "10.0.1",
"contentHash": "ISahzLHsHY7vrwqr2p1YWZ+gsxoBRtH7gWRDK8fDUst9pp2He0GiesaqEfeX0V8QMCJM3eNEHGGpnIcPjFo2NQ=="
"requested": "[10.0.8, )",
"resolved": "10.0.8",
"contentHash": "dVbSXGIFNR5nZcv2tOLoWI+a9T4jtFd77IYjuND+QVe360qWgAF7H0WtoopYhRw/+SgpGUTyrkrh+65+ClNnfw=="
},
"MoonSharp": {
"type": "Direct",
Expand Down
Loading