Script_AniName: Apply mapping override also to effects

Author: georgeto

source/Scripts/Script_AniName/Readme_DE.txt

@@ -7,6 +7,11 @@ Dieses Skript überschreibt dieses Zuordnungsmuster für bestimmte Spezies:
   - gESpecies_Skeleton: Skelett_....xmot
   - gESpecies_Zombie: Zombie_....xmot
 
+Das gleiche Zuordnungsmuster wird auf die Effekte `eff_creature_<actor name>_stumble_01` und
+`eff_creature_<actor name>_die_01` angewendet:
+  - gESpecies_Skeleton: eff_creature_skeleton_stumble_01, eff_creature_skeleton_die_01
+  - gESpecies_Zombie: eff_creature_zombie_stumble_01, eff_creature_zombie_die_01
+
 1. Installation
 Der Ordner 'scripts' muss ins Gothic 3 Installationverzeichnis kopiert werden.
 Es ist nicht notwendig ein neues Spiel zu beginnen.

source/Scripts/Script_AniName/Readme_EN.txt

@@ -7,6 +7,11 @@ This Script overrides that mapping for certain species:
   - gESpecies_Skeleton: Skeleton_....xmot
   - gESpecies_Zombie: Zombie_....xmot
 
+The same mapping override is applied to the `eff_creature_<actor name>_stumble_01` and
+`eff_creature_<actor name>_die_01` effects.
+  - gESpecies_Skeleton: eff_creature_skeleton_stumble_01, eff_creature_skeleton_die_01
+  - gESpecies_Zombie: eff_creature_zombie_stumble_01, eff_creature_zombie_die_01
+
 1. Installation
 The 'scripts' folder has to be copied into the Gothic 3 install folder.
 There is no need to start a new game.

source/Scripts/Script_AniName/Script_AniName.cpp

@@ -21,6 +21,26 @@ namespace
             }
         }
     }
+
+    static mCFunctionHook Hook_PSAnimation_GetSkeletonName;
+    GEBool GE_STDCALL PSAnimation_GetSkeletonName(PSAnimation const &This, bCString & o_SkeletonName)
+    {
+        gCNPC_PS const * NPC = This.IsValid() ? GetPropertySet<gCNPC_PS>(This->GetEntity(), eEPropertySetType_NPC) : nullptr;
+        if (NPC)
+        {
+            switch (NPC->GetSpecies().GetValue())
+            {
+            case gESpecies_Skeleton:
+                o_SkeletonName = "Skeleton";
+                return GETrue;
+            case gESpecies_Zombie:
+                o_SkeletonName = "Zombie";
+                return GETrue;
+            }
+        }
+
+        return Hook_PSAnimation_GetSkeletonName.GetOriginalFunction(PSAnimation_GetSkeletonName)(This, o_SkeletonName);
+    }
 }
 
 void ApplyHooks()
@@ -32,6 +52,10 @@ void ApplyHooks()
         .AddRegArg(mCRegisterBase::mERegisterType_Ebx) // eCEntity const * Actor
         .AddRegArg(mCRegisterBase::mERegisterType_Esi) // bCString & ActorName
         .InsertCall().Hook();
+
+    Hook_PSAnimation_GetSkeletonName
+        .Prepare(PROC_Script("?GetSkeletonName@PSAnimation@@QBE_NAAVbCString@@@Z"), &PSAnimation_GetSkeletonName)
+        .ThisCall().Hook();
 }