Skip to content

Commit 2cd5df3

Browse files
CazzarCazzar
authored
Merge pull request #260 from ktisis-tools/7.4-update
7.4 update
2 parents c32e4d6 + 654169c commit 2cd5df3

File tree

17 files changed

+103
-41
lines changed

17 files changed

+103
-41
lines changed

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ concurrency:
55
group: ${{ github.workflow }}-${{ github.ref }}
66
cancel-in-progress: true
77

8-
# Only run this workflow when a tag is pushed when the tag starts with "v".
8+
# Only run this workflow when a tag is pushed when the tag starts with "v0.2.".
99
on:
1010
push:
1111
tags:
12-
- 'v*'
12+
- 'v0.2.*'
1313

1414
# So we can use the GitHub API to create releases with the run token.
1515
permissions:
@@ -35,7 +35,7 @@ jobs:
3535
- name: Setup .NET
3636
uses: actions/setup-dotnet@v3
3737
with:
38-
dotnet-version: 9.0.x
38+
dotnet-version: 10.0.x
3939

4040
- name: Download Dalamud Library
4141
run: |
@@ -82,9 +82,7 @@ jobs:
8282
8383
sed -i repo.json -E \
8484
-e 's#"AssemblyVersion": "([0-9]*\.){2,3}[0-9]*"#"AssemblyVersion": "'"$release_version"'"#g' \
85-
-e 's#"TestingAssemblyVersion": "([0-9]*\.){2,3}[0-9]*"#"TestingAssemblyVersion": "'"$release_version"'"#' \
8685
-e 's#"DownloadLinkInstall": "[^"]*"#"DownloadLinkInstall": "'"$repo_url/releases/download/${{ github.ref_name }}/latest.zip"'"#g' \
87-
-e 's#"DownloadLinkTesting": "[^"]*"#"DownloadLinkTesting": "'"$repo_url/releases/download/${{ github.ref_name }}/latest.zip"'"#g' \
8886
-e 's#"DownloadLinkUpdate": "[^"]*"#"DownloadLinkUpdate": "'"$repo_url/releases/download/${{ github.ref_name }}/latest.zip"'"#g'
8987
9088
git add repo.json

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
dotnet-version: [9.0.x] # Can add multiple .NET versions here to test against (For example, testing a new version of .NET before it's released)
28+
dotnet-version: [10.0.x] # Can add multiple .NET versions here to test against (For example, testing a new version of .NET before it's released)
2929
dalamud-version: [""] # Can add multiple Dalamud branches here to test against - empty string means live latest.
3030
env:
3131
DALAMUD_HOME: /tmp/dalamud

‎GLib‎

‎Ktisis/Data/Excel/BattleNpc.cs‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
using Ktisis.Data.Npc;
55
using Ktisis.Structs.Actor;
66
using Ktisis.Structs.Extensions;
7+
using Lumina.Text.ReadOnly;
78

89
namespace Ktisis.Data.Excel {
910
[Sheet("BNpcBase", columnHash: 0xD5D82616)]
10-
public struct BattleNpc(uint row) : IExcelRow<BattleNpc>, INpcBase {
11+
public struct BattleNpc(ExcelPage page, uint offset, uint row) : IExcelRow<BattleNpc>, INpcBase {
1112
// Excel
12-
13+
public ExcelPage ExcelPage => page;
14+
public uint RowOffset => offset;
1315
public uint RowId => row;
1416

1517
public float Scale { get; set; }
@@ -18,7 +20,7 @@ public struct BattleNpc(uint row) : IExcelRow<BattleNpc>, INpcBase {
1820
private RowRef<NpcEquipment> NpcEquipment { get; set; }
1921

2022
public static BattleNpc Create(ExcelPage page, uint offset, uint row) {
21-
return new BattleNpc(row) {
23+
return new BattleNpc(page, offset, row) {
2224
Scale = page.ReadColumn<float>(4, offset),
2325
ModelChara = page.ReadRowRef<ModelChara>(5, offset),
2426
CustomizeSheet = page.ReadRowRef<BNpcCustomizeSheet>(6, offset),
@@ -48,13 +50,15 @@ public ushort GetModelId()
4850
// Customize Sheet
4951

5052
[Sheet("BNpcCustomize", columnHash: 0x18f060d4)]
51-
private struct BNpcCustomizeSheet(uint row) : IExcelRow<BNpcCustomizeSheet> {
53+
private struct BNpcCustomizeSheet(ExcelPage page, uint offset, uint row) : IExcelRow<BNpcCustomizeSheet> {
54+
public ExcelPage ExcelPage => page;
55+
public uint RowOffset => offset;
5256
public uint RowId => row;
5357

5458
public Customize Customize { get; set; }
5559

5660
public static BNpcCustomizeSheet Create(ExcelPage page, uint offset, uint row) {
57-
return new BNpcCustomizeSheet(row) {
61+
return new BNpcCustomizeSheet(page, offset, row) {
5862
Customize = page.ReadCustomize(0, offset)
5963
};
6064
}

‎Ktisis/Data/Excel/CharaMakeCustomize.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55

66
namespace Ktisis.Data.Excel {
77
[Sheet("CharaMakeCustomize")]
8-
public struct CharaMakeCustomize(uint row) : IExcelRow<CharaMakeCustomize> {
8+
public struct CharaMakeCustomize(ExcelPage page, uint offset, uint row) : IExcelRow<CharaMakeCustomize> {
9+
public ExcelPage ExcelPage => page;
10+
public uint RowOffset => offset;
911
public uint RowId => row;
1012

1113
public string Name { get; set; } = "";
@@ -18,7 +20,7 @@ public struct CharaMakeCustomize(uint row) : IExcelRow<CharaMakeCustomize> {
1820
public byte FaceType { get; set; }
1921

2022
static CharaMakeCustomize IExcelRow<CharaMakeCustomize>.Create(ExcelPage page, uint offset, uint row) {
21-
return new CharaMakeCustomize(row) {
23+
return new CharaMakeCustomize(page, offset, row) {
2224
FeatureId = page.ReadColumn<byte>(0, offset),
2325
Icon = page.ReadColumn<uint>(1, offset),
2426
Data = page.ReadColumn<ushort>(2, offset),

‎Ktisis/Data/Excel/CharaMakeType.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public struct Menu {
3838
}
3939

4040
[Sheet("CharaMakeType")]
41-
public struct CharaMakeType(uint row) : IExcelRow<CharaMakeType> {
41+
public struct CharaMakeType(ExcelPage page, uint offset, uint row) : IExcelRow<CharaMakeType> {
4242
// Consts
4343

4444
public const int MenuCt = 28;
@@ -47,6 +47,8 @@ public struct CharaMakeType(uint row) : IExcelRow<CharaMakeType> {
4747
public const int FacialFeaturesCt = 7 * 8;
4848

4949
// Properties
50+
public ExcelPage ExcelPage => page;
51+
public uint RowOffset => offset;
5052

5153
public uint RowId => row;
5254

@@ -67,7 +69,7 @@ public struct CharaMakeType(uint row) : IExcelRow<CharaMakeType> {
6769
public static CharaMakeType Create(ExcelPage page, uint offset, uint row) {
6870
var features = new int[FacialFeaturesCt];
6971
for (var i = 0; i < FacialFeaturesCt; i++)
70-
features[i] = page.ReadColumn<int>(3291 + i, offset);
72+
features[i] = page.ReadColumn<int>(3459 + i, offset);
7173

7274
var menus = new Menu[MenuCt];
7375
for (var i = 0; i < MenuCt; i++) {
@@ -87,7 +89,7 @@ public static CharaMakeType Create(ExcelPage page, uint offset, uint row) {
8789
for (var p = 0; p < ct; p++)
8890
menu.Params[p] = page.ReadColumn<uint>(3 + (7 + p) * MenuCt + i, offset);
8991
for (var g = 0; g < GraphicCt; g++)
90-
menu.Graphics[g] = page.ReadColumn<byte>(3 + (107 + g) * MenuCt + i, offset);
92+
menu.Graphics[g] = page.ReadColumn<byte>(3 + (113 + g) * MenuCt + i, offset);
9193
}
9294

9395
if (menu.IsFeature) {
@@ -100,7 +102,7 @@ public static CharaMakeType Create(ExcelPage page, uint offset, uint row) {
100102
menus[i] = menu;
101103
}
102104

103-
return new CharaMakeType(row) {
105+
return new CharaMakeType(page, offset, row) {
104106
Race = page.ReadRowRef<Race>(0, offset),
105107
Tribe = page.ReadRowRef<Tribe>(1, offset),
106108
Gender = page.ReadColumn<sbyte>(2, offset),

‎Ktisis/Data/Excel/Dye.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010

1111
namespace Ktisis.Data.Excel {
1212
[Sheet("Stain")]
13-
public struct Dye(uint row) : IExcelRow<Dye> {
13+
public struct Dye(ExcelPage page, uint offset, uint row) : IExcelRow<Dye> {
14+
public ExcelPage ExcelPage => page;
15+
public uint RowOffset => offset;
1416
public uint RowId => row;
1517

1618
public string Name { get; set; }
@@ -33,7 +35,7 @@ public Vector4 ColorVector4
3335

3436
public static Dye Create(ExcelPage page, uint offset, uint row) {
3537
var name = page.ReadColumn<string>(3, offset);
36-
return new Dye(row) {
38+
return new Dye(page, offset, row) {
3739
Name = !name.IsNullOrEmpty() ? name : "Undyed", // TODO: translation
3840
Color = page.ReadColumn<uint>(0, offset),
3941
Shade = page.ReadColumn<byte>(1, offset),

‎Ktisis/Data/Excel/EventNpc.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ namespace Ktisis.Data.Excel {
1010
public struct EventNpc : IExcelRow<EventNpc>, INpcBase {
1111
// Excel
1212

13+
public ExcelPage ExcelPage { get; }
14+
public uint RowOffset { get; }
1315
public uint RowId { get; }
1416

1517
public ushort EventHandler { get; set; }
@@ -22,6 +24,8 @@ public struct EventNpc : IExcelRow<EventNpc>, INpcBase {
2224
public Equipment Equipment { get; set; }
2325

2426
public EventNpc(ExcelPage page, uint offset, uint row) {
27+
this.ExcelPage = page;
28+
this.RowOffset = offset;
2529
this.RowId = row;
2630

2731
this.Name = $"E:{this.RowId:D7}";

‎Ktisis/Data/Excel/Glasses.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
namespace Ktisis.Data.Excel {
99
[Sheet("Glasses")]
1010
public struct Glasses(ExcelPage page, uint offset, uint row) : IExcelRow<Glasses> {
11+
public ExcelPage ExcelPage => page;
12+
public uint RowOffset => offset;
1113
public uint RowId => row;
1214

1315
public string Name { get; set; } = string.Empty;

‎Ktisis/Data/Excel/HairMakeType.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
namespace Ktisis.Data.Excel {
99
[Sheet("HairMakeType")]
10-
public struct HairMakeType(uint row) : IExcelRow<HairMakeType> {
10+
public struct HairMakeType(ExcelPage page, uint offset, uint row) : IExcelRow<HairMakeType> {
11+
public ExcelPage ExcelPage => page;
12+
public uint RowOffset => offset;
1113
public uint RowId => row;
1214

1315
// Properties
@@ -26,7 +28,7 @@ public struct HairMakeType(uint row) : IExcelRow<HairMakeType> {
2628
static HairMakeType IExcelRow<HairMakeType>.Create(ExcelPage page, uint offset, uint row) {
2729
var hairStartIndex = page.ReadColumn<uint>(66, offset);
2830
var facePaintStartIndex = page.ReadColumn<uint>(82, offset);
29-
return new HairMakeType(row) {
31+
return new HairMakeType(page, offset, row) {
3032
HairStartIndex = hairStartIndex,
3133
FacepaintStartIndex = facePaintStartIndex,
3234
HairStyles = GetRange(page, hairStartIndex, HairLength).ToList(),

0 commit comments

Comments
 (0)