From c5b124fa25fa3b6d3fa7270b9bb02cf9ed18d4e3 Mon Sep 17 00:00:00 2001 From: psiberx Date: Fri, 13 Dec 2024 09:25:56 +0300 Subject: [PATCH] Support patch 2.2 --- .gitignore | 1 + README.md | 8 +++---- scripts/Facade.reds | 2 +- .../PhotoModePlayerEntityComponent.reds | 8 ++++--- support/hints/EquipmentEx.toml | 24 +++++++++---------- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 626d6e0..e33c1d6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ /archive/source/raw/**/*.json /archive/*.xml /archive/*.zip +/archive/fileTreeState.json /build /dev /*.log diff --git a/README.md b/README.md index a3a0578..6a074a2 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,11 @@ ### Requirements -- Cyberpunk 2077 2.13 -- [ArchiveXL](https://github.com/psiberx/cp2077-archive-xl) 1.16.9+ +- Cyberpunk 2077 2.2 +- [ArchiveXL](https://github.com/psiberx/cp2077-archive-xl) 1.18.0+ - [TweakXL](https://github.com/psiberx/cp2077-tweak-xl) 1.10.4+ -- [Codeware](https://github.com/psiberx/cp2077-codeware) 1.12.7+ -- [redscript](https://github.com/jac3km4/redscript) 0.5.24+ +- [Codeware](https://github.com/psiberx/cp2077-codeware) 1.13.0+ +- [redscript](https://github.com/jac3km4/redscript) 0.5.25+ ### Installation diff --git a/scripts/Facade.reds b/scripts/Facade.reds index 1e44b64..b70c89e 100644 --- a/scripts/Facade.reds +++ b/scripts/Facade.reds @@ -1,7 +1,7 @@ import EquipmentEx.OutfitSystem public abstract class EquipmentEx { - public static func Version() -> String = "1.2.6"; + public static func Version() -> String = "1.2.7"; public static func Activate(game: GameInstance) { OutfitSystem.GetInstance(game).Activate(); diff --git a/scripts/Overrides/PhotoModePlayerEntityComponent.reds b/scripts/Overrides/PhotoModePlayerEntityComponent.reds index c001ec1..934f68d 100644 --- a/scripts/Overrides/PhotoModePlayerEntityComponent.reds +++ b/scripts/Overrides/PhotoModePlayerEntityComponent.reds @@ -18,10 +18,12 @@ private final func OnGameAttach() { private final func SetupInventory(isCurrentPlayerObjectCustomizable: Bool) { wrappedMethod(isCurrentPlayerObjectCustomizable); - this.m_paperdollHelper.AddPuppet(this.fakePuppet); + if this.customizable { + this.m_paperdollHelper.AddPuppet(this.fakePuppet); - if this.m_outfitSystem.IsActive() { - this.m_outfitSystem.EquipPuppetOutfit(this.fakePuppet, this.loadingItems); + if this.m_outfitSystem.IsActive() { + this.m_outfitSystem.EquipPuppetOutfit(this.fakePuppet, this.loadingItems); + } } } diff --git a/support/hints/EquipmentEx.toml b/support/hints/EquipmentEx.toml index 6accd3a..4b81ebc 100644 --- a/support/hints/EquipmentEx.toml +++ b/support/hints/EquipmentEx.toml @@ -1,12 +1,12 @@ [[UNRESOLVED_REF]] -id = "ARCHIVEXL_11609" +id = "ARCHIVEXL_11800" span_starts_with = "ArchiveXL" -message = "Install ArchiveXL 1.16.9 or higher" +message = "Install ArchiveXL 1.18.0 or higher" [[UNRESOLVED_METHOD]] -id = "ARCHIVEXL_11609" +id = "ARCHIVEXL_11800" span_starts_with = "ArchiveXL" -message = "Install ArchiveXL 1.16.9 or higher" +message = "Install ArchiveXL 1.18.0 or higher" [[UNRESOLVED_REF]] id = "TWEAKXL_11004" @@ -14,24 +14,24 @@ span_starts_with = "TweakXL" message = "Install TweakXL 1.10.4 or higher" [[UNRESOLVED_FN]] -id = "CODEWARE_11207" +id = "CODEWARE_11300" span_starts_with = "Print(command)" -message = "Install Codeware 1.12.7 or higher" +message = "Install Codeware 1.13.0 or higher" [[UNRESOLVED_FN]] -id = "CODEWARE_11207" +id = "CODEWARE_11300" line_contains = "UTF8StrLower" -message = "Install Codeware 1.12.7 or higher" +message = "Install Codeware 1.13.0 or higher" [[UNRESOLVED_METHOD]] -id = "CODEWARE_11207" +id = "CODEWARE_11300" line_contains = "ForgetItemID" -message = "Install Codeware 1.12.7 or higher" +message = "Install Codeware 1.13.0 or higher" [[UNRESOLVED_TYPE]] -id = "CODEWARE_11207" +id = "CODEWARE_11300" line_contains = "InMenuPopup" -message = "Install Codeware 1.12.7 or higher" +message = "Install Codeware 1.13.0 or higher" [[UNRESOLVED_METHOD]] id = "EQEX_MIX"