Merge pull request #34 from Rim-Of-Madness-Team/dev

Byakhee code fixes; Added Byakhee translation text to separate it fro…

1.4/Defs/PawnKindDefs_CosmicHorrors/PawnKinds_Byakhee.xml

@@ -172,7 +172,6 @@
     <leavingDef>ByakheeLeaving</leavingDef>
     <travelingDef>ByakheeTraveling</travelingDef>
     <incomingDef>ByakheeIncoming</incomingDef>
-    <landedDef>ByakheeLanded</landedDef>
     <takeOffSound>ByakheeTakeOff</takeOffSound>
     <landingSound>ByakheeLanding</landingSound>
     <dismountSound>Pawn_Mech_Centipede_Call</dismountSound>

1.4/Defs/ThingDefs_Special/PawnFlyerDefs.xml

@@ -4,10 +4,10 @@
   <ThingDef ParentName="SkyfallerBase">
     <defName>ByakheeIncoming</defName>
     <label>byakhee (incoming)</label>
-    <thingClass>DropPodIncoming</thingClass>
+    <thingClass>CultOfCthulhu.PawnFlyersIncoming</thingClass>
     <graphicData>
-      <texPath>Pawn/Byakhee/Byakhee</texPath>
-      <graphicClass>Graphic_Multi</graphicClass>
+      <texPath>Pawn/Byakhee/Byakhee_east</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
       <drawSize>5.0</drawSize>
       <shadowData>
         <volume>(0.6, 0.8, 0.6)</volume>
@@ -26,10 +26,10 @@
   <ThingDef ParentName="SkyfallerBase">
     <defName>ByakheeLeaving</defName>
     <label>byakhee (leaving)</label>
-    <thingClass>FlyShipLeaving</thingClass>
+    <thingClass>CultOfCthulhu.PawnFlyersLeaving</thingClass>
     <graphicData>
-      <texPath>Pawn/Byakhee/Byakhee</texPath>
-      <graphicClass>Graphic_Multi</graphicClass>
+      <texPath>Pawn/Byakhee/Byakhee_west</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
       <drawSize>5.0</drawSize>
       <shadowData>
         <volume>(0.6, 0.8, 0.6)</volume>
@@ -51,7 +51,7 @@
     <defName>ByakheeTraveling</defName>
     <label>byakhee</label>
     <description>Byakhee in flight.</description>
-    <worldObjectClass>TravelingTransportPods</worldObjectClass>
+    <worldObjectClass>CultOfCthulhu.PawnFlyersTraveling</worldObjectClass>
     <texture>WorldObjects/ByakheeFlying</texture>
     <useDynamicDrawer>true</useDynamicDrawer>
     <expandingIcon>true</expandingIcon>
@@ -62,6 +62,29 @@
   </WorldObjectDef>
 
 
+  <ThingDef ParentName="ActiveDropPod">
+    <defName>ByakheeDrop</defName>
+    <label>byakhee</label>
+    <thingClass>CultOfCthulhu.PawnFlyersCargo</thingClass>
+    <soundOpen>Pawn_Mech_Centipede_Call</soundOpen>
+    <graphicData>
+      <texPath>Pawn/Byakhee/Byakhee_east</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <drawSize>5.0</drawSize>
+      <shadowData>
+        <volume>(0.6, 0.8, 0.6)</volume>
+      </shadowData>
+    </graphicData>
+    <altitudeLayer>Building</altitudeLayer>
+    <blockWind>true</blockWind>
+    <useHitPoints>true</useHitPoints>
+    <statBases>
+      <MaxHitPoints>500</MaxHitPoints>
+      <Flammability>0</Flammability>
+    </statBases>
+  </ThingDef>
+
+
   <ThingDef>
     <defName>ByakheeIncoming_old</defName>
     <label>flyer (incoming)</label>
@@ -111,7 +134,7 @@
     <defName>ByakheeLanded</defName>
     <label>flyer (landed)</label>
     <category>Item</category>
-    <thingClass>CultOfCthulhu.PawnFlyersLanded</thingClass>
+    <thingClass>CultOfCthulhu.PawnFlyersCargo</thingClass>
     <scatterableOnMapGen>false</scatterableOnMapGen>
     <tickerType>Normal</tickerType>
     <graphicData>

About/About.xml

@@ -30,7 +30,7 @@
     <li>CETeam.CombatExtended</li>
     <li>syrchalis.traitvalue</li>
   </loadAfter>
-  <description>1.0.24.0 (11-01-2022)
+  <description>1.0.24.1 (11-13-2022)
 
 
 [h1]Gameplay expansion for RimWorld.[/h1]
@@ -101,6 +101,10 @@ Darcilyn Lynds (darci.andel), Luke Salinas, RainerWingel , Noisy Koi, Lea Stanna
 ========================
 Changelog
 ========================
+1.0.24.1 (11-13-2022)
+========================
+Fixed byakhee code (RW 1.4); Added translation text for byakhee to seperate it from transport pods
+
 1.0.24.0 (11-01-2022)
 ========================
 Updated Call of Cthulhu - Cults for RimWorld 1.4

About/Changelog.txt

@@ -1,3 +1,7 @@
+1.0.24.1 (11-13-2022)
+========================
+Fixed byakhee code (RW 1.4); Added translation text for byakhee to seperate it from transport pods
+
 1.0.24.0 (11-01-2022)
 ========================
 Updated Call of Cthulhu - Cults for RimWorld 1.4

About/Manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>CallofCthulhuCults</identifier>
-  <version>1.0.24.0</version>
+  <version>1.0.24.1</version>
   <dependencies />
   <incompatibleWith />
   <loadBefore />

About/Version.txt

@@ -1 +1 @@
-1.0.24.0
+1.0.24.1

Languages/English/Keyed/PawnFlyer.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LanguageData>
+
+<!-- 11/13/22 -->
+  <PawnFlyer_CommandTakeOffGroup>Fly</PawnFlyer_CommandTakeOffGroup>
+  <CommandLaunchGroupDesc>Take off and fly to a destination.</CommandLaunchGroupDesc>
+  <PawnFlyer_LetterLandedInEnemyBase>{0} arrived at {1}.</PawnFlyer_LetterLandedInEnemyBase>
+  <PawnFlyer_MessageUnreachable>Some flyers are unreachable.</PawnFlyer_MessageUnreachable>
+  <PawnFlyer_CommandLaunchGroupFailUnderRoof>Some flyers are under a roof.</PawnFlyer_CommandLaunchGroupFailUnderRoof>
+  <PawnFlyer_ConfirmSendNotCompletelyLoaded>Flight group isn't completely loaded. {1_labelShort} is missing. Take off anyway?</PawnFlyer_ConfirmSendNotCompletelyLoaded>
+  <PawnFlyer_ReadyForTakeOff>Ready for take off.</PawnFlyer_ReadyForTakeOff>
+  <PawnFlyer_NotReadyForTakeOff>Not ready for take off</PawnFlyer_NotReadyForTakeOff>
+  <PawnFlyer_MessageArrived>Your flight group have arrived.</PawnFlyer_MessageArrived>
+  <PawnFlyer_MessageArrivedAndLost>Your flight group have arrived, but since there were no colonists inside, everything has been lost.</PawnFlyer_MessageArrivedAndLost>
+  <PawnFlyer_MessageArrivedAndAddedToCaravan>Your flight group has arrived. The contents have been added to {0}.</PawnFlyer_MessageArrivedAndAddedToCaravan>
+  <PawnFlyer_LetterLandedInEnemyBase>Your flight group has arrived at {0}.</PawnFlyer_LetterLandedInEnemyBase>
+  <PawnFlyer_LandAtEdge>Land at edge</PawnFlyer_LandAtEdge>
+  <PawnFlyer_LandInCenter>Land in center</PawnFlyer_LandInCenter>
+  <PawnFlyer_AttackAndLandAtEdge>Attack {0}: Land at edge</PawnFlyer_AttackAndLandAtEdge>
+  <PawnFlyer_AttackAndLandInCenter>Attack {0}: Land in center</PawnFlyer_AttackAndLandInCenter>
+  <PawnFlyer_TooBigMassUsage>The assigned people and items are too heavy for the flight group.</PawnFlyer_TooBigMassUsage>
+  <PawnFlyer_PawnCantReach>{1_labelShort} can't reach the flight group.</PawnFlyer_PawnCantReach>
+  <PawnFlyer_ItemIsUnreachableSingle>There is no path between the flight group and the {0}.</PawnFlyer_ItemIsUnreachableSingle>
+  <PawnFlyer_ItemIsUnreachableMulti>There is no path between the flight group and {0}x {1}.</PawnFlyer_ItemIsUnreachableMulti>
+  <PawnFlyer_CommandLoad>Load flight group of {0}</PawnFlyer_CommandLoad>
+  <PawnFlyer_CommandLoadDesc>Defines the selected flyer(s) as a flight group. Opens the loading dialog so you can decide who and what cargo should be loaded.</PawnFlyer_CommandLoadDesc>
+  <PawnFlyer_MessageLoadingProcessStarted>Assigned items and passengers will now be loaded into the flight group.</PawnFlyer_MessageLoadingProcessStarted>
+  <
+
+
+</LanguageData>