Merge pull request UnofficialCrusaderPatch#634 from LordHansCapon/fea…

…ture/fix_assassin Fix assassin pathing and behaviour
Lolasik011 · Aug 4, 2021 · 21f203d · 21f203d
2 parents b686f90 + ed4cbe6
commit 21f203d
Show file tree

Hide file tree

Showing 11 changed files with 97 additions and 1 deletion.
diff --git a/UnofficialCrusaderPatch/CodeBlocks/u_assassinfix_descension.block b/UnofficialCrusaderPatch/CodeBlocks/u_assassinfix_descension.block
@@ -0,0 +1 @@
+74 24 66 0F B6 89
diff --git a/UnofficialCrusaderPatch/CodeBlocks/u_assassinfix_forgetfullness.block b/UnofficialCrusaderPatch/CodeBlocks/u_assassinfix_forgetfullness.block
@@ -0,0 +1 @@
+66 C7 86 0A 07 00 00 00 00
diff --git a/UnofficialCrusaderPatch/CodeBlocks/u_assassinfix_forgetfullness_wall_climb.block b/UnofficialCrusaderPatch/CodeBlocks/u_assassinfix_forgetfullness_wall_climb.block
@@ -0,0 +1 @@
+66 3B C3 66 89 86 BC 08 00 00
diff --git a/UnofficialCrusaderPatch/Localization/Chinese.txt b/UnofficialCrusaderPatch/Localization/Chinese.txt
@@ -1,6 +1,16 @@
 // ======================
 //         DEV
 // ======================
+u_assassinfix
+{
+"Fix assassin unit pathing and behaviour"
+}
+
+u_assassinfix_descr
+{
+"- Assassins will no longer stop and forget their destination in the middle of the map after encountering an enemy on the way
+- Assassins will no longer attack units on atop the keep after descending the wall into a 1 tile gap path between the wall and the keep"
+}
 
 u_ghosteng
 {

diff --git a/UnofficialCrusaderPatch/Localization/English.txt b/UnofficialCrusaderPatch/Localization/English.txt
@@ -1,6 +1,16 @@
 // ======================
 //         DEV
 // ======================
+u_assassinfix
+{
+"Fix assassin unit pathing and behaviour"
+}
+
+u_assassinfix_descr
+{
+"- Assassins will no longer stop and forget their destination in the middle of the map after encountering an enemy on the way
+- Assassins will no longer attack units on atop the keep after descending the wall into a 1 tile gap path between the wall and the keep"
+}
 
 u_ghosteng
 {

diff --git a/UnofficialCrusaderPatch/Localization/German.txt b/UnofficialCrusaderPatch/Localization/German.txt
@@ -1,6 +1,18 @@
 // ======================
 //         DEV
 // ======================
+
+u_assassinfix
+{
+"Fix assassin unit pathing and behaviour"
+}
+
+u_assassinfix_descr
+{
+"- Assassins will no longer stop and forget their destination in the middle of the map after encountering an enemy on the way
+- Assassins will no longer attack units on atop the keep after descending the wall into a 1 tile gap path between the wall and the keep"
+}
+
 u_jestermoveto_assassin
 {
 	"Stop the jester from visiting assassins"

diff --git a/UnofficialCrusaderPatch/Localization/Hungarian.txt b/UnofficialCrusaderPatch/Localization/Hungarian.txt
@@ -1,6 +1,16 @@
 // ======================
-//         DEV
+//         dev
 // ======================
+u_assassinfix
+{
+"Fix assassin unit pathing and behaviour"
+}
+
+u_assassinfix_descr
+{
+"- Assassins will no longer stop and forget their destination in the middle of the map after encountering an enemy on the way
+- Assassins will no longer attack units on atop the keep after descending the wall into a 1 tile gap path between the wall and the keep"
+}
 
 u_ghosteng
 {

diff --git a/UnofficialCrusaderPatch/Localization/Polish.txt b/UnofficialCrusaderPatch/Localization/Polish.txt
@@ -1,6 +1,16 @@
 // ======================
 //         DEV
 // ======================
+u_assassinfix
+{
+"Fix assassin unit pathing and behaviour"
+}
+
+u_assassinfix_descr
+{
+"- Assassins will no longer stop and forget their destination in the middle of the map after encountering an enemy on the way
+- Assassins will no longer attack units on atop the keep after descending the wall into a 1 tile gap path between the wall and the keep"
+}
 
 u_ghosteng
 {

diff --git a/UnofficialCrusaderPatch/Localization/Russian.txt b/UnofficialCrusaderPatch/Localization/Russian.txt
@@ -1,6 +1,16 @@
 // ======================
 //         DEV
 // ======================
+u_assassinfix
+{
+"Fix assassin unit pathing and behaviour"
+}
+
+u_assassinfix_descr
+{
+"- Assassins will no longer stop and forget their destination in the middle of the map after encountering an enemy on the way
+- Assassins will no longer attack units on atop the keep after descending the wall into a 1 tile gap path between the wall and the keep"
+}
 
 u_ghosteng
 {

diff --git a/UnofficialCrusaderPatch/UnofficialCrusaderPatch.csproj b/UnofficialCrusaderPatch/UnofficialCrusaderPatch.csproj
@@ -164,6 +164,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <EmbeddedResource Include="CodeBlocks\u_assassinfix_descension.block" />
     <EmbeddedResource Include="CodeBlocks\ai_fix_crusader_archers_pitch.block" />
     <EmbeddedResource Include="CodeBlocks\ai_fix_crusader_archers_pitch_attr.block" />
     <EmbeddedResource Include="CodeBlocks\ai_fix_crusader_archers_pitch_fn.block" />
@@ -218,6 +219,8 @@
     <EmbeddedResource Include="CodeBlocks\o_armory_marketplace_weapon_order_fix3.block" />
     <EmbeddedResource Include="CodeBlocks\o_armory_marketplace_weapon_order_fix4.block" />
     <EmbeddedResource Include="CodeBlocks\o_armory_marketplace_weapon_order_fix5.block" />
+    <EmbeddedResource Include="CodeBlocks\u_assassinfix_forgetfullness.block" />
+    <EmbeddedResource Include="CodeBlocks\u_assassinfix_forgetfullness_wall_climb.block" />
     <EmbeddedResource Include="CodeBlocks\u_fireballistatunneler.block" />
     <EmbeddedResource Include="CodeBlocks\o_fix_rapid_deletion_bug.block" />
     <EmbeddedResource Include="CodeBlocks\u_fix_lord_animation_stuck_building_attack.block" />

diff --git a/UnofficialCrusaderPatch/Version.cs b/UnofficialCrusaderPatch/Version.cs
@@ -559,6 +559,34 @@ public class Version
 
                 }
             },
+
+            // Fix assassin
+            new Change("u_assassinfix", ChangeType.Bugfix, true)
+            {
+                new DefaultHeader("u_assassinfix")
+                {
+                    new BinaryEdit("u_assassinfix_descension") // 49732E
+                    {
+                        new BinBytes(0xEB, 0x24),
+                    },
+                    new BinaryEdit("u_assassinfix_forgetfullness") // 53D89C
+                    {
+                        new BinSkip(7),
+                        new BinBytes(0x02),
+                    },
+                    new BinaryEdit("u_assassinfix_forgetfullness_wall_climb") // 53D694
+                    {
+                        new BinHook(10)
+                        {
+                            0x66, 0x3D, 0x00, 0x00, // cmp ax,0000
+                            0x0F, 0x85, 0x04, 0x00, 0x00, 0x00, // jne short 4
+                            0x66, 0xB8, 0x06, 0x00, // mov ax,0006
+                            0x66, 0x39, 0xD8, // cmp ax,bx
+                            0x66, 0x89, 0x86, 0xBC, 0x8, 0x00, 0x00 // mov [esi+8BC],ax
+                        }
+                    }
+                }
+            },
 
             new Change("o_fix_rapid_deletion_bug", ChangeType.Bugfix, true)
             {