diff --git a/MyLittleRimPony/About/About.xml b/MyLittleRimPony/About/About.xml index 55e86f55..2f94a9d1 100644 --- a/MyLittleRimPony/About/About.xml +++ b/MyLittleRimPony/About/About.xml @@ -3,7 +3,7 @@ GeodesicDragon geodesicdragon.rimpony https://discord.gg/BGKnpza - 5.15.39 + 5.17.45
  • 1.4
  • 1.5
    • @@ -12,6 +12,7 @@
  • WheatyTail.MyLittleRimPonyRus
    • +
  • brrainz.harmony
  • imranfish.xmlextensions
  • CETeam.CombatExtended
    •  diff --git a/MyLittleRimPony/About/Changelog.txt b/MyLittleRimPony/About/Changelog.txt index 795b9942..d48b7a84 100644 --- a/MyLittleRimPony/About/Changelog.txt +++ b/MyLittleRimPony/About/Changelog.txt @@ -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. diff --git a/MyLittleRimPony/About/Manifest.xml b/MyLittleRimPony/About/Manifest.xml index d2d05d78..e8c7756c 100644 --- a/MyLittleRimPony/About/Manifest.xml +++ b/MyLittleRimPony/About/Manifest.xml @@ -1,6 +1,6 @@ My Little RimPony - 5.15.39 + 5.17.45 true https://raw.githubusercontent.com/GeodesicDragon/mylittlerimpony/main/MyLittleRimPony/About/Manifest.xml https://github.com/geodesicdragon/mylittlerimpony/releases/latest diff --git a/MyLittleRimPony/Anomaly/Defs/ResearchProjectDefs/MLRP_AnomalyResearch.xml b/MyLittleRimPony/Anomaly/Defs/ResearchProjectDefs/MLRP_AnomalyResearch.xml index aab58b9e..fe095fcd 100644 --- a/MyLittleRimPony/Anomaly/Defs/ResearchProjectDefs/MLRP_AnomalyResearch.xml +++ b/MyLittleRimPony/Anomaly/Defs/ResearchProjectDefs/MLRP_AnomalyResearch.xml @@ -5,7 +5,7 @@ MLRP_ThingponeResearch - Allows you to build + Allows you to build a statue of Thingpone, where you can request items from beyond the void. MLRP_ResearchTab
  • Electricity
    • diff --git a/MyLittleRimPony/Anomaly/Patches/Anomaly/UnlockThingponeResearch.xml b/MyLittleRimPony/Anomaly/Patches/Anomaly/UnlockThingponeResearch.xml new file mode 100644 index 00000000..15ff194f --- /dev/null +++ b/MyLittleRimPony/Anomaly/Patches/Anomaly/UnlockThingponeResearch.xml @@ -0,0 +1,10 @@ + + + + Defs/EntityCodexEntryDef[defName="Fleshbeasts"]/discoveredResearchProjects + +
  • MLRP_ThingponeResearch
    • +     +     + +     \ No newline at end of file diff --git a/MyLittleRimPony/Biotech/Defs/Scenarios/MLP_BiotechScenario.xml b/MyLittleRimPony/Biotech/Defs/Scenarios/MLP_BiotechScenario.xml index 7b5c2140..50f22942 100644 --- a/MyLittleRimPony/Biotech/Defs/Scenarios/MLP_BiotechScenario.xml +++ b/MyLittleRimPony/Biotech/Defs/Scenarios/MLP_BiotechScenario.xml @@ -89,19 +89,19 @@ MLRP_ScrewballResearch - + -
  • - + 3
    • -
  • - + Plasteel
    • diff --git a/MyLittleRimPony/Core 1.5/Assemblies/MyLittleRimPony.dll b/MyLittleRimPony/Core 1.5/Assemblies/MyLittleRimPony.dll index c0ea3104..a7a9ad97 100644 Binary files a/MyLittleRimPony/Core 1.5/Assemblies/MyLittleRimPony.dll and b/MyLittleRimPony/Core 1.5/Assemblies/MyLittleRimPony.dll differ diff --git a/MyLittleRimPony/Core 1.5/Defs/FactionDefs/MLP_Scenario.xml b/MyLittleRimPony/Core 1.5/Defs/FactionDefs/MLP_Scenario.xml index f621ac72..1f006b4b 100644 --- a/MyLittleRimPony/Core 1.5/Defs/FactionDefs/MLP_Scenario.xml +++ b/MyLittleRimPony/Core 1.5/Defs/FactionDefs/MLP_Scenario.xml @@ -4,7 +4,7 @@ MLRP_Scenario - 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. + 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. A group of bronies attempt to carve out a new existence for themselves. Difficult. @@ -43,19 +43,20 @@ MLRP_BronyTrait - + -
  • - + 2
    • -
  • - + Plasteel
    • @@ -157,7 +158,7 @@
  • GameStartDialog - 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. + 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.
    • diff --git a/MyLittleRimPony/Core 1.5/Defs/ResearchProjectDefs/ResearchProjects_MLRP.xml b/MyLittleRimPony/Core 1.5/Defs/ResearchProjectDefs/ResearchProjects_MLRP.xml index eff9fd6a..bcf1878c 100644 --- a/MyLittleRimPony/Core 1.5/Defs/ResearchProjectDefs/ResearchProjects_MLRP.xml +++ b/MyLittleRimPony/Core 1.5/Defs/ResearchProjectDefs/ResearchProjects_MLRP.xml @@ -106,7 +106,7 @@ 7 0 Magical power efficiency - 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% + 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%     \ No newline at end of file diff --git a/MyLittleRimPony/Core 1.5/Defs/TraitDefs/BronyTrait.xml b/MyLittleRimPony/Core 1.5/Defs/TraitDefs/BronyTrait.xml index 1fae9640..66a001ce 100644 --- a/MyLittleRimPony/Core 1.5/Defs/TraitDefs/BronyTrait.xml +++ b/MyLittleRimPony/Core 1.5/Defs/TraitDefs/BronyTrait.xml @@ -3,15 +3,13 @@ MLRP_BronyTrait 0.1 - Violent
  • - {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. + {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. 6 - -0.5 -3~1 -98~1 diff --git a/MyLittleRimPony/Core 1.5/Languages/English/Keyed/Keys.xml b/MyLittleRimPony/Core 1.5/Languages/English/Keyed/Keys.xml index f3d98d86..c43a7ddc 100644 --- a/MyLittleRimPony/Core 1.5/Languages/English/Keyed/Keys.xml +++ b/MyLittleRimPony/Core 1.5/Languages/English/Keyed/Keys.xml @@ -32,18 +32,19 @@ - Anti brony has harmony chip - 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. + Anti brony has harmony chip + 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. - Sweetie Bot mechanoids - 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. + Sweetie Bot mechanoids + 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. - [My Little RimPony] XML Extensions has been detected. - [My Little RimPony] Combat Extended has been detected. - [My Little RimPony] Medieval Overhaul patches have been applied. + [My Little RimPony] XML Extensions has been detected. + [My Little RimPony] Combat Extended has been detected. + [My Little RimPony] Medieval Overhaul patches have been applied. + [My Little RimPony] Harmony detected. Research tracker is now active. \ No newline at end of file diff --git a/MyLittleRimPony/Core 1.5/Languages/English/Strings/NameBanks/PonySingleNames.txt b/MyLittleRimPony/Core 1.5/Languages/English/Strings/NameBanks/PonySingleNames.txt index 0c43fd4f..37e3f0a9 100644 --- a/MyLittleRimPony/Core 1.5/Languages/English/Strings/NameBanks/PonySingleNames.txt +++ b/MyLittleRimPony/Core 1.5/Languages/English/Strings/NameBanks/PonySingleNames.txt @@ -19,7 +19,11 @@ Flim Flam Derpy Bon Bon +Daisy +Lily Roseluck +Aloe +Lotus Minuette Twinkleshine Blossomforth diff --git a/MyLittleRimPony/Core 1.5/Languages/French/Keyed/Keys.xml b/MyLittleRimPony/Core 1.5/Languages/French/Keyed/Keys.xml index e1eca459..e74dc856 100644 --- a/MyLittleRimPony/Core 1.5/Languages/French/Keyed/Keys.xml +++ b/MyLittleRimPony/Core 1.5/Languages/French/Keyed/Keys.xml @@ -9,27 +9,27 @@ Anti brony utilisant la peluche 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. Affliction de la blague du poison - Fumer une blague du poison a donné à {0} ce qui suit : {1} + Fumer une blague du poison a donné à {0} ce qui suit: {1} - accrue de l'état de conscience - diminution de l'état de conscience - vitesse de déplacement accrue - vitesse de déplacement réduite - une meilleure manipulation - réduction de la manipulation - amélioration de la capacité d'expression orale - incapacité à parler - Amélioration de la vitesse de consommation - réduction de la vitesse d'ingestion des aliments - amélioration de la vue - cécité - amélioration de l'audition - surdité - amélioration de la capacité respiratoire - une diminution de la capacité respiratoire - la Cutie Pox + Fumer une blague du poison a donné à {0} ce qui suit: accrue de l'état de conscience + Fumer une blague du poison a donné à {0} ce qui suit: diminution de l'état de conscience + Fumer une blague du poison a donné à {0} ce qui suit: vitesse de déplacement accrue + Fumer une blague du poison a donné à {0} ce qui suit: vitesse de déplacement réduite + Fumer une blague du poison a donné à {0} ce qui suit: une meilleure manipulation + Fumer une blague du poison a donné à {0} ce qui suit: réduction de la manipulation + Fumer une blague du poison a donné à {0} ce qui suit: amélioration de la capacité d'expression orale + Fumer une blague du poison a donné à {0} ce qui suit: incapacité à parler + Fumer une blague du poison a donné à {0} ce qui suit: Amélioration de la vitesse de consommation + Fumer une blague du poison a donné à {0} ce qui suit: réduction de la vitesse d'ingestion des aliments + Fumer une blague du poison a donné à {0} ce qui suit: amélioration de la vue + Fumer une blague du poison a donné à {0} ce qui suit: cécité + Fumer une blague du poison a donné à {0} ce qui suit: amélioration de l'audition + Fumer une blague du poison a donné à {0} ce qui suit: surdité + Fumer une blague du poison a donné à {0} ce qui suit: amélioration de la capacité respiratoire + Fumer une blague du poison a donné à {0} ce qui suit: une diminution de la capacité respiratoire + Fumer une blague du poison a donné à {0} ce qui suit: la Cutie Pox diff --git a/MyLittleRimPony/Core 1.5/Languages/German/Keyed/Keys.xml b/MyLittleRimPony/Core 1.5/Languages/German/Keyed/Keys.xml index 3f3bcc13..6ee72834 100644 --- a/MyLittleRimPony/Core 1.5/Languages/German/Keyed/Keys.xml +++ b/MyLittleRimPony/Core 1.5/Languages/German/Keyed/Keys.xml @@ -13,23 +13,23 @@ - erhöhtes Bewusstsein - reduziertes Bewusstsein - Bewegungsgeschwindigkeit erhöht - Bewegungsgeschwindigkeit verringert - verbesserte Manipulation - reduzierte Manipulation - verbesserte Sprechfähigkeit - Unfähigkeit zu sprechen - verbesserte Essgeschwindigkeit - Essgeschwindigkeit verringert - verbesserte Sehkraft - Blindheit - verbessertes Hören - Taubheit - verbesserte Atmungsfähigkeit - reduzierte Atmungsfähigkeit - die Cutie Pox + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: erhöhtes Bewusstsein + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: reduziertes Bewusstsein + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: Bewegungsgeschwindigkeit erhöht + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: Bewegungsgeschwindigkeit verringert + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: verbesserte Manipulation + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: reduzierte Manipulation + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: verbesserte Sprechfähigkeit + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: Unfähigkeit zu sprechen + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: verbesserte Essgeschwindigkeit + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: Essgeschwindigkeit verringert + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: verbesserte Sehkraft + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: Blindheit + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: verbessertes Hören + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: Taubheit + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: verbesserte Atmungsfähigkeit + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: reduzierte Atmungsfähigkeit + Das Rauchen eines Giftwitzes hat {0} Folgendes gegeben: die Cutie Pox diff --git a/MyLittleRimPony/Core 1.5/Patches/Humanoid Alien Races/BroniesAreNotXenophobic.xml b/MyLittleRimPony/Core 1.5/Patches/Humanoid Alien Races/BroniesAreNotXenophobic.xml index db6264bf..0dd44377 100644 --- a/MyLittleRimPony/Core 1.5/Patches/Humanoid Alien Races/BroniesAreNotXenophobic.xml +++ b/MyLittleRimPony/Core 1.5/Patches/Humanoid Alien Races/BroniesAreNotXenophobic.xml @@ -7,7 +7,7 @@ Defs/TraitDef[defName="MLRP_BronyTrait"]/conflictingTraits -
  • Xenophobia
    • +
  • HAR_Xenophobia
    • diff --git a/MyLittleRimPony/Core 1.5/Patches/Ponies of the Rim/POTRPawnsCannotBeAntiBronies.xml b/MyLittleRimPony/Core 1.5/Patches/Ponies of the Rim/POTRPawnsCannotBeAntiBronies.xml new file mode 100644 index 00000000..b2610bea --- /dev/null +++ b/MyLittleRimPony/Core 1.5/Patches/Ponies of the Rim/POTRPawnsCannotBeAntiBronies.xml @@ -0,0 +1,32 @@ + + + + +
  • Ponies of the Rim
    • +     + + +
  • + /Defs/PawnKindDef[defName="EPonyGrenadier_Destructive" or defName="EPonyMercenary_Gunner" or defName="EPonyMercenary_Slasher" or defName="EPonyMercenary_Elite" or defName="PPonyGrenadier_Destructive" or defName="PPonyMercenary_Gunner" or defName="PPonyMercenary_Slasher" or defName="PPonyMercenary_Elite" or defName="UPonyGrenadier_Destructive" or defName="UPonyMercenary_Gunner" or defName="UPonyMercenary_Slasher" or defName="UPonyMercenary_Elite" or defName="EPonySlave" or defName="EPonyRefugee" or defName="EPonyVillager" or defName="PPonySlave" or defName="PPonyRefugee" or defName="PPonyVillager" or defName="UPonySlave" or defName="UPonyRefugee" or defName="UPonyVillager" or defName="EPonyTown_Guard" or defName="EPonyTown_Trader" or defName="EPonyTown_Councilman" or defName="PPonyTown_Guard" or defName="PPonyTown_Trader" or defName="PPonyTown_Councilman" or defName="UPonyTown_Guard" or defName="UPonyTown_Trader" or defName="UPonyTown_Councilman" or defName="EPonyColonist" or defName="PPonyColonist" or defName="UPonyColonist" or defName="EPonyTribe" or defName="PPonyTribe" or defName="UPonyTribe"]/disallowedTraits + + /Defs/PawnKindDef[defName="EPonyGrenadier_Destructive" or defName="EPonyMercenary_Gunner" or defName="EPonyMercenary_Slasher" or defName="EPonyMercenary_Elite" or defName="PPonyGrenadier_Destructive" or defName="PPonyMercenary_Gunner" or defName="PPonyMercenary_Slasher" or defName="PPonyMercenary_Elite" or defName="UPonyGrenadier_Destructive" or defName="UPonyMercenary_Gunner" or defName="UPonyMercenary_Slasher" or defName="UPonyMercenary_Elite" or defName="EPonySlave" or defName="EPonyRefugee" or defName="EPonyVillager" or defName="PPonySlave" or defName="PPonyRefugee" or defName="PPonyVillager" or defName="UPonySlave" or defName="UPonyRefugee" or defName="UPonyVillager" or defName="EPonyTown_Guard" or defName="EPonyTown_Trader" or defName="EPonyTown_Councilman" or defName="PPonyTown_Guard" or defName="PPonyTown_Trader" or defName="PPonyTown_Councilman" or defName="UPonyTown_Guard" or defName="UPonyTown_Trader" or defName="UPonyTown_Councilman" or defName="EPonyColonist" or defName="PPonyColonist" or defName="UPonyColonist" or defName="EPonyTribe" or defName="PPonyTribe" or defName="UPonyTribe"] + + +
  • MLRP_BronyTrait
    • +
  • MLRP_AntiBronyTrait
    • + + + + + /Defs/PawnKindDef[defName="EPonyGrenadier_Destructive" or defName="EPonyMercenary_Gunner" or defName="EPonyMercenary_Slasher" or defName="EPonyMercenary_Elite" or defName="PPonyGrenadier_Destructive" or defName="PPonyMercenary_Gunner" or defName="PPonyMercenary_Slasher" or defName="PPonyMercenary_Elite" or defName="UPonyGrenadier_Destructive" or defName="UPonyMercenary_Gunner" or defName="UPonyMercenary_Slasher" or defName="UPonyMercenary_Elite" or defName="EPonySlave" or defName="EPonyRefugee" or defName="EPonyVillager" or defName="PPonySlave" or defName="PPonyRefugee" or defName="PPonyVillager" or defName="UPonySlave" or defName="UPonyRefugee" or defName="UPonyVillager" or defName="EPonyTown_Guard" or defName="EPonyTown_Trader" or defName="EPonyTown_Councilman" or defName="PPonyTown_Guard" or defName="PPonyTown_Trader" or defName="PPonyTown_Councilman" or defName="UPonyTown_Guard" or defName="UPonyTown_Trader" or defName="UPonyTown_Councilman" or defName="EPonyColonist" or defName="PPonyColonist" or defName="UPonyColonist" or defName="EPonyTribe" or defName="PPonyTribe" or defName="UPonyTribe"]/disallowedTraits + +
  • MLRP_AntiBronyTrait
    • +
  • MLRP_BronyTrait
    • +     +     + +     +     +     + +     \ No newline at end of file diff --git a/MyLittleRimPony/Core 1.5/Patches/Ponies of the Rim/POTR_FE_Recipes.xml b/MyLittleRimPony/Core 1.5/Patches/Ponies of the Rim/POTR_FE_Recipes.xml new file mode 100644 index 00000000..63ec4fe2 --- /dev/null +++ b/MyLittleRimPony/Core 1.5/Patches/Ponies of the Rim/POTR_FE_Recipes.xml @@ -0,0 +1,33 @@ + + + + +
  • Ponies of the Rim
    • +     + + Defs + + + MLRP_POTR_FE_PonyFur + + Exchanging materials + Convert 100 pony fur into the market value equivalent of cloth. + +
  • + + +
  • PonyFur
    • + + + 100 + +     + + 300 + +     +     +     +     + +     \ No newline at end of file diff --git a/MyLittleRimPony/Core/Assemblies/MyLittleRimPony.dll b/MyLittleRimPony/Core/Assemblies/MyLittleRimPony.dll index d029f491..6085d1fc 100644 Binary files a/MyLittleRimPony/Core/Assemblies/MyLittleRimPony.dll and b/MyLittleRimPony/Core/Assemblies/MyLittleRimPony.dll differ diff --git a/MyLittleRimPony/Core/Defs/FactionDefs/MLP_Scenario.xml b/MyLittleRimPony/Core/Defs/FactionDefs/MLP_Scenario.xml index f621ac72..bd570434 100644 --- a/MyLittleRimPony/Core/Defs/FactionDefs/MLP_Scenario.xml +++ b/MyLittleRimPony/Core/Defs/FactionDefs/MLP_Scenario.xml @@ -43,19 +43,20 @@ MLRP_BronyTrait - + -
  • - + 2
    • -
  • - + Plasteel
    • @@ -157,7 +158,7 @@
  • GameStartDialog - 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. + 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.
    • diff --git a/MyLittleRimPony/Core/Defs/TraitDefs/BronyTrait.xml b/MyLittleRimPony/Core/Defs/TraitDefs/BronyTrait.xml index 1675d15a..887d5b24 100644 --- a/MyLittleRimPony/Core/Defs/TraitDefs/BronyTrait.xml +++ b/MyLittleRimPony/Core/Defs/TraitDefs/BronyTrait.xml @@ -3,18 +3,16 @@ MLRP_BronyTrait 0.1 - Violent
  • - {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. + {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.
  • Social 6
    • - -0.5     diff --git a/MyLittleRimPony/Core/Languages/English/Strings/NameBanks/PonySingleNames.txt b/MyLittleRimPony/Core/Languages/English/Strings/NameBanks/PonySingleNames.txt index 0c43fd4f..37e3f0a9 100644 --- a/MyLittleRimPony/Core/Languages/English/Strings/NameBanks/PonySingleNames.txt +++ b/MyLittleRimPony/Core/Languages/English/Strings/NameBanks/PonySingleNames.txt @@ -19,7 +19,11 @@ Flim Flam Derpy Bon Bon +Daisy +Lily Roseluck +Aloe +Lotus Minuette Twinkleshine Blossomforth diff --git a/MyLittleRimPony/Harmony/Assemblies/MLRP_ResearchTracker.dll b/MyLittleRimPony/Harmony/Assemblies/MLRP_ResearchTracker.dll new file mode 100644 index 00000000..6ffb25d4 Binary files /dev/null and b/MyLittleRimPony/Harmony/Assemblies/MLRP_ResearchTracker.dll differ diff --git a/MyLittleRimPony/Harmony/Languages/English/Keyed/Keys_Harmony.xml b/MyLittleRimPony/Harmony/Languages/English/Keyed/Keys_Harmony.xml new file mode 100644 index 00000000..60aeca7e --- /dev/null +++ b/MyLittleRimPony/Harmony/Languages/English/Keyed/Keys_Harmony.xml @@ -0,0 +1,9 @@ + + + New recipe(s) unlocked + New recipe(s) available at the Daybreaker statue. + New recipe(s) available at the Fabric Exchange. + New recipe(s) available at the Nightmare Moon statue. + New recipe(s) available from Thingpone. + + \ No newline at end of file diff --git a/MyLittleRimPony/Harmony/Source/.vs/MLRP_ResearchTracker/v16/.suo b/MyLittleRimPony/Harmony/Source/.vs/MLRP_ResearchTracker/v16/.suo new file mode 100644 index 00000000..01657829 Binary files /dev/null and b/MyLittleRimPony/Harmony/Source/.vs/MLRP_ResearchTracker/v16/.suo differ diff --git a/MyLittleRimPony/Harmony/Source/Class1.cs b/MyLittleRimPony/Harmony/Source/Class1.cs new file mode 100644 index 00000000..2486715e --- /dev/null +++ b/MyLittleRimPony/Harmony/Source/Class1.cs @@ -0,0 +1,77 @@ +using RimWorld; +using System.Reflection; +using Verse; +using HarmonyLib; + +namespace MLRP_ResearchTracker +{ + [StaticConstructorOnStartup] + static class MLRP_HarmonyPatch + { + static MLRP_HarmonyPatch() + { + var rimpony_harmony = new Harmony("geodesicdragon.rimpony"); + rimpony_harmony.PatchAll(Assembly.GetExecutingAssembly()); + } + } + + // RESEARCH TRACKER + + [HarmonyPatch(typeof(ResearchManager), "FinishProject")] + public static class MLRP_ResearchTracker + { + private static void Postfix(ResearchProjectDef proj) + { + // DAYBREAKER STATUE + if (proj == DefDatabase.GetNamed("Brewing") || proj == DefDatabase.GetNamed("Fabrication") || proj == DefDatabase.GetNamed("AdvancedFabrication") || proj == DefDatabase.GetNamed("BioferriteShaping")) + { + LetterDef MLRP_NewDBRecipe = LetterDefOf.PositiveEvent; + string title = "MLRP_NewRecipeUnlockedTitle".Translate(); + string text = "MLRP_NewRecipeUnlockedTextDB".Translate(); + Find.LetterStack.ReceiveLetter(title, text, MLRP_NewDBRecipe); + } + + // FABRIC EXCHANGE + if (proj == DefDatabase.GetNamed("Devilstrand")) + { + LetterDef MLRP_NewFERecipe = LetterDefOf.PositiveEvent; + string title = "MLRP_NewRecipeUnlockedTitle".Translate(); + string text = "MLRP_NewRecipeUnlockedTextFE".Translate(); + Find.LetterStack.ReceiveLetter(title, text, MLRP_NewFERecipe); + } + + // NIGHTMARE MOON + if (proj == DefDatabase.GetNamed("ShipComputerCore") || proj == DefDatabase.GetNamed("MedicineProduction") || proj == DefDatabase.GetNamed("DrugProduction") || proj == DefDatabase.GetNamed("Mortars") || proj == DefDatabase.GetNamed("Bionics") || proj == DefDatabase.GetNamed("HealingFactors") || proj == DefDatabase.GetNamed("NeuralComputation") || proj == DefDatabase.GetNamed("MolecularAnalysis") || proj == DefDatabase.GetNamed("SkinHardening") || proj == DefDatabase.GetNamed("FleshShaping") || proj == DefDatabase.GetNamed("ArtificialMetabolism") || proj == DefDatabase.GetNamed("CircadianInfluence") || proj == DefDatabase.GetNamed("StandardMechtech") || proj == DefDatabase.GetNamed("HighMechtech") || proj == DefDatabase.GetNamed("UltraMechtech") || proj == DefDatabase.GetNamed("Deathrest") || proj == DefDatabase.GetNamed("ToxFiltration") || proj == DefDatabase.GetNamed("MLRP_MagicMirrorResearch") || proj == DefDatabase.GetNamed("MLRP_ArchotechResearch") || proj == DefDatabase.GetNamed("MolecularNutrientResequencing") || proj == DefDatabase.GetNamed("AcceleratedCellularRegeneration") || proj == DefDatabase.GetNamed("RM_WeatherController") || proj == DefDatabase.GetNamed("RM_ClimateAdjuster") || proj == DefDatabase.GetNamed("RM_SunBlocker") || proj == DefDatabase.GetNamed("AdvancedBandwidthEnhancer")) + { + LetterDef MLRP_NewNMMRecipe = LetterDefOf.PositiveEvent; + string title = "MLRP_NewRecipeUnlockedTitle".Translate(); + string text = "MLRP_NewRecipeUnlockedTextNMM".Translate(); + Find.LetterStack.ReceiveLetter(title, text, MLRP_NewNMMRecipe); + } + + if (proj == DefDatabase.GetNamed("HospitalBed")) + { + if (ModsConfig.IsActive("Ludeon.RimWorld.Royalty")) + { + return; // Don't send a letter if the player researches hospital beds with Royalty enabled + } + else + { + LetterDef MLRP_NewNMMRecipe = LetterDefOf.PositiveEvent; + string title = "MLRP_NewRecipeUnlockedTitle".Translate(); + string text = "MLRP_NewRecipeUnlockedTextNMM".Translate(); + Find.LetterStack.ReceiveLetter(title, text, MLRP_NewNMMRecipe); + } + } + + // THINGPONE (REQUIRES ANOMALY DLC) + if (proj == DefDatabase.GetNamed("DeadlifeDust") || proj == DefDatabase.GetNamed("SerumSynthesis") || proj == DefDatabase.GetNamed("MetalbloodSerum") || proj == DefDatabase.GetNamed("JuggernautSerum") || proj == DefDatabase.GetNamed("MindNumbSerum") || proj == DefDatabase.GetNamed("GhoulResurrection")) + { + LetterDef MLRP_NewTPRecipe = LetterDefOf.PositiveEvent; + string title = "MLRP_NewRecipeUnlockedTitle".Translate(); + string text = "MLRP_NewRecipeUnlockedTextTP".Translate(); + Find.LetterStack.ReceiveLetter(title, text, MLRP_NewTPRecipe); + } + } + } +} diff --git a/MyLittleRimPony/Harmony/Source/MLRP_ResearchTracker.csproj b/MyLittleRimPony/Harmony/Source/MLRP_ResearchTracker.csproj new file mode 100644 index 00000000..c565b675 --- /dev/null +++ b/MyLittleRimPony/Harmony/Source/MLRP_ResearchTracker.csproj @@ -0,0 +1,56 @@ + + + + + Debug + AnyCPU + {9D13B30D-F39A-4E27-B731-6B4FFAC09D56} + Library + Properties + MLRP_ResearchTracker + MLRP_ResearchTracker + v4.8 + 512 + true + + + true + full + false + ..\Assemblies\ + DEBUG;TRACE + prompt + 4 + + + none + true + ..\Assemblies\ + TRACE + prompt + 4 + + + + ..\..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll + False + + + ..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll + False + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MyLittleRimPony/Harmony/Source/MLRP_ResearchTracker.sln b/MyLittleRimPony/Harmony/Source/MLRP_ResearchTracker.sln new file mode 100644 index 00000000..043289d2 --- /dev/null +++ b/MyLittleRimPony/Harmony/Source/MLRP_ResearchTracker.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.32929.386 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MLRP_ResearchTracker", "MLRP_ResearchTracker.csproj", "{9D13B30D-F39A-4E27-B731-6B4FFAC09D56}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9D13B30D-F39A-4E27-B731-6B4FFAC09D56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9D13B30D-F39A-4E27-B731-6B4FFAC09D56}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9D13B30D-F39A-4E27-B731-6B4FFAC09D56}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9D13B30D-F39A-4E27-B731-6B4FFAC09D56}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {1AFCDF2A-1ECA-44EA-B7AC-3E6F60914977} + EndGlobalSection +EndGlobal diff --git a/MyLittleRimPony/Harmony/Source/Properties/AssemblyInfo.cs b/MyLittleRimPony/Harmony/Source/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..31a56172 --- /dev/null +++ b/MyLittleRimPony/Harmony/Source/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("MLRP_ResearchTracker")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("MLRP_ResearchTracker")] +[assembly: AssemblyCopyright("Copyright © 2024")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("9d13b30d-f39a-4e27-b731-6b4ffac09d56")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/MyLittleRimPony/Harmony/Source/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs b/MyLittleRimPony/Harmony/Source/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs new file mode 100644 index 00000000..15efebfc --- /dev/null +++ b/MyLittleRimPony/Harmony/Source/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")] diff --git a/MyLittleRimPony/Harmony/Source/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/MyLittleRimPony/Harmony/Source/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 00000000..cd730454 Binary files /dev/null and b/MyLittleRimPony/Harmony/Source/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.csproj.AssemblyReference.cache b/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.csproj.AssemblyReference.cache new file mode 100644 index 00000000..56bd7cf3 Binary files /dev/null and b/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.csproj.AssemblyReference.cache differ diff --git a/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.csproj.CoreCompileInputs.cache b/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.csproj.CoreCompileInputs.cache new file mode 100644 index 00000000..94975024 --- /dev/null +++ b/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +aa28ddf7b379514779d906ff5bf0aa3c1af888f4 diff --git a/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.csproj.FileListAbsolute.txt b/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.csproj.FileListAbsolute.txt new file mode 100644 index 00000000..9d4f7eea --- /dev/null +++ b/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.csproj.FileListAbsolute.txt @@ -0,0 +1,6 @@ +E:\SteamLibrary\steamapps\common\RimWorld\Mods\MyLittleRimPony\Harmony\Assemblies\MLRP_ResearchTracker.dll +E:\SteamLibrary\steamapps\common\RimWorld\Mods\MyLittleRimPony\Harmony\Assemblies\MLRP_ResearchTracker.pdb +E:\SteamLibrary\steamapps\common\RimWorld\Mods\MyLittleRimPony\Harmony\Source\obj\Debug\MLRP_ResearchTracker.csproj.AssemblyReference.cache +E:\SteamLibrary\steamapps\common\RimWorld\Mods\MyLittleRimPony\Harmony\Source\obj\Debug\MLRP_ResearchTracker.csproj.CoreCompileInputs.cache +E:\SteamLibrary\steamapps\common\RimWorld\Mods\MyLittleRimPony\Harmony\Source\obj\Debug\MLRP_ResearchTracker.dll +E:\SteamLibrary\steamapps\common\RimWorld\Mods\MyLittleRimPony\Harmony\Source\obj\Debug\MLRP_ResearchTracker.pdb diff --git a/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.dll b/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.dll new file mode 100644 index 00000000..eae9d7fb Binary files /dev/null and b/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.dll differ diff --git a/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.pdb b/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.pdb new file mode 100644 index 00000000..5ec481de Binary files /dev/null and b/MyLittleRimPony/Harmony/Source/obj/Debug/MLRP_ResearchTracker.pdb differ diff --git a/MyLittleRimPony/Harmony/Source/obj/Release/.NETFramework,Version=v4.8.AssemblyAttributes.cs b/MyLittleRimPony/Harmony/Source/obj/Release/.NETFramework,Version=v4.8.AssemblyAttributes.cs new file mode 100644 index 00000000..15efebfc --- /dev/null +++ b/MyLittleRimPony/Harmony/Source/obj/Release/.NETFramework,Version=v4.8.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")] diff --git a/MyLittleRimPony/Harmony/Source/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/MyLittleRimPony/Harmony/Source/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 00000000..392d4a3e Binary files /dev/null and b/MyLittleRimPony/Harmony/Source/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/MyLittleRimPony/Harmony/Source/obj/Release/MLRP_ResearchTracker.csproj.AssemblyReference.cache b/MyLittleRimPony/Harmony/Source/obj/Release/MLRP_ResearchTracker.csproj.AssemblyReference.cache new file mode 100644 index 00000000..f5e894ae Binary files /dev/null and b/MyLittleRimPony/Harmony/Source/obj/Release/MLRP_ResearchTracker.csproj.AssemblyReference.cache differ diff --git a/MyLittleRimPony/Harmony/Source/obj/Release/MLRP_ResearchTracker.csproj.CoreCompileInputs.cache b/MyLittleRimPony/Harmony/Source/obj/Release/MLRP_ResearchTracker.csproj.CoreCompileInputs.cache new file mode 100644 index 00000000..61189131 --- /dev/null +++ b/MyLittleRimPony/Harmony/Source/obj/Release/MLRP_ResearchTracker.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +827dc2a64cf328970f0c9c766a20a3ab6c3b0c5b diff --git a/MyLittleRimPony/Harmony/Source/obj/Release/MLRP_ResearchTracker.csproj.FileListAbsolute.txt b/MyLittleRimPony/Harmony/Source/obj/Release/MLRP_ResearchTracker.csproj.FileListAbsolute.txt new file mode 100644 index 00000000..315a7a0e --- /dev/null +++ b/MyLittleRimPony/Harmony/Source/obj/Release/MLRP_ResearchTracker.csproj.FileListAbsolute.txt @@ -0,0 +1,6 @@ +E:\SteamLibrary\steamapps\common\RimWorld\Mods\MyLittleRimPony\Harmony\Source\bin\Release\MLRP_ResearchTracker.dll +E:\SteamLibrary\steamapps\common\RimWorld\Mods\MyLittleRimPony\Harmony\Source\bin\Release\MLRP_ResearchTracker.pdb +E:\SteamLibrary\steamapps\common\RimWorld\Mods\MyLittleRimPony\Harmony\Source\obj\Release\MLRP_ResearchTracker.csproj.AssemblyReference.cache +E:\SteamLibrary\steamapps\common\RimWorld\Mods\MyLittleRimPony\Harmony\Source\obj\Release\MLRP_ResearchTracker.csproj.CoreCompileInputs.cache +E:\SteamLibrary\steamapps\common\RimWorld\Mods\MyLittleRimPony\Harmony\Source\obj\Release\MLRP_ResearchTracker.dll +E:\SteamLibrary\steamapps\common\RimWorld\Mods\MyLittleRimPony\Harmony\Assemblies\MLRP_ResearchTracker.dll diff --git a/MyLittleRimPony/Harmony/Source/obj/Release/MLRP_ResearchTracker.dll b/MyLittleRimPony/Harmony/Source/obj/Release/MLRP_ResearchTracker.dll new file mode 100644 index 00000000..6ffb25d4 Binary files /dev/null and b/MyLittleRimPony/Harmony/Source/obj/Release/MLRP_ResearchTracker.dll differ diff --git a/MyLittleRimPony/LoadFolders.xml b/MyLittleRimPony/LoadFolders.xml index 3314dc95..852a79d4 100644 --- a/MyLittleRimPony/LoadFolders.xml +++ b/MyLittleRimPony/LoadFolders.xml @@ -22,6 +22,7 @@
  • Ideology
  • Biotech
  • Anomaly
    • +
  • Harmony
  • HugsLib
  • Dubs Bad Hygiene
  • Alpha Genes
    • diff --git a/MyLittleRimPony/Source 1.4/.vs/MLRP_Assemblies/v16/.suo b/MyLittleRimPony/Source 1.4/.vs/MLRP_Assemblies/v16/.suo index db9402ee..30e61098 100644 Binary files a/MyLittleRimPony/Source 1.4/.vs/MLRP_Assemblies/v16/.suo and b/MyLittleRimPony/Source 1.4/.vs/MLRP_Assemblies/v16/.suo differ diff --git a/MyLittleRimPony/Source 1.4/Properties/AssemblyInfo.cs b/MyLittleRimPony/Source 1.4/Properties/AssemblyInfo.cs index 56c13eae..218fd55d 100644 --- a/MyLittleRimPony/Source 1.4/Properties/AssemblyInfo.cs +++ b/MyLittleRimPony/Source 1.4/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.15.39.0")] -[assembly: AssemblyFileVersion("5.15.39.0")] +[assembly: AssemblyVersion("5.17.45.0")] +[assembly: AssemblyFileVersion("5.17.45.0")] [assembly: NeutralResourcesLanguage("")] diff --git a/MyLittleRimPony/Source 1.4/obj/Debug/MyLittleRimPony.dll b/MyLittleRimPony/Source 1.4/obj/Debug/MyLittleRimPony.dll index d029f491..6085d1fc 100644 Binary files a/MyLittleRimPony/Source 1.4/obj/Debug/MyLittleRimPony.dll and b/MyLittleRimPony/Source 1.4/obj/Debug/MyLittleRimPony.dll differ diff --git a/MyLittleRimPony/Source 1.5/.vs/MLRP_Assemblies/v16/.suo b/MyLittleRimPony/Source 1.5/.vs/MLRP_Assemblies/v16/.suo index bfe74b12..d82d814d 100644 Binary files a/MyLittleRimPony/Source 1.5/.vs/MLRP_Assemblies/v16/.suo and b/MyLittleRimPony/Source 1.5/.vs/MLRP_Assemblies/v16/.suo differ diff --git a/MyLittleRimPony/Source 1.5/MLRP_Assemblies.csproj b/MyLittleRimPony/Source 1.5/MLRP_Assemblies.csproj index 70254be2..310b4871 100644 --- a/MyLittleRimPony/Source 1.5/MLRP_Assemblies.csproj +++ b/MyLittleRimPony/Source 1.5/MLRP_Assemblies.csproj @@ -31,6 +31,10 @@ 4 + + ..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll + False + ..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll False diff --git a/MyLittleRimPony/Source 1.5/MLRP_ResearchNotifications.cs b/MyLittleRimPony/Source 1.5/MLRP_ResearchNotifications.cs index 77f3e90b..79001e41 100644 --- a/MyLittleRimPony/Source 1.5/MLRP_ResearchNotifications.cs +++ b/MyLittleRimPony/Source 1.5/MLRP_ResearchNotifications.cs @@ -56,12 +56,6 @@ public class MLRP_ResearchTracker : GameComponent "AdvancedFabrication" // Vanilla Factions Expanded - Vikings }; - // Track research on Sweetie Bot mechanoids to send a brief letter about them when it's finished - private List otherResearchToTrack = new List - { - "MLRP_SweetieBotMechResearch" - }; - public MLRP_ResearchTracker(Game game) { } public override void ExposeData() diff --git a/MyLittleRimPony/Source 1.5/MyLittleRimPony.cs b/MyLittleRimPony/Source 1.5/MyLittleRimPony.cs index 8b5a5603..8c268494 100644 --- a/MyLittleRimPony/Source 1.5/MyLittleRimPony.cs +++ b/MyLittleRimPony/Source 1.5/MyLittleRimPony.cs @@ -70,6 +70,10 @@ static MyDefOf() { Log.Message("MLRP_MOPatchesDetected".Translate()); } + if (ModsConfig.IsActive("brrainz.harmony")) + { + Log.Message("MLRP_HarmonyDetected".Translate()); + } } } diff --git a/MyLittleRimPony/Source 1.5/Properties/AssemblyInfo.cs b/MyLittleRimPony/Source 1.5/Properties/AssemblyInfo.cs index 56c13eae..218fd55d 100644 --- a/MyLittleRimPony/Source 1.5/Properties/AssemblyInfo.cs +++ b/MyLittleRimPony/Source 1.5/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.15.39.0")] -[assembly: AssemblyFileVersion("5.15.39.0")] +[assembly: AssemblyVersion("5.17.45.0")] +[assembly: AssemblyFileVersion("5.17.45.0")] [assembly: NeutralResourcesLanguage("")] diff --git a/MyLittleRimPony/Source 1.5/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/MyLittleRimPony/Source 1.5/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 3e418850..6a7f1a7a 100644 Binary files a/MyLittleRimPony/Source 1.5/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/MyLittleRimPony/Source 1.5/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/MyLittleRimPony/Source 1.5/obj/Debug/MLRP_Assemblies.csproj.AssemblyReference.cache b/MyLittleRimPony/Source 1.5/obj/Debug/MLRP_Assemblies.csproj.AssemblyReference.cache index eaaef504..75e64fae 100644 Binary files a/MyLittleRimPony/Source 1.5/obj/Debug/MLRP_Assemblies.csproj.AssemblyReference.cache and b/MyLittleRimPony/Source 1.5/obj/Debug/MLRP_Assemblies.csproj.AssemblyReference.cache differ diff --git a/MyLittleRimPony/Source 1.5/obj/Debug/MLRP_Assemblies.csproj.CoreCompileInputs.cache b/MyLittleRimPony/Source 1.5/obj/Debug/MLRP_Assemblies.csproj.CoreCompileInputs.cache index 7d252100..9d848a5c 100644 --- a/MyLittleRimPony/Source 1.5/obj/Debug/MLRP_Assemblies.csproj.CoreCompileInputs.cache +++ b/MyLittleRimPony/Source 1.5/obj/Debug/MLRP_Assemblies.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -dd57837e088ea5a5249a612d04ab33ab2d82ba1b +4bcb38b6d73ace67aec1d8763c05b511b2ff8bfa diff --git a/MyLittleRimPony/Source 1.5/obj/Debug/MyLittleRimPony.dll b/MyLittleRimPony/Source 1.5/obj/Debug/MyLittleRimPony.dll index c0ea3104..a7a9ad97 100644 Binary files a/MyLittleRimPony/Source 1.5/obj/Debug/MyLittleRimPony.dll and b/MyLittleRimPony/Source 1.5/obj/Debug/MyLittleRimPony.dll differ diff --git a/MyLittleRimPony/XML Extensions/Patches/MLRP_Settings.xml b/MyLittleRimPony/XML Extensions/Patches/MLRP_Settings.xml index 60e79d47..aaf1925a 100644 --- a/MyLittleRimPony/XML Extensions/Patches/MLRP_Settings.xml +++ b/MyLittleRimPony/XML Extensions/Patches/MLRP_Settings.xml @@ -151,187 +151,6 @@ - -
  • - geodesicdragon.rimpony - MLRP_BroniesCanBeViolent - false - - - Defs/TraitDef[defName="MLRP_BronyTrait"]/disabledWorkTags - - - - - - - Defs/TraitDef[defName="MLRP_BronyTrait"]/degreeDatas/li/description - - {PAWN_nameDef} has taken the lessons of My Little Pony: Friendship is Magic to heart; {PAWN_possessive} social skills have improved, and {PAWN_pronoun} will never judge others based on their appearance, voice or breathing. Also, 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. - - - - - Defs/TraitDef[defName="MLRP_BronyTrait"]/degreeDatas/li/marketValueFactorOffset - - 0 - - - - - Defs/ScenarioDef[defName="MLRP_Scenario"]/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. - - - - - Defs/ScenarioDef[defName="MLRP_Scenario"]/scenario/parts/li[@Name="MLRP_CoreScenario_RangedWeapons"] - -
  • - StartingThing_Defined - Gun_Autopistol - 2 -
    • -
  • - StartingThing_Defined - Ammo_45ACP_FMJ - 210 -
    • - - - - - Defs/ScenarioDef[defName="MLRP_Scenario"]/scenario/parts/li[@Name="MLRP_CoreScenario_MeleeWeapons"] - -
  • - StartingThing_Defined - MeleeWeapon_Knife - 1 - Plasteel -
    • -     -     - - - Defs/ScenarioDef[defName="MLRP_Scenario_Xenos"]/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 are so passionate about My Little Pony, you each underwent xenotype implentation to transform yourselves into your favourite pony race.\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. - - - - - Defs/ScenarioDef[defName="MLRP_Scenario_Xenos"]/scenario/parts/li[@Name="MLRP_BiotechScenario_RangedWeapons"] - -
  • - StartingThing_Defined - Gun_Autopistol - 3 -
    • -
  • - StartingThing_Defined - Ammo_45ACP_FMJ - 315 -
    • -     -     - - - Defs/ScenarioDef[defName="MLRP_Scenario_Xenos"]/scenario/parts/li[@Name="MLRP_BiotechScenario_MeleeWeapons"] - -
  • - StartingThing_Defined - MeleeWeapon_Knife - 2 - Plasteel -
    • -     -     - - - - Defs/TraitDef[defName="MLRP_BronyTrait"]/disabledWorkTags - - Violent - - - - - Defs/TraitDef[defName="MLRP_BronyTrait"]/degreeDatas/li/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. - - - - - Defs/TraitDef[defName="MLRP_BronyTrait"]/degreeDatas/li/marketValueFactorOffset - - -0.5 - - - - - Defs/ScenarioDef[defName="MLRP_Scenario"]/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. - - - - - Defs/ScenarioDef[defName="MLRP_Scenario"]/scenario/parts/li[@Name="MLRP_CoreScenario_RangedWeapons"] - -
  • - -
    • -     -     - - - Defs/ScenarioDef[defName="MLRP_Scenario"]/scenario/parts/li[@Name="MLRP_CoreScenario_MeleeWeapons"] - -
  • - -
    • -     -     - - - Defs/ScenarioDef[defName="MLRP_Scenario_Xenos"]/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 are so passionate about My Little Pony, you each underwent xenotype implentation to transform yourselves into your favourite pony race.\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. - - - - - Defs/ScenarioDef[defName="MLRP_Scenario_Xenos"]/scenario/parts/li[@Name="MLRP_BiotechScenario_RangedWeapons"] - -
  • - -
    • -     -     - - - Defs/ScenarioDef[defName="MLRP_Scenario_Xenos"]/scenario/parts/li[@Name="MLRP_BiotechScenario_MeleeWeapons"] - -
  • - -
    • -     -     -     - -
  • geodesicdragon.rimpony @@ -1621,11 +1440,6 @@ Left
    • -
  • - MLRP_BroniesCanBeViolent - -
    • -
  • MLRP_BronyTraitCommonality 0.1