Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Upload Release
uses: actions/upload-artifact@v4
with:
name: toolchain-release-windows
name: toolchain-release
path: dist/Release/win
- name: Upload Release
uses: actions/upload-artifact@v4
Expand Down
9 changes: 5 additions & 4 deletions DataTool/DataModels/GameModes/GameRulesetSchemaEntry.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Linq;
using System;
using System.Linq;
using TankLib;
using TankLib.STU.Types;
using TankLib.STU.Types.Enums;
Expand Down Expand Up @@ -36,11 +37,11 @@ public GameRulesetSchemaEntry(STUGameRulesetSchemaEntry entry) {
break;
case STU_776E5ADD val2:
Value = new RulesetSchemaValueEnum {
DefaultValue = val2.m_default.ToString(),
Choices = val2.m_3FE1EA9E.Select(x => new RulesetSchemaValueEnumChoice {
DefaultValue = val2.m_default?.ToString(),
Choices = val2.m_3FE1EA9E?.Select(x => new RulesetSchemaValueEnumChoice {
DisplayText = GetString(x.m_displayText),
Identifier = x.m_identifier
}).ToArray()
}).ToArray() ?? Array.Empty<RulesetSchemaValueEnumChoice>()
};
break;
case STU_A499C365 val3:
Expand Down
2 changes: 1 addition & 1 deletion DataTool/Static/GUIDNames.csv
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ FFB,078,Voicelines,1 ; 1.62
1AED,078,Voicelines,1 ; 2026 - s5 - solo leveling
1AEE,078,Voicelines,1 ; 2026 - s5 - solo leveling
1AEF,078,Voicelines,1 ; 2026 - s5 - solo leveling
1AFO,078,Voicelines,1 ; 2026 - s5 - solo leveling
1AF0,078,Voicelines,1 ; 2026 - s5 - solo leveling
; Note: Weapon models are often two entities, one for 1P, one for 3P, if they have different animations
; Ana,Classic,47,
1610,003,Teabag,0
Expand Down
2 changes: 2 additions & 0 deletions DataTool/ToolFlags.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ public class ToolFlags : IToolFlags {
public bool StringsAsGuids;

[CLIFlag(Default = false, Flag = "rcn", Help = "Load Chinese exclusive content", Parser = new[] {"DataTool.Flag.Converter", "CLIFlagBoolean"})]
[Alias("RCN")]
public bool RCN;

[CLIFlag(Default = false, Flag = "rkr", Help = "Load Korean exclusive content", Parser = new[] {"DataTool.Flag.Converter", "CLIFlagBoolean"})]
[Alias("RKR")]
public bool RKR;

[CLIFlag(Default = null, Flag = "scratchdb", Hidden = true, NeedsValue = true, Help = "Directory for persistent database storage for deduplication info")]
Expand Down