Skip to content

Commit e8f7d6b

Browse files
jecrelljecrell
committed
Byakhee code fixes; Added Byakhee translation text to separate it from transport pods
1 parent 326a3de commit e8f7d6b

38 files changed

+1998
-1853
lines changed

‎1.4/Assemblies/CultOfCthulhu.dll‎

7.5 KB
Binary file not shown.

‎1.4/Defs/PawnKindDefs_CosmicHorrors/PawnKinds_Byakhee.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@
172172
<leavingDef>ByakheeLeaving</leavingDef>
173173
<travelingDef>ByakheeTraveling</travelingDef>
174174
<incomingDef>ByakheeIncoming</incomingDef>
175-
<landedDef>ByakheeLanded</landedDef>
176175
<takeOffSound>ByakheeTakeOff</takeOffSound>
177176
<landingSound>ByakheeLanding</landingSound>
178177
<dismountSound>Pawn_Mech_Centipede_Call</dismountSound>

‎1.4/Defs/ThingDefs_Special/PawnFlyerDefs.xml‎

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<ThingDef ParentName="SkyfallerBase">
55
<defName>ByakheeIncoming</defName>
66
<label>byakhee (incoming)</label>
7-
<thingClass>DropPodIncoming</thingClass>
7+
<thingClass>CultOfCthulhu.PawnFlyersIncoming</thingClass>
88
<graphicData>
9-
<texPath>Pawn/Byakhee/Byakhee</texPath>
10-
<graphicClass>Graphic_Multi</graphicClass>
9+
<texPath>Pawn/Byakhee/Byakhee_east</texPath>
10+
<graphicClass>Graphic_Single</graphicClass>
1111
<drawSize>5.0</drawSize>
1212
<shadowData>
1313
<volume>(0.6, 0.8, 0.6)</volume>
@@ -26,10 +26,10 @@
2626
<ThingDef ParentName="SkyfallerBase">
2727
<defName>ByakheeLeaving</defName>
2828
<label>byakhee (leaving)</label>
29-
<thingClass>FlyShipLeaving</thingClass>
29+
<thingClass>CultOfCthulhu.PawnFlyersLeaving</thingClass>
3030
<graphicData>
31-
<texPath>Pawn/Byakhee/Byakhee</texPath>
32-
<graphicClass>Graphic_Multi</graphicClass>
31+
<texPath>Pawn/Byakhee/Byakhee_west</texPath>
32+
<graphicClass>Graphic_Single</graphicClass>
3333
<drawSize>5.0</drawSize>
3434
<shadowData>
3535
<volume>(0.6, 0.8, 0.6)</volume>
@@ -51,7 +51,7 @@
5151
<defName>ByakheeTraveling</defName>
5252
<label>byakhee</label>
5353
<description>Byakhee in flight.</description>
54-
<worldObjectClass>TravelingTransportPods</worldObjectClass>
54+
<worldObjectClass>CultOfCthulhu.PawnFlyersTraveling</worldObjectClass>
5555
<texture>WorldObjects/ByakheeFlying</texture>
5656
<useDynamicDrawer>true</useDynamicDrawer>
5757
<expandingIcon>true</expandingIcon>
@@ -62,6 +62,29 @@
6262
</WorldObjectDef>
6363

6464

65+
<ThingDef ParentName="ActiveDropPod">
66+
<defName>ByakheeDrop</defName>
67+
<label>byakhee</label>
68+
<thingClass>CultOfCthulhu.PawnFlyersCargo</thingClass>
69+
<soundOpen>Pawn_Mech_Centipede_Call</soundOpen>
70+
<graphicData>
71+
<texPath>Pawn/Byakhee/Byakhee_east</texPath>
72+
<graphicClass>Graphic_Single</graphicClass>
73+
<drawSize>5.0</drawSize>
74+
<shadowData>
75+
<volume>(0.6, 0.8, 0.6)</volume>
76+
</shadowData>
77+
</graphicData>
78+
<altitudeLayer>Building</altitudeLayer>
79+
<blockWind>true</blockWind>
80+
<useHitPoints>true</useHitPoints>
81+
<statBases>
82+
<MaxHitPoints>500</MaxHitPoints>
83+
<Flammability>0</Flammability>
84+
</statBases>
85+
</ThingDef>
86+
87+
6588
<ThingDef>
6689
<defName>ByakheeIncoming_old</defName>
6790
<label>flyer (incoming)</label>
@@ -111,7 +134,7 @@
111134
<defName>ByakheeLanded</defName>
112135
<label>flyer (landed)</label>
113136
<category>Item</category>
114-
<thingClass>CultOfCthulhu.PawnFlyersLanded</thingClass>
137+
<thingClass>CultOfCthulhu.PawnFlyersCargo</thingClass>
115138
<scatterableOnMapGen>false</scatterableOnMapGen>
116139
<tickerType>Normal</tickerType>
117140
<graphicData>

‎About/About.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<li>CETeam.CombatExtended</li>
3131
<li>syrchalis.traitvalue</li>
3232
</loadAfter>
33-
<description>1.0.24.0 (11-01-2022)
33+
<description>1.0.24.1 (11-13-2022)
3434

3535

3636
[h1]Gameplay expansion for RimWorld.[/h1]
@@ -101,6 +101,10 @@ Darcilyn Lynds (darci.andel), Luke Salinas, RainerWingel , Noisy Koi, Lea Stanna
101101
========================
102102
Changelog
103103
========================
104+
1.0.24.1 (11-13-2022)
105+
========================
106+
Fixed byakhee code (RW 1.4); Added translation text for byakhee to seperate it from transport pods
107+
104108
1.0.24.0 (11-01-2022)
105109
========================
106110
Updated Call of Cthulhu - Cults for RimWorld 1.4

‎About/Changelog.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
1.0.24.1 (11-13-2022)
2+
========================
3+
Fixed byakhee code (RW 1.4); Added translation text for byakhee to seperate it from transport pods
4+
15
1.0.24.0 (11-01-2022)
26
========================
37
Updated Call of Cthulhu - Cults for RimWorld 1.4

‎About/Manifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<Manifest>
33
<identifier>CallofCthulhuCults</identifier>
4-
<version>1.0.24.0</version>
4+
<version>1.0.24.1</version>
55
<dependencies />
66
<incompatibleWith />
77
<loadBefore />

‎About/Version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.24.0
1+
1.0.24.1

‎Languages/English/Keyed/PawnFlyer.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LanguageData>
3+
4+
<!-- 11/13/22 -->
5+
<PawnFlyer_CommandTakeOffGroup>Fly</PawnFlyer_CommandTakeOffGroup>
6+
<CommandLaunchGroupDesc>Take off and fly to a destination.</CommandLaunchGroupDesc>
7+
<PawnFlyer_LetterLandedInEnemyBase>{0} arrived at {1}.</PawnFlyer_LetterLandedInEnemyBase>
8+
<PawnFlyer_MessageUnreachable>Some flyers are unreachable.</PawnFlyer_MessageUnreachable>
9+
<PawnFlyer_CommandLaunchGroupFailUnderRoof>Some flyers are under a roof.</PawnFlyer_CommandLaunchGroupFailUnderRoof>
10+
<PawnFlyer_ConfirmSendNotCompletelyLoaded>Flight group isn't completely loaded. {1_labelShort} is missing. Take off anyway?</PawnFlyer_ConfirmSendNotCompletelyLoaded>
11+
<PawnFlyer_ReadyForTakeOff>Ready for take off.</PawnFlyer_ReadyForTakeOff>
12+
<PawnFlyer_NotReadyForTakeOff>Not ready for take off</PawnFlyer_NotReadyForTakeOff>
13+
<PawnFlyer_MessageArrived>Your flight group have arrived.</PawnFlyer_MessageArrived>
14+
<PawnFlyer_MessageArrivedAndLost>Your flight group have arrived, but since there were no colonists inside, everything has been lost.</PawnFlyer_MessageArrivedAndLost>
15+
<PawnFlyer_MessageArrivedAndAddedToCaravan>Your flight group has arrived. The contents have been added to {0}.</PawnFlyer_MessageArrivedAndAddedToCaravan>
16+
<PawnFlyer_LetterLandedInEnemyBase>Your flight group has arrived at {0}.</PawnFlyer_LetterLandedInEnemyBase>
17+
<PawnFlyer_LandAtEdge>Land at edge</PawnFlyer_LandAtEdge>
18+
<PawnFlyer_LandInCenter>Land in center</PawnFlyer_LandInCenter>
19+
<PawnFlyer_AttackAndLandAtEdge>Attack {0}: Land at edge</PawnFlyer_AttackAndLandAtEdge>
20+
<PawnFlyer_AttackAndLandInCenter>Attack {0}: Land in center</PawnFlyer_AttackAndLandInCenter>
21+
<PawnFlyer_TooBigMassUsage>The assigned people and items are too heavy for the flight group.</PawnFlyer_TooBigMassUsage>
22+
<PawnFlyer_PawnCantReach>{1_labelShort} can't reach the flight group.</PawnFlyer_PawnCantReach>
23+
<PawnFlyer_ItemIsUnreachableSingle>There is no path between the flight group and the {0}.</PawnFlyer_ItemIsUnreachableSingle>
24+
<PawnFlyer_ItemIsUnreachableMulti>There is no path between the flight group and {0}x {1}.</PawnFlyer_ItemIsUnreachableMulti>
25+
<PawnFlyer_CommandLoad>Load flight group of {0}</PawnFlyer_CommandLoad>
26+
<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>
27+
<PawnFlyer_MessageLoadingProcessStarted>Assigned items and passengers will now be loaded into the flight group.</PawnFlyer_MessageLoadingProcessStarted>
28+
<
29+
30+
31+
</LanguageData>

‎Source/Code/NewSystems/PawnFlyer/ByakheeArrivalAction_AttackSettlement.cs‎

Lines changed: 0 additions & 123 deletions
This file was deleted.

‎Source/Code/NewSystems/PawnFlyer/ByakheeArrivalAction_GiveGift.cs‎

Lines changed: 0 additions & 117 deletions
This file was deleted.

0 commit comments

Comments
 (0)