Refactoring

Author: psiberx

scripts/Utils/Casts.reds

@@ -13,6 +13,9 @@ public func Cast(value: Uint64) -> NodeRef = HashToNodeRef(value)
 public func Cast(value: NodeRef) -> EntityID = EntityID.FromHash(NodeRefToHash(value))
 public func Cast(value: EntityID) -> NodeRef = HashToNodeRef(EntityID.ToHash(value))
 
+public func Cast(value: TweakDBID) -> Uint64 = TDBID.ToNumber(value)
+public func Cast(value: Uint64) -> TweakDBID = TDBID.FromNumber(value)
+
 public func Cast(value: String) -> NodeRef = CreateNodeRef(value)
 
 public func Cast(value: LocalizationString) -> String = ExtractLocalizationString(value)

scripts/Utils/TDBID.reds scripts/Utils/TweakDBID.redsscripts/Utils/TDBID.reds renamed to scripts/Utils/TweakDBID.reds

@@ -3,7 +3,7 @@
 
 bool App::EntityEx::ApplyMorphTarget(Red::CName aTarget, Red::CName aRegion, float aValue)
 {
-    for (const auto& component : GetComponents())
+    for (const auto& component : components)
     {
         if (component->GetType()->IsA(Red::GetType<Red::entMorphTargetManagerComponent>()))
         {

src/App/Entity/EntityEx.cpp

@@ -8,14 +8,14 @@ struct EntityEx : Red::Entity
 {
     Red::ResourceAsyncReference<> GetTemplatePath()
     {
-        return *Raw::Entity::TemplatePath(this);
+        return templatePath;
     }
 
     Red::Handle<Red::IComponent> FindComponentByType(Red::CName aType)
     {
         if (auto type = Red::GetClass(aType))
         {
-            for (const auto& component : Raw::Entity::ComponentsStorage::Ptr(this)->components)
+            for (const auto& component : components)
             {
                 if (component->GetType()->IsA(type))
                 {
@@ -28,17 +28,19 @@ struct EntityEx : Red::Entity
 
     Red::DynArray<Red::Handle<Red::IComponent>> GetComponents()
     {
-        return Raw::Entity::ComponentsStorage(this)->components;
+        return components;
     }
 
     void AddComponent(const Red::Handle<Red::IComponent>& aComponent)
     {
-        Raw::Entity::ComponentsStorage(this)->components.PushBack(aComponent);
+        aComponent->owner = this;
+
+        components.PushBack(aComponent);
     }
 
     void SetWorldTransform(const Red::WorldTransform& aTransform)
     {
-        Raw::IPlacedComponent::SetTransform(Raw::Entity::TransformComponent::Ref(this), aTransform);
+        Raw::IPlacedComponent::SetTransform(transformComponent, aTransform);
     }
 
     bool ApplyMorphTarget(Red::CName aTarget, Red::CName aRegion, float aValue);

src/App/Entity/EntityEx.hpp

@@ -6,13 +6,11 @@ struct gamedataTDBIDHelperEx : Red::gamedataTDBIDHelper
 {
     static Red::TweakDBID FromNumber(uint64_t aHash)
     {
-        return {.value = aHash};
+        return {aHash};
     }
 };
 }
 
 RTTI_EXPAND_CLASS(Red::gamedataTDBIDHelper, App::gamedataTDBIDHelperEx, {
-    RTTI_ALIAS("TDBID");
-
     RTTI_METHOD(FromNumber);
 });

src/App/Utils/TDBIDHelperEx.hpp src/App/Utils/TweakDBID.hppsrc/App/Utils/TDBIDHelperEx.hpp renamed to src/App/Utils/TweakDBID.hpp

@@ -68,7 +68,7 @@
 #include "App/Utils/NodeRef.hpp"
 #include "App/Utils/Number.hpp"
 #include "App/Utils/String.hpp"
-#include "App/Utils/TDBIDHelperEx.hpp"
+#include "App/Utils/TweakDBID.hpp"
 #include "App/World/DynamicEntityEvent.hpp"
 #include "App/World/DynamicEntitySpec.hpp"
 #include "App/World/DynamicEntityState.hpp"

src/rtti.cpp

@@ -1221,7 +1221,9 @@ Add the following casts:
 ### TDBID
 
 ```swift
-let hash = 191898568373ul; // Mizutani Shion Coyote
+// Vehicle.v_sport2_mizutani_shion_nomad_player
+// 0x0000002CAE0BC6B5
+let hash = 191898568373ul;
 let recordID = TDBID.FromNumber(hash);
 ```
 
@@ -1235,4 +1237,4 @@ let recordID = TDBID.FromNumber(hash);
 - [Bits](https://github.com/psiberx/cp2077-codeware/blob/main/scripts/Utils/Bits.reds)
 - [Vector2](https://github.com/psiberx/cp2077-codeware/blob/main/scripts/Utils/Vector2.reds)
 - [Vector3](https://github.com/psiberx/cp2077-codeware/blob/main/scripts/Utils/Vector3.reds)
-- [TDBID](https://github.com/psiberx/cp2077-codeware/blob/main/scripts/Utils/TDBID.reds)
+- [TweakDBID](https://github.com/psiberx/cp2077-codeware/blob/main/scripts/Utils/TweakDBID.reds)