From 1334a72572a9a85297e448295d277d4e2bbf9da3 Mon Sep 17 00:00:00 2001 From: KillzXGaming Date: Fri, 6 May 2022 20:47:50 -0400 Subject: [PATCH] Add KCL flag for trick + high gravity --- .../Editors/CollisionEditor/CollisionMaterialSelector.cs | 6 ++++-- Plugins/TurboLibrary/Editors/FileLoaders/KclPlugin.cs | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Plugins/TurboLibrary/Editors/CollisionEditor/CollisionMaterialSelector.cs b/Plugins/TurboLibrary/Editors/CollisionEditor/CollisionMaterialSelector.cs index 97e4170..3821ae0 100644 --- a/Plugins/TurboLibrary/Editors/CollisionEditor/CollisionMaterialSelector.cs +++ b/Plugins/TurboLibrary/Editors/CollisionEditor/CollisionMaterialSelector.cs @@ -57,7 +57,8 @@ public string GetSpecialTypeName(ushort attribute) if (specialFlag == 0x10) return CollisionCalculator.SpecialType[1]; if (specialFlag == 0x20) return CollisionCalculator.SpecialType[2]; if (specialFlag == 0x40) return CollisionCalculator.SpecialType[3]; - if (specialFlag == 0x80) return CollisionCalculator.SpecialType[4]; + if (specialFlag == 0x50) return CollisionCalculator.SpecialType[4]; + if (specialFlag == 0x80) return CollisionCalculator.SpecialType[5]; return "None"; } @@ -345,7 +346,8 @@ public void Calculate() if (SpecialTypeIdx == 1) Attribute += 0x1000; if (SpecialTypeIdx == 2) Attribute += 0x2000; if (SpecialTypeIdx == 3) Attribute += 0x4000; - if (SpecialTypeIdx == 4) Attribute += 0x8000; + if (SpecialTypeIdx == 4) Attribute += 0x5000; + if (SpecialTypeIdx == 5) Attribute += 0x8000; AttributeCalculated?.Invoke(this, EventArgs.Empty); } diff --git a/Plugins/TurboLibrary/Editors/FileLoaders/KclPlugin.cs b/Plugins/TurboLibrary/Editors/FileLoaders/KclPlugin.cs index 9329c37..30830fe 100644 --- a/Plugins/TurboLibrary/Editors/FileLoaders/KclPlugin.cs +++ b/Plugins/TurboLibrary/Editors/FileLoaders/KclPlugin.cs @@ -245,7 +245,8 @@ public PrismProperties(NodeBase node, ushort id) { if (specialFlag == 0x10) SpecialFlag = CollisionCalculator.SpecialType[1]; if (specialFlag == 0x20) SpecialFlag = CollisionCalculator.SpecialType[2]; if (specialFlag == 0x40) SpecialFlag = CollisionCalculator.SpecialType[3]; - if (specialFlag == 0x80) SpecialFlag = CollisionCalculator.SpecialType[4]; + if (specialFlag == 0x50) SpecialFlag = CollisionCalculator.SpecialType[4]; + if (specialFlag == 0x80) SpecialFlag = CollisionCalculator.SpecialType[5]; } }