Version 6.44.110

See release.
GeodesicDragon · Jan 12, 2025 · 1def99a · 1def99a
1 parent 229ceb2
commit 1def99a
Show file tree

Hide file tree

Showing 54 changed files with 351 additions and 217 deletions.
diff --git a/MyLittleRimPony/About/About.xml b/MyLittleRimPony/About/About.xml
@@ -3,7 +3,7 @@
 	<author>GeodesicDragon</author>
 	<packageId>geodesicdragon.rimpony</packageId>
 	<url>https://github.com/GeodesicDragon/mylittlerimpony/wiki</url>
-	<modVersion>6.39.93</modVersion>
+	<modVersion>6.44.110</modVersion>
 	<supportedVersions>
 		<li>1.5</li>
 	</supportedVersions>
@@ -30,7 +30,7 @@
 	<modIconPath IgnoreIfNoMatchingField="True">Things/PonyPlush/NurseHaywick</modIconPath>
 	<description><![CDATA[<b>ABOUT</b>
 	
-(More details can be found in the About.txt and Credits.txt files, located in the About folder.)
+(More details can be found on the wiki (Advanced > Website). For art sources, refer to Credits.txt, located in the About folder.)
 
 It has been thousands of years since <i>My Little Pony: Friendship is Magic</i> last aired, but the show is once again enjoying a resurgence; how it came to the rim, though, remains a mystery. Regardless of the hows and whys, many colonists have embraced the show, as the colourful characters and messages of peace, hope and friendship help them to escape the struggles of trying to survive daily life in their colonies.
 
@@ -40,5 +40,5 @@ Some people have even gone so far as to undergo xenotype implementation in order
 
 <b>I HAVE A QUESTION/COMMENT/BUG/SUGGESTION</b>
 
-Please use my Discord server for all enquiries; I am on Discord a lot, so I will reply to you much faster there than I will anywhere else.]]></description>
+Please use the mod's dedicated Discord server - https://discord.gg/DAd2EHeJWk - for all enquiries; I am on Discord a lot, so I will reply to you much faster there than I will anywhere else.]]></description>
 </ModMetaData>
diff --git a/MyLittleRimPony/About/Changelog.txt b/MyLittleRimPony/About/Changelog.txt
@@ -1,3 +1,34 @@
+Version 6.44.110 (January 12th 2025)
+
+IMPORTANT: Non-Steam users MUST reinstall the mod, as some files have been moved and/or renamed.
+
+* Ponies of the Rim: Added 1 new compatibility patch for the upcoming Batponies extension mod.
+	* The thestral kingdom player faction starts off at neutral with the batpony faction added by this mod (requires Alpha Genes).
+* XML Extensions: Added a new setting to configure whether or not the NPC faction is always present when starting a new colony. (1)
+* XML Extensions/Biotech: Added a new setting to configure whether or not the Diamond Dog faction is always present when starting a new colony. (1)
+* XML Extensions/Alpha Genes: Added a new setting to configure whether or not the batpony faction is always present when starting a new colony. (1)
+* Vanilla Achievements Expanded: Added an achievement to build the Statue of the Three Villains.
+* Core: Fixed new research tracker keys not being translated into German properly.
+* Core: Fixed new research tracker keys not being translated into French properly.
+* Core: Fixed Sunny Starscout's details not being translated into French properly.
+* Core: Sunny Starscout no longer causes frequent disease outbreaks.
+* Core: The Statue of the Three Villains has been moved to the Core directory.
+* Core: The Statue of the Three Villains is no longer a terror structure. It never actually caused terror, and I couldn't figure out why, or how to fix it, so I decided to make it into a glorified art piece. It is still constructed via the RimPony section of the Architect menu.
+* Core: The Statue of the Three Villains can now be built using metal.
+* Core: The Statue of the Three Villains can now be built using wood.
+* Core: Increased the beauty of the Statue of the Three Villains to 300 (was 0).
+* Biotech: Fixed the harmony chip not improving fertility.
+* Biotech: The Empire now uses Diamond Dog archers as well as soldiers as mercenaries for offered quests.
+* Biotech: Fixed the brony gene not cancelling the negative opinion given by the unattractive and very unattractive genes.
+* Vanilla Backstories Expanded: Increased the Artistic skill gain of the 'MLP Obsessive' backstory to +20 (was +10). (2)
+* Vanilla Backstories Expanded: Increased the Crafting skill gain of the 'MLP Obsessive' backstory to +20 (was +10). (2)
+* Vanilla Backstories Expanded: Increased the Social skill gain of the 'MLP Obsessive' backstory to +20 (was +10). (2)
+* Vanilla Backstories Expanded: Pawns with the 'MLP Obsessive' backstory may now spawn with drug desire traits.
+* Vanilla Recycling Expanded: Fixed the same letter being sent twice when researching complex recycling.
+
+1. Setting these to true means you won't need to manually add the faction to the world when starting a new game. They are all set to false by default.
+2. Since pawns with this backstory are incapable of many things, I wanted to make them more worthwhile to keep around.
+
 Version 6.39.93 (December 11th 2024)
 
 * Core: Letters sent by the research tracker now tell you what recipes have been unlocked.

diff --git a/MyLittleRimPony/Allergies/Patches/Royalty/HarmonyChipReducesAllergicSensitivity.xml b/MyLittleRimPony/Allergies/Patches/Royalty/HarmonyChipReducesAllergicSensitivity.xml
@@ -1,15 +1,3 @@
 <Patch>
 
-<Operation Class="PatchOperationFindMod">
-	<mods>
-		<li>Royalty</li>
-	</mods>
-	<match Class="PatchOperationAdd">
-		<xpath>/Defs/HediffDef[defName="MLRP_HarmonyChipInstalled"]/stages/li/statOffsets</xpath>
-		<value>
-			<P42_AllergicSensitivity>-0.25</P42_AllergicSensitivity>
-		</value>
-	</match>
-</Operation>
-
 </Patch>
diff --git a/MyLittleRimPony/Alpha Genes/Defs/FactionDefs/MLP_Faction_Batpony.xml b/MyLittleRimPony/Alpha Genes/Defs/FactionDefs/MLP_Faction_Batpony.xml
@@ -162,5 +162,12 @@
 		</options>
       </li>
     </pawnGroupMakers>
+	<modExtensions>
+		<li Class="VFECore.FactionDefExtension" MayRequire="OskarPotocki.VanillaFactionsExpanded.Core">			
+			<startingGoodwillByFactionDefs>
+				<Pony_PlayerThestralKingdom MayRequire="Pony.PoniesOfTheRim.Batponies">0</Pony_PlayerThestralKingdom>
+			</startingGoodwillByFactionDefs>
+		</li>
+	</modExtensions>
   </FactionDef>
 </Defs>
diff --git a/MyLittleRimPony/Anomaly/Patches/My Little RimPony/HarmonyChipGrantsAnomalyBonuses.xml b/MyLittleRimPony/Anomaly/Patches/My Little RimPony/HarmonyChipGrantsAnomalyBonuses.xml
@@ -1,15 +1,3 @@
 <Patch>
 
-<Operation Class="PatchOperationFindMod">
-	<mods>
-		<li>Royalty</li>
-	</mods>
-	<match Class="PatchOperationAdd">
-		<xpath>/Defs/HediffDef[defName="MLRP_HarmonyChipInstalled"]/stages/li/statOffsets</xpath>
-		<value>
-			<EntityStudyRate>0.1</EntityStudyRate>
-		</value>
-	</match>
-</Operation>
-
 </Patch>
diff --git a/MyLittleRimPony/Biotech/Patches/Biotech/MLRP_GeneConflicts.xml b/MyLittleRimPony/Biotech/Patches/Biotech/MLRP_GeneConflicts.xml
@@ -0,0 +1,21 @@
+<Patch>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/GeneDef[defName="Beauty_VeryUgly" or defName="Beauty_Ugly"]/exclusionTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/GeneDef[defName="Beauty_VeryUgly" or defName="Beauty_Ugly"]</xpath>
+			<value>
+				<exclusionTags>
+					<li>MLRP_BronyGene</li>
+				</exclusionTags>
+			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/GeneDef[defName="Beauty_VeryUgly" or defName="Beauty_Ugly"]/exclusionTags</xpath>
+			<value>
+				<li>MLRP_BronyGene</li>
+			</value>
+		</match>
+	</Operation>
+
+</Patch>
diff --git a/MyLittleRimPony/Biotech/Patches/My Little RimPony/HarmonyChipGrantsBiotechBonuses.xml b/MyLittleRimPony/Biotech/Patches/My Little RimPony/HarmonyChipGrantsBiotechBonuses.xml
@@ -1,15 +1,3 @@
 <Patch>
 
-<Operation Class="PatchOperationFindMod">
-	<mods>
-		<li>Royalty</li>
-	</mods>
-	<match Class="PatchOperationAdd">
-		<xpath>/Defs/HediffDef[defName="MLRP_HarmonyChipInstalled"]/stages/li/statOffsets</xpath>
-		<value>
-			<MechBandwidth>2</MechBandwidth>
-		</value>
-	</match>
-</Operation>
-
 </Patch>
diff --git a/MyLittleRimPony/Biotech/Patches/Royalty/Empire_DiamondDogMercenaries.xml b/MyLittleRimPony/Biotech/Patches/Royalty/Empire_DiamondDogMercenaries.xml
@@ -6,6 +6,7 @@
 				<factionDef>MLRP_DiamondDog_Faction</factionDef>
 				<pawnKinds>
 					<li>DiamondDogSoldier</li>
+					<li>DiamondDogArcher</li>
 				</pawnKinds>
 			</li>  
 		</value>

diff --git a/MyLittleRimPony/Combat Extended/Patches/PlushiePatch.xml b/MyLittleRimPony/Combat Extended/Patches/PlushiePatch.xml
@@ -104,17 +104,6 @@
 
 	<!--Harmony Chip (Requires Royalty DLC)-->
 
-	<Operation Class="PatchOperationAdd" MayRequire="Ludeon.RimWorld.Royalty">
-	    <xpath>/Defs/HediffDef[defName="MLRP_HarmonyChipInstalled"]/stages/li/statOffsets</xpath>
-	    <value>
-			<CarryBulk>15</CarryBulk>
-			<ReloadSpeed>0.05</ReloadSpeed>
-			<NightVisionEfficiency>0.1</NightVisionEfficiency>
-			<SmokeSensitivity>-0.25</SmokeSensitivity>
-			<Suppressability>-0.05</Suppressability>
-	    </value>
-	</Operation>
-
 	<Operation Class="PatchOperationReplace" MayRequire="Ludeon.RimWorld.Royalty">
 		<xpath>/Defs/HediffDef[defName="MLRP_HarmonyChipInstalled"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
 		<value>

diff --git a/MyLittleRimPony/Core/Assemblies/MyLittleRimPony.dll b/MyLittleRimPony/Core/Assemblies/MyLittleRimPony.dll
diff --git a/MyLittleRimPony/Core/Defs/Storyteller/Storytellers.xml b/MyLittleRimPony/Core/Defs/Storyteller/Storytellers.xml
@@ -3,7 +3,7 @@
 <StorytellerDef ParentName="BaseStoryteller">
     <defName>MLRP_Storyteller_Sunny</defName>
     <label>Sunny Starscout</label>
-    <description>Sunny prefers to make friends instead of enemies, so she will send you more quests, traders and visitors instead.\n\nRaids will occur, but only once a certain number of threat points are reached, and with more time between them in order to help you thrive and build up your relationships with other factions.\n\nAs a downside, however, disease outbreaks will happen much more frequently.</description>
+    <description>Sunny prefers to make friends instead of enemies, so she will send you more quests, traders and visitors instead.\n\nRaids will occur, but only once a certain number of threat points are reached, and with more time between them in order to help you thrive and build up your relationships with other factions.</description>
     <portraitLarge>UI/HeroArt/Storytellers/SunnyStarscout</portraitLarge>
     <portraitTiny>UI/HeroArt/Storytellers/SunnyStarscout_Tiny</portraitTiny>
     <listOrder>50</listOrder>
@@ -59,14 +59,6 @@
         <mtbDays>7</mtbDays>
       </li>
       <li Class="StorytellerCompProperties_ShipChunkDrop"/>
-      <li Class="StorytellerCompProperties_Disease">
-        <category>DiseaseHuman</category>
-        <minDaysPassed>15</minDaysPassed>
-      </li>
-      <li Class="StorytellerCompProperties_Disease">
-        <category>DiseaseAnimal</category>
-        <minDaysPassed>15</minDaysPassed>
-      </li>
       <!-- Ally/neutral interaction -->
       <li Class="StorytellerCompProperties_FactionInteraction">
         <incident>RaidFriendly</incident>

diff --git a/MyLittleRimPony/Core/Defs/ThingDef_Buildings/VillainStatue_Core.xml b/MyLittleRimPony/Core/Defs/ThingDef_Buildings/VillainStatue_Core.xml
@@ -0,0 +1,51 @@
+<Defs>
+
+<ThingDef ParentName="BuildingBase">
+    <defName>MLRP_VillainStatue</defName>
+    <label>Statue of the Three Villains</label>
+    <description>A replica of a statue depicting three villains who tried to conquer Equestria but failed, thanks to the combined efforts of many creatures.\n\nA truly glorious sight to behold, this reminder of the power of friendship is a beautiful addition to any room.</description>
+    <drawerType>MapMeshAndRealTime</drawerType>
+    <altitudeLayer>Building</altitudeLayer>
+    <graphicData>
+      <texPath>Things/Building/VillainStatue</texPath>
+      <graphicClass>Graphic_Single</graphicClass>
+      <drawSize>(2,3)</drawSize>
+    </graphicData>
+    <minifiedDef>MinifiedThing</minifiedDef>
+    <thingCategories>
+      <li>BuildingsMisc</li>
+    </thingCategories>
+    <uiIconPath>Things/Building/VillainStatue</uiIconPath>
+    <passability>PassThroughOnly</passability>
+    <pathCost>30</pathCost>
+    <blockWind>true</blockWind>
+    <fillPercent>0.5</fillPercent>
+    <canOverlapZones>false</canOverlapZones>
+    <statBases>
+      <WorkToBuild>1600</WorkToBuild>
+      <MaxHitPoints>150</MaxHitPoints>
+      <Beauty>300</Beauty>
+      <Mass>15</Mass>
+    </statBases>
+    <size>(2,3)</size>
+    <designationCategory>MLRP_Buildings</designationCategory>
+    <uiOrder>3000</uiOrder>
+    <defaultPlacingRot>North</defaultPlacingRot>
+    <rotatable>false</rotatable>
+    <building>
+      <ai_chillDestination>false</ai_chillDestination>
+      <destroySound>BuildingDestroyed_Stone_Small</destroySound>
+      <haulToContainerDuration>500</haulToContainerDuration>
+      <paintable>false</paintable>
+    </building>
+    <stuffCategories>
+		<li>Metallic</li>
+		<li>Stony</li>
+		<li>Woody</li>
+    </stuffCategories>
+    <costStuffCount>300</costStuffCount>
+    <terrainAffordanceNeeded>Medium</terrainAffordanceNeeded>
+    <constructionSkillPrerequisite>4</constructionSkillPrerequisite>
+  </ThingDef>
+
+</Defs>
diff --git a/MyLittleRimPony/Core/Languages/English/Keyed/Keys.xml b/MyLittleRimPony/Core/Languages/English/Keyed/Keys.xml
@@ -44,6 +44,7 @@
 	<MLRP_NMMLetterText>Now available at the Nightmare Moon statue:\n\n{0}</MLRP_NMMLetterText>
 	<MLRP_PBLetterText>Now available at the pony workbench:\n\n{0}</MLRP_PBLetterText>
 	<MLRP_FELetterText>Now available at the Fabric Exchange:\n\n{0}</MLRP_FELetterText>
+	<MLRP_SELetterText>Now available at the Stone Exchange:\n\n{0}</MLRP_SELetterText>
 	<MLRP_TPLetterText MayRequire="Ludeon.RimWorld.Anomaly">Now available at Thingpone:\n\n{0}</MLRP_TPLetterText>
 
 	<MLRP_ExtraScrewballOutputTitle MayRequire="leion247612.HigherHPower">Advanced power researched</MLRP_ExtraScrewballOutputTitle>

diff --git a/...yteller/Incidents_Map_Disease_MLRP_FR.xml → ...lerDefs/Incidents_Map_Disease_MLRP_FR.xml b/...yteller/Incidents_Map_Disease_MLRP_FR.xml → ...lerDefs/Incidents_Map_Disease_MLRP_FR.xml
diff --git a/...fInjected/Storyteller/Storytellers_FR.xml → ...ected/StorytellerDefs/Storytellers_FR.xml b/...fInjected/Storyteller/Storytellers_FR.xml → ...ected/StorytellerDefs/Storytellers_FR.xml
@@ -4,7 +4,7 @@
 	<MLRP_Storyteller_Sunny.label>Sunny Starscout</MLRP_Storyteller_Sunny.label>
 
 	<!--EN: Sunny prefers to make friends instead of enemies, so she will send you more quests, traders and visitors instead.\n\nRaids will occur, but only once a certain number of threat points are reached, and with more time between them in order to help you thrive and build up your relationships with other factions.\n\nAs a downside, however, disease outbreaks will happen much more frequently.-->
-	<MLRP_Storyteller_Sunny.description>Sunny Starscout préfère se faire des amis plutôt que des ennemis, elle vous enverra donc plus de quêtes, de marchands et de visiteurs.\n\nDes raids auront lieu, mais seulement après avoir atteint un certain nombre de points de menace, et avec plus de temps entre eux afin de vous aider à prospérer et à construire vos relations avec les autres factions.\n\nEn revanche, les épidémies seront beaucoup plus fréquentes.</MLRP_Storyteller_Sunny.description>
+	<MLRP_Storyteller_Sunny.description>Sunny Starscout préfère se faire des amis plutôt que des ennemis, elle vous enverra donc plus de quêtes, de marchands et de visiteurs.\n\nDes raids auront lieu, mais seulement après avoir atteint un certain nombre de points de menace, et avec plus de temps entre eux afin de vous aider à prospérer et à construire vos relations avec les autres factions.</MLRP_Storyteller_Sunny.description>
 
 
 </LanguageData>
diff --git a/MyLittleRimPony/Core/Languages/French/DefInjected/ThingDefs/MLRP_Buildings_FR.xml b/MyLittleRimPony/Core/Languages/French/DefInjected/ThingDefs/MLRP_Buildings_FR.xml
@@ -107,5 +107,11 @@
 
 	<!--EN: Although Zephyr Breeze reckons he is Celestia's gift to mares, he is yet to find one who agrees with him. Thankfully, though, his pig-headed arrogance can actually be useful.\n\nFuthermore, his thick skull - which has absorbed countless rejections from Rainbow Dash alone - makes him surprisingly durable.\n\nGood thing, too, because a lot of people seem to want to hit him.-->
 	<MLRP_ZephyrBreeze.description>Bien que Zephyr Breeze considère qu'il est le cadeau de Celestia pour les juments, il n'en a encore trouvé aucune qui soit d'accord avec lui. Heureusement, son arrogance de tête de cochon peut s'avérer utile.\n\nDe plus, son crâne épais - qui a absorbé d'innombrables refus de la part de Rainbow Dash - le rend étonnamment résistant.\n\nC'est une bonne chose, car beaucoup de gens semblent vouloir le frapper.</MLRP_ZephyrBreeze.description>
+
+	<!--EN: Statue of the Three Villains-->
+	<MLRP_VillainStatue.label>Statue des trois méchants</MLRP_VillainStatue.label>
+
+	<!--EN: A replica of a statue depicting three villains who tried to conquer Equestria but failed, thanks to the combined efforts of many creatures.\n\nA truly glorious sight to behold, this reminder of the power of friendship is a beautiful addition to any room.-->
+	<MLRP_VillainStatue.description>Réplique d'une statue représentant trois méchants qui ont tenté de conquérir Equestria mais qui ont échoué, grâce aux efforts combinés de nombreuses créatures.\n\nCe rappel de la puissance de l'amitié est un bel ajout à n'importe quelle pièce.</MLRP_VillainStatue.description>
 
 </LanguageData>