update

Oops19 · Oops19 · commit 59d8fea55554 · 2024-12-07T23:21:28.000+01:00
diff --git a/README.md b/README.md
@@ -201,7 +201,7 @@ This mod has been inspired by 'Copy Any Outfit' by scumbumbo. All code has been
 # Addendum
 
 ## Game compatibility
-This mod has been tested with `The Sims 4` 1.110.311, S4CL 3.9, TS4Lib 0.3.32.
+This mod has been tested with `The Sims 4` 1.111.102, S4CL 3.9, TS4Lib 0.3.32.
 It is expected to be compatible with many upcoming releases of TS4, S4CL and TS4Lib.
 
 ## Dependencies
diff --git a/_TS4/Mods/_o19_/copy_outfits.package b/_TS4/Mods/_o19_/copy_outfits.package
diff --git a/_TS4/mod_documentation/copy_outfits/README.md b/_TS4/mod_documentation/copy_outfits/README.md
@@ -201,7 +201,7 @@ This mod has been inspired by 'Copy Any Outfit' by scumbumbo. All code has been
 # Addendum
 
 ## Game compatibility
-This mod has been tested with `The Sims 4` 1.110.311, S4CL 3.9, TS4Lib 0.3.32.
+This mod has been tested with `The Sims 4` 1.111.102, S4CL 3.9, TS4Lib 0.3.32.
 It is expected to be compatible with many upcoming releases of TS4, S4CL and TS4Lib.
 
 ## Dependencies
diff --git a/_TS4/mod_documentation/copy_outfits/version.txt b/_TS4/mod_documentation/copy_outfits/version.txt
@@ -1,5 +1,5 @@
-CopyOutfits v1.9.11 for The Sims 4 v1.110.311 and S4CL v3.9
-Created on 2024-11-26
-v1.9.11
-    Fix generate_outfit()
+CopyOutfits v1.9.13 for The Sims 4 v1.111.102 and S4CL v3.9
+Created on 2024-12-07
+v1.9.13
+    Add PieMenu More > Fix Head
 
diff --git a/copy_outfits/copy_outfits_mannequin.py b/copy_outfits/copy_outfits_mannequin.py
@@ -39,7 +39,7 @@
 log.enable()
 
 
-class CopyOutfitsMannequin:  # (metaclass=Singleton):
+class CopyOutfitsMannequin(metaclass=Singleton):
     def __init__(self):
         self.guids = {
             CopyOutfitsAge.TYAE: {
diff --git a/copy_outfits/enums/pie_menu_action.py b/copy_outfits/enums/pie_menu_action.py
@@ -20,4 +20,8 @@ class PieMenuAction(CommonEnum):
     BODY_TYPE = 128  # TS4 CAS parts as defined in ts4lib.BodyType(CommonEnum) ea.outfits.BodyType(Enum)
 
     SKIN = 256  # Apply next head/skin to mannequin
-    MANNEQUIN = 512  # Add mannequin
+    MANNEQUIN = 512  # Add mannequin
+
+    RESERVED = 1024  # free
+
+    FIX_HEAD = 2048
diff --git a/copy_outfits/main.py b/copy_outfits/main.py
@@ -112,8 +112,9 @@ def on_started(self, interaction_sim: Sim, interaction_target: Any, instance_tun
             elif _action == PieMenuAction.ADD:
                 OutfitAdd().add_outfits(self._sim)
             elif _action == PieMenuAction.BODY_TYPE:
-
                 log.debug(f"TODO - BODY_TYPE Picker")
+            elif _action == PieMenuAction.FIX_HEAD:
+                OutfitSkin().fix_head(self.interaction_target)
             else:
                 log.warn(f"Unknown action '{_action}'. This should never happen.")
         except Exception as e:
diff --git a/copy_outfits/modinfo.py b/copy_outfits/modinfo.py
@@ -28,7 +28,7 @@ def _file_path(self) -> str:
 
     @property
     def _version(self) -> str:
-        return '1.9.11'
+        return '1.9.13'
 
 
 r'''
@@ -42,6 +42,10 @@ def _version(self) -> str:
 TODO
     Load and Save outfits
     Read config files / support user defined skins
+v1.9.13
+    Add PieMenu More > Fix Head
+v1.9.12
+    Add 'o19.co.fix' to apply the vanilla head to Child, Teen-Elder sims
 v1.9.11
     Fix generate_outfit()
 v1.9.10
diff --git a/copy_outfits/outfit_skin.py b/copy_outfits/outfit_skin.py
@@ -2,30 +2,78 @@
 # LICENSE https://creativecommons.org/licenses/by/4.0/ https://creativecommons.org/licenses/by/4.0/legalcode
 # © 2024 https://github.com/Oops19
 #
+
+
 import random
+import sys
+import threading
+import traceback
+from typing import Dict, Set
 
+import services
 from copy_outfits.enums.copy_outfits_age import CopyOutfitsAge
 from copy_outfits.enums.default_head import DefaultHead
 from copy_outfits.enums.pie_menu_action_id import PieMenuActionId
 from copy_outfits.modinfo import ModInfo
 from copy_outfits.persist.skin_store import SkinStore
 from copy_outfits.struct.copy_outfits_sim import CopyOutfitsSim
+from objects import HiddenReasonFlag, ALL_HIDDEN_REASONS
+from sims.sim_info import SimInfo
+from sims4communitylib.services.commands.common_console_command import CommonConsoleCommand
+from sims4communitylib.services.commands.common_console_command_output import CommonConsoleCommandOutput
 from sims4communitylib.services.sim.cas.common_sim_outfit_io import CommonSimOutfitIO
+from sims4communitylib.utils.cas.common_cas_utils import CommonCASUtils
 from sims4communitylib.utils.cas.common_outfit_utils import CommonOutfitUtils
 from sims4communitylib.utils.common_log_registry import CommonLog, CommonLogRegistry
+from sims4communitylib.utils.sims.common_age_utils import CommonAgeUtils
+from sims4communitylib.utils.sims.common_gender_utils import CommonGenderUtils
+from sims4communitylib.utils.sims.common_sim_utils import CommonSimUtils
+from ts4lib.common_enums.body_type import BodyType
 from ts4lib.utils.singleton import Singleton
 
 log: CommonLog = CommonLogRegistry.get().register_log(ModInfo.get_identity(), 'OutfitSkin')
 log.enable()
 
 
 class OutfitSkin(metaclass=Singleton):
-    """ Add skins to sims """
+    do_init = True
+
     def __init__(self):
-        self.config = {
+        log.debug(f"{OutfitSkin.do_init}")
+        if OutfitSkin.do_init is True:
+            OutfitSkin.do_init = False
+            self.init()
+
+    """ Add skins to sims """
+    def init(self):
+        log.debug(f"init")
+        try:
+            log.debug(f"Thread Dump")
+            for thread in threading.enumerate():
+                log.debug(f"{thread}")
+                thread_details = traceback.extract_stack(sys._current_frames()[thread.ident])
+                for thread_detail in thread_details:
+                    (filename, number, function, line_text) = thread_detail
+                    log.debug(f"    {filename}#{number} '{line_text}' in '{function}()'")
+            log.debug(f"")
+        except:
+            pass
+
+        self.available_skins: Dict = {
+            CopyOutfitsAge.TYAE: {
+                True: [],  # Female / is_female==True
+                False: [],  # Male
+            },
+            CopyOutfitsAge.CHILD: {
+                True: [],  # Female
+                False: [],  # Male
+            },
+        }
+        self.supported_skins: Dict = {
             CopyOutfitsAge.TYAE: {
                 True: [  # is_female, used in o19_yfHead.package
                     # The high-bit must be set for all custom CAS Parts. Otherwise, they will not be found.
+                    # custom head cas part, custom skin images, description
                     (0xFD57E11C9F0D2AFD, 0xA83ABE943B90DD44, 'ddarkpinkrosa0_Miami_Skin_V1'),
                     (0xE2F29393763FBEFD, 0xE9DF3FAEC660DE19, 'ddarkpinkrosa0_Miami_Skin_V1'),
                     (0xF2157D9C0F5DBB0C, 0xE1750D34ED49C938, 'ddarkpinkrosa0_Miami_Skin_V1'),
@@ -36,7 +84,6 @@ def __init__(self):
                     (0x8B269F3A852B0059, 0xC42933F4CFD6B686, 'JS_008Skin'),
                     (0x8F30F85CC19644C1, 0xDABE010DB300612C, 'JS_008Skin'),
                     (0x8D88C11365FFA9EC, 0xA91D148D8D6709B5, 'JS_008Skin'),
-
                     (0xCD27D0CC83CC79CE, 0xA2C37B6FF654696D, '[THISISTHEM] Pamela Anderson Skin'),
                     (0x8111880154582F44, 0xBF054E412D1C3FF1, '[THISISTHEM] Selena G. Skin'),
                     (0xD8191C563F223169, 0x945804D533C7195C, '[THISISTHEM] Salma Hayek Skin'),
@@ -53,7 +100,6 @@ def __init__(self):
                     (0xF5E803E374BAAA88, 0xC6E085AE73312D6D, '[THISISTHEM] Ashley Skin'),
                     (0xA59BBF6B64B413FF, 0xAD660A57BEC2E456, '[THISISTHEM] Abény Skin'),
                     (DefaultHead.YF_HEAD_DEFAULT.value, DefaultHead.YF_HEAD_DEFAULT.value, 'TS4 Default'),
-
                 ],
                 False: [  # is_male, used in o19_ymHead.package
                     (0xE66AA85AD5A6C480, 0xA63963459FAC2D01, '[THISISTHEM] A$AP Rocky Skin'),
@@ -77,10 +123,35 @@ def __init__(self):
                     (0x800298CD9078A60D, 0xA78520CC00C7191C, '[THISISTHEM] Child Skin N24'),
                     (DefaultHead.CU_HEAD_DEFAULT.value, DefaultHead.CU_HEAD_DEFAULT.value, 'TS4 Default'),
                 ],
-
             },
         }
-        self.skin_store = SkinStore(self.config)
+
+        missing_packages: Set = set()
+        for sim_age in [CopyOutfitsAge.CHILD, CopyOutfitsAge.TYAE, ]:
+            _ages = {}
+            for is_female in [True, False, ]:
+                _available_skins = []
+                for data in self.supported_skins.get(sim_age).get(is_female):
+                    check_cas_part, use_cas_part, package_name = data
+                    if CommonCASUtils.is_cas_part_loaded(check_cas_part):
+                        if CommonCASUtils.is_cas_part_loaded(use_cas_part):
+                            _available_skins.append(use_cas_part)
+                        else:
+                            # this should never happen
+                            log.warn(f"copy_outfits.package missing or broken - {use_cas_part:016X} not found!")
+                    else:
+                        missing_packages.add(package_name)
+                        log.warn(f"Dropping: {is_female} {sim_age}: {data}")
+                _ages.update({is_female: _available_skins})
+            self.available_skins.update({sim_age: _ages})
+
+        if missing_packages:
+            log.info(f"Optional packages which are not installed: '{missing_packages}'. Install some of them to use more skins on mannequins.")
+
+        log.debug(f".... {self.available_skins}")
+        # Initialize store with the available skins
+        self.skin_store = SkinStore(self.available_skins)
+        log.debug(f"init-end")
 
     # A78520CC00C7191C
     def apply_skin(self, zim: CopyOutfitsSim):
@@ -116,6 +187,31 @@ def apply_skin(self, zim: CopyOutfitsSim):
             sim_info._current_outfit = (outfit_category, outfit_index)
         log.debug(f"Replacing head {current_head} with new {head_skin}.")
 
+    def fix_head(self, sim_info: SimInfo):
+        sim_info = CommonSimUtils.get_sim_info(sim_info)
+        if not sim_info:
+            return
+        if CommonAgeUtils.is_child(sim_info):
+            sim_age = CopyOutfitsAge.CHILD
+        elif CommonAgeUtils.is_teen_adult_or_elder(sim_info):
+            sim_age = CopyOutfitsAge.TYAE
+        else:
+            log.info(f"Age not supported.")
+            return
+        is_female = CommonGenderUtils.is_female(sim_info)
+        old_head_id = CommonCASUtils.get_cas_part_id_at_body_type(sim_info, BodyType.HEAD.value)
+        # True == CommonCASUtils.is_cas_part_loaded(old_head_id) as the part is 'in use'. A test makes no sense.
+        head_ids = OutfitSkin().available_skins.get(sim_age).get(is_female)
+        head_id = random.choice(head_ids)
+
+        log.info(f"Fixing '{sim_info}'s head to {head_id} (from {old_head_id}).")
+        CommonCASUtils.attach_cas_part_to_sim(sim_info, head_id, BodyType.HEAD.value)
+
+    @staticmethod
+    @CommonConsoleCommand(ModInfo.get_identity(), 'o19.co.fix', 'Fix the head of the active sim.')
+    def cheat_o19_test_print_genetics(output: CommonConsoleCommandOutput):
+        sim_info = CommonSimUtils.get_active_sim_info()
+        OutfitSkin().fix_head(sim_info)
 
-# Init SkinStore as soon as possible
+# Init OutfitSkin / SkinStore as soon as possible
 OutfitSkin()
diff --git a/copy_outfits/persist/skin_store.py b/copy_outfits/persist/skin_store.py
@@ -9,7 +9,6 @@
 
 from copy_outfits.enums.copy_outfits_age import CopyOutfitsAge
 from copy_outfits.modinfo import ModInfo
-from sims4communitylib.utils.cas.common_cas_utils import CommonCASUtils
 from sims4communitylib.utils.common_log_registry import CommonLog, CommonLogRegistry
 from ts4lib.utils.singleton import Singleton
 
@@ -19,6 +18,7 @@
 
 class SkinStore(metaclass=Singleton):
     def __init__(self, config: Dict):
+        log.debug(f'init')
         self.index = {
             CopyOutfitsAge.TYAE: {
                 True: 0,
@@ -29,16 +29,19 @@ def __init__(self, config: Dict):
                 False: 0,
             },
         }
-        self.config = {
-            CopyOutfitsAge.TYAE: {
-                True: [],
-                False: [],
-            },
-            CopyOutfitsAge.CHILD: {
-                True: [],
-                False: [],
-            },
-        }
+        if config:
+            self.config = config
+        else:
+            self.config = {
+                CopyOutfitsAge.TYAE: {
+                    True: [],
+                    False: [],
+                },
+                CopyOutfitsAge.CHILD: {
+                    True: [],
+                    False: [],
+                },
+            }
         self.size = {
             CopyOutfitsAge.TYAE: {
                 True: 0,
@@ -49,30 +52,14 @@ def __init__(self, config: Dict):
                 False: 0,
             },
         }
-        missing_packages: Set = set()
-        for age, gender_data in config.items():
-            gender_size = {}
-            for gender, cas_parts in gender_data.items():
-                existing_cas_parts = []
-                for cas_part in cas_parts:
-                    check_cas_part, use_cas_part, package_name = cas_part
-                    if CommonCASUtils.is_cas_part_loaded(check_cas_part):
-                        if CommonCASUtils.is_cas_part_loaded(use_cas_part):
-                            existing_cas_parts.append(use_cas_part)
-                        else:
-                            log.warn(f"copy_outfits.package missing or broken - {use_cas_part:016X} not found!")
-                    else:
-                        missing_packages.add(package_name)
-                        log.warn(f"Dropping: {cas_part}")
-                gender_data.update({gender: existing_cas_parts})
-                gender_size.update({gender: len(existing_cas_parts)})
-            self.config.update({age: gender_data})
-            self.size.update({age: gender_size})
 
-        if missing_packages:
-            log.info(f"Optional packages which are not installed: '{missing_packages}'. Install some of them to use more skins on mannequins.")
-        log.debug(f"self.size = {self.size}")
-        log.debug(f"self.config = {self.config}")
+        for sim_age in [CopyOutfitsAge.CHILD, CopyOutfitsAge.TYAE, ]:
+            _age_sizes = {}
+            for is_female in [True, False, ]:
+                _age_sizes.update({is_female: len(config.get(sim_age).get(is_female))})
+            self.size.update({sim_age: _age_sizes})
+        log.debug(f"size = {self.size}")
+        log.debug(f"config = {self.config}")
 
     def get_skin(self, age: CopyOutfitsAge, is_female: bool = True, offset: int = 1, random_offset: bool = False):
         size = self.size.get(age).get(is_female)
diff --git a/copy_outfits/pie/interactions_reg.py b/copy_outfits/pie/interactions_reg.py
@@ -101,6 +101,7 @@ def interactions_to_add(self) -> Tuple[int]:
             0xC11F89ED9D7FF93A,  # 'Destroy' - fnv('o19_Copy_Outfits_PMC__Copy_Outfits__Mannequin__Remove_PMA_Destroy_debug')
 
             0x4B864F684F7FC787,  # 'Print Clipboard' - fnv('o19_Copy_Outfits_PMC__Copy_Outfits__More_PMA_Print_Clipboard_debug')
+            0x9D595705F4525479,  # 'Fix Head' - fnv('o19_Copy_Outfits_PMC__Copy_Outfits__More_PMA_Fix_Head_debug')
             0x5BA6F113C0F2661A,  # 'Clear All' - fnv('o19_Copy_Outfits_PMC__Copy_Outfits__More_PMA_Clear_All_debug')
             0xA88C83FEBA17597D,  # 'Clipboard 0' - fnv('o19_Copy_Outfits_PMC__Copy_Outfits__More__Clear_PMA_Clipboard_0_debug')
             0x71BE7E2EB047630C,  # 'Clipboard 1' - fnv('o19_Copy_Outfits_PMC__Copy_Outfits__More__Clear_PMA_Clipboard_1_debug')
