Skip to content

Commit

Permalink
Version 5.17.45
Browse files Browse the repository at this point in the history 
See release.
  • Loading branch information
@GeodesicDragon
GeodesicDragon committed Apr 22, 2024
1 parent 98a3c84 commit eceb854
Show file tree
Hide file tree
Showing 55 changed files with 416 additions and 275 deletions.
3 changes: 2 additions & 1 deletion MyLittleRimPony/About/About.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<author>GeodesicDragon</author>
<packageId>geodesicdragon.rimpony</packageId>
<url>https://discord.gg/BGKnpza</url>
<modVersion>5.15.39</modVersion>
<modVersion>5.17.45</modVersion>
<supportedVersions>
<li>1.4</li>
<li>1.5</li>
Expand All @@ -12,6 +12,7 @@
<li>WheatyTail.MyLittleRimPonyRus</li>
</loadBefore>
<loadAfter>
<li>brrainz.harmony</li>
<li>imranfish.xmlextensions</li>
<li>CETeam.CombatExtended</li>
</loadAfter>
Expand Down
18 changes: 17 additions & 1 deletion MyLittleRimPony/About/Changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
Version 5.15.39 (April 17th 2024)
Version 5.17.45 (April 22nd 2024)

* Core 1.5: Good news, Harmony users, the research tracker is back! And this time, it won't eat up all your TPS!
* Makes use of a Harmony patch to monitor your completed research and send a letter informing you of new recipes when certain projects are completed.
* Harmony is not required to use MLRP now; thanks to LoadFolders.xml, the tracker DLL is only loaded if Harmony is active.
* Many thanks to SoundOfSpouting and order_without_power from the Harmony Discord server for their assistance.
* Core 1.5/Ponies of the Rim: Added a recipe to the Fabric Exchange which allows you to convert 100 pony fur into cloth.
* Core: The brony trait no longer renders pawns incapable of violence.
* This means you don't need to use XML Extensions to make them capable of fighting.
* XML Extensions users will now have an unused setting - MLRP_BroniesCanBeViolent - that can be safely removed.
* Anomaly: Fixed incomplete description on Thingpone research.
* Anomaly: Fixed being unable to research Thingpone. The ability to do so is now unlocked after you first encounter fleshbeasts.
* Core 1.5/Humanoid Alien Races: Fixed 'Could not resolve cross-reference to RimWorld.TraitDef named Xenophobia (wanter=conflictingTraits)' error.
* Core 1.5/Ponies of the Rim: Ponies added by this mod should no longer spawn with the brony trait.
* Core 1.5/Ponies of the Rim: Ponies added by this mod should no longer spawn with the anti brony trait.

Version 5.15.39 (April 19th 2024)

Changes marked as just 'Core' apply to both version 1.4 and 1.5 of the game.

Expand Down
2 changes: 1 addition & 1 deletion MyLittleRimPony/About/Manifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Manifest>
<identifier>My Little RimPony</identifier>
<version>5.15.39</version>
<version>5.17.45</version>
<showCrossPromotions>true</showCrossPromotions>
<manifestUri>https://raw.githubusercontent.com/GeodesicDragon/mylittlerimpony/main/MyLittleRimPony/About/Manifest.xml</manifestUri>
<downloadUri>https://github.com/geodesicdragon/mylittlerimpony/releases/latest</downloadUri>
Expand Down
2 changes: 1 addition & 1 deletion MyLittleRimPony/Anomaly/Defs/ResearchProjectDefs/MLRP_AnomalyResearch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ResearchProjectDef>
<defName>MLRP_ThingponeResearch</defName>
<label>thingpone</label>
<description>Allows you to build</description>
<description>Allows you to build a statue of Thingpone, where you can request items from beyond the void.</description>
<tab>MLRP_ResearchTab</tab>
<prerequisites>
<li>Electricity</li>
Expand Down
10 changes: 10 additions & 0 deletions MyLittleRimPony/Anomaly/Patches/Anomaly/UnlockThingponeResearch.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Patch>

<Operation Class="PatchOperationAdd">
<xpath>Defs/EntityCodexEntryDef[defName="Fleshbeasts"]/discoveredResearchProjects</xpath>
<value>
<li>MLRP_ThingponeResearch</li>
</value>
</Operation>

</Patch>
14 changes: 7 additions & 7 deletions MyLittleRimPony/Biotech/Defs/Scenarios/MLP_BiotechScenario.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,19 +89,19 @@
<project>MLRP_ScrewballResearch</project>
</li>

<!-- Player starting weapons (Requires XML Extensions)-->
<!-- Player starting weapons-->

<li Name="MLRP_BiotechScenario_RangedWeapons" Class="ScenPart_StartingThing_Defined" MayRequire="imranfish.xmlextensions">
<!--<def>StartingThing_Defined</def>
<li Class="ScenPart_StartingThing_Defined">
<def>StartingThing_Defined</def>
<thingDef>Gun_Autopistol</thingDef>
<count>3</count>-->
<count>3</count>
</li>

<li Name="MLRP_BiotechScenario_MeleeWeapons" Class="ScenPart_StartingThing_Defined" MayRequire="imranfish.xmlextensions">
<!--<def>StartingThing_Defined</def>
<li Class="ScenPart_StartingThing_Defined">
<def>StartingThing_Defined</def>
<thingDef>MeleeWeapon_Knife</thingDef>
<count>2</count>
<stuff>Plasteel</stuff>-->
<stuff>Plasteel</stuff>
</li>

<!-- Player starting things-->
Expand Down
Binary file modified MyLittleRimPony/Core 1.5/Assemblies/MyLittleRimPony.dll
View file
Binary file not shown.
19 changes: 10 additions & 9 deletions MyLittleRimPony/Core 1.5/Defs/FactionDefs/MLP_Scenario.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ScenarioDef>
<defName>MLRP_Scenario</defName>
<label>Brony Community</label>
<description>Your group has been wandering these lands for a while now, and you've finally decided to settle down and build a home.\n\nYou are all from different walks of life, but you have one thing in common: you all love a show about cartoon ponies, and have taken its lessons to heart.\n\nYou'll need to work fast in order to secure your new home, though; since you are all against violence, you are tempting targets for raiders.</description>
<description>Your group has been wandering these lands for a while now, and you've finally decided to settle down and build a home.\n\nYou are all from different walks of life, but you have one thing in common: you all love a show about cartoon ponies, and have taken its lessons to heart.\n\nYou'll need to work fast in order to secure your new home, though; your starting weapons are very basic and you are in posession of a lot of valuable items, thus making you tempting targets for raiders.</description>
<scenario>
<summary>A group of bronies attempt to carve out a new existence for themselves. Difficult.</summary>
<playerFaction>
Expand Down Expand Up @@ -43,19 +43,20 @@
<trait>MLRP_BronyTrait</trait>
</li>

<!-- Player starting weapons (Requires XML Extensions)-->
<!-- Player starting weapons-->

<li Name="MLRP_CoreScenario_RangedWeapons" Class="ScenPart_StartingThing_Defined" MayRequire="imranfish.xmlextensions">
<!--<def>StartingThing_Defined</def>
<li Class="ScenPart_StartingThing_Defined">
<def>StartingThing_Defined</def>
<thingDef>Gun_Autopistol</thingDef>
<count>2</count>-->
<count>2</count>
</li>

<li Name="MLRP_CoreScenario_MeleeWeapons" Class="ScenPart_StartingThing_Defined" MayRequire="imranfish.xmlextensions">
<!--<def>StartingThing_Defined</def>

<li Class="ScenPart_StartingThing_Defined">
<def>StartingThing_Defined</def>
<thingDef>MeleeWeapon_Knife</thingDef>
<count>1</count>
<stuff>Plasteel</stuff>-->
<stuff>Plasteel</stuff>
</li>

<!-- Player starting things-->
Expand Down Expand Up @@ -157,7 +158,7 @@

<li Class="ScenPart_GameStartDialog">
<def>GameStartDialog</def>
<text>You're finally done wandering the planet, and it is time for you to build a new home where you can live in peace.\n\nIt's not going to be easy - the fact that you're all pacifists will make you tempting targets for those with the presence of mind to consider you a viable threat - but you have belief in yourselves that you can make this work.</text>
<text>You're finally done wandering the planet, and it is time for you to build a new home where you can live in peace.\n\nIt's not going to be easy - the fact that you've got all this stuff will make you tempting targets for those with the presence of mind to consider you a viable threat - but you have belief in yourselves that you can make this work.</text>
</li>
</parts>
</scenario>
Expand Down
2 changes: 1 addition & 1 deletion MyLittleRimPony/Core 1.5/Defs/ResearchProjectDefs/ResearchProjects_MLRP.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<researchViewX>7</researchViewX>
<researchViewY>0</researchViewY>
<discoveredLetterTitle>Magical power efficiency</discoveredLetterTitle>
<discoveredLetterText>These buildings now generate more power:\n\n- Screwball: +50%\n- Magic mirror: +25%\n\nThese buildings now use less power:\n\n- Plushie bench: -50%\n- Fabric Exchange: -50%\n- Stone Exchange: -50%\n- Sweetie Bot turret: -25%\n- Nurse Redheart: -25%\n- Super Speedy Cider Squeezy 6000: -25%</discoveredLetterText>
<discoveredLetterText>These buildings now generate more power:\n\n- Screwball: +50%\n- Magic mirror: +25%\n\nThese buildings now use less power:\n\n- Plushie bench: -50%\n- Fabric Exchange: -50%\n- Stone Exchange: -50%\n- Sweetie Bot turret: -25%\n- Nurse Redheart: -25%\n- Super Speedy Cider Squeezy 6000: -25%\n- Thingpone: -25%</discoveredLetterText>
</ResearchProjectDef>

</Defs>
4 changes: 1 addition & 3 deletions MyLittleRimPony/Core 1.5/Defs/TraitDefs/BronyTrait.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
<TraitDef>
<defName>MLRP_BronyTrait</defName>
<commonality>0.1</commonality>
<disabledWorkTags>Violent</disabledWorkTags>
<degreeDatas>
<li>
<label>brony</label>
<description>{PAWN_nameDef} has taken the lessons of My Little Pony: Friendship is Magic to heart; {PAWN_possessive} social skills have improved, but {PAWN_pronoun} is against the idea of using violence.\n\n{PAWN_pronoun} will never judge others based on their appearance, voice or breathing, and insults have no effect on {PAWN_objective} whatsoever.\n\n{PAWN_pronoun} gets a mood bonus from equipping pony plushies, and has a positive attitude towards other bronies.</description>
<description>{PAWN_nameDef} has taken the lessons of My Little Pony: Friendship is Magic to heart; {PAWN_possessive} social skills have improved, {PAWN_pronoun} will never judge others based on their appearance, voice or breathing, and insults have no effect on {PAWN_objective} whatsoever.\n\n{PAWN_pronoun} gets a mood bonus from equipping pony plushies, and has a positive attitude towards other bronies.</description>
<skillGains>
<Social>6</Social>
</skillGains>
<marketValueFactorOffset>-0.5</marketValueFactorOffset>
<possessions>
<MLRP_ElementsOfHarmony>-3~1</MLRP_ElementsOfHarmony>
<MLRP_ElementsOfHarmonyWeaponised>-98~1</MLRP_ElementsOfHarmonyWeaponised> <!--Does this equal a 1% chance, or am I overthinking it?-->
Expand Down
15 changes: 8 additions & 7 deletions MyLittleRimPony/Core 1.5/Languages/English/Keyed/Keys.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,19 @@

<!--C# ROYALTY-->

<MLRP_AntiBronyHasHarmonyChipAlert MayRequire="Ludeon.RimWorld.Royalty">Anti brony has harmony chip</MLRP_AntiBronyHasHarmonyChipAlert>
<MLRP_AntiBronyHasHarmonyChipExplanation MayRequire="Ludeon.RimWorld.Royalty">A pawn with the anti brony trait has a harmony chip installed. This will cause a -10 penalty to their mood until it is removed.</MLRP_AntiBronyHasHarmonyChipExplanation>
<MLRP_AntiBronyHasHarmonyChipAlert>Anti brony has harmony chip</MLRP_AntiBronyHasHarmonyChipAlert>
<MLRP_AntiBronyHasHarmonyChipExplanation>A pawn with the anti brony trait has a harmony chip installed. This will cause a -10 penalty to their mood until it is removed.</MLRP_AntiBronyHasHarmonyChipExplanation>

<!--C# BIOTECH-->

<MLRP_AboutSweetieBotMechLetterHeader MayRequire="Ludeon.RimWorld.Biotech">Sweetie Bot mechanoids</MLRP_AboutSweetieBotMechLetterHeader>
<MLRP_AboutSweetieBotMechLetterText MayRequire="Ludeon.RimWorld.Biotech">Sweetie Bot mechanoids are fast moving with decent sharp armour, but they are vulnerable when engaged in melee combat.\n\nThey are best suited for attacking an enemy's flanks, rushing in and laying down fire before retreating to a safe distance.\n\nThey can also be used as mounts when part of caravans.</MLRP_AboutSweetieBotMechLetterText>
<MLRP_AboutSweetieBotMechLetterHeader>Sweetie Bot mechanoids</MLRP_AboutSweetieBotMechLetterHeader>
<MLRP_AboutSweetieBotMechLetterText>Sweetie Bot mechanoids are fast moving with decent sharp armour, but they are vulnerable when engaged in melee combat.\n\nThey are best suited for attacking an enemy's flanks, rushing in and laying down fire before retreating to a safe distance.\n\nThey can also be used as mounts when part of caravans.</MLRP_AboutSweetieBotMechLetterText>

<!--C# MODS-->

<MLRP_XMLExtensionsDetected MayRequire="imranfish.xmlextensions">[My Little RimPony] XML Extensions has been detected.</MLRP_XMLExtensionsDetected>
<MLRP_CEDetected MayRequire="CETeam.CombatExtended">[My Little RimPony] Combat Extended has been detected.</MLRP_CEDetected>
<MLRP_MOPatchesDetected MayRequire="geodesicdragon.rimpony.medieval">[My Little RimPony] Medieval Overhaul patches have been applied.</MLRP_MOPatchesDetected>
<MLRP_XMLExtensionsDetected>[My Little RimPony] XML Extensions has been detected.</MLRP_XMLExtensionsDetected>
<MLRP_CEDetected>[My Little RimPony] Combat Extended has been detected.</MLRP_CEDetected>
<MLRP_MOPatchesDetected>[My Little RimPony] Medieval Overhaul patches have been applied.</MLRP_MOPatchesDetected>
<MLRP_HarmonyDetected>[My Little RimPony] Harmony detected. Research tracker is now active.</MLRP_HarmonyDetected>

</LanguageData>
4 changes: 4 additions & 0 deletions MyLittleRimPony/Core 1.5/Languages/English/Strings/NameBanks/PonySingleNames.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ Flim
Flam
Derpy
Bon Bon
Daisy
Lily
Roseluck
Aloe
Lotus
Minuette
Twinkleshine
Blossomforth
Expand Down
36 changes: 18 additions & 18 deletions MyLittleRimPony/Core 1.5/Languages/French/Keyed/Keys.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@
<MLRP_AntiBronyHasPlushieAlert>Anti brony utilisant la peluche</MLRP_AntiBronyHasPlushieAlert> <!--Shown at side of screen when a pawn with the anti brony trait has a plushie equipped.-->
<MLRP_AntiBronyHasPlushieExplanation>Un pion avec le trait anti brony a une peluche de poney équipée, ce qui causera une pénalité d'humeur jusqu'à ce qu'elle soit abandonnée. Il pourrait être intéressant d'attribuer aux anti-bronys une tenue distincte afin d'éviter cela.</MLRP_AntiBronyHasPlushieExplanation>
<MLRP_PoisonJokeLetterTitle>Affliction de la blague du poison</MLRP_PoisonJokeLetterTitle> <!--Title of letter received after a pawn smokes poison joke.-->
<MLRP_PoisonJokeLetterText>Fumer une blague du poison a donné à {0} ce qui suit : {1}</MLRP_PoisonJokeLetterText> <!--Text of letter received after a pawn smokes poison joke. {0} is the pawn's name and {1} is what they were afflicted with; translations for afflictions are below.-->
<MLRP_PoisonJokeLetterText>Fumer une blague du poison a donné à {0} ce qui suit: {1}</MLRP_PoisonJokeLetterText> <!--Text of letter received after a pawn smokes poison joke. {0} is the pawn's name and {1} is what they were afflicted with; translations for afflictions are below.-->

<!--POISON JOKE AFFLICTIONS: MUST BE LOWER CASE UNLESS OTHERWISE SPECIFIED-->

<MLRP_PoisonJokeGoodConsciousness>accrue de l'état de conscience</MLRP_PoisonJokeGoodConsciousness>
<MLRP_PoisonJokeBadConsciousness>diminution de l'état de conscience</MLRP_PoisonJokeBadConsciousness>
<MLRP_PoisonJokeGoodSpeed>vitesse de déplacement accrue</MLRP_PoisonJokeGoodSpeed>
<MLRP_PoisonJokeBadSpeed>vitesse de déplacement réduite</MLRP_PoisonJokeBadSpeed>
<MLRP_PoisonJokeGoodManipulation>une meilleure manipulation</MLRP_PoisonJokeGoodManipulation>
<MLRP_PoisonJokeBadManipulation>réduction de la manipulation</MLRP_PoisonJokeBadManipulation>
<MLRP_PoisonJokeGoodTalking>amélioration de la capacité d'expression orale</MLRP_PoisonJokeGoodTalking>
<MLRP_PoisonJokeBadTalking>incapacité à parler</MLRP_PoisonJokeBadTalking>
<MLRP_PoisonJokeGoodEating>Amélioration de la vitesse de consommation</MLRP_PoisonJokeGoodEating>
<MLRP_PoisonJokeBadEating>réduction de la vitesse d'ingestion des aliments</MLRP_PoisonJokeBadEating>
<MLRP_PoisonJokeGoodSight>amélioration de la vue</MLRP_PoisonJokeGoodSight>
<MLRP_PoisonJokeBadSight>cécité</MLRP_PoisonJokeBadSight>
<MLRP_PoisonJokeGoodHearing>amélioration de l'audition</MLRP_PoisonJokeGoodHearing>
<MLRP_PoisonJokeBadHearing>surdité</MLRP_PoisonJokeBadHearing>
<MLRP_PoisonJokeGoodBreathing>amélioration de la capacité respiratoire</MLRP_PoisonJokeGoodBreathing>
<MLRP_PoisonJokeBadBreathing>une diminution de la capacité respiratoire</MLRP_PoisonJokeBadBreathing>
<MLRP_PoisonJokeCutiePox>la Cutie Pox</MLRP_PoisonJokeCutiePox>
<MLRP_PoisonJokeGoodConsciousness>Fumer une blague du poison a donné à {0} ce qui suit: accrue de l'état de conscience</MLRP_PoisonJokeGoodConsciousness>
<MLRP_PoisonJokeBadConsciousness>Fumer une blague du poison a donné à {0} ce qui suit: diminution de l'état de conscience</MLRP_PoisonJokeBadConsciousness>
<MLRP_PoisonJokeGoodSpeed>Fumer une blague du poison a donné à {0} ce qui suit: vitesse de déplacement accrue</MLRP_PoisonJokeGoodSpeed>
<MLRP_PoisonJokeBadSpeed>Fumer une blague du poison a donné à {0} ce qui suit: vitesse de déplacement réduite</MLRP_PoisonJokeBadSpeed>
<MLRP_PoisonJokeGoodManipulation>Fumer une blague du poison a donné à {0} ce qui suit: une meilleure manipulation</MLRP_PoisonJokeGoodManipulation>
<MLRP_PoisonJokeBadManipulation>Fumer une blague du poison a donné à {0} ce qui suit: réduction de la manipulation</MLRP_PoisonJokeBadManipulation>
<MLRP_PoisonJokeGoodTalking>Fumer une blague du poison a donné à {0} ce qui suit: amélioration de la capacité d'expression orale</MLRP_PoisonJokeGoodTalking>
<MLRP_PoisonJokeBadTalking>Fumer une blague du poison a donné à {0} ce qui suit: incapacité à parler</MLRP_PoisonJokeBadTalking>
<MLRP_PoisonJokeGoodEating>Fumer une blague du poison a donné à {0} ce qui suit: Amélioration de la vitesse de consommation</MLRP_PoisonJokeGoodEating>
<MLRP_PoisonJokeBadEating>Fumer une blague du poison a donné à {0} ce qui suit: réduction de la vitesse d'ingestion des aliments</MLRP_PoisonJokeBadEating>
<MLRP_PoisonJokeGoodSight>Fumer une blague du poison a donné à {0} ce qui suit: amélioration de la vue</MLRP_PoisonJokeGoodSight>
<MLRP_PoisonJokeBadSight>Fumer une blague du poison a donné à {0} ce qui suit: cécité</MLRP_PoisonJokeBadSight>
<MLRP_PoisonJokeGoodHearing>Fumer une blague du poison a donné à {0} ce qui suit: amélioration de l'audition</MLRP_PoisonJokeGoodHearing>
<MLRP_PoisonJokeBadHearing>Fumer une blague du poison a donné à {0} ce qui suit: surdité</MLRP_PoisonJokeBadHearing>
<MLRP_PoisonJokeGoodBreathing>Fumer une blague du poison a donné à {0} ce qui suit: amélioration de la capacité respiratoire</MLRP_PoisonJokeGoodBreathing>
<MLRP_PoisonJokeBadBreathing>Fumer une blague du poison a donné à {0} ce qui suit: une diminution de la capacité respiratoire</MLRP_PoisonJokeBadBreathing>
<MLRP_PoisonJokeCutiePox>Fumer une blague du poison a donné à {0} ce qui suit: la Cutie Pox</MLRP_PoisonJokeCutiePox>

<!--C# ROYALTY-->

Expand Down
Loading

0 comments on commit eceb854

Please sign in to comment.