anna
/
remote-party-finder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: switch to ushort

This commit is contained in:
Anna 2022-07-05 13:21:24 -04:00
parent fae4760ade
commit 1d4b5aa1f3
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
csharp/RemotePartyFinder/UploadableListing.cs
View File

@ -13,9 +13,9 @@ namespace RemotePartyFinder {
public uint ContentIdLower { get; }
public byte[] Name { get; }
public byte[] Description { get; }
public byte CreatedWorld { get; }
public byte HomeWorld { get; }
public byte CurrentWorld { get; }
public ushort CreatedWorld { get; }
public ushort HomeWorld { get; }
public ushort CurrentWorld { get; }
public DutyCategory Category { get; }
public ushort Duty { get; }
public DutyType DutyType { get; }
@ -38,9 +38,9 @@ namespace RemotePartyFinder {
this.ContentIdLower = listing.ContentIdLower;
this.Name = listing.Name.Encode();
this.Description = listing.Description.Encode();
this.CreatedWorld = (byte) listing.World.Value.RowId;
this.HomeWorld = (byte) listing.HomeWorld.Value.RowId;
this.CurrentWorld = (byte) listing.CurrentWorld.Value.RowId;
this.CreatedWorld = (ushort) listing.World.Value.RowId;
this.HomeWorld = (ushort) listing.HomeWorld.Value.RowId;
this.CurrentWorld = (ushort) listing.CurrentWorld.Value.RowId;
this.Category = listing.Category;
this.Duty = listing.RawDuty;
this.DutyType = listing.DutyType;
@ -66,7 +66,7 @@ namespace RemotePartyFinder {
public JobFlags Accepting { get; }
internal UploadableSlot(PartyFinderSlot slot) {
this.Accepting = slot.Accepting.Aggregate((JobFlags) 0, ((agg, flag) => agg | flag));
this.Accepting = slot.Accepting.Aggregate((JobFlags) 0, (agg, flag) => agg | flag);
}
}
}

2
csharp/SourceGenerator/SourceGenerator.csproj
View File

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Lumina" Version="3.5.2"/>
<PackageReference Include="Lumina" Version="3.8.0"/>
<PackageReference Include="Lumina.Excel" Version="6.1.1"/>
<PackageReference Include="Pidgin" Version="3.1.0"/>
</ItemGroup>

6
server/src/listing.rs
View File

@ -16,9 +16,9 @@ pub struct PartyFinderListing {
pub name: SeString,
#[serde(with = "crate::base64_sestring")]
pub description: SeString,
pub created_world: u8,
pub home_world: u8,
pub current_world: u8,
pub created_world: u16,
pub home_world: u16,
pub current_world: u16,
pub category: DutyCategory,
pub duty: u16,
pub duty_type: DutyType,