暂存

2025-09-08 21:59:11 +08:00
parent 24a0ed126b
commit 8a0fbe32e8
5 changed files with 206 additions and 79 deletions
--- a/1.6/1.6/Assemblies/ArachnaeSwarm.dll
+++ b/1.6/1.6/Assemblies/ArachnaeSwarm.dll
--- a/1.6/1.6/Defs/AnimationDefs/WULA_Mech_Flyer_Anim.xml
+++ b/1.6/1.6/Defs/AnimationDefs/WULA_Mech_Flyer_Anim.xml
@@ -4,15 +4,21 @@
  <!-- North-facing Animation -->
  <AnimationDef>
    <defName>WULA_Mech_Flyer_North</defName>
-    <durationTicks>4</durationTicks>
+    <durationTicks>16</durationTicks> <!-- 8 frames * 2 ticks/frame -->
    <startOnRandomTick>true</startOnRandomTick>
    <keyframeParts>
      <li>
        <key>ARA_Flight_Attachment</key>
        <value>
          <keyframes>
-            <li><graphicState>WULA_Mech_Flyer_Flying_north_0_gs</graphicState><tick>0</tick></li>
-            <li><graphicState>WULA_Mech_Flyer_Flying_north_1_gs</graphicState><tick>2</tick></li>
+            <li><graphicState>ARA_Goose_Flying_north_1_gs</graphicState><tick>0</tick></li>
+            <li><graphicState>ARA_Goose_Flying_north_2_gs</graphicState><tick>2</tick></li>
+            <li><graphicState>ARA_Goose_Flying_north_3_gs</graphicState><tick>4</tick></li>
+            <li><graphicState>ARA_Goose_Flying_north_4_gs</graphicState><tick>6</tick></li>
+            <li><graphicState>ARA_Goose_Flying_north_5_gs</graphicState><tick>8</tick></li>
+            <li><graphicState>ARA_Goose_Flying_north_6_gs</graphicState><tick>10</tick></li>
+            <li><graphicState>ARA_Goose_Flying_north_7_gs</graphicState><tick>12</tick></li>
+            <li><graphicState>ARA_Goose_Flying_north_8_gs</graphicState><tick>14</tick></li>
          </keyframes>
        </value>
      </li>
@@ -22,15 +28,21 @@
  <!-- East-facing Animation -->
  <AnimationDef>
    <defName>WULA_Mech_Flyer_East</defName>
-    <durationTicks>4</durationTicks>
+    <durationTicks>16</durationTicks>
    <startOnRandomTick>true</startOnRandomTick>
    <keyframeParts>
      <li>
        <key>ARA_Flight_Attachment</key>
        <value>
          <keyframes>
-            <li><graphicState>WULA_Mech_Flyer_Flying_east_0_gs</graphicState><tick>0</tick></li>
-            <li><graphicState>WULA_Mech_Flyer_Flying_east_1_gs</graphicState><tick>2</tick></li>
+            <li><graphicState>ARA_Goose_Flying_east_1_gs</graphicState><tick>0</tick></li>
+            <li><graphicState>ARA_Goose_Flying_east_2_gs</graphicState><tick>2</tick></li>
+            <li><graphicState>ARA_Goose_Flying_east_3_gs</graphicState><tick>4</tick></li>
+            <li><graphicState>ARA_Goose_Flying_east_4_gs</graphicState><tick>6</tick></li>
+            <li><graphicState>ARA_Goose_Flying_east_5_gs</graphicState><tick>8</tick></li>
+            <li><graphicState>ARA_Goose_Flying_east_6_gs</graphicState><tick>10</tick></li>
+            <li><graphicState>ARA_Goose_Flying_east_7_gs</graphicState><tick>12</tick></li>
+            <li><graphicState>ARA_Goose_Flying_east_8_gs</graphicState><tick>14</tick></li>
          </keyframes>
        </value>
      </li>
@@ -40,15 +52,21 @@
  <!-- South-facing Animation -->
  <AnimationDef>
    <defName>WULA_Mech_Flyer_South</defName>
-    <durationTicks>4</durationTicks>
+    <durationTicks>16</durationTicks>
    <startOnRandomTick>true</startOnRandomTick>
    <keyframeParts>
      <li>
        <key>ARA_Flight_Attachment</key>
        <value>
          <keyframes>
-            <li><graphicState>WULA_Mech_Flyer_Flying_south_0_gs</graphicState><tick>0</tick></li>
-            <li><graphicState>WULA_Mech_Flyer_Flying_south_1_gs</graphicState><tick>2</tick></li>
+            <li><graphicState>ARA_Goose_Flying_south_1_gs</graphicState><tick>0</tick></li>
+            <li><graphicState>ARA_Goose_Flying_south_2_gs</graphicState><tick>2</tick></li>
+            <li><graphicState>ARA_Goose_Flying_south_3_gs</graphicState><tick>4</tick></li>
+            <li><graphicState>ARA_Goose_Flying_south_4_gs</graphicState><tick>6</tick></li>
+            <li><graphicState>ARA_Goose_Flying_south_5_gs</graphicState><tick>8</tick></li>
+            <li><graphicState>ARA_Goose_Flying_south_6_gs</graphicState><tick>10</tick></li>
+            <li><graphicState>ARA_Goose_Flying_south_7_gs</graphicState><tick>12</tick></li>
+            <li><graphicState>ARA_Goose_Flying_south_8_gs</graphicState><tick>14</tick></li>
          </keyframes>
        </value>
      </li>
--- a/1.6/1.6/Defs/GraphicStateDefs/WULA_Mech_Flyer_Graphics.xml
+++ b/1.6/1.6/Defs/GraphicStateDefs/WULA_Mech_Flyer_Graphics.xml
@@ -1,50 +1,174 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>

-  <!-- North Frames -->
+  <!-- Using Goose Frames for Testing -->
  <GraphicStateDef>
-    <defName>WULA_Mech_Flyer_Flying_north_0_gs</defName>
+    <defName>ARA_Goose_Flying_north_1_gs</defName>
    <defaultGraphicData>
-      <texPath>Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_north_0</texPath>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_1_north</texPath>
      <drawSize>1.35</drawSize>
    </defaultGraphicData>
  </GraphicStateDef>
  <GraphicStateDef>
-    <defName>WULA_Mech_Flyer_Flying_north_1_gs</defName>
+    <defName>ARA_Goose_Flying_north_2_gs</defName>
    <defaultGraphicData>
-      <texPath>Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_north_1</texPath>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_2_north</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_north_3_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_3_north</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_north_4_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_4_north</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_north_5_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_5_north</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_north_6_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_6_north</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_north_7_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_7_north</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_north_8_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_8_north</texPath>
      <drawSize>1.35</drawSize>
    </defaultGraphicData>
  </GraphicStateDef>

-  <!-- East Frames -->
  <GraphicStateDef>
-    <defName>WULA_Mech_Flyer_Flying_east_0_gs</defName>
+    <defName>ARA_Goose_Flying_east_1_gs</defName>
    <defaultGraphicData>
-      <texPath>Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_east_0</texPath>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_1_east</texPath>
      <drawSize>1.35</drawSize>
    </defaultGraphicData>
  </GraphicStateDef>
  <GraphicStateDef>
-    <defName>WULA_Mech_Flyer_Flying_east_1_gs</defName>
+    <defName>ARA_Goose_Flying_east_2_gs</defName>
    <defaultGraphicData>
-      <texPath>Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_east_1</texPath>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_2_east</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_east_3_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_3_east</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_east_4_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_4_east</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_east_5_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_5_east</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_east_6_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_6_east</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_east_7_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_7_east</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_east_8_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_8_east</texPath>
      <drawSize>1.35</drawSize>
    </defaultGraphicData>
  </GraphicStateDef>

-  <!-- South Frames -->
  <GraphicStateDef>
-    <defName>WULA_Mech_Flyer_Flying_south_0_gs</defName>
+    <defName>ARA_Goose_Flying_south_1_gs</defName>
    <defaultGraphicData>
-      <texPath>Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_south_0</texPath>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_1_south</texPath>
      <drawSize>1.35</drawSize>
    </defaultGraphicData>
  </GraphicStateDef>
  <GraphicStateDef>
-    <defName>WULA_Mech_Flyer_Flying_south_1_gs</defName>
+    <defName>ARA_Goose_Flying_south_2_gs</defName>
    <defaultGraphicData>
-      <texPath>Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_south_1</texPath>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_2_south</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_south_3_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_3_south</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_south_4_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_4_south</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_south_5_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_5_south</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_south_6_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_6_south</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_south_7_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_7_south</texPath>
+      <drawSize>1.35</drawSize>
+    </defaultGraphicData>
+  </GraphicStateDef>
+  <GraphicStateDef>
+    <defName>ARA_Goose_Flying_south_8_gs</defName>
+    <defaultGraphicData>
+      <texPath>Things/Pawn/Animal/Goose/Goose_Flying_8_south</texPath>
      <drawSize>1.35</drawSize>
    </defaultGraphicData>
  </GraphicStateDef>
--- a/1.6/1.6/Defs/PawnRenderTreeDefs/ARA_RenderTree.xml
+++ b/1.6/1.6/Defs/PawnRenderTreeDefs/ARA_RenderTree.xml
@@ -46,7 +46,12 @@
              <debugLabel>Arachnae Flight Attachment</debugLabel>
              <tagDef>ARA_Flight_Attachment</tagDef>
              <texPath>ArachnaeSwarm/Things/General/Invisible/Inv</texPath>
-              <baseLayer>-10</baseLayer> <!-- Place it before apparel -->
+              <baseLayer>60</baseLayer>
+              <drawData>
+                <dataSouth>
+                  <layer>-10</layer>
+                </dataSouth>
+              </drawData>
            </li>
            <!-- ===== OUR CUSTOM NODE INSERTION END ===== -->

--- a/Source/ArachnaeSwarm/HarmonyPatches.cs
+++ b/Source/ArachnaeSwarm/HarmonyPatches.cs
@@ -5,96 +5,76 @@ using Verse.AI;

 namespace ArachnaeSwarm
 {
-    // Note: We are no longer patching PawnGenerator.
-    // We will inject/override flight logic at more precise points.
+    // Restore the simple, flat structure. [HarmonyPatch] on the methods themselves.
    [HarmonyPatch]
    public static class FlightHarmonyPatches
    {
-        // Patch 1: Override the animation selection
        [HarmonyPrefix]
        [HarmonyPatch(typeof(Pawn_FlightTracker), "GetBestFlyAnimation")]
-        public static bool GetBestFlyAnimation_Prefix(Pawn_FlightTracker __instance, Pawn ___pawn, Rot4? facingOverride, ref AnimationDef __result)
+        public static bool GetBestFlyAnimation_Prefix(Pawn ___pawn, ref AnimationDef __result)
        {
-            var flightComp = ___pawn.TryGetComp<CompPawnFlight>();
-            if (flightComp == null)
+            var flightComp = ___pawn?.TryGetComp<CompPawnFlight>();
+            if (flightComp == null || flightComp.props == null)
            {
-                return true; // Let original method run for non-comped pawns
+                return true; 
            }

            var compProps = flightComp.Props;
-            bool isFemale = ___pawn.gender == Gender.Female;
-
-            // Determine which animation to use based on rotation and gender
            AnimationDef selectedAnim = null;
-            switch ((facingOverride ?? ___pawn.Rotation).AsInt)
+
+            if (___pawn.gender == Gender.Female && compProps.flyingAnimationNorthFemale != null)
            {
-                case 0: // North
-                    selectedAnim = isFemale ? compProps.flyingAnimationNorthFemale : compProps.flyingAnimationNorth;
-                    break;
-                case 1: // East
-                    selectedAnim = isFemale ? compProps.flyingAnimationEastFemale : compProps.flyingAnimationEast;
-                    break;
-                case 2: // South
-                    selectedAnim = isFemale ? compProps.flyingAnimationSouthFemale : compProps.flyingAnimationSouth;
-                    break;
-                case 3: // West - Use East animation as fallback if West is not defined
-                    selectedAnim = isFemale ? (compProps.flyingAnimationEastFemale ?? compProps.flyingAnimationEast) : compProps.flyingAnimationEast;
-                    break;
+                switch (___pawn.Rotation.AsInt)
+                {
+                    case 0: selectedAnim = compProps.flyingAnimationNorthFemale; break;
+                    case 1: selectedAnim = compProps.flyingAnimationEastFemale; break;
+                    case 2: selectedAnim = compProps.flyingAnimationSouthFemale; break;
+                    case 3: selectedAnim = compProps.flyingAnimationEastFemale ?? compProps.flyingAnimationEast; break;
+                }
+            }
+            else
+            {
+                switch (___pawn.Rotation.AsInt)
+                {
+                    case 0: selectedAnim = compProps.flyingAnimationNorth; break;
+                    case 1: selectedAnim = compProps.flyingAnimationEast; break;
+                    case 2: selectedAnim = compProps.flyingAnimationSouth; break;
+                    case 3: selectedAnim = compProps.flyingAnimationEast; break;
+                }
            }

-            // If we have a valid animation from our comp, use it and stop the original method.
            if (selectedAnim != null)
            {
                __result = selectedAnim;
-                return false; // Stop original method
+                return false;
+            }
+            return true;
        }

-            return true; // Fallback to original if no animation is found in comp
-        }
-
-
-        // Patch 2: Decide whether to fly when a new job starts
        [HarmonyPrefix]
        [HarmonyPatch(typeof(Pawn_FlightTracker), "Notify_JobStarted")]
        public static bool Notify_JobStarted_Prefix(Job job, Pawn_FlightTracker __instance, Pawn ___pawn)
        {
-            var flightComp = ___pawn.TryGetComp<CompPawnFlight>();
-            if (flightComp == null || !__instance.CanEverFly || ___pawn.Dead)
+            var flightComp = ___pawn?.TryGetComp<CompPawnFlight>();
+            if (flightComp == null || flightComp.props == null || __instance == null || !__instance.CanEverFly || ___pawn == null || ___pawn.Dead)
            {
-                return true; // Let original method run
+                return true;
            }

            var compProps = flightComp.Props;
-            bool shouldBeFlying = false;
+            bool shouldBeFlying = (compProps.flightCondition == FlightCondition.Drafted && ___pawn.Drafted);

-            // Check our custom condition
-            if (compProps.flightCondition == FlightCondition.Drafted)
-            {
-                if (___pawn.Drafted)
-                {
-                    shouldBeFlying = true;
-                }
-            }
-
-            // Apply the decision
            if (shouldBeFlying)
            {
-                if (!__instance.Flying)
-                {
-                    __instance.StartFlying();
-                }
-                job.flying = true; // Mark the job as a flying job
+                if (!__instance.Flying) __instance.StartFlying();
+                job.flying = true;
            }
            else
            {
-                if (__instance.Flying)
-                {
-                    __instance.ForceLand();
-                }
+                if (__instance.Flying) __instance.ForceLand();
                job.flying = false;
            }
-
-            return false; // We have handled the logic, stop the original method.
+            return false;
        }
    }
 }